From 8557c7adbc32b06e6e730955d2b798a8a330b16c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Sat, 10 Dec 2022 12:09:26 +0100
Subject: groups/251.native_packages_lib.group: libxslt: bump to v1.1.37
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/libxslt-1.1.35.local.patch     | 15 ---------------
 patches/libxslt-1.1.35_pre.local.patch | 25 -------------------------
 patches/libxslt-1.1.37.local.patch     | 12 ++++++++++++
 patches/libxslt-1.1.37_pre.local.patch | 25 +++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 40 deletions(-)
 delete mode 100644 patches/libxslt-1.1.35.local.patch
 delete mode 100644 patches/libxslt-1.1.35_pre.local.patch
 create mode 100644 patches/libxslt-1.1.37.local.patch
 create mode 100644 patches/libxslt-1.1.37_pre.local.patch

(limited to 'patches')

diff --git a/patches/libxslt-1.1.35.local.patch b/patches/libxslt-1.1.35.local.patch
deleted file mode 100644
index 1cf25319..00000000
--- a/patches/libxslt-1.1.35.local.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru libxslt-1.1.32.orig/Makefile.in libxslt-1.1.32/Makefile.in
---- libxslt-1.1.32.orig/Makefile.in	2017-11-02 21:34:22.000000000 +0100
-+++ libxslt-1.1.32/Makefile.in	2018-08-04 15:15:09.283854093 +0200
-@@ -415,10 +415,7 @@
- SUBDIRS = \
- 	libxslt \
- 	libexslt \
--	xsltproc \
--	doc \
--	$(PYTHON_SUBDIR) \
--	tests
-+	xsltproc
- 
- DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
- confexecdir = $(libdir)
diff --git a/patches/libxslt-1.1.35_pre.local.patch b/patches/libxslt-1.1.35_pre.local.patch
deleted file mode 100644
index 08be2163..00000000
--- a/patches/libxslt-1.1.35_pre.local.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru libxslt-1.1.34.orig/configure.ac libxslt-1.1.34/configure.ac
---- libxslt-1.1.34.orig/configure.ac	2019-10-28 09:11:11.000000000 +0100
-+++ libxslt-1.1.34/configure.ac	2020-09-26 17:08:16.822422567 +0200
-@@ -329,17 +329,16 @@
-     CRYPTO_TESTDIR=crypto
-     ;;
-   *)
--    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
--    if test "$LIBGCRYPT_CONFIG" != "no" ; then
--      LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
-+    if test "$PKG_CONFIG" != "no" ; then
-+      LIBGCRYPT_VERSION=`$PKG_CONFIG --modver libgcrypt`
-       if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
-       then
-         LIBGCRYPT_CFLAGS=""
-         LIBGCRYPT_LIBS=""
-         echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.'
-       else
--        LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
--        LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
-+        LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt`
-+        LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt`
-         AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
-         echo 'Crypto extensions will be available.'
-         WITH_CRYPTO=1
diff --git a/patches/libxslt-1.1.37.local.patch b/patches/libxslt-1.1.37.local.patch
new file mode 100644
index 00000000..ccafaf1e
--- /dev/null
+++ b/patches/libxslt-1.1.37.local.patch
@@ -0,0 +1,12 @@
+diff -ru libxslt-1.1.37.orig/Makefile.in libxslt-1.1.37/Makefile.in
+--- libxslt-1.1.37.orig/Makefile.in	2022-12-10 12:03:50.891594062 +0100
++++ libxslt-1.1.37/Makefile.in	2022-12-10 12:05:46.048683627 +0100
+@@ -427,7 +427,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = libxslt libexslt xsltproc doc tests $(am__append_1)
++SUBDIRS = libxslt libexslt xsltproc $(am__append_1)
+ DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
+ confexecdir = $(libdir)
+ confexec_DATA = xsltConf.sh
diff --git a/patches/libxslt-1.1.37_pre.local.patch b/patches/libxslt-1.1.37_pre.local.patch
new file mode 100644
index 00000000..08be2163
--- /dev/null
+++ b/patches/libxslt-1.1.37_pre.local.patch
@@ -0,0 +1,25 @@
+diff -ru libxslt-1.1.34.orig/configure.ac libxslt-1.1.34/configure.ac
+--- libxslt-1.1.34.orig/configure.ac	2019-10-28 09:11:11.000000000 +0100
++++ libxslt-1.1.34/configure.ac	2020-09-26 17:08:16.822422567 +0200
+@@ -329,17 +329,16 @@
+     CRYPTO_TESTDIR=crypto
+     ;;
+   *)
+-    AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+-    if test "$LIBGCRYPT_CONFIG" != "no" ; then
+-      LIBGCRYPT_VERSION=`$LIBGCRYPT_CONFIG --version`
++    if test "$PKG_CONFIG" != "no" ; then
++      LIBGCRYPT_VERSION=`$PKG_CONFIG --modver libgcrypt`
+       if test VERSION_TO_NUMBER(echo $LIBGCRYPT_VERSION) -lt VERSION_TO_NUMBER(echo "1.1.42")
+       then
+         LIBGCRYPT_CFLAGS=""
+         LIBGCRYPT_LIBS=""
+         echo 'gcrypt library version < 1.1.42 - Crypto extensions will not be available.'
+       else
+-        LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --cflags`
+-        LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG $libgcrypt_config_args --libs`
++        LIBGCRYPT_CFLAGS=`$PKG_CONFIG --cflags libgcrypt`
++        LIBGCRYPT_LIBS=`$PKG_CONFIG --libs libgcrypt`
+         AC_DEFINE(HAVE_GCRYPT, 1, [Define if gcrypt library is available.])
+         echo 'Crypto extensions will be available.'
+         WITH_CRYPTO=1
-- 
cgit v1.2.3