1 |
commit: 4226ad83c5e7cacf9dcddd5181eb27d42ed75035 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 23 19:19:17 2019 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 23 19:32:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4226ad83 |
7 |
|
8 |
net-libs/libsoup: bump to 2.66.2, fix vala:0.46 compat |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
net-libs/libsoup/Manifest | 1 + |
14 |
.../libsoup/files/2.66.2-vala-0.46-compat.patch | 26 ++++++ |
15 |
net-libs/libsoup/files/disable-apache-tests.patch | 33 ++++++++ |
16 |
net-libs/libsoup/libsoup-2.66.2.ebuild | 94 ++++++++++++++++++++++ |
17 |
4 files changed, 154 insertions(+) |
18 |
|
19 |
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest |
20 |
index f7aa4020665..f180d4e59e4 100644 |
21 |
--- a/net-libs/libsoup/Manifest |
22 |
+++ b/net-libs/libsoup/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST libsoup-2.58.2.tar.xz 1815256 BLAKE2B 23c6e40f91a2dca13fcabe4fa3af7311874cbe06962c6cdc93d8d8d0a998d29cff9e7ce61190541b6114b4996d758b7c469b0354a6012856667e9541a78177cb SHA512 85af6fac87343bdd22312518402144d33916225f60d6fa158efdd84f7ee7ed1f9895989b3558f711c9aedc93cff35a4114ad79d6d2aa19c54cb326f162a4c7de |
25 |
DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b |
26 |
DIST libsoup-2.64.2.tar.xz 1793440 BLAKE2B 77a41ad62e0e419711cb26f510b6c0ca09c0430300f72144a0d0563a24e24639d1ca430784051b8de279623193a273510d5c95de6edb4a54a3aee0bd7903d9cd SHA512 c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f |
27 |
+DIST libsoup-2.66.2.tar.xz 1446024 BLAKE2B 2953b91e3bf28b80189a87ecff3a9d103d57bb090f62121dc441e9bfa65750b67f2ab4f50e7a7a0cf5691b79139ae84de5aeaff69e7505b5c2fdd3f375536724 SHA512 1df443470239f23d22301e37e36f3d34963352ee0122f317cd15b19d90115831091bddcee27bc6f0d4994adcf4e5bd9c0395de2bd7f39ae305ba0edea7789092 |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 00000000000..ce0e1dc9b62 |
32 |
--- /dev/null |
33 |
+++ b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch |
34 |
@@ -0,0 +1,26 @@ |
35 |
+From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001 |
36 |
+From: Rico Tzschichholz <ricotz@××××××.com> |
37 |
+Date: Tue, 28 May 2019 09:08:35 +0200 |
38 |
+Subject: [PATCH] gir: soup_auth_new is not a constructor |
39 |
+ |
40 |
+--- |
41 |
+ libsoup/Soup-2.4.metadata | 3 +++ |
42 |
+ 1 file changed, 3 insertions(+) |
43 |
+ |
44 |
+diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata |
45 |
+index c0056ec8..1f107eda 100644 |
46 |
+--- a/libsoup/Soup-2.4.metadata |
47 |
++++ b/libsoup/Soup-2.4.metadata |
48 |
+@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver" |
49 |
+ |
50 |
+ // Report upstream |
51 |
+ add_* skip=false type="unowned GLib.TimeoutSource" |
52 |
++Auth |
53 |
++ // Factory method |
54 |
++ .new symbol_type="function" |
55 |
+ AuthDomain |
56 |
+ .accepts#method name="accepts_authorization" |
57 |
+ AuthDomainBasic.new skip=false |
58 |
+-- |
59 |
+2.20.1 |
60 |
+ |
61 |
|
62 |
diff --git a/net-libs/libsoup/files/disable-apache-tests.patch b/net-libs/libsoup/files/disable-apache-tests.patch |
63 |
new file mode 100644 |
64 |
index 00000000000..e7d306bde97 |
65 |
--- /dev/null |
66 |
+++ b/net-libs/libsoup/files/disable-apache-tests.patch |
67 |
@@ -0,0 +1,33 @@ |
68 |
+From 6c9bbf0d91688e831f8f19232e18619bfc57e12e Mon Sep 17 00:00:00 2001 |
69 |
+From: Mart Raudsepp <leio@g.o> |
70 |
+Date: Fri, 23 Aug 2019 21:11:57 +0300 |
71 |
+Subject: [PATCH] meson: Force disable apache/php using tests for now |
72 |
+ |
73 |
+We had them disabled in autotools with a sed. Keep them disabled for now |
74 |
+in meson port as well. Should be revisited at some point. |
75 |
+--- |
76 |
+ meson.build | 7 ++----- |
77 |
+ 1 file changed, 2 insertions(+), 5 deletions(-) |
78 |
+ |
79 |
+diff --git a/meson.build b/meson.build |
80 |
+index 89837c15..f0e34cb0 100644 |
81 |
+--- a/meson.build |
82 |
++++ b/meson.build |
83 |
+@@ -162,12 +162,9 @@ endif |
84 |
+ # |
85 |
+ # The summary is that for the configuration parsing we will use the apachectl, |
86 |
+ # but for running the tests we will use the httpd binary. |
87 |
+-apachectl = find_program('apachectl', '/sbin/apachectl', '/usr/sbin/apachectl', required : false) |
88 |
++apachectl = disabler() |
89 |
+ # This abomination is a result of https://github.com/mesonbuild/meson/issues/1576 |
90 |
+-apache_httpd2 = find_program('httpd2', 'httpd', 'apache2', 'apache', |
91 |
+- '/sbin/httpd2', '/sbin/httpd', '/sbin/apache2', '/sbin/apache', |
92 |
+- '/usr/sbin/httpd2', '/usr/sbin/httpd', '/usr/sbin/apache2', '/usr/sbin/apache', |
93 |
+- required : false) |
94 |
++apache_httpd2 = disabler() |
95 |
+ have_apache=false |
96 |
+ apache_httpd2_version = '' |
97 |
+ if apache_httpd2.found() and apachectl.found() |
98 |
+-- |
99 |
+2.20.1 |
100 |
+ |
101 |
|
102 |
diff --git a/net-libs/libsoup/libsoup-2.66.2.ebuild b/net-libs/libsoup/libsoup-2.66.2.ebuild |
103 |
new file mode 100644 |
104 |
index 00000000000..57963364f49 |
105 |
--- /dev/null |
106 |
+++ b/net-libs/libsoup/libsoup-2.66.2.ebuild |
107 |
@@ -0,0 +1,94 @@ |
108 |
+# Copyright 1999-2019 Gentoo Authors |
109 |
+# Distributed under the terms of the GNU General Public License v2 |
110 |
+ |
111 |
+EAPI=7 |
112 |
+VALA_USE_DEPEND="vapigen" |
113 |
+ |
114 |
+inherit gnome.org meson multilib-minimal vala xdg |
115 |
+ |
116 |
+DESCRIPTION="HTTP client/server library for GNOME" |
117 |
+HOMEPAGE="https://wiki.gnome.org/Projects/libsoup" |
118 |
+ |
119 |
+LICENSE="LGPL-2.1+" |
120 |
+SLOT="2.4" |
121 |
+ |
122 |
+IUSE="gssapi gtk-doc +introspection samba ssl test +vala" |
123 |
+REQUIRED_USE="vala? ( introspection )" |
124 |
+ |
125 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" |
126 |
+ |
127 |
+DEPEND=" |
128 |
+ >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] |
129 |
+ >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] |
130 |
+ >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] |
131 |
+ >=net-libs/libpsl-0.20[${MULTILIB_USEDEP}] |
132 |
+ gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
133 |
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= ) |
134 |
+ samba? ( net-fs/samba ) |
135 |
+" |
136 |
+RDEPEND="${DEPEND} |
137 |
+ >=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}] |
138 |
+" |
139 |
+BDEPEND=" |
140 |
+ dev-util/glib-utils |
141 |
+ gtk-doc? ( >=dev-util/gtk-doc-1.20 |
142 |
+ app-text/docbook-xml-dtd:4.1.2 ) |
143 |
+ >=sys-devel/gettext-0.19.8 |
144 |
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
145 |
+ vala? ( $(vala_depend) ) |
146 |
+" |
147 |
+# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, |
148 |
+# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, |
149 |
+# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] |
150 |
+# dev-lang/php[apache2,xmlrpc] |
151 |
+# net-misc/curl |
152 |
+# net-libs/glib-networking[ssl])" |
153 |
+ |
154 |
+PATCHES=( |
155 |
+ # Disable apache tests until they are usable on Gentoo, bug #326957 |
156 |
+ "${FILESDIR}"/disable-apache-tests.patch |
157 |
+ # Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2 |
158 |
+ "${FILESDIR}"/${PV}-vala-0.46-compat.patch |
159 |
+) |
160 |
+ |
161 |
+src_prepare() { |
162 |
+ use vala && vala_src_prepare |
163 |
+ xdg_src_prepare |
164 |
+} |
165 |
+ |
166 |
+src_configure() { |
167 |
+ # FIXME: we need addpredict to workaround bug #324779 until |
168 |
+ # root cause (bug #249496) is solved |
169 |
+ # But necessary while apache tests are disabled |
170 |
+ #addpredict /usr/share/snmp/mibs/.index |
171 |
+ |
172 |
+ multilib-minimal_src_configure |
173 |
+} |
174 |
+ |
175 |
+multilib_src_configure() { |
176 |
+ local emesonargs=( |
177 |
+ $(meson_use gssapi) |
178 |
+ -Dkrb5_config="${CHOST}-krb5-config" |
179 |
+ $(meson_use samba ntlm) |
180 |
+ -Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth" |
181 |
+ -Dtls_check=false # disables check, we still rdep on glib-networking |
182 |
+ -Dgnome=false |
183 |
+ -Dintrospection=$(multilib_native_usex introspection true false) |
184 |
+ -Dvapi=$(multilib_native_usex vala true false) |
185 |
+ -Ddoc=$(multilib_native_usex gtk-doc true false) |
186 |
+ $(meson_use test tests) |
187 |
+ ) |
188 |
+ meson_src_configure |
189 |
+} |
190 |
+ |
191 |
+multilib_src_compile() { |
192 |
+ meson_src_compile |
193 |
+} |
194 |
+ |
195 |
+multilib_src_test() { |
196 |
+ meson_src_test |
197 |
+} |
198 |
+ |
199 |
+multilib_src_install() { |
200 |
+ meson_src_install |
201 |
+} |