[arch-commits] Commit in libsoup/repos (8 files)

Jan Steffens heftig at archlinux.org
Fri Oct 27 08:53:01 UTC 2017


    Date: Friday, October 27, 2017 @ 08:53:00
  Author: heftig
Revision: 308541

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libsoup/repos/extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
    (from rev 308540, libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
  libsoup/repos/extra-i686/PKGBUILD
    (from rev 308540, libsoup/trunk/PKGBUILD)
  libsoup/repos/extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
    (from rev 308540, libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
  libsoup/repos/extra-x86_64/PKGBUILD
    (from rev 308540, libsoup/trunk/PKGBUILD)
Deleted:
  libsoup/repos/extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
  libsoup/repos/extra-i686/PKGBUILD
  libsoup/repos/extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
  libsoup/repos/extra-x86_64/PKGBUILD

------------------------------------------------------------------------------+
 /0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch             |  228 ++++++++++
 /PKGBUILD                                                                    |  100 ++++
 extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch   |  114 -----
 extra-i686/PKGBUILD                                                          |   50 --
 extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch |  114 -----
 extra-x86_64/PKGBUILD                                                        |   50 --
 6 files changed, 328 insertions(+), 328 deletions(-)

Deleted: extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
===================================================================
--- extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	2017-10-27 08:50:42 UTC (rev 308540)
+++ extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	2017-10-27 08:53:00 UTC (rev 308541)
@@ -1,114 +0,0 @@
-From 22fae95aff7073da55b2a79055292d320475439b Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 9 May 2017 22:54:16 +0200
-Subject: [PATCH] Configure PHP to load the XMLRPC extension if present
-
-This is needed when the system PHP configuration does not already load
-the extension.
----
- configure.ac        | 7 ++++++-
- tests/Makefile.am   | 8 +++++++-
- tests/httpd.conf.in | 2 ++
- tests/php.ini.in    | 1 +
- 4 files changed, 16 insertions(+), 2 deletions(-)
- create mode 100644 tests/php.ini.in
-
-diff --git a/configure.ac b/configure.ac
-index 3df131e67d586522..868b00e7f091a70e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -272,22 +272,26 @@ if test "$have_apache" = 1; then
- 
-     if test "$have_php" = yes; then
- 	AC_MSG_CHECKING([for php-xmlrpc])
--	if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
-+	if $PHP -d extension=xmlrpc.so --rf xmlrpc_server_create | grep -q "does not exist"; then
- 	    have_php_xmlrpc=no
-+	    IF_HAVE_PHP_XMLRPC=";"
- 	else
- 	    have_php_xmlrpc=yes
-+	    IF_HAVE_PHP_XMLRPC=""
- 	    AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
- 	fi
- 	AC_MSG_RESULT($have_php_xmlrpc)
-+	AC_SUBST(IF_HAVE_PHP_XMLRPC)
-     fi
- 
-     if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
- 	IF_HAVE_MOD_UNIXD=""
-     else
- 	IF_HAVE_MOD_UNIXD="#"
-     fi
-     AC_SUBST(IF_HAVE_MOD_UNIXD)
- fi
-+AM_CONDITIONAL(HAVE_PHP, test "$have_php" = yes)
- 
- AC_PATH_PROG(CURL, curl, no)
- if test "$CURL" != no; then
-@@ -415,6 +419,7 @@ AC_CONFIG_FILES([
- 	po/Makefile
- 	tests/Makefile
- 	tests/httpd.conf
-+	tests/php.ini
- 	examples/Makefile
- 	docs/Makefile
- 	docs/reference/Makefile
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 81a72cbc5ffd9739..d2986975be11eca2 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -73,24 +73,30 @@ test_data +=			\
- 	httpd.conf
- endif
- 
-+if HAVE_PHP
-+test_data +=			\
-+	php.ini
-+endif
-+
- RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/soup-tests.gresource.xml)
- 
- soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
- 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
- 
- EXTRA_DIST +=			 \
- 	htdigest		 \
- 	htpasswd		 \
- 	httpd.conf.in		 \
- 	index.txt		 \
- 	libsoup.supp		 \
-+	php.ini.in		 \
- 	soup-tests.gresource.xml \
- 	test-cert.pem		 \
- 	test-key.pem		 \
- 	xmlrpc-server.php	 \
- 	$(RESOURCES)
- 
--DISTCLEANFILES += soup-tests.gresource httpd.conf
-+DISTCLEANFILES += soup-tests.gresource httpd.conf php.ini
- 
- TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1
- 
-diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
-index b818c12d198e6618..31c36674a9c5d8c2 100644
---- a/tests/httpd.conf.in
-+++ b/tests/httpd.conf.in
-@@ -31,6 +31,8 @@ LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so
- LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
- @IF_HAVE_MOD_UNIXD at LoadModule unixd_module         @APACHE_SSL_MODULE_DIR@/mod_unixd.so
- 
-+ at IF_HAVE_PHP@PHPIniDir .
-+
- DirectoryIndex index.txt
- TypesConfig /dev/null
- AddType application/x-httpd-php .php
-diff --git a/tests/php.ini.in b/tests/php.ini.in
-new file mode 100644
-index 0000000000000000..779c022323b2f55f
---- /dev/null
-+++ b/tests/php.ini.in
-@@ -0,0 +1 @@
-+ at IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so
--- 
-2.12.2
-

Copied: libsoup/repos/extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch (from rev 308540, libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
===================================================================
--- extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	                        (rev 0)
+++ extra-i686/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	2017-10-27 08:53:00 UTC (rev 308541)
@@ -0,0 +1,114 @@
+From 22fae95aff7073da55b2a79055292d320475439b Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 9 May 2017 22:54:16 +0200
+Subject: [PATCH] Configure PHP to load the XMLRPC extension if present
+
+This is needed when the system PHP configuration does not already load
+the extension.
+---
+ configure.ac        | 7 ++++++-
+ tests/Makefile.am   | 8 +++++++-
+ tests/httpd.conf.in | 2 ++
+ tests/php.ini.in    | 1 +
+ 4 files changed, 16 insertions(+), 2 deletions(-)
+ create mode 100644 tests/php.ini.in
+
+diff --git a/configure.ac b/configure.ac
+index 3df131e67d586522..868b00e7f091a70e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -272,22 +272,26 @@ if test "$have_apache" = 1; then
+ 
+     if test "$have_php" = yes; then
+ 	AC_MSG_CHECKING([for php-xmlrpc])
+-	if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
++	if $PHP -d extension=xmlrpc.so --rf xmlrpc_server_create | grep -q "does not exist"; then
+ 	    have_php_xmlrpc=no
++	    IF_HAVE_PHP_XMLRPC=";"
+ 	else
+ 	    have_php_xmlrpc=yes
++	    IF_HAVE_PHP_XMLRPC=""
+ 	    AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
+ 	fi
+ 	AC_MSG_RESULT($have_php_xmlrpc)
++	AC_SUBST(IF_HAVE_PHP_XMLRPC)
+     fi
+ 
+     if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
+ 	IF_HAVE_MOD_UNIXD=""
+     else
+ 	IF_HAVE_MOD_UNIXD="#"
+     fi
+     AC_SUBST(IF_HAVE_MOD_UNIXD)
+ fi
++AM_CONDITIONAL(HAVE_PHP, test "$have_php" = yes)
+ 
+ AC_PATH_PROG(CURL, curl, no)
+ if test "$CURL" != no; then
+@@ -415,6 +419,7 @@ AC_CONFIG_FILES([
+ 	po/Makefile
+ 	tests/Makefile
+ 	tests/httpd.conf
++	tests/php.ini
+ 	examples/Makefile
+ 	docs/Makefile
+ 	docs/reference/Makefile
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 81a72cbc5ffd9739..d2986975be11eca2 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -73,24 +73,30 @@ test_data +=			\
+ 	httpd.conf
+ endif
+ 
++if HAVE_PHP
++test_data +=			\
++	php.ini
++endif
++
+ RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/soup-tests.gresource.xml)
+ 
+ soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
+ 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+ 
+ EXTRA_DIST +=			 \
+ 	htdigest		 \
+ 	htpasswd		 \
+ 	httpd.conf.in		 \
+ 	index.txt		 \
+ 	libsoup.supp		 \
++	php.ini.in		 \
+ 	soup-tests.gresource.xml \
+ 	test-cert.pem		 \
+ 	test-key.pem		 \
+ 	xmlrpc-server.php	 \
+ 	$(RESOURCES)
+ 
+-DISTCLEANFILES += soup-tests.gresource httpd.conf
++DISTCLEANFILES += soup-tests.gresource httpd.conf php.ini
+ 
+ TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1
+ 
+diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
+index b818c12d198e6618..31c36674a9c5d8c2 100644
+--- a/tests/httpd.conf.in
++++ b/tests/httpd.conf.in
+@@ -31,6 +31,8 @@ LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so
+ LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
+ @IF_HAVE_MOD_UNIXD at LoadModule unixd_module         @APACHE_SSL_MODULE_DIR@/mod_unixd.so
+ 
++ at IF_HAVE_PHP@PHPIniDir .
++
+ DirectoryIndex index.txt
+ TypesConfig /dev/null
+ AddType application/x-httpd-php .php
+diff --git a/tests/php.ini.in b/tests/php.ini.in
+new file mode 100644
+index 0000000000000000..779c022323b2f55f
+--- /dev/null
++++ b/tests/php.ini.in
+@@ -0,0 +1 @@
++ at IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so
+-- 
+2.12.2
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-10-27 08:50:42 UTC (rev 308540)
+++ extra-i686/PKGBUILD	2017-10-27 08:53:00 UTC (rev 308541)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libsoup
-pkgver=2.60.1
-pkgrel=1
-pkgdesc="HTTP client/server library for GNOME"
-url="https://wiki.gnome.org/Projects/libsoup"
-arch=(i686 x86_64)
-license=(LGPL)
-depends=(glib2 libxml2 glib-networking sqlite krb5)
-makedepends=(intltool gobject-introspection python vala git gtk-doc)
-checkdepends=(apache php-apache)
-_commit=7556557b8fb989368d530ad55a57dcd46e1f2633  # tags/2.60.1^0
-source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit"
-        0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
-sha256sums=('SKIP'
-            '1ad674810317ff2be817d00e9490d0d70014a38682a3dabc22801ae5db78aecc')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=782410
-  patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd $pkgname
-  make check
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: libsoup/repos/extra-i686/PKGBUILD (from rev 308540, libsoup/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-10-27 08:53:00 UTC (rev 308541)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libsoup
+pkgver=2.60.2
+pkgrel=1
+pkgdesc="HTTP client/server library for GNOME"
+url="https://wiki.gnome.org/Projects/libsoup"
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(glib2 libxml2 glib-networking sqlite krb5)
+makedepends=(intltool gobject-introspection python vala git gtk-doc)
+checkdepends=(apache php-apache)
+_commit=2a6368154fc324ecbb2d165636608a5362904862  # tags/2.60.2^0
+source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit"
+        0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
+sha256sums=('SKIP'
+            '1ad674810317ff2be817d00e9490d0d70014a38682a3dabc22801ae5db78aecc')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=782410
+  patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
===================================================================
--- extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	2017-10-27 08:50:42 UTC (rev 308540)
+++ extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	2017-10-27 08:53:00 UTC (rev 308541)
@@ -1,114 +0,0 @@
-From 22fae95aff7073da55b2a79055292d320475439b Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 9 May 2017 22:54:16 +0200
-Subject: [PATCH] Configure PHP to load the XMLRPC extension if present
-
-This is needed when the system PHP configuration does not already load
-the extension.
----
- configure.ac        | 7 ++++++-
- tests/Makefile.am   | 8 +++++++-
- tests/httpd.conf.in | 2 ++
- tests/php.ini.in    | 1 +
- 4 files changed, 16 insertions(+), 2 deletions(-)
- create mode 100644 tests/php.ini.in
-
-diff --git a/configure.ac b/configure.ac
-index 3df131e67d586522..868b00e7f091a70e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -272,22 +272,26 @@ if test "$have_apache" = 1; then
- 
-     if test "$have_php" = yes; then
- 	AC_MSG_CHECKING([for php-xmlrpc])
--	if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
-+	if $PHP -d extension=xmlrpc.so --rf xmlrpc_server_create | grep -q "does not exist"; then
- 	    have_php_xmlrpc=no
-+	    IF_HAVE_PHP_XMLRPC=";"
- 	else
- 	    have_php_xmlrpc=yes
-+	    IF_HAVE_PHP_XMLRPC=""
- 	    AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
- 	fi
- 	AC_MSG_RESULT($have_php_xmlrpc)
-+	AC_SUBST(IF_HAVE_PHP_XMLRPC)
-     fi
- 
-     if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
- 	IF_HAVE_MOD_UNIXD=""
-     else
- 	IF_HAVE_MOD_UNIXD="#"
-     fi
-     AC_SUBST(IF_HAVE_MOD_UNIXD)
- fi
-+AM_CONDITIONAL(HAVE_PHP, test "$have_php" = yes)
- 
- AC_PATH_PROG(CURL, curl, no)
- if test "$CURL" != no; then
-@@ -415,6 +419,7 @@ AC_CONFIG_FILES([
- 	po/Makefile
- 	tests/Makefile
- 	tests/httpd.conf
-+	tests/php.ini
- 	examples/Makefile
- 	docs/Makefile
- 	docs/reference/Makefile
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 81a72cbc5ffd9739..d2986975be11eca2 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -73,24 +73,30 @@ test_data +=			\
- 	httpd.conf
- endif
- 
-+if HAVE_PHP
-+test_data +=			\
-+	php.ini
-+endif
-+
- RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/soup-tests.gresource.xml)
- 
- soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
- 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
- 
- EXTRA_DIST +=			 \
- 	htdigest		 \
- 	htpasswd		 \
- 	httpd.conf.in		 \
- 	index.txt		 \
- 	libsoup.supp		 \
-+	php.ini.in		 \
- 	soup-tests.gresource.xml \
- 	test-cert.pem		 \
- 	test-key.pem		 \
- 	xmlrpc-server.php	 \
- 	$(RESOURCES)
- 
--DISTCLEANFILES += soup-tests.gresource httpd.conf
-+DISTCLEANFILES += soup-tests.gresource httpd.conf php.ini
- 
- TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1
- 
-diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
-index b818c12d198e6618..31c36674a9c5d8c2 100644
---- a/tests/httpd.conf.in
-+++ b/tests/httpd.conf.in
-@@ -31,6 +31,8 @@ LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so
- LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
- @IF_HAVE_MOD_UNIXD at LoadModule unixd_module         @APACHE_SSL_MODULE_DIR@/mod_unixd.so
- 
-+ at IF_HAVE_PHP@PHPIniDir .
-+
- DirectoryIndex index.txt
- TypesConfig /dev/null
- AddType application/x-httpd-php .php
-diff --git a/tests/php.ini.in b/tests/php.ini.in
-new file mode 100644
-index 0000000000000000..779c022323b2f55f
---- /dev/null
-+++ b/tests/php.ini.in
-@@ -0,0 +1 @@
-+ at IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so
--- 
-2.12.2
-

Copied: libsoup/repos/extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch (from rev 308540, libsoup/trunk/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
===================================================================
--- extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	                        (rev 0)
+++ extra-x86_64/0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch	2017-10-27 08:53:00 UTC (rev 308541)
@@ -0,0 +1,114 @@
+From 22fae95aff7073da55b2a79055292d320475439b Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 9 May 2017 22:54:16 +0200
+Subject: [PATCH] Configure PHP to load the XMLRPC extension if present
+
+This is needed when the system PHP configuration does not already load
+the extension.
+---
+ configure.ac        | 7 ++++++-
+ tests/Makefile.am   | 8 +++++++-
+ tests/httpd.conf.in | 2 ++
+ tests/php.ini.in    | 1 +
+ 4 files changed, 16 insertions(+), 2 deletions(-)
+ create mode 100644 tests/php.ini.in
+
+diff --git a/configure.ac b/configure.ac
+index 3df131e67d586522..868b00e7f091a70e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -272,22 +272,26 @@ if test "$have_apache" = 1; then
+ 
+     if test "$have_php" = yes; then
+ 	AC_MSG_CHECKING([for php-xmlrpc])
+-	if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
++	if $PHP -d extension=xmlrpc.so --rf xmlrpc_server_create | grep -q "does not exist"; then
+ 	    have_php_xmlrpc=no
++	    IF_HAVE_PHP_XMLRPC=";"
+ 	else
+ 	    have_php_xmlrpc=yes
++	    IF_HAVE_PHP_XMLRPC=""
+ 	    AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
+ 	fi
+ 	AC_MSG_RESULT($have_php_xmlrpc)
++	AC_SUBST(IF_HAVE_PHP_XMLRPC)
+     fi
+ 
+     if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
+ 	IF_HAVE_MOD_UNIXD=""
+     else
+ 	IF_HAVE_MOD_UNIXD="#"
+     fi
+     AC_SUBST(IF_HAVE_MOD_UNIXD)
+ fi
++AM_CONDITIONAL(HAVE_PHP, test "$have_php" = yes)
+ 
+ AC_PATH_PROG(CURL, curl, no)
+ if test "$CURL" != no; then
+@@ -415,6 +419,7 @@ AC_CONFIG_FILES([
+ 	po/Makefile
+ 	tests/Makefile
+ 	tests/httpd.conf
++	tests/php.ini
+ 	examples/Makefile
+ 	docs/Makefile
+ 	docs/reference/Makefile
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 81a72cbc5ffd9739..d2986975be11eca2 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -73,24 +73,30 @@ test_data +=			\
+ 	httpd.conf
+ endif
+ 
++if HAVE_PHP
++test_data +=			\
++	php.ini
++endif
++
+ RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/soup-tests.gresource.xml)
+ 
+ soup-tests.gresource: soup-tests.gresource.xml $(RESOURCES)
+ 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) $<
+ 
+ EXTRA_DIST +=			 \
+ 	htdigest		 \
+ 	htpasswd		 \
+ 	httpd.conf.in		 \
+ 	index.txt		 \
+ 	libsoup.supp		 \
++	php.ini.in		 \
+ 	soup-tests.gresource.xml \
+ 	test-cert.pem		 \
+ 	test-key.pem		 \
+ 	xmlrpc-server.php	 \
+ 	$(RESOURCES)
+ 
+-DISTCLEANFILES += soup-tests.gresource httpd.conf
++DISTCLEANFILES += soup-tests.gresource httpd.conf php.ini
+ 
+ TESTS_ENVIRONMENT += SOUP_TESTS_IN_MAKE_CHECK=1
+ 
+diff --git a/tests/httpd.conf.in b/tests/httpd.conf.in
+index b818c12d198e6618..31c36674a9c5d8c2 100644
+--- a/tests/httpd.conf.in
++++ b/tests/httpd.conf.in
+@@ -31,6 +31,8 @@ LoadModule proxy_connect_module @APACHE_MODULE_DIR@/mod_proxy_connect.so
+ LoadModule ssl_module           @APACHE_SSL_MODULE_DIR@/mod_ssl.so
+ @IF_HAVE_MOD_UNIXD at LoadModule unixd_module         @APACHE_SSL_MODULE_DIR@/mod_unixd.so
+ 
++ at IF_HAVE_PHP@PHPIniDir .
++
+ DirectoryIndex index.txt
+ TypesConfig /dev/null
+ AddType application/x-httpd-php .php
+diff --git a/tests/php.ini.in b/tests/php.ini.in
+new file mode 100644
+index 0000000000000000..779c022323b2f55f
+--- /dev/null
++++ b/tests/php.ini.in
+@@ -0,0 +1 @@
++ at IF_HAVE_PHP_XMLRPC@extension=xmlrpc.so
+-- 
+2.12.2
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-10-27 08:50:42 UTC (rev 308540)
+++ extra-x86_64/PKGBUILD	2017-10-27 08:53:00 UTC (rev 308541)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=libsoup
-pkgver=2.60.1
-pkgrel=1
-pkgdesc="HTTP client/server library for GNOME"
-url="https://wiki.gnome.org/Projects/libsoup"
-arch=(i686 x86_64)
-license=(LGPL)
-depends=(glib2 libxml2 glib-networking sqlite krb5)
-makedepends=(intltool gobject-introspection python vala git gtk-doc)
-checkdepends=(apache php-apache)
-_commit=7556557b8fb989368d530ad55a57dcd46e1f2633  # tags/2.60.1^0
-source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit"
-        0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
-sha256sums=('SKIP'
-            '1ad674810317ff2be817d00e9490d0d70014a38682a3dabc22801ae5db78aecc')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=782410
-  patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-check() {
-  cd $pkgname
-  make check
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: libsoup/repos/extra-x86_64/PKGBUILD (from rev 308540, libsoup/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-10-27 08:53:00 UTC (rev 308541)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=libsoup
+pkgver=2.60.2
+pkgrel=1
+pkgdesc="HTTP client/server library for GNOME"
+url="https://wiki.gnome.org/Projects/libsoup"
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(glib2 libxml2 glib-networking sqlite krb5)
+makedepends=(intltool gobject-introspection python vala git gtk-doc)
+checkdepends=(apache php-apache)
+_commit=2a6368154fc324ecbb2d165636608a5362904862  # tags/2.60.2^0
+source=("git+https://git.gnome.org/browse/libsoup#commit=$_commit"
+        0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch)
+sha256sums=('SKIP'
+            '1ad674810317ff2be817d00e9490d0d70014a38682a3dabc22801ae5db78aecc')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd $pkgname
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=782410
+  patch -Np1 -i ../0001-Configure-PHP-to-load-the-XMLRPC-extension-if-presen.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-static --enable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd $pkgname
+  make check
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}



More information about the arch-commits mailing list