From: "orbea" <orbea@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/
Date: Wed, 31 May 2023 15:34:21 +0000 (UTC) [thread overview]
Message-ID: <1685545790.ad5d5f2a2e54df66b56222a3ac635ca74de50b17.orbea@gentoo> (raw)
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 <asturm@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 <asturm@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=(
next reply other threads:[~2023-05-31 15:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 15:34 orbea [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-12 14:50 [gentoo-commits] repo/proj/libressl:master commit in: dev-qt/qtnetwork/files/, dev-qt/qtnetwork/ orbea
2023-06-13 3:45 orbea
2022-12-01 18:19 Quentin Retornaz
2022-10-07 21:11 Quentin Retornaz
2022-05-01 0:19 Quentin Retornaz
2022-01-20 1:29 Quentin Retornaz
2020-11-28 19:22 Stefan Strogin
2020-11-28 19:18 Stefan Strogin
2020-05-27 8:15 Stefan Strogin
2019-03-02 0:51 Stefan Strogin
2019-03-02 0:51 Stefan Strogin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1685545790.ad5d5f2a2e54df66b56222a3ac635ca74de50b17.orbea@gentoo \
--to=orbea@riseup.net \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox