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