From 4226ad83c5e7cacf9dcddd5181eb27d42ed75035 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Fri, 23 Aug 2019 22:19:17 +0300 Subject: net-libs/libsoup: bump to 2.66.2, fix vala:0.46 compat Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Mart Raudsepp --- .../libsoup/files/2.66.2-vala-0.46-compat.patch | 26 +++++++++++++++++ net-libs/libsoup/files/disable-apache-tests.patch | 33 ++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch create mode 100644 net-libs/libsoup/files/disable-apache-tests.patch (limited to 'net-libs/libsoup/files') 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 +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 +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 + -- cgit v1.2.3-65-gdbad