[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtnetwork/files/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtnetwork/files/

[Michael Palimaka]

commit:     d6764dd2692a809075c5597c094dbd0a43370d3d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 16:16:08 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 16:20:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6764dd2

dev-qt/qtnetwork: remove unused patch

Package-Manager: portage-2.3.3

 .../qtnetwork/files/qtnetwork-5.5-socklen_t.patch  | 40 ----------------------
 1 file changed, 40 deletions(-)

diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch b/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
deleted file mode 100644
index dd8c335..00000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.5-socklen_t.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 813f468a14fb84af43c1f8fc0a1430277358eba2 Mon Sep 17 00:00:00 2001
-From: Dave Flogeras <dflogeras2@gmail.com>
-Date: Tue, 29 Sep 2015 08:52:31 -0300
-Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc.
-
-Rather than treating >=glibc-2 specially, we treat <glibc-2 specially
-and all other libc implementations as POSIX.
-
-This was found here http://patchwork.openembedded.org/patch/94947/ and
-tested with armv6j-hardfloat-linux-uclibceabi and
-armv6j-hardfloat-linux-musleabi.
-
-Change-Id: I3850b1561a2e240f6564afedd80ce39407cc50b6
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- mkspecs/linux-g++/qplatformdefs.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
-index 5c18632..95a5758 100644
---- a/mkspecs/linux-g++/qplatformdefs.h
-+++ b/mkspecs/linux-g++/qplatformdefs.h
-@@ -78,10 +78,10 @@
- 
- #undef QT_SOCKLEN_T
- 
--#if defined(__GLIBC__) && (__GLIBC__ >= 2)
--#define QT_SOCKLEN_T            socklen_t
--#else
-+#if defined(__GLIBC__) && (__GLIBC__ < 2)
- #define QT_SOCKLEN_T            int
-+#else
-+#define QT_SOCKLEN_T            socklen_t
- #endif
- 
- #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
--- 
-2.6.0
-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtnetwork/files/

[Andreas Sturmlechner]

commit:     07a156795982a897c4a30aa154e22038970af90f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 18:33:52 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 24 18:33:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a15679

dev-qt/qtnetwork: Fix build with >=net-libs/libproxy-0.5.1

Bug: https://bugs.gentoo.org/907047
Closes: https://bugs.gentoo.org/906879
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../qtnetwork-5.15.9-libproxy-0.5-pkgconfig.patch  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

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 000000000000..d24553182e7d
--- /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
+