commit: 15d180e881dd776f10cf2ce8222563970bdf57e0 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Sep 5 19:06:09 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Sep 5 20:28:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d180e8
net-libs/glib-networking: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> net-libs/glib-networking/Manifest | 1 - .../glib-networking-2.76.0-libproxy-0.5.patch | 65 ---------------- .../glib-networking/glib-networking-2.76.0.ebuild | 86 ---------------------- 3 files changed, 152 deletions(-) diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest index c740845b38ea..f09cf7ff9d53 100644 --- a/net-libs/glib-networking/Manifest +++ b/net-libs/glib-networking/Manifest @@ -1,2 +1 @@ -DIST glib-networking-2.76.0.tar.xz 280852 BLAKE2B 418d747473054d00c0eb0258538f919ac077728157523a157a6e6c43a4cdd4554411a486dcdc6af05b1ece8b35884e4954a056d5a01c5118a37721c151b77b8b SHA512 dae704ad70312239379e1e66a4171e9315ee44e1785c9cb2563adc3f0bbab43d08a75873bfd2be12e3ed4210d4a7e177c9540815c8eb4bda89032c5354c4be30 DIST glib-networking-2.76.1.tar.xz 280896 BLAKE2B d4fb8e30096e2e0bdca183795e5d6f86f13c887ad61a52a46dd2af90756ced41e540f286b2cdafb4655cf337758e3742508c0e62e0ea3850ab293cd04e12488e SHA512 9da7844dc767c8dc33953bf984aa9fcc12ac6f9945b55b9c0ec34ecf13592deefead37dc27b048f564dc423286224c041b9842034e197d90f93822128fab4f97 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 deleted file mode 100644 index e59fe9a07416..000000000000 --- a/net-libs/glib-networking/files/glib-networking-2.76.0-libproxy-0.5.patch +++ /dev/null @@ -1,65 +0,0 @@ -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.brum...@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 deleted file mode 100644 index 349108fee1a8..000000000000 --- a/net-libs/glib-networking/glib-networking-2.76.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org gnome2-utils meson-multilib xdg - -DESCRIPTION="Network-related giomodules for glib" -HOMEPAGE="https://gitlab.gnome.org/GNOME/glib-networking"; - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="+gnome +libproxy +ssl test" -RESTRICT="!test? ( test )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -RDEPEND=" - >=dev-libs/glib-2.73.3:2[${MULTILIB_USEDEP}] - libproxy? ( >=net-libs/libproxy-0.4.16[${MULTILIB_USEDEP}] ) - >=net-libs/gnutls-3.7.4:=[${MULTILIB_USEDEP}] - ssl? ( app-misc/ca-certificates ) - gnome? ( gnome-base/gsettings-desktop-schemas ) -" -DEPEND="${RDEPEND} - test? ( net-libs/gnutls[pkcs11] ) -" -BDEPEND=" - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - test? ( sys-apps/dbus ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.76.0-libproxy-0.5.patch -) - -src_prepare() { - default - xdg_environment_reset - - if ! use test ; then - # Don't build tests unconditionally - # This is a hack to avoid needing gnutls[pkcs11] when USE=-test - # It may become a real runtime dependency in future - # Please check! - # bug #777462 - sed -i "/^subdir('tests')/d" tls/meson.build || die - fi -} - -multilib_src_configure() { - local emesonargs=( - -Dgnutls=enabled - -Dopenssl=disabled - $(meson_feature !libproxy environment_proxy) - $(meson_feature libproxy) - $(meson_feature gnome gnome_proxy) - -Dinstalled_tests=false - -Ddebug_logs=false - ) - meson_src_configure -} - -multilib_src_test() { - dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' -} - -pkg_postinst() { - xdg_pkg_postinst - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - multilib_foreach_abi multilib_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm - - multilib_pkg_postrm() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - multilib_foreach_abi multilib_pkg_postrm -}
