commit: ad5d5f2a2e54df66b56222a3ac635ca74de50b17 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Wed May 31 15:09:36 2023 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed May 31 15:09:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=ad5d5f2a
dev-qt/qtnetwork: sync ::gentoo Signed-off-by: orbea <orbea <AT> riseup.net> .../qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch | 32 ++++++++++++++++++++++ dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch new file mode 100644 index 0000000..d245531 --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch @@ -0,0 +1,32 @@ +From df809fd0b505b61d718fe1dc7fe19a79f9336cd9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Wed, 24 May 2023 20:21:33 +0200 +Subject: [PATCH] Use pkgconfig in order to find libproxy configuration + +>=libproxy-0.5 moved proxy.h into a non-default include search path. + +See also: +https://github.com/libproxy/libproxy/issues/226#issuecomment-1557064225 +https://bugs.gentoo.org/906879 + +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org> +--- + src/network/configure.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/configure.json b/src/network/configure.json +index 271ff164ac..ffba2d1eea 100644 +--- a/src/network/configure.json ++++ b/src/network/configure.json +@@ -53,7 +53,7 @@ + }, + "headers": "proxy.h", + "sources": [ +- "-lproxy" ++ { "type": "pkgConfig", "args": "libproxy-1.0" } + ] + }, + "openssl_headers": { +-- +2.40.1 + diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild index 45eeceb..2e9886e 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=1 - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86" fi QT5_MODULE="qtbase" @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.15.7-libressl.patch" #562050 "${FILESDIR}/${P}-QDnsLookup-dont-overflow-the-buffer.patch" "${FILESDIR}/${P}-CVE-2023-32762.patch" + "${FILESDIR}/${P}-libproxy-0.5-pkgconfig.patch" ) QT5_TARGET_SUBDIRS=(
