Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1540279073227930"
MIME-Version: 1.0
Date: Tue, 23 Oct 2018 07:17:53 +0000
From: "Leonardo Taccari" <leot@netbsd.org>
Subject: CVS commit: pkgsrc/net/libsoup
To: pkgsrc-changes@NetBSD.org
Reply-To: leot@netbsd.org
Message-Id: <20181023071753.75D54FBEE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1540279073227930
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="UTF-8"

Module Name:	pkgsrc
Committed By:	leot
Date:		Tue Oct 23 07:17:53 UTC 2018

Modified Files:
	pkgsrc/net/libsoup: Makefile distinfo
Added Files:
	pkgsrc/net/libsoup/patches: patch-tests_Makefile.in

Log Message:
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).


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/net/libsoup/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/libsoup/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/libsoup/patches/patch-tests_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1540279073227930
Content-Disposition: inline
Content-Length: 3987
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/libsoup/Makefile
diff -u pkgsrc/net/libsoup/Makefile:1.47 pkgsrc/net/libsoup/Makefile:1.48
--- pkgsrc/net/libsoup/Makefile:1.47	Thu Aug 16 12:16:17 2018
+++ pkgsrc/net/libsoup/Makefile	Tue Oct 23 07:17:53 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2018/08/16 12:16:17 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2018/10/23 07:17:53 leot Exp $
 
-DISTNAME=	libsoup-2.62.3
+DISTNAME=	libsoup-2.64.2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=	.tar.xz
@@ -21,8 +21,9 @@ CONFIGURE_ENV+=		DATADIRNAME=share
 
 # XXX: disable Vala bindings otherwise the configure phase fails because is not
 # XXX: able to find vapigen.
-CONFIGURE_ARGS+=	--enable-vala=no \
-			--disable-tls-check
+CONFIGURE_ARGS+=	--enable-vala=no
+CONFIGURE_ARGS+=	--disable-tls-check
+CONFIGURE_ARGS+=	--with-apache-httpd=no
 
 PKGCONFIG_OVERRIDE+=	libsoup-2.4.pc.in
 PKGCONFIG_OVERRIDE+=	libsoup-gnome-2.4.pc.in
@@ -44,11 +45,6 @@ CWRAPPERS_APPEND.cc+=	-Wno-error=format-
 
 .include "options.mk"
 
-REPLACE_PYTHON= libsoup/tld-parser.py
-PYTHON_FOR_BUILD_ONLY= yes
-
-.include "../../lang/python/application.mk"
-
 .include "../../databases/sqlite3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
@@ -57,4 +53,5 @@ BUILDLINK_DEPMETHOD.gobject-introspectio
 .include "../../devel/gobject-introspection/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-introspection
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/libpsl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/libsoup/distinfo
diff -u pkgsrc/net/libsoup/distinfo:1.20 pkgsrc/net/libsoup/distinfo:1.21
--- pkgsrc/net/libsoup/distinfo:1.20	Thu Aug 16 12:16:17 2018
+++ pkgsrc/net/libsoup/distinfo	Tue Oct 23 07:17:53 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.20 2018/08/16 12:16:17 wiz Exp $
+$NetBSD: distinfo,v 1.21 2018/10/23 07:17:53 leot Exp $
 
-SHA1 (libsoup-2.62.3.tar.xz) = 8b9c743348b1f9fc044c6abf3431899154e93ad1
-RMD160 (libsoup-2.62.3.tar.xz) = 24806f33b83c35b16b7b424b10401dc3a51a7e4c
-SHA512 (libsoup-2.62.3.tar.xz) = 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
-Size (libsoup-2.62.3.tar.xz) = 1851780 bytes
+SHA1 (libsoup-2.64.2.tar.xz) = 286b2dc5e4396b6328870da761798e61701f901a
+RMD160 (libsoup-2.64.2.tar.xz) = 12af987a048627f662788742ec3f66e3f8053348
+SHA512 (libsoup-2.64.2.tar.xz) = c001495be4e1eafd169b904431b22e961b52f5a3202f2e75b0657281cbfd91153148765bd95378bba3e85a66d7eaca428750641f20c07ca3232d1f9bdabdc90f
+Size (libsoup-2.64.2.tar.xz) = 1793440 bytes
+SHA1 (patch-tests_Makefile.in) = 7144b1b29fc35a950f2f0c3e2a1600483636a645

Added files:

Index: pkgsrc/net/libsoup/patches/patch-tests_Makefile.in
diff -u /dev/null pkgsrc/net/libsoup/patches/patch-tests_Makefile.in:1.1
--- /dev/null	Tue Oct 23 07:17:53 2018
+++ pkgsrc/net/libsoup/patches/patch-tests_Makefile.in	Tue Oct 23 07:17:53 2018
@@ -0,0 +1,25 @@
+$NetBSD: patch-tests_Makefile.in,v 1.1 2018/10/23 07:17:53 leot Exp $
+
+Run APACHE_HTTPD targets only if an APACHE_HTTPD was defined
+(otherwise this lead to executing a `no' program and to fail the
+tests due that).
+
+--- tests/Makefile.in.orig	2018-10-22 16:12:48.000000000 +0000
++++ tests/Makefile.in
+@@ -2181,12 +2181,12 @@ uninstall-am: uninstall-installed_testLT
+ soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
+ 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+ 
+-check: start-httpd
++@HAVE_APACHE_TRUE@check: start-httpd
+ 
+-check-local: check-TESTS
+-	@$(MAKE) kill-httpd
++@HAVE_APACHE_TRUE@check-local: check-TESTS
++@HAVE_APACHE_TRUE@	@$(MAKE) kill-httpd
+ 
+-.PHONY: start-httpd kill-httpd
++@HAVE_APACHE_TRUE@.PHONY: start-httpd kill-httpd
+ 
+ start-httpd:
+ 	@$(APACHE_HTTPD) -d $(abs_srcdir) -c "DefaultRuntimeDir `pwd`" -c "PidFile `pwd`/httpd.pid" -f `pwd`/httpd.conf -k start;


--_----------=_1540279073227930--