diff options
Diffstat (limited to 'net-libs/libsoup')
| -rw-r--r-- | net-libs/libsoup/Manifest | 5 | ||||
| -rw-r--r-- | net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch | 28 | ||||
| -rw-r--r-- | net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch | 26 | ||||
| -rw-r--r-- | net-libs/libsoup/files/disable-apache-tests.patch | 33 | ||||
| -rw-r--r-- | net-libs/libsoup/libsoup-2.66.2.ebuild | 95 |
5 files changed, 187 insertions, 0 deletions
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest index 05fa79392b0c..a987a1ddce02 100644 --- a/net-libs/libsoup/Manifest +++ b/net-libs/libsoup/Manifest @@ -1,8 +1,13 @@ +AUX 2.66.2-meson-ntlm_auth-fix.patch 873 BLAKE2B ea7f36d5cb7d9df048b6f9ecf8cf0ab24424fae6bc918a3130ae6bac8b7c03fc8b69e7c2288e9c7dae2115ecaf48e1ed1c75c2abdc704faf0bdb093f2adde17f SHA512 227015874f95e759eb8850fc139d8340cff1bb05024585d7a8fa2af60f09aca17e497e43ca2a78a15c9ce71c90c7855e5235c1abc9b41e734a922e499a44edab +AUX 2.66.2-vala-0.46-compat.patch 767 BLAKE2B ff124c8ab2897b2cdbe02e3a4c90e1584f856f9254e320a828daf1d6966c87060fb654d233baa7086e740086935b49640670f2b76ed65204bdc76b66bc2924a6 SHA512 ff218cdd450130fe12e95c3c93f8762ed891444c0a8f9b1d2c77a580717fec96a856b65ff54485ed7353d9fa3e9620acfae87fd77a096f76b647c70b8d74dbfb +AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095 AUX libsoup-2.58.2-sparc-unaligned.patch 1006 BLAKE2B 95a3695e59c8fa86ce550cd90b9d138b6e6ebf1ee8ae3e38fff1a8ac1f89cb088feec8297c8532fcea578260b0947946a18b6e3e8b87e6faf7643cc79a5200ba SHA512 cb8e90ef7d3b163c0e9f9991e7f219d08769f101de09f1cc17dd55fe768f9193938e45f8547e8a26f599d965eea05ff2f27c11af221384b08ab76411325dcfb5 DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f +DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092 EBUILD libsoup-2.58.2.ebuild 3011 BLAKE2B 6bb09cc7a247550ac1ef0fbc82b3a6e2d0fe421174243f12feabb87dda992b305ef0aaec2fdbc99a13eccd1523ed98f46bfe175598907f30d9365034ad6c3fd7 SHA512 98dfcd612e875658b20e590875f0ffc016fed4f4da998d38954a6fbd5f8817c0d95819343d567432b682dadb152299d826f8d65aa36714de091e4aad8c20e8aa EBUILD libsoup-2.62.3.ebuild 2922 BLAKE2B 8b7f012a12a0a6d6ec723a5d8fd74ac57bc5c734c2dd4c65fa51ac6db657f4a286a3324509c4490fe97b9e5c8f0834d8116285392bf643349bb398bffb8c406f SHA512 c70d71b679159df7cf00829cd13e68f8723e054ef3bb3ddcd131008ce699317fb5a7e9a0a69cc4381746441555b2f1dd78c78f1528e39cc38315d396054cbcb0 EBUILD libsoup-2.64.2.ebuild 2749 BLAKE2B 355649f9823662e3de59e959e3123cebb01fb3bf80fd3f4d68d2197cef02f444fd0761d79153af3217a9d5409f81fc00d74649c931d483aedf349cb0966112eb SHA512 bea4a4a5774888038defe6b3c0041d3b14ffdf46e4942b5afb0183c56d95d8b77478cbaebd0f03fa2aae4cbb17bed028e68a839de5bb7fba7f676543c3105629 +EBUILD libsoup-2.66.2.ebuild 2751 BLAKE2B 19a21abb9fd70ca5c5f21d9756fc711114aba0f8028364603574e8550a2a2a100890d9df5d459e57cb769bca805b92ac8f77b606e2444f17e9f5e4870b7fb283 SHA512 f49379ff1e40ec9b62861141c6157576d8d0dc4f9e40c16199bcedb8267d6e3012e6b73e3a4b2850e79116642b81251199f5253440f33ae27cb8c1215b088032 MISC metadata.xml 402 BLAKE2B 19f91e3d9de7ec450d9c60686a443e0180d3f36c5d9508d50ef55f64924fa4b7e6f143e7fd5c25b437bd4a1d85e9a1c8aa8592b414c73935084fa6d93aa18f55 SHA512 db900ca6c6904d8c293938f6cbd25a39aa123273cf42dd6f5c670635501c81af94e0c4076ca45267c2d8861ce61b3189900b3027c6477d9e9b6d3c093006ed9f diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch new file mode 100644 index 000000000000..04c9cccfeec0 --- /dev/null +++ b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch @@ -0,0 +1,28 @@ +From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001 +From: Claudio Saavedra <csaavedra@igalia.com> +Date: Tue, 20 Aug 2019 16:04:06 +0300 +Subject: [PATCH] NTLM: Fix build with ntlm enabled + +Just realized that build with NTLM enabled was broken (!?) + +(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a) +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index f0e34cb0..346ed2fd 100644 +--- a/meson.build ++++ b/meson.build +@@ -271,7 +271,7 @@ if host_machine.system() != 'windows' + + if ntlm_auth.found() + add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c') +- add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c') ++ add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c') + endif + endif + endif +-- +2.20.1 + diff --git a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch new file mode 100644 index 000000000000..ce0e1dc9b620 --- /dev/null +++ b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch @@ -0,0 +1,26 @@ +From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001 +From: Rico Tzschichholz <ricotz@ubuntu.com> +Date: Tue, 28 May 2019 09:08:35 +0200 +Subject: [PATCH] gir: soup_auth_new is not a constructor + +--- + libsoup/Soup-2.4.metadata | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata +index c0056ec8..1f107eda 100644 +--- a/libsoup/Soup-2.4.metadata ++++ b/libsoup/Soup-2.4.metadata +@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver" + + // Report upstream + add_* skip=false type="unowned GLib.TimeoutSource" ++Auth ++ // Factory method ++ .new symbol_type="function" + AuthDomain + .accepts#method name="accepts_authorization" + AuthDomainBasic.new skip=false +-- +2.20.1 + diff --git a/net-libs/libsoup/files/disable-apache-tests.patch b/net-libs/libsoup/files/disable-apache-tests.patch new file mode 100644 index 000000000000..e7d306bde971 --- /dev/null +++ b/net-libs/libsoup/files/disable-apache-tests.patch @@ -0,0 +1,33 @@ +From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Fri, 23 Aug 2019 21:11:57 +0300 +Subject: [PATCH] meson: Force disable apache/php using tests for now + +We had them disabled in autotools with a sed. Keep them disabled for now +in meson port as well. Should be revisited at some point. +--- + meson.build | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/meson.build b/meson.build +index 89837c15..f0e34cb0 100644 +--- a/meson.build ++++ b/meson.build +@@ -162,12 +162,9 @@ endif + # + # The summary is that for the configuration parsing we will use the apachectl, + # but for running the tests we will use the httpd binary. +-apachectl = find_program('apachectl', '/sbin/apachectl', '/usr/sbin/apachectl', required : false) ++apachectl = disabler() + # This abomination is a result of https://github.com/mesonbuild/meson/issues/1576 +-apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache', +- '/sbin/httpd2', '/sbin/httpd', '/sbin/apache2', '/sbin/apache', +- '/usr/sbin/httpd2', '/usr/sbin/httpd', '/usr/sbin/apache2', '/usr/sbin/apache', +- required : false) ++apache_httpd2 = disabler() + have_apache=false + apache_httpd2_version = '' + if apache_httpd2.found() and apachectl.found() +-- +2.20.1 + diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild b/net-libs/libsoup/libsoup-2.66.2.ebuild new file mode 100644 index 000000000000..238bf9bb9666 --- /dev/null +++ b/net-libs/libsoup/libsoup-2.66.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit gnome.org meson multilib-minimal vala xdg + +DESCRIPTION="HTTP client/server library for GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/libsoup" + +LICENSE="LGPL-2.1+" +SLOT="2.4" + +IUSE="gssapi gtk-doc +introspection samba ssl test +vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" + +DEPEND=" + >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] + >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] + gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + samba? ( net-fs/samba ) +" +RDEPEND="${DEPEND} + >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}] +" +BDEPEND=" + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1.20 + app-text/docbook-xml-dtd:4.1.2 ) + >=sys-devel/gettext-0.19.8 + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + vala? ( $(vala_depend) ) +" +# 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 + # Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2 + "${FILESDIR}"/${PV}-vala-0.46-compat.patch + "${FILESDIR}"/${PV}-meson-ntlm_auth-fix.patch +) + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + # But necessary while apache tests are disabled + #addpredict /usr/share/snmp/mibs/.index + + multilib-minimal_src_configure +} + +multilib_src_configure() { + local emesonargs=( + $(meson_use gssapi) + -Dkrb5_config="${CHOST}-krb5-config" + $(meson_use samba ntlm) + -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" + -Dtls_check=false # disables check, we still rdep on glib-networking + -Dgnome=false + -Dintrospection=$(multilib_native_usex introspection true false) + -Dvapi=$(multilib_native_usex vala true false) + -Ddoc=$(multilib_native_usex gtk-doc true false) + $(meson_use test tests) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} |