[arch-commits] Commit in libxslt/trunk (3 files)

[Jan de Groot]

    Date: Friday, November 10, 2017 @ 23:13:04
  Author: jgc
Revision: 309417

upgpkg: libxslt 1.1.32+3+g32c88216-1

Modified:
  libxslt/trunk/PKGBUILD
Deleted:
  libxslt/trunk/0001-Fix-bashism-in-configure.in.patch
  libxslt/trunk/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch

--------------------------------------------------+
 0001-Fix-bashism-in-configure.in.patch           |   27 --------------------
 0002-Set-XML_CONFIG-in-the-pkg-config-path.patch |   28 ---------------------
 PKGBUILD                                         |   18 +++----------
 3 files changed, 5 insertions(+), 68 deletions(-)

Deleted: 0001-Fix-bashism-in-configure.in.patch
===================================================================
--- 0001-Fix-bashism-in-configure.in.patch	2017-11-10 23:00:52 UTC (rev 309416)
+++ 0001-Fix-bashism-in-configure.in.patch	2017-11-10 23:13:04 UTC (rev 309417)
@@ -1,27 +0,0 @@
-From 57bbfa2e84464dd3a7eb57458b98283f81d2a0ad Mon Sep 17 00:00:00 2001
-Message-Id: <57bbfa2e84464dd3a7eb57458b98283f81d2a0ad.1505293157.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 13 Sep 2017 07:54:31 +0200
-Subject: [PATCH 1/2] Fix bashism in configure.in
-
-Resulted in pkg-config never getting used for libxml if sh is not bash.
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index d6aa3664e6aab08c..f4a0219eecbab9d4 100644
---- a/configure.in
-+++ b/configure.in
-@@ -505,7 +505,7 @@ dnl
- dnl Try pkg-config first if nothing is set
- dnl
- 
--if test "x$LIBXML_CONFIG_PREFIX" == "x" -a "x$LIBXML_SRC" == "x"
-+if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_SRC" = "x"
- then
- 	PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [
- 		LIBXML_MANUAL_SEARCH=no
--- 
-2.14.1
-

Deleted: 0002-Set-XML_CONFIG-in-the-pkg-config-path.patch
===================================================================
--- 0002-Set-XML_CONFIG-in-the-pkg-config-path.patch	2017-11-10 23:00:52 UTC (rev 309416)
+++ 0002-Set-XML_CONFIG-in-the-pkg-config-path.patch	2017-11-10 23:13:04 UTC (rev 309417)
@@ -1,28 +0,0 @@
-From 33f08609c1c2f054cf513bff06913c3d7013edc9 Mon Sep 17 00:00:00 2001
-Message-Id: <33f08609c1c2f054cf513bff06913c3d7013edc9.1505293157.git.jan.steffens at gmail.com>
-In-Reply-To: <57bbfa2e84464dd3a7eb57458b98283f81d2a0ad.1505293157.git.jan.steffens at gmail.com>
-References: <57bbfa2e84464dd3a7eb57458b98283f81d2a0ad.1505293157.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 13 Sep 2017 07:58:39 +0200
-Subject: [PATCH 2/2] Set XML_CONFIG in the pkg-config path
-
-Otherwise it's missing for the substitution into xslt-config.
----
- configure.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure.in b/configure.in
-index f4a0219eecbab9d4..52ada0a1fa3354a1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -510,6 +510,7 @@ then
- 	PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [
- 		LIBXML_MANUAL_SEARCH=no
- 		WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`"
-+		XML_CONFIG="$PKG_CONFIG libxml-2.0"
- 	],
- 	[
- 		LIBXML_MANUAL_SEARCH=yes
--- 
-2.14.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-10 23:00:52 UTC (rev 309416)
+++ PKGBUILD	2017-11-10 23:13:04 UTC (rev 309417)
@@ -3,8 +3,8 @@
 # Contributor: John Proctor <jproctor at prium.net>
 
 pkgname=libxslt
-pkgver=1.1.30
-pkgrel=2
+pkgver=1.1.32+3+g32c88216
+pkgrel=1
 pkgdesc="XML stylesheet transformation library"
 url="http://xmlsoft.org/XSLT/"
 arch=(i686 x86_64)
@@ -12,13 +12,9 @@
 depends=(libxml2 libgcrypt)
 makedepends=(python2 git)
 checkdepends=(docbook-xml python)
-_commit=bec1788d0627db0b510dcb337f989fae0440dbd5  # tags/v1.1.30^0
-source=("git+https://git.gnome.org/browse/libxslt#commit=$_commit"
-        0001-Fix-bashism-in-configure.in.patch
-        0002-Set-XML_CONFIG-in-the-pkg-config-path.patch)
-sha256sums=('SKIP'
-            '2845fdea4c1191b9b61e0a8f27cb48b7489d525ef1dbb019eb2b9050f4d50f94'
-            'bbc9eefc4fe3617554fffdc45838d9150d906a617719fa5eb59997f7deadd54b')
+_commit=32c88216ddbaa0f3491f45bc84ee89285c6a1129  # master
+source=("git+https://git.gnome.org/browse/libxslt#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -28,10 +24,6 @@
 prepare() {
   cd $pkgname
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=787617
-  patch -Np1 -i ../0001-Fix-bashism-in-configure.in.patch
-  patch -Np1 -i ../0002-Set-XML_CONFIG-in-the-pkg-config-path.patch
-
   sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' \
       -e 's|/usr/bin/python$|/usr/bin/python2|g' \
       -i python/tests/*.py