[arch-commits] Commit in libxslt/repos/extra-x86_64 (4 files)
Jan de Groot
jgc at archlinux.org
Fri Nov 10 23:13:12 UTC 2017
Date: Friday, November 10, 2017 @ 23:13:11
Author: jgc
Revision: 309418
archrelease: copy trunk to extra-x86_64
Added:
libxslt/repos/extra-x86_64/PKGBUILD
(from rev 309417, libxslt/trunk/PKGBUILD)
Deleted:
libxslt/repos/extra-x86_64/0001-Fix-bashism-in-configure.in.patch
libxslt/repos/extra-x86_64/0002-Set-XML_CONFIG-in-the-pkg-config-path.patch
libxslt/repos/extra-x86_64/PKGBUILD
--------------------------------------------------+
0001-Fix-bashism-in-configure.in.patch | 27 -----
0002-Set-XML_CONFIG-in-the-pkg-config-path.patch | 28 -----
PKGBUILD | 110 +++++++++------------
3 files changed, 51 insertions(+), 114 deletions(-)
Deleted: 0001-Fix-bashism-in-configure.in.patch
===================================================================
--- 0001-Fix-bashism-in-configure.in.patch 2017-11-10 23:13:04 UTC (rev 309417)
+++ 0001-Fix-bashism-in-configure.in.patch 2017-11-10 23:13:11 UTC (rev 309418)
@@ -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:13:04 UTC (rev 309417)
+++ 0002-Set-XML_CONFIG-in-the-pkg-config-path.patch 2017-11-10 23:13:11 UTC (rev 309418)
@@ -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
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-11-10 23:13:04 UTC (rev 309417)
+++ PKGBUILD 2017-11-10 23:13:11 UTC (rev 309418)
@@ -1,59 +0,0 @@
-# $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/PKGBUILD (from rev 309417, libxslt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-11-10 23:13:11 UTC (rev 309418)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: John Proctor <jproctor at prium.net>
+
+pkgname=libxslt
+pkgver=1.1.32+3+g32c88216
+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=32c88216ddbaa0f3491f45bc84ee89285c6a1129 # master
+source=("git+https://git.gnome.org/browse/libxslt#commit=$_commit")
+sha256sums=('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
+}
More information about the arch-commits
mailing list