Skip to content

Commit e5657e7

Browse files
committed
libsoup: Update net/libsoup to 2.64.2
pkgsrc changes: - Add a dependency to www/libpsl - Add a patch to adjust running of the tests (otherwise because `APACHE_HTTPD' is defined to `no' a `no' program will be executed but will fail because no `no' program is usually available) Changes: Changes in libsoup from 2.64.1 to 2.64.2: * TLD tests updated (Claudio Saavedra) * Updated translations: Serbian Changes in libsoup from 2.63.92 to 2.64.1: * Many fixes to the meson build system (which, by the way, is NOT official yet) (#13, Tomas Popela) * Updated translations: Belarusian. Changes in libsoup from 2.63.92 to 2.64.0: * Many fixes to the meson build system [#7, #8, #9, #11, Tomas Popela] * Updated translations: Brazilian Portuguese, Galician, Hungarian, Latvian, Danish. Changes in libsoup from 2.63.91 to 2.63.92: * Make sure that XMLRPC tests build in Debian too [Claudio Saavedra] * Distribute missing meson files [Claudio Saavedra] * Some fixes to the meson build files [Claudio Saavedra] * Updated Korean and Swedish translations Changes in libsoup from 2.63.90 to 2.63.91: * Simplify soup_hosts_matches_host() [Claudio Saavedra] * Add new tests for trailing dots in domain names [Claudio Saavedra] * Updated Turkish translation Changes in libsoup from 2.63.2 to 2.63.90: * Set default cookie path for NULL origins [#1, Adrian Perez de Castro] * Fixes to GObject-introspection [bgo#794787, Corentin Noël] * Use atomic-refcounting in classes that are not using GObject-refcounting [bgo#785110, Edward Hervey] * Many Coverity-found code fixes [bgo#781771, Milan Crha] * Bail out on cookie-jar calls with empty hostnames [#3, Michael Catanzaro] * Fixes to the simple-httpd example [#2, Mooffie] * Updated translations: Chinese (Taiwan), Catalan Note: from now onwards bgo# references bugs in GNOME Bugzilla and # issues in GNOME gitlab. Changes in libsoup from 2.63.1 to 2.63.2: * Many fixes to the meson build system support [#795324, #782410, Tomas Popela, Jan Alexander Steffens] * Fixes to xmlrpc-server test with PHP >= 7.2 and related [#795111, #782410 Jan Alexander Steffens] * Fix critical warning in SoupSocket [Carlos Garcia Campos] * Updated translations: Romanian, Friulian, Slovenian, Czech, Spanish, Indonesian, Chinese (China).
1 parent a82306d commit e5657e7

File tree

3 files changed

+37
-14
lines changed

3 files changed

+37
-14
lines changed

net/libsoup/Makefile

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.47 2018/08/16 12:16:17 wiz Exp $
1+
# $NetBSD: Makefile,v 1.48 2018/10/23 07:17:53 leot Exp $
22

3-
DISTNAME= libsoup-2.62.3
3+
DISTNAME= libsoup-2.64.2
44
CATEGORIES= net gnome
55
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/${PKGVERSION_NOREV:R}/}
66
EXTRACT_SUFX= .tar.xz
@@ -21,8 +21,9 @@ CONFIGURE_ENV+= DATADIRNAME=share
2121

2222
# XXX: disable Vala bindings otherwise the configure phase fails because is not
2323
# XXX: able to find vapigen.
24-
CONFIGURE_ARGS+= --enable-vala=no \
25-
--disable-tls-check
24+
CONFIGURE_ARGS+= --enable-vala=no
25+
CONFIGURE_ARGS+= --disable-tls-check
26+
CONFIGURE_ARGS+= --with-apache-httpd=no
2627

2728
PKGCONFIG_OVERRIDE+= libsoup-2.4.pc.in
2829
PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in
@@ -44,11 +45,6 @@ CWRAPPERS_APPEND.cc+= -Wno-error=format-nonliteral
4445

4546
.include "options.mk"
4647

47-
REPLACE_PYTHON= libsoup/tld-parser.py
48-
PYTHON_FOR_BUILD_ONLY= yes
49-
50-
.include "../../lang/python/application.mk"
51-
5248
.include "../../databases/sqlite3/buildlink3.mk"
5349
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.38.0
5450
.include "../../devel/glib2/buildlink3.mk"
@@ -57,4 +53,5 @@ BUILDLINK_DEPMETHOD.gobject-introspection+= build
5753
.include "../../devel/gobject-introspection/buildlink3.mk"
5854
CONFIGURE_ARGS+= --enable-introspection
5955
.include "../../textproc/libxml2/buildlink3.mk"
56+
.include "../../www/libpsl/buildlink3.mk"
6057
.include "../../mk/bsd.pkg.mk"

net/libsoup/distinfo

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
$NetBSD: distinfo,v 1.20 2018/08/16 12:16:17 wiz Exp $
1+
$NetBSD: distinfo,v 1.21 2018/10/23 07:17:53 leot Exp $
22

3-
SHA1 (libsoup-2.62.3.tar.xz) = 8b9c743348b1f9fc044c6abf3431899154e93ad1
4-
RMD160 (libsoup-2.62.3.tar.xz) = 24806f33b83c35b16b7b424b10401dc3a51a7e4c
5-
SHA512 (libsoup-2.62.3.tar.xz) = 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
6-
Size (libsoup-2.62.3.tar.xz) = 1851780 bytes
3+
SHA1 (libsoup-2.64.2.tar.xz) = 286b2dc5e4396b6328870da761798e61701f901a
4+
RMD160 (libsoup-2.64.2.tar.xz) = 12af987a048627f662788742ec3f66e3f8053348
5+
SHA512 (libsoup-2.64.2.tar.xz) = c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
6+
Size (libsoup-2.64.2.tar.xz) = 1793440 bytes
7+
SHA1 (patch-tests_Makefile.in) = 7144b1b29fc35a950f2f0c3e2a1600483636a645
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
$NetBSD: patch-tests_Makefile.in,v 1.1 2018/10/23 07:17:53 leot Exp $
2+
3+
Run APACHE_HTTPD targets only if an APACHE_HTTPD was defined
4+
(otherwise this lead to executing a `no' program and to fail the
5+
tests due that).
6+
7+
--- tests/Makefile.in.orig 2018-10-22 16:12:48.000000000 +0000
8+
+++ tests/Makefile.in
9+
@@ -2181,12 +2181,12 @@ uninstall-am: uninstall-installed_testLT
10+
soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
11+
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
12+
13+
-check: start-httpd
14+
+@HAVE_APACHE_TRUE@check: start-httpd
15+
16+
-check-local: check-TESTS
17+
- @$(MAKE) kill-httpd
18+
+@HAVE_APACHE_TRUE@check-local: check-TESTS
19+
+@HAVE_APACHE_TRUE@ @$(MAKE) kill-httpd
20+
21+
-.PHONY: start-httpd kill-httpd
22+
+@[email protected]: start-httpd kill-httpd
23+
24+
start-httpd:
25+
@$(APACHE_HTTPD) -d $(abs_srcdir) -c "DefaultRuntimeDir `pwd`" -c "PidFile `pwd`/httpd.pid" -f `pwd`/httpd.conf -k start;

0 commit comments

Comments
 (0)