qt6-webengine: fix resolver on glibc

void-linux · Nov 1, 2023 · a2b861a · a2b861a
1 parent ea22fa0
commit a2b861a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git 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
diff --git 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
@@ -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