Date: Wednesday, August 17, 2022 @ 19:15:53 Author: heftig Revision: 453055
1.1.36-1: clean up, match lib32-libxslt better Modified: libxslt/trunk/0001-Make-generate-id-deterministic.patch libxslt/trunk/PKGBUILD -------------------------------------------+ 0001-Make-generate-id-deterministic.patch | 12 +++++----- PKGBUILD | 31 ++++++++++++++++++---------- 2 files changed, 27 insertions(+), 16 deletions(-) Modified: 0001-Make-generate-id-deterministic.patch =================================================================== --- 0001-Make-generate-id-deterministic.patch 2022-08-17 18:23:00 UTC (rev 453054) +++ 0001-Make-generate-id-deterministic.patch 2022-08-17 19:15:53 UTC (rev 453055) @@ -14,10 +14,10 @@ 4 files changed, 107 insertions(+), 1 deletion(-) diff --git a/libxslt/functions.c b/libxslt/functions.c -index 7887dda70f67..be0d897bd471 100644 +index fa8b6d93b205..0ca57b43453a 100644 --- a/libxslt/functions.c +++ b/libxslt/functions.c -@@ -683,6 +683,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) +@@ -658,6 +658,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs) xmlXPathFreeObject(decimalObj); } @@ -81,7 +81,7 @@ /** * xsltGenerateIdFunction: * @ctxt: the XPath Parser context -@@ -734,7 +791,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ +@@ -709,7 +766,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){ if (obj) xmlXPathFreeObject(obj); @@ -141,10 +141,10 @@ * And the registration */ diff --git a/libxslt/transform.c b/libxslt/transform.c -index 57f05bf71920..9368e17197bf 100644 +index 2d8fd7f9abd5..b899f7cbc688 100644 --- a/libxslt/transform.c +++ b/libxslt/transform.c -@@ -706,6 +706,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) { +@@ -705,6 +705,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) { cur->traceCode = (unsigned long*) &xsltDefaultTrace; cur->xinclude = xsltGetXIncludeDefault(); cur->keyInitLevel = 0; @@ -152,7 +152,7 @@ return(cur); -@@ -6038,6 +6039,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, +@@ -6037,6 +6038,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc, if (root != NULL) { const xmlChar *doctype = NULL; Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-17 18:23:00 UTC (rev 453054) +++ PKGBUILD 2022-08-17 19:15:53 UTC (rev 453055) @@ -2,22 +2,32 @@ # Contributor: John Proctor <jproc...@prium.net> pkgname=libxslt -pkgver=1.1.35 +pkgver=1.1.36 pkgrel=1 pkgdesc="XML stylesheet transformation library" url="https://gitlab.gnome.org/GNOME/libxslt/-/wikis" arch=(x86_64) -license=(custom) -depends=(libxml2 libgcrypt) -makedepends=(git python) -checkdepends=(docbook-xml) +license=(custom:MIT) +depends=( + libgcrypt + libxml2 + xz +) +makedepends=( + git + python +) +checkdepends=( + docbook-xml +) optdepends=('python: Python bindings') provides=(lib{,e}xslt.so) -_commit=50af4e65da712ceb59f98a7feeeab2ddc3324ab9 # tags/v1.1.35^0 +options=(debug) +_commit=bcd17763a9f371ec5c9bdce0ffa2f2eb3ef74c43 # tags/v1.1.36^0 source=("git+https://gitlab.gnome.org/GNOME/libxslt.git#commit=$_commit" 0001-Make-generate-id-deterministic.patch) sha256sums=('SKIP' - '0b1dc7ac703e347eace1b92f7ef48735a8b6013b8e5b9620a9ca882d8bf46a74') + 'e83c20f9a4f0c95716410c127ad10d6cde814c25d183de0d319f5dda529b7a6e') pkgver() { cd libxslt @@ -35,7 +45,8 @@ build() { cd libxslt - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr \ + --disable-static sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } @@ -48,7 +59,7 @@ package() { cd libxslt make DESTDIR="$pkgdir" install - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 Copyright } -# vim:set sw=2 et: +# vim:set sw=2 sts=-1 et: