commit: 97e1796d5bc5667af47f4ebe54936b2d2d77e0ce Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Wed May 17 21:14:07 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed May 17 21:54:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e1796d
net-libs/libsoup: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> net-libs/libsoup/Manifest | 2 - net-libs/libsoup/files/strict-prototypes.patch | 20 ----- net-libs/libsoup/files/unsigned-char-http2.patch | 21 ----- net-libs/libsoup/libsoup-3.2.2.ebuild | 101 ---------------------- net-libs/libsoup/libsoup-3.4.0-r1.ebuild | 105 ----------------------- 5 files changed, 249 deletions(-) diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index 24933980acea..d90ea73c1cff 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,5 +1,3 @@ DIST libsoup-2.74.3.tar.xz 1504804 BLAKE2B 91f441197414314bb78cf15e7c13b54714e669145784812fb7a68cc41c8965ea29c53dc686d690e00f28f711be9f767038e5cc43b11aa0136f190dd2d41ec2a0 SHA512 72f8a055df984cb35105fe67f4ca67d3fb110d40a9cacb660fccd89f93b06bc32e25d94375dcc76608a245f7c5e081d968d7aaf5952eb16013d81c741247cb4c -DIST libsoup-3.2.2.tar.xz 1530460 BLAKE2B 8df66651a0bdcdb3337ced0031e4e8a32883241f6b7310a2b91396883368fa849d1e7dbab3766ec38ec05fdd81fafabd1f165cfe22a168e87db9a431ca86274d SHA512 1f2b49244f8bac4d112b39ac9c6a942acbc1ae1cff33262ed02e7682af3994cf6ba6741b365b3c80c45c6427d391599fa6f31df6caa4ffefe7d078ac373bad1b -DIST libsoup-3.4.0.tar.xz 1530892 BLAKE2B 9c5ad6ba8a476c633d8e6a65e6c3e910e4b4848e80284a0e47f67fba61efb8743973a1498ad5735dcfb92a7cd7517603de8a503e98aeb3e51029cf587562d67c SHA512 d9bc5c160e453d5bc467694dac057e03d9e6c075a87bd6ff59be4ddedbfcb496168d9457e905edc3aff569270f0401560001f3d54fca1a7c3679ac631bd779d6 DIST libsoup-3.4.1.tar.xz 1537968 BLAKE2B 4cee695f35fcfa87a43b1015fe4be679927939eb5d7ba6f5a95da32308bf16215d9cd45a15a82a39a5c105aa5b85bd6ee76d733dab5d7a053e8a8185d03b700c SHA512 1fabd75aa4fa74b322eab3a2c073555daaaf216e70c5f0cb41a57ef6e56553756e499cceea29e726a291ecc2e381e507b122f9d5771db2730f85beee803d22dc DIST libsoup-3.4.2.tar.xz 1535992 BLAKE2B 09423b5f7f0385105d00523f38597ebd91d8a19ed1c4cd6fbc27b12d81fdbd13c54f8fabbe16411ea45de4b48d6dd85c226ea812618b337a34c3dfd220c0be9a SHA512 711007599f639625fe2efdb7adb81de2dea0035180737ce0ec8234afb034646a2b6bd9ae384a69d6591aa142e91d245d502d13e1d97cd7b51c8c87c2d925f6b3 diff --git a/net-libs/libsoup/files/strict-prototypes.patch b/net-libs/libsoup/files/strict-prototypes.patch deleted file mode 100644 index e9a84257ccb5..000000000000 --- a/net-libs/libsoup/files/strict-prototypes.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://gitlab.gnome.org/GNOME/libsoup/-/commit/146f1c96f741fb9ab62d74d99585b2e859f6cb5f - -From 146f1c96f741fb9ab62d74d99585b2e859f6cb5f Mon Sep 17 00:00:00 2001 -From: Patrick Griffis <[email protected]> -Date: Fri, 17 Mar 2023 19:10:40 -0500 -Subject: [PATCH] Fix strict-prototype warning - ---- a/libsoup/http2/soup-body-input-stream-http2.c -+++ b/libsoup/http2/soup-body-input-stream-http2.c -@@ -72,7 +72,7 @@ static guint signals [LAST_SIGNAL] = { 0 }; - * Returns: a new #GInputStream - */ - GInputStream * --soup_body_input_stream_http2_new () -+soup_body_input_stream_http2_new (void) - { - return G_INPUT_STREAM (g_object_new (SOUP_TYPE_BODY_INPUT_STREAM_HTTP2, NULL)); - } --- -GitLab diff --git a/net-libs/libsoup/files/unsigned-char-http2.patch b/net-libs/libsoup/files/unsigned-char-http2.patch deleted file mode 100644 index ceee9d360e4b..000000000000 --- a/net-libs/libsoup/files/unsigned-char-http2.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://gitlab.gnome.org/GNOME/libsoup/-/commit/d1509188ebd2219db1a147e9d77ffd5b4d161a2e - -From d1509188ebd2219db1a147e9d77ffd5b4d161a2e Mon Sep 17 00:00:00 2001 -From: Patrick Griffis <[email protected]> -Date: Fri, 17 Mar 2023 19:05:35 -0500 -Subject: [PATCH] Fix regression breaking HTTP/2 on platforms with unsigned - char - ---- a/libsoup/soup-connection-manager.c -+++ b/libsoup/soup-connection-manager.c -@@ -378,7 +378,7 @@ static SoupConnection * - soup_connection_manager_get_connection_locked (SoupConnectionManager *manager, - SoupMessageQueueItem *item) - { -- static gchar env_force_http1 = -1; -+ static int env_force_http1 = -1; - SoupMessage *msg = item->msg; - gboolean need_new_connection; - SoupConnection *conn; --- -GitLab diff --git a/net-libs/libsoup/libsoup-3.2.2.ebuild b/net-libs/libsoup/libsoup-3.2.2.ebuild deleted file mode 100644 index a683c5c8c682..000000000000 --- a/net-libs/libsoup/libsoup-3.2.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson-multilib vala xdg - -DESCRIPTION="HTTP client/server library for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"; - -LICENSE="LGPL-2.1+" -SLOT="3.0" - -IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -DEPEND=" - >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}] - net-libs/nghttp2:=[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] - brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) - sys-libs/zlib - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - >=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-libs/glib - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gi-docgen-2021.1 - app-text/docbook-xml-dtd:4.1.2 - ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) - test? ( >=net-libs/gnutls-3.6.0[pkcs11] ) -" -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, -# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, -# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] -# dev-lang/php[apache2,xmlrpc] -# net-misc/curl -# net-libs/glib-networking[ssl])" - -PATCHES=( - # Disable apache tests until they are usable on Gentoo, bug #326957 - "${FILESDIR}"/disable-apache-tests.patch -) - -src_prepare() { - default - use vala && vala_setup - xdg_environment_reset - # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname - sed -e '/hsts/d' -i tests/meson.build || die -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - # But unnecessary while apache tests are disabled - #addpredict /usr/share/snmp/mibs/.index - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature gssapi) - -Dkrb5_config="${CHOST}-krb5-config" - $(meson_feature samba ntlm) - $(meson_feature brotli) - -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" - -Dtls_check=false # disables check, we still rdep on glib-networking - $(meson_native_use_feature introspection) - $(meson_native_use_feature vala vapi) - $(meson_native_use_feature gtk-doc docs) - -Ddoc_tests=false - $(meson_use test tests) - -Dinstalled_tests=false - $(meson_feature sysprof) - $(meson_feature test pkcs11_tests) - ) - meson_src_configure -} - -multilib_src_install_all() { - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/libsoup-3.0 "${ED}"/usr/share/gtk-doc/html/ || die - fi -} diff --git a/net-libs/libsoup/libsoup-3.4.0-r1.ebuild b/net-libs/libsoup/libsoup-3.4.0-r1.ebuild deleted file mode 100644 index af164f1c1964..000000000000 --- a/net-libs/libsoup/libsoup-3.4.0-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit gnome.org meson-multilib vala xdg - -DESCRIPTION="HTTP client/server library for GNOME" -HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"; - -LICENSE="LGPL-2.1+" -SLOT="3.0" - -IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala" -RESTRICT="!test? ( test )" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -DEPEND=" - >=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}] - net-libs/nghttp2:=[${MULTILIB_USEDEP}] - >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] - brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] ) - >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) - sys-libs/zlib - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - samba? ( net-fs/samba ) -" -RDEPEND="${DEPEND} - >=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}] -" -BDEPEND=" - dev-libs/glib - dev-util/glib-utils - gtk-doc? ( - >=dev-util/gi-docgen-2021.1 - app-text/docbook-xml-dtd:4.1.2 - ) - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - vala? ( $(vala_depend) ) - test? ( >=net-libs/gnutls-3.6.0[pkcs11] ) -" -# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, -# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, -# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] -# dev-lang/php[apache2,xmlrpc] -# net-misc/curl -# net-libs/glib-networking[ssl])" - -PATCHES=( - # Disable apache tests until they are usable on Gentoo, bug #326957 - "${FILESDIR}"/disable-apache-tests.patch - # Upstream patch to fix HTTP/2 on platforms w/ unsigned char - "${FILESDIR}"/unsigned-char-http2.patch - # Upstream patch to fix -Wstrict-prototypes - "${FILESDIR}"/strict-prototypes.patch -) - -src_prepare() { - default - use vala && vala_setup - xdg_environment_reset - # https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname - sed -e '/hsts/d' -i tests/meson.build || die -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - # But unnecessary while apache tests are disabled - #addpredict /usr/share/snmp/mibs/.index - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature gssapi) - -Dkrb5_config="${CHOST}-krb5-config" - $(meson_feature samba ntlm) - $(meson_feature brotli) - -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" - -Dtls_check=false # disables check, we still rdep on glib-networking - $(meson_native_use_feature introspection) - $(meson_native_use_feature vala vapi) - $(meson_native_use_feature gtk-doc docs) - -Ddoc_tests=false - $(meson_use test tests) - -Dinstalled_tests=false - $(meson_feature sysprof) - $(meson_feature test pkcs11_tests) - ) - meson_src_configure -} - -multilib_src_install_all() { - if use gtk-doc; then - mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die - mv "${ED}"/usr/share/doc/libsoup-3.0 "${ED}"/usr/share/gtk-doc/html/ || die - fi -}
