* [PR PATCH] qt6-webengine: fix glibc
@ 2023-10-31 22:46 Johnnynator
2023-10-31 22:48 ` [PR PATCH] [Updated] " Johnnynator
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Johnnynator @ 2023-10-31 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/46997
qt6-webengine: fix glibc
- qt6ct: update to 0.9.
- qt6-webengine: fix resolver on glibc
A patch file from https://github.com/void-linux/void-packages/pull/46997.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-46997.patch --]
[-- Type: text/x-diff, Size: 2628 bytes --]
From f4bf9cb543b1070a50943998802fceb46c2e171b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 22:50:34 +0100
Subject: [PATCH 1/2] qt6ct: update to 0.9.
---
srcpkgs/qt6ct/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
index 731ebfa7aaf36..3b0d91b37474b 100644
--- a/srcpkgs/qt6ct/template
+++ b/srcpkgs/qt6ct/template
@@ -1,7 +1,7 @@
# Template file for 'qt6ct'
pkgname=qt6ct
-version=0.8
-revision=2
+version=0.9
+revision=1
build_style=cmake
hostmakedepends="qt6-tools qt6-base"
makedepends="qt6-base-devel"
@@ -11,7 +11,7 @@ maintainer="Adam Pschorr <adampschorr13@aol.com>"
license="BSD-2-Clause"
homepage="https://github.com/trialuser02/qt6ct"
distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
-checksum=ca3706770cbdbce769ee4393de9f7469be043810fe40283690612f5f6552018a
+checksum=aa49c4fb51a82dd6947cd9c8dee9b3a1fdd4fbbc9f3c8c5c2d33fa1de9e8826e
post_install() {
vlicense COPYING
From 508858c22d4ea8343425e40156424bd8d3290ff2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 23:45:15 +0100
Subject: [PATCH 2/2] qt6-webengine: fix resolver on glibc
---
srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch | 2 +-
srcpkgs/qt6-webengine/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
index 3a06a994dd635..b6813bd5f5ded 100644
--- a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
+++ b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
@@ -45,7 +45,7 @@ index 2743697bf..36dc8adbf 100644
ScopedResState::ScopedResState() {
-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
++#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
// res_init behaves the same way.
memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 588194d573f05..98cdc680481b3 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-webengine'
pkgname=qt6-webengine
version=6.6.0
-revision=1
+revision=2
build_style=cmake
configure_args="
-DQT_FEATURE_webengine_system_ffmpeg=ON
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] qt6-webengine: fix glibc
2023-10-31 22:46 [PR PATCH] qt6-webengine: fix glibc Johnnynator
@ 2023-10-31 22:48 ` Johnnynator
2023-10-31 23:34 ` Johnnynator
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Johnnynator @ 2023-10-31 22:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/46997
qt6-webengine: fix glibc
- qt6ct: update to 0.9.
- qt6-webengine: fix resolver on glibc
A patch file from https://github.com/void-linux/void-packages/pull/46997.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-46997.patch --]
[-- Type: text/x-diff, Size: 1575 bytes --]
From e36941192c20ca5819852a9215259eb2d43a3496 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 23:45:15 +0100
Subject: [PATCH] qt6-webengine: fix resolver on glibc
---
srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch | 2 +-
srcpkgs/qt6-webengine/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
index 3a06a994dd635..b6813bd5f5ded 100644
--- a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
+++ b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
@@ -45,7 +45,7 @@ index 2743697bf..36dc8adbf 100644
ScopedResState::ScopedResState() {
-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
++#if !BUILDFLAG(IS_OPENBSD) && !BUILDFLAG(IS_FUCHSIA) && !(BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
// res_init behaves the same way.
memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 588194d573f05..98cdc680481b3 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-webengine'
pkgname=qt6-webengine
version=6.6.0
-revision=1
+revision=2
build_style=cmake
configure_args="
-DQT_FEATURE_webengine_system_ffmpeg=ON
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] qt6-webengine: fix glibc
2023-10-31 22:46 [PR PATCH] qt6-webengine: fix glibc Johnnynator
2023-10-31 22:48 ` [PR PATCH] [Updated] " Johnnynator
@ 2023-10-31 23:34 ` Johnnynator
2023-11-01 22:24 ` Johnnynator
2023-11-01 22:24 ` [PR PATCH] [Merged]: " Johnnynator
3 siblings, 0 replies; 5+ messages in thread
From: Johnnynator @ 2023-10-31 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/46997
qt6-webengine: fix glibc
- qt6ct: update to 0.9.
- qt6-webengine: fix resolver on glibc
A patch file from https://github.com/void-linux/void-packages/pull/46997.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-46997.patch --]
[-- Type: text/x-diff, Size: 3214 bytes --]
From 117c9fd447b4685fa7fc6dcf7fa81d787599bc64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 23:45:15 +0100
Subject: [PATCH] qt6-webengine: fix resolver on glibc and musl sandbox
---
.../patches/0117-chromium-musl-resolver.patch | 2 +-
.../patches/0128-chromium-sandbox-membarrier.patch | 10 ----------
.../patches/0129-chromium-sandbox-shed_getparam.patch | 2 +-
srcpkgs/qt6-webengine/template | 2 +-
4 files changed, 3 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch
diff --git a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
index 3a06a994dd635..12d1f81833cba 100644
--- a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
+++ b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
@@ -45,7 +45,7 @@ index 2743697bf..36dc8adbf 100644
ScopedResState::ScopedResState() {
-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
// res_init behaves the same way.
memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch
deleted file mode 100644
index 2e1492c3f6228..0000000000000
--- a/srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ qt6-webengine-6.4.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -418,6 +418,7 @@ bool SyscallSets::IsAllowedProcessStartO
- switch (sysno) {
- case __NR_exit:
- case __NR_exit_group:
-+ case __NR_membarrier:
- case __NR_wait4:
- case __NR_waitid:
- #if defined(__i386__)
diff --git a/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch b/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch
index 63c589f4a58e4..94260d5d62eb1 100644
--- a/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch
+++ b/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch
@@ -7,7 +7,7 @@ musl uses them for pthread_getschedparam()
case __NR_pwrite64:
case __NR_sched_get_priority_max:
case __NR_sched_get_priority_min:
-+#ifdef __GLIBC__
++#ifndef __GLIBC__
+ case __NR_sched_getparam:
+ case __NR_sched_getscheduler:
+ case __NR_sched_setscheduler:
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 588194d573f05..98cdc680481b3 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-webengine'
pkgname=qt6-webengine
version=6.6.0
-revision=1
+revision=2
build_style=cmake
configure_args="
-DQT_FEATURE_webengine_system_ffmpeg=ON
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] qt6-webengine: fix glibc
2023-10-31 22:46 [PR PATCH] qt6-webengine: fix glibc Johnnynator
2023-10-31 22:48 ` [PR PATCH] [Updated] " Johnnynator
2023-10-31 23:34 ` Johnnynator
@ 2023-11-01 22:24 ` Johnnynator
2023-11-01 22:24 ` [PR PATCH] [Merged]: " Johnnynator
3 siblings, 0 replies; 5+ messages in thread
From: Johnnynator @ 2023-11-01 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 391 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qt6-webengine
https://github.com/void-linux/void-packages/pull/46997
qt6-webengine: fix glibc
- qt6ct: update to 0.9.
- qt6-webengine: fix resolver on glibc
A patch file from https://github.com/void-linux/void-packages/pull/46997.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qt6-webengine-46997.patch --]
[-- Type: text/x-diff, Size: 3197 bytes --]
From 3cca91f6a63a35928f49b462be82742ffe4faf6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 31 Oct 2023 23:45:15 +0100
Subject: [PATCH] qt6-webengine: fix resolver on glibc
---
.../patches/0117-chromium-musl-resolver.patch | 2 +-
.../patches/0128-chromium-sandbox-membarrier.patch | 10 ----------
.../patches/0129-chromium-sandbox-shed_getparam.patch | 2 +-
srcpkgs/qt6-webengine/template | 2 +-
4 files changed, 3 insertions(+), 13 deletions(-)
delete mode 100644 srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch
diff --git a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
index 3a06a994dd635..12d1f81833cba 100644
--- a/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
+++ b/srcpkgs/qt6-webengine/patches/0117-chromium-musl-resolver.patch
@@ -45,7 +45,7 @@ index 2743697bf..36dc8adbf 100644
ScopedResState::ScopedResState() {
-#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA)
-+#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || defined(_GNU_SOURCE)
++#if BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_LINUX) && !defined(__GLIBC__))
// Note: res_ninit in glibc always returns 0 and sets RES_INIT.
// res_init behaves the same way.
memset(&_res, 0, sizeof(_res));
diff --git a/srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch b/srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch
deleted file mode 100644
index 2e1492c3f6228..0000000000000
--- a/srcpkgs/qt6-webengine/patches/0128-chromium-sandbox-membarrier.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qt6-webengine-6.4.2.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ qt6-webengine-6.4.2/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -418,6 +418,7 @@ bool SyscallSets::IsAllowedProcessStartO
- switch (sysno) {
- case __NR_exit:
- case __NR_exit_group:
-+ case __NR_membarrier:
- case __NR_wait4:
- case __NR_waitid:
- #if defined(__i386__)
diff --git a/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch b/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch
index 63c589f4a58e4..94260d5d62eb1 100644
--- a/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch
+++ b/srcpkgs/qt6-webengine/patches/0129-chromium-sandbox-shed_getparam.patch
@@ -7,7 +7,7 @@ musl uses them for pthread_getschedparam()
case __NR_pwrite64:
case __NR_sched_get_priority_max:
case __NR_sched_get_priority_min:
-+#ifdef __GLIBC__
++#ifndef __GLIBC__
+ case __NR_sched_getparam:
+ case __NR_sched_getscheduler:
+ case __NR_sched_setscheduler:
diff --git a/srcpkgs/qt6-webengine/template b/srcpkgs/qt6-webengine/template
index 588194d573f05..98cdc680481b3 100644
--- a/srcpkgs/qt6-webengine/template
+++ b/srcpkgs/qt6-webengine/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-webengine'
pkgname=qt6-webengine
version=6.6.0
-revision=1
+revision=2
build_style=cmake
configure_args="
-DQT_FEATURE_webengine_system_ffmpeg=ON
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: qt6-webengine: fix glibc
2023-10-31 22:46 [PR PATCH] qt6-webengine: fix glibc Johnnynator
` (2 preceding siblings ...)
2023-11-01 22:24 ` Johnnynator
@ 2023-11-01 22:24 ` Johnnynator
3 siblings, 0 replies; 5+ messages in thread
From: Johnnynator @ 2023-11-01 22:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
There's a merged pull request on the void-packages repository
qt6-webengine: fix glibc
https://github.com/void-linux/void-packages/pull/46997
Description:
- qt6ct: update to 0.9.
- qt6-webengine: fix resolver on glibc
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-01 22:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-31 22:46 [PR PATCH] qt6-webengine: fix glibc Johnnynator
2023-10-31 22:48 ` [PR PATCH] [Updated] " Johnnynator
2023-10-31 23:34 ` Johnnynator
2023-11-01 22:24 ` Johnnynator
2023-11-01 22:24 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).