From 117c9fd447b4685fa7fc6dcf7fa81d787599bc64 Mon Sep 17 00:00:00 2001 From: John 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