From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] qt6-webengine: fix glibc
Date: Wed, 01 Nov 2023 23:24:22 +0100 [thread overview]
Message-ID: <20231101222422.RZn7MowwvOQVqbHDQZAunSWWjnYCoHvhYmDeIi8hYmA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46997@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2023-11-01 22:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 22:46 [PR PATCH] " Johnnynator
2023-10-31 22:48 ` [PR PATCH] [Updated] " Johnnynator
2023-10-31 23:34 ` Johnnynator
2023-11-01 22:24 ` Johnnynator [this message]
2023-11-01 22:24 ` [PR PATCH] [Merged]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231101222422.RZn7MowwvOQVqbHDQZAunSWWjnYCoHvhYmDeIi8hYmA@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).