[arch-commits] Commit in libxslt/repos (8 files)
Jan Steffens
heftig at archlinux.org
Thu Sep 14 07:31:52 UTC 2017
Date: Thursday, September 14, 2017 @ 07:31:51
Author: heftig
Revision: 305485
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libxslt/repos/extra-i686/0001-Fix-bashism-in-configure.in.patch
(from rev 305484, libxslt/trunk/0001-Fix-bashism-in-configure.in.patch)
libxslt/repos/extra-i686/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch
(from rev 305484, libxslt/trunk/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch)
libxslt/repos/extra-i686/PKGBUILD
(from rev 305484, libxslt/trunk/PKGBUILD)
libxslt/repos/extra-x86_64/0001-Fix-bashism-in-configure.in.patch
(from rev 305484, libxslt/trunk/0001-Fix-bashism-in-configure.in.patch)
libxslt/repos/extra-x86_64/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch
(from rev 305484, libxslt/trunk/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch)
libxslt/repos/extra-x86_64/PKGBUILD
(from rev 305484, libxslt/trunk/PKGBUILD)
Deleted:
libxslt/repos/extra-i686/PKGBUILD
libxslt/repos/extra-x86_64/PKGBUILD
---------------------------------------------------------------+
/PKGBUILD | 118 ++++++++++
extra-i686/0001-Fix-bashism-in-configure.in.patch | 27 ++
extra-i686/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch | 28 ++
extra-i686/PKGBUILD | 49 ----
extra-x86_64/0001-Fix-bashism-in-configure.in.patch | 27 ++
extra-x86_64/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch | 28 ++
extra-x86_64/PKGBUILD | 49 ----
7 files changed, 228 insertions(+), 98 deletions(-)
Copied: libxslt/repos/extra-i686/0001-Fix-bashism-in-configure.in.patch (from rev 305484, libxslt/trunk/0001-Fix-bashism-in-configure.in.patch)
===================================================================
--- extra-i686/0001-Fix-bashism-in-configure.in.patch (rev 0)
+++ extra-i686/0001-Fix-bashism-in-configure.in.patch 2017-09-14 07:31:51 UTC (rev 305485)
@@ -0,0 +1,27 @@
+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
+
Copied: libxslt/repos/extra-i686/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch (from rev 305484, libxslt/trunk/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch)
===================================================================
--- extra-i686/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch (rev 0)
+++ extra-i686/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch 2017-09-14 07:31:51 UTC (rev 305485)
@@ -0,0 +1,28 @@
+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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-09-14 07:30:55 UTC (rev 305484)
+++ extra-i686/PKGBUILD 2017-09-14 07:31:51 UTC (rev 305485)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=libxslt
-pkgver=1.1.30
-pkgrel=1
-pkgdesc="XML stylesheet transformation library"
-url="http://xmlsoft.org/XSLT/"
-arch=(i686 x86_64)
-license=(custom)
-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")
-md5sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- 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
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr --with-python=/usr/bin/python2
- 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
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- find "$pkgdir" -name '*.a' -print -delete
-}
Copied: libxslt/repos/extra-i686/PKGBUILD (from rev 305484, libxslt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-09-14 07:31:51 UTC (rev 305485)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxslt
+pkgver=1.1.30
+pkgrel=2
+pkgdesc="XML stylesheet transformation library"
+url="http://xmlsoft.org/XSLT/"
+arch=(i686 x86_64)
+license=(custom)
+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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+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
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --with-python=/usr/bin/python2
+ 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
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ find "$pkgdir" -name '*.a' -print -delete
+}
Copied: libxslt/repos/extra-x86_64/0001-Fix-bashism-in-configure.in.patch (from rev 305484, libxslt/trunk/0001-Fix-bashism-in-configure.in.patch)
===================================================================
--- extra-x86_64/0001-Fix-bashism-in-configure.in.patch (rev 0)
+++ extra-x86_64/0001-Fix-bashism-in-configure.in.patch 2017-09-14 07:31:51 UTC (rev 305485)
@@ -0,0 +1,27 @@
+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
+
Copied: libxslt/repos/extra-x86_64/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch (from rev 305484, libxslt/trunk/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch)
===================================================================
--- extra-x86_64/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch (rev 0)
+++ extra-x86_64/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch 2017-09-14 07:31:51 UTC (rev 305485)
@@ -0,0 +1,28 @@
+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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-09-14 07:30:55 UTC (rev 305484)
+++ extra-x86_64/PKGBUILD 2017-09-14 07:31:51 UTC (rev 305485)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: John Proctor <jproctor at prium.net>
-
-pkgname=libxslt
-pkgver=1.1.30
-pkgrel=1
-pkgdesc="XML stylesheet transformation library"
-url="http://xmlsoft.org/XSLT/"
-arch=(i686 x86_64)
-license=(custom)
-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")
-md5sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- 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
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr --with-python=/usr/bin/python2
- 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
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- find "$pkgdir" -name '*.a' -print -delete
-}
Copied: libxslt/repos/extra-x86_64/PKGBUILD (from rev 305484, libxslt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-09-14 07:31:51 UTC (rev 305485)
@@ -0,0 +1,59 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxslt
+pkgver=1.1.30
+pkgrel=2
+pkgdesc="XML stylesheet transformation library"
+url="http://xmlsoft.org/XSLT/"
+arch=(i686 x86_64)
+license=(custom)
+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')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+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
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --with-python=/usr/bin/python2
+ 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
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ find "$pkgdir" -name '*.a' -print -delete
+}
More information about the arch-commits
mailing list