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

[Jan Steffens]

    Date: Monday, August 29, 2022 @ 16:21:25
  Author: heftig
Revision: 454699

1.1.37-1: bring closer to libxml2

Modified:
  libxslt/trunk/0001-Make-generate-id-deterministic.patch
  libxslt/trunk/PKGBUILD

-------------------------------------------+
 0001-Make-generate-id-deterministic.patch |    8 ++---
 PKGBUILD                                  |   39 ++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 15 deletions(-)

Modified: 0001-Make-generate-id-deterministic.patch
===================================================================
--- 0001-Make-generate-id-deterministic.patch	2022-08-29 16:20:13 UTC (rev 454698)
+++ 0001-Make-generate-id-deterministic.patch	2022-08-29 16:21:25 UTC (rev 454699)
@@ -14,10 +14,10 @@
  4 files changed, 107 insertions(+), 1 deletion(-)
 
 diff --git a/libxslt/functions.c b/libxslt/functions.c
-index fa8b6d93b205..0ca57b43453a 100644
+index ed2b002362dc..9c4408b325bd 100644
 --- a/libxslt/functions.c
 +++ b/libxslt/functions.c
-@@ -658,6 +658,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
+@@ -662,6 +662,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
      xmlXPathFreeObject(decimalObj);
  }
  
@@ -81,7 +81,7 @@
  /**
   * xsltGenerateIdFunction:
   * @ctxt:  the XPath Parser context
-@@ -709,7 +766,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+@@ -713,7 +770,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
      if (obj)
          xmlXPathFreeObject(obj);
  
@@ -141,7 +141,7 @@
   * And the registration
   */
 diff --git a/libxslt/transform.c b/libxslt/transform.c
-index 2d8fd7f9abd5..b899f7cbc688 100644
+index cb43bb47d997..bc1c6afcfdd8 100644
 --- a/libxslt/transform.c
 +++ b/libxslt/transform.c
 @@ -705,6 +705,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-29 16:20:13 UTC (rev 454698)
+++ PKGBUILD	2022-08-29 16:21:25 UTC (rev 454699)
@@ -1,11 +1,12 @@
 # Contributor: Eric Belanger <eric at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
 
-pkgname=libxslt
-pkgver=1.1.36
+pkgbase=libxslt
+pkgname=(libxslt libxslt-docs)
+pkgver=1.1.37
 pkgrel=1
 pkgdesc="XML stylesheet transformation library"
-url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis"
+url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis/home"
 arch=(x86_64)
 license=(custom:MIT)
 depends=(
@@ -20,14 +21,12 @@
 checkdepends=(
   docbook-xml
 )
-optdepends=('python: Python bindings')
-provides=(lib{,e}xslt.so)
 options=(debug)
-_commit=bcd17763a9f371ec5c9bdce0ffa2f2eb3ef74c43  # tags/v1.1.36^0
+_commit=5eca7fb65b7337409a02f9f94fde608edf7d1b0a  # tags/v1.1.37^0
 source=("git+https://gitlab.gnome.org/GNOME/libxslt.git#commit=$_commit"
         0001-Make-generate-id-deterministic.patch)
 sha256sums=('SKIP'
-            'e83c20f9a4f0c95716410c127ad10d6cde814c25d183de0d319f5dda529b7a6e')
+            '605e0a0b2ca385a90226bc5b141d3f6bfeade13e43ab39f8dea863505d7cbf18')
 
 pkgver() {
   cd libxslt
@@ -45,9 +44,12 @@
 
 build() {
   cd libxslt
-  ./configure --prefix=/usr \
+
+  ./configure \
+    --prefix=/usr \
+    --with-python=/usr/bin/python \
     --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
   make
 }
 
@@ -56,10 +58,25 @@
   make check
 }
 
-package() {
+package_libxslt() {
+  optdepends=('python: Python bindings')
+  provides=(lib{,e}xslt.so)
+
   cd libxslt
+
   make DESTDIR="$pkgdir" install
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 Copyright
+
+  mkdir -p ../doc/usr/share
+  mv "$pkgdir"/usr/share/{doc,gtk-doc} -t ../doc/usr/share
+
+  install -Dm644 Copyright -t "$pkgdir/usr/share/licenses/$pkgname"
 }
 
+package_libxslt-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  mv doc/* "$pkgdir"
+}
+
 # vim:set sw=2 sts=-1 et: