[arch-commits] Commit in libsoup/trunk (2 files)

[Jan Steffens]

    Date: Monday, May 7, 2018 @ 13:36:53
  Author: heftig
Revision: 323438

2.62.2-1

Modified:
  libsoup/trunk/PKGBUILD
Deleted:
  libsoup/trunk/0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch

-------------------------------------------------------------+
 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch |   33 ----------
 PKGBUILD                                                    |   13 +--
 2 files changed, 4 insertions(+), 42 deletions(-)

Deleted: 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch
===================================================================
--- 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch	2018-05-07 09:18:31 UTC (rev 323437)
+++ 0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch	2018-05-07 13:36:53 UTC (rev 323438)
@@ -1,33 +0,0 @@
-From e8b8f9776dae4007b4d9bf0e729a00c7f553daad Mon Sep 17 00:00:00 2001
-Message-Id: <e8b8f9776dae4007b4d9bf0e729a00c7f553daad.1520796778.git.jan.steffens at gmail.com>
-In-Reply-To: <437356c457cfeb7b4ab0cdad67f59f431d459536.1520796778.git.jan.steffens at gmail.com>
-References: <437356c457cfeb7b4ab0cdad67f59f431d459536.1520796778.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Thu, 11 Jan 2018 20:22:58 +0100
-Subject: [PATCH 2/2] xmlrpc-server.php: Don't try to count NULL params
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Trying to count something uncountable causes PHP ≥7.2 to emit a warning.
-I assume that $params is NULL when there are no parameters.
----
- tests/xmlrpc-server.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/xmlrpc-server.php b/tests/xmlrpc-server.php
-index 4025f95c..f315b6d0 100644
---- a/tests/xmlrpc-server.php
-+++ b/tests/xmlrpc-server.php
-@@ -71,7 +71,7 @@ function echo_ ($method_name, $params, $app_data)
- 
- function ping ($method_name, $params, $app_data)
- {
--	if (count ($params) == 0)
-+	if (is_null ($params) or count ($params) == 0)
- 		return "pong";
- 	else
- 		return paramfault ();
--- 
-2.16.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-07 09:18:31 UTC (rev 323437)
+++ PKGBUILD	2018-05-07 13:36:53 UTC (rev 323438)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libsoup
-pkgver=2.62.1
+pkgver=2.62.2
 pkgrel=1
 pkgdesc="HTTP client/server library for GNOME"
 url="https://wiki.gnome.org/Projects/libsoup"
@@ -11,13 +11,11 @@
 depends=(glib2 libxml2 glib-networking sqlite krb5)
 makedepends=(intltool gobject-introspection python vala git gtk-doc)
 checkdepends=(apache php-apache)
-_commit=5a62f67afb1457f6d02e8b7269b8477163990fd1  # tags/2.62.1^0
+_commit=17c46764b715bac3bf42a0b3d54d76cd8a4bab0d  # tags/2.62.2^0
 source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit"
-        0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
-        0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch)
+        0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
 sha256sums=('SKIP'
-            '7bf5257afb2c248c8ef8709e4aeaaafe9252835887b6944fe143eddc7ce98a8c'
-            '9238d9a2deff3ba57fb8ebd03d70564f872f785798750af9a455b616b6e2190e')
+            '7bf5257afb2c248c8ef8709e4aeaaafe9252835887b6944fe143eddc7ce98a8c')
 
 pkgver() {
   cd $pkgname
@@ -30,9 +28,6 @@
   # https://bugzilla.gnome.org/show_bug.cgi?id=782410
   patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
 
-  # tests fail with php 7.2
-  patch -Np1 -i ../0002-xmlrpc-server.php-Don-t-try-to-count-NULL-params.patch
-
   NOCONFIGURE=1 ./autogen.sh
 }