From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6FDAC15806E for ; Wed, 31 May 2023 15:34:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEC75E0916; Wed, 31 May 2023 15:34:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 971D1E0916 for ; Wed, 31 May 2023 15:34:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD970340E77 for ; Wed, 31 May 2023 15:34:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC9CEA82 for ; Wed, 31 May 2023 15:34:21 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1685545790.ad5d5f2a2e54df66b56222a3ac635ca74de50b17.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-qt/qtnetwork/files/qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch dev-qt/qtnetwork/qtnetwork-5.15.9-r2.ebuild X-VCS-Directories: dev-qt/qtnetwork/ dev-qt/qtnetwork/files/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: ad5d5f2a2e54df66b56222a3ac635ca74de50b17 X-VCS-Branch: master Date: Wed, 31 May 2023 15:34:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c67f2d02-1451-4568-87b1-94dc54e831e6 X-Archives-Hash: d87bcca6d9238c7d75b2c8face55fa52 commit: ad5d5f2a2e54df66b56222a3ac635ca74de50b17 Author: orbea riseup net> AuthorDate: Wed May 31 15:09:36 2023 +0000 Commit: orbea riseup 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 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 +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 +--- + 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=(