gentoo auto-resync : 16:06:2023 - 01:40:03

4 files changed, 71 insertions, 1 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index eb1f901b83e2..02bc8f9602a0 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 51196f0563f5..15031f39588c 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,3 +1,4 @@
+AUX glib-networking-2.76.0-libproxy-0.5.patch 1858 BLAKE2B 5dd4b055f29fc070d52e4d19a99b9f6f10abff2e2c09dce3d0fce470d49b656c06617692dd00a9eb2defeb1dfa87b829bd8bfaf74081b4b45e34e9843ddbbd3b SHA512 2fbc317926743be12f7d31ad4b1ba53abbfb6c7ad72e2cb58be60262e79a7992b8ea70a6f10062e184082834c17d7f4cbf436658aab5fff791cc713bb84ea06e
 DIST glib-networking-2.76.0.tar.xz 280852 BLAKE2B 418d747473054d00c0eb0258538f919ac077728157523a157a6e6c43a4cdd4554411a486dcdc6af05b1ece8b35884e4954a056d5a01c5118a37721c151b77b8b SHA512 dae704ad70312239379e1e66a4171e9315ee44e1785c9cb2563adc3f0bbab43d08a75873bfd2be12e3ed4210d4a7e177c9540815c8eb4bda89032c5354c4be30
-EBUILD glib-networking-2.76.0.ebuild 1997 BLAKE2B 752782d2ac730a39a7760999265a9782900c70b0034df667661d0c960f682f0b4fce9fffeda544da77aab7e2d9ea8245211e71a819cf7379250b224225284493 SHA512 b5e0bc24f6446774edd382478bfff02f7d8945f6506286efb61eb1e39cc472eb5516b7d57a38c8436fa230581bc3a3f6c2837a7044135a3f7057864163c757d6
+EBUILD glib-networking-2.76.0.ebuild 2057 BLAKE2B b00104af4467feade6a82ded901c30791bef8dc4a13de020a0c003accaa5e0f5bf50ba504a6391345ed67e632b746ceeb1a52c10bf7c23682505a3ef3256b477 SHA512 00136bca3ae25dac4a490f5a5390c1b2be206845f40a76dfcfdd0245950c7036f835dcea90ecff1a87c2335ad26fbd3924d2233188d3f60a7fd78adf9207f440
 MISC metadata.xml 590 BLAKE2B c74ff24be718581a894745c99a4a6ace914fd396958f988986ea55ca4c2e271e1a417a27c7b63a9e3496260985fde1796a0f2fd9c0b5ee212eb2c8d0d33076a2 SHA512 c83668d49e2353f4608e15c0a5ba3b3700a042e8aa94e4214e5246db6fe31f6d668e5d190c9c3032798ece3725508b7063461dee9bbf039c1cf54dc2230f4b6a
diff --git a/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
new file mode 100644
index 000000000000..e59fe9a07416
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/907303
+https://gitlab.gnome.org/GNOME/glib-networking/-/commit/a7db10e8862050f19af5c2eebcd1d590a04d5ced
+
+From a7db10e8862050f19af5c2eebcd1d590a04d5ced Mon Sep 17 00:00:00 2001
+From: Jan-Michael Brummer <jan.brummer@tabos.org>
+Date: Tue, 13 Jun 2023 17:10:11 +0200
+Subject: [PATCH] Fix tests using libproxy 0.5
+
+New libproxy 0.5 now behaves just like glib, additional checks aren't
+needed.
+
+Fixes: https://gitlab.gnome.org/GNOME/glib-networking/-/issues/212
+--- a/proxy/tests/common.c
++++ b/proxy/tests/common.c
+@@ -172,13 +172,15 @@ static void
+ test_proxy_ignore_common (void)
+ {
+   GProxyResolver *resolver;
+-  gboolean is_libproxy;
+   GError *error = NULL;
+   char **proxies;
+   int i;
+ 
++#ifndef LIBPROXY_0_5
++  gboolean is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
++#endif
++
+   resolver = g_proxy_resolver_get_default ();
+-  is_libproxy = g_strcmp0 (g_getenv ("GIO_PROXY_TEST_NAME"), "libproxy") == 0;
+ 
+   for (i = 0; i < n_ignore_tests; i++)
+     {
+@@ -186,9 +188,11 @@ test_proxy_ignore_common (void)
+                                          NULL, &error);
+       g_assert_no_error (error);
+ 
++#ifndef LIBPROXY_0_5
+       if (is_libproxy && ignore_tests[i].libproxy_fails)
+         g_assert_cmpstr (proxies[0], ==, "http://localhost:8080");
+       else
++#endif
+         g_assert_cmpstr (proxies[0], ==, ignore_tests[i].proxy);
+ 
+       g_strfreev (proxies);
+--- a/proxy/tests/meson.build
++++ b/proxy/tests/meson.build
+@@ -18,9 +18,16 @@ foreach program: proxy_test_programs
+     )
+   endif
+ 
++  c_flags = []
++
++  if libproxy_dep.version() >= '0.5.0'
++    c_flags += '-DLIBPROXY_0_5'
++  endif
++
+   exe = executable(
+     test_name,
+     program[0] + '.c',
++    c_args : c_flags,
+     include_directories: top_inc,
+     dependencies: program[2],
+     install: enable_installed_tests,
+-- 
+GitLab
diff --git a/net-libs/glib-networking/glib-networking-2.76.0.ebuild b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
index 63096b664380..349108fee1a8 100644
--- a/net-libs/glib-networking/glib-networking-2.76.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.76.0.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 	test? ( sys-apps/dbus )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.76.0-libproxy-0.5.patch
+)
+
 src_prepare() {
 	default
 	xdg_environment_reset