[arch-commits] Commit in libxslt/trunk (3 files)
Jan Steffens
heftig at gemini.archlinux.org
Wed Feb 16 19:36:03 UTC 2022
Date: Wednesday, February 16, 2022 @ 19:36:02
Author: heftig
Revision: 437516
1.1.35-1
Modified:
libxslt/trunk/0001-Make-generate-id-deterministic.patch
libxslt/trunk/PKGBUILD
Deleted:
libxslt/trunk/0002-Fix-manpage.patch
-------------------------------------------+
0001-Make-generate-id-deterministic.patch | 23 ++++++--------
0002-Fix-manpage.patch | 45 ----------------------------
PKGBUILD | 45 +++++++++++-----------------
3 files changed, 28 insertions(+), 85 deletions(-)
Modified: 0001-Make-generate-id-deterministic.patch
===================================================================
--- 0001-Make-generate-id-deterministic.patch 2022-02-16 19:30:43 UTC (rev 437515)
+++ 0001-Make-generate-id-deterministic.patch 2022-02-16 19:36:02 UTC (rev 437516)
@@ -1,7 +1,7 @@
-From a94626df19f62bc7ee5aa8e65dd1995bed1a8092 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard at redhat.com>
Date: Sun, 29 Oct 2017 01:04:54 +0200
-Subject: [PATCH 1/2] Make generate-id deterministic
+Subject: [PATCH] Make generate-id deterministic
Origin: upstream, https://bugzilla.gnome.org/attachment.cgi?id=306475
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=751621
@@ -14,10 +14,10 @@
4 files changed, 107 insertions(+), 1 deletion(-)
diff --git a/libxslt/functions.c b/libxslt/functions.c
-index b350545a..858a483a 100644
+index 7887dda70f67..be0d897bd471 100644
--- a/libxslt/functions.c
+++ b/libxslt/functions.c
-@@ -671,6 +671,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
+@@ -683,6 +683,63 @@ xsltFormatNumberFunction(xmlXPathParserContextPtr ctxt, int nargs)
xmlXPathFreeObject(decimalObj);
}
@@ -81,7 +81,7 @@
/**
* xsltGenerateIdFunction:
* @ctxt: the XPath Parser context
-@@ -722,7 +779,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
+@@ -734,7 +791,39 @@ xsltGenerateIdFunction(xmlXPathParserContextPtr ctxt, int nargs){
if (obj)
xmlXPathFreeObject(obj);
@@ -123,7 +123,7 @@
snprintf((char *)str, sizeof(str), "idp%ld", val);
} else {
diff --git a/libxslt/functions.h b/libxslt/functions.h
-index 5455b7f4..31163613 100644
+index 5455b7f47802..31163613f6e9 100644
--- a/libxslt/functions.h
+++ b/libxslt/functions.h
@@ -63,6 +63,13 @@ XSLTPUBFUN void XSLTCALL
@@ -141,7 +141,7 @@
* And the registration
*/
diff --git a/libxslt/transform.c b/libxslt/transform.c
-index d1c47932..3d1ee059 100644
+index 57f05bf71920..9368e17197bf 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -706,6 +706,7 @@ xsltNewTransformContext(xsltStylesheetPtr style, xmlDocPtr doc) {
@@ -152,7 +152,7 @@
return(cur);
-@@ -6140,6 +6141,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc,
+@@ -6038,6 +6039,13 @@ xsltApplyStylesheetInternal(xsltStylesheetPtr style, xmlDocPtr doc,
if (root != NULL) {
const xmlChar *doctype = NULL;
@@ -167,10 +167,10 @@
doctype = xmlDictQLookup(ctxt->dict, root->ns->prefix, root->name);
if (doctype == NULL)
diff --git a/libxslt/xsltInternals.h b/libxslt/xsltInternals.h
-index 14a971aa..a7d71b57 100644
+index 14343d2751c8..9d3ff5fc0c06 100644
--- a/libxslt/xsltInternals.h
+++ b/libxslt/xsltInternals.h
-@@ -1782,6 +1782,8 @@ struct _xsltTransformContext {
+@@ -1786,6 +1786,8 @@ struct _xsltTransformContext {
int maxTemplateVars;
unsigned long opLimit;
unsigned long opCount;
@@ -179,6 +179,3 @@
};
/**
---
-2.27.0
-
Deleted: 0002-Fix-manpage.patch
===================================================================
--- 0002-Fix-manpage.patch 2022-02-16 19:30:43 UTC (rev 437515)
+++ 0002-Fix-manpage.patch 2022-02-16 19:36:02 UTC (rev 437516)
@@ -1,45 +0,0 @@
-From ea42953d3d75278f4f89009dfeed115200e4d102 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 10 Jun 2020 17:13:43 +0000
-Subject: [PATCH 2/2] Fix manpage
-
-Use the right stylesheet for DocBook 4. This fixes the bad whitespace
-processing.
-
-Use the just-built xsltproc to generate the manpage.
----
- doc/Makefile.am | 4 ++--
- doc/xsltproc.xml | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 3d5364ca..6a7b9408 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -239,9 +239,9 @@ libxslt-api.xml libxslt-refs.xml EXSLT/libexslt-api.xml \
- ($(XSLTPROC) -o ../libxslt/libxslt.syms $(srcdir)/syms.xsl $(srcdir)/symbols.xml)
-
- xsltproc.1: $(srcdir)/xsltproc.xml
-- -@(if [ -x $(XSLTPROC) ] ; then \
-+ -@(if [ -x $(srcdir)/../xsltproc/xsltproc ] ; then \
- echo "Rebuilding the man pages from the xml" ; \
-- $(XSLTPROC) --nonet $(srcdir)/xsltproc.xml ; fi)
-+ $(srcdir)/../xsltproc/xsltproc --nonet $(srcdir)/xsltproc.xml ; fi)
-
- # Note that in the following, xmllint output is piped to xsltproc
- search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
-diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml
-index 08fc3e97..6ca1b323 100644
---- a/doc/xsltproc.xml
-+++ b/doc/xsltproc.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0"?>
- <?xml-stylesheet type="text/xsl"
-- href="http://cdn.docbook.org/release/xsl/current//manpages/docbook.xsl"?>
-+ href="http://cdn.docbook.org/release/xsl-nons/current/manpages/docbook.xsl"?>
- <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-
---
-2.27.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-16 19:30:43 UTC (rev 437515)
+++ PKGBUILD 2022-02-16 19:36:02 UTC (rev 437516)
@@ -1,61 +1,52 @@
-# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
# Contributor: John Proctor <jproctor at prium.net>
pkgname=libxslt
-pkgver=1.1.34
-pkgrel=6
+pkgver=1.1.35
+pkgrel=1
pkgdesc="XML stylesheet transformation library"
url="http://xmlsoft.org/XSLT/"
arch=(x86_64)
license=(custom)
depends=(libxml2 libgcrypt)
-makedepends=(git docbook-xsl)
-checkdepends=(docbook-xml python)
-_commit=3653123f992db24cec417d12600f4c67388025e3 # tags/v1.1.34^0
+makedepends=(git python)
+checkdepends=(docbook-xml)
+optdepends=('python: Python bindings')
+provides=(lib{,e}xslt.so)
+_commit=50af4e65da712ceb59f98a7feeeab2ddc3324ab9 # tags/v1.1.35^0
source=("git+https://gitlab.gnome.org/GNOME/libxslt.git#commit=$_commit"
- 0001-Make-generate-id-deterministic.patch
- 0002-Fix-manpage.patch)
+ 0001-Make-generate-id-deterministic.patch)
sha256sums=('SKIP'
- '80ffc45016b2c0b8edeb332ba587a8523ea5ed856229e7f531edd0af9742bab3'
- 'd7dea109c91958e2231c06d9b841853855a666f93b001a1999beab42c3345203')
+ '0b1dc7ac703e347eace1b92f7ef48735a8b6013b8e5b9620a9ca882d8bf46a74')
pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^v//;s/-/+/g'
+ cd libxslt
+ git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
}
prepare() {
- cd $pkgname
+ cd libxslt
- # Fix build with libxml libxml2-2.9.12
- git cherry-pick -n 9ae2f94df1721e002941b40665efb762aefcea1a
- git cherry-pick -n 824657768aea2cce9c23e72ba8085cb5e44350c7
- git cherry-pick -n 77c26bad0433541f486b1e7ced44ca9979376908
-
# Make xsltproc output reproducible for packages which use it to generate documentation
- patch -Np1 -i ../0001-Make-generate-id-deterministic.patch
+ git apply -3 ../0001-Make-generate-id-deterministic.patch
- # Fix manpage whitespace and rebuild the manpage
- patch -Np1 -i ../0002-Fix-manpage.patch
- rm doc/xsltproc.1
-
NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd $pkgname
- ./configure --prefix=/usr --without-python --disable-static
+ cd libxslt
+ ./configure --prefix=/usr --disable-static
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
check() {
- cd $pkgname
+ cd libxslt
make check
}
package() {
- cd $pkgname
+ cd libxslt
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
More information about the arch-commits
mailing list