From a7a7c26f1b852578e1ba1def2a74e5034d2d935e Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Wed, 21 Aug 2019 21:20:45 +1000
Subject: [PATCH] libxslt: 1.1.30 -> 1.1.33

---
 libxslt/.footprint                    | 12 +++++-----
 libxslt/.signature                    |  9 ++++----
 libxslt/Pkgfile                       |  9 ++------
 libxslt/libxslt-1.1.30-glibc226.patch | 32 ---------------------------
 4 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 libxslt/libxslt-1.1.30-glibc226.patch

diff --git a/libxslt/.footprint b/libxslt/.footprint
index 0724a545e..b54edc8b9 100644
--- a/libxslt/.footprint
+++ b/libxslt/.footprint
@@ -32,15 +32,15 @@ drwxr-xr-x	root/root	usr/include/libxslt/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libexslt.a
 -rwxr-xr-x	root/root	usr/lib/libexslt.la
-lrwxrwxrwx	root/root	usr/lib/libexslt.so -> libexslt.so.0.8.18
-lrwxrwxrwx	root/root	usr/lib/libexslt.so.0 -> libexslt.so.0.8.18
--rwxr-xr-x	root/root	usr/lib/libexslt.so.0.8.18
+lrwxrwxrwx	root/root	usr/lib/libexslt.so -> libexslt.so.0.8.20
+lrwxrwxrwx	root/root	usr/lib/libexslt.so.0 -> libexslt.so.0.8.20
+-rwxr-xr-x	root/root	usr/lib/libexslt.so.0.8.20
 drwxr-xr-x	root/root	usr/lib/libxslt-plugins/
 -rw-r--r--	root/root	usr/lib/libxslt.a
 -rwxr-xr-x	root/root	usr/lib/libxslt.la
-lrwxrwxrwx	root/root	usr/lib/libxslt.so -> libxslt.so.1.1.30
-lrwxrwxrwx	root/root	usr/lib/libxslt.so.1 -> libxslt.so.1.1.30
--rwxr-xr-x	root/root	usr/lib/libxslt.so.1.1.30
+lrwxrwxrwx	root/root	usr/lib/libxslt.so -> libxslt.so.1.1.33
+lrwxrwxrwx	root/root	usr/lib/libxslt.so.1 -> libxslt.so.1.1.33
+-rwxr-xr-x	root/root	usr/lib/libxslt.so.1.1.33
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libexslt.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libxslt.pc
diff --git a/libxslt/.signature b/libxslt/.signature
index da2c8d082..4e1f11e16 100644
--- a/libxslt/.signature
+++ b/libxslt/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Tl5XxV/D7ikkdubmktWcV8dDtLHLBg0AsrLE5KEbDbCj5QhVttn+moscdFBepHn/HTXInl5tvZAr+AHbSw1tgQ=
-SHA256 (Pkgfile) = 9c835558dde3f7b4cc52fa79f4a7940d2fed847fcf6c6466e9f9157b8edfad50
-SHA256 (.footprint) = acaef843f07c72002d37bc8629061fe5119bc814741fde66f4f6017118aa0aac
-SHA256 (libxslt-1.1.30.tar.gz) = ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
-SHA256 (libxslt-1.1.30-glibc226.patch) = 02a57690c9e2d6c941877304a16f14e3bc6c82d002b7a043fa7461a5562f070e
+RWSE3ohX2g5d/bVgKvO7Lfkagc9fWr47wn/4zlAxNkyqcg8AsqWlcpjoUGbxD3nAyfj85vyBHJqBmKA+Ps0K3k+Mp1Xhf6s2VQ8=
+SHA256 (Pkgfile) = 36f66cf4ecc7f21f04c63fd2f81eb8f3a195de89d0442d6196bdd895bd5702a5
+SHA256 (.footprint) = 5c55155d30a55e88dbf0ddf79586958115431cdf0ee1314c60cccb91ede44112
+SHA256 (libxslt-1.1.33.tar.gz) = 8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
diff --git a/libxslt/Pkgfile b/libxslt/Pkgfile
index 5677a8d78..6d17798c7 100644
--- a/libxslt/Pkgfile
+++ b/libxslt/Pkgfile
@@ -4,18 +4,13 @@
 # Depends on: libxml2
 
 name=libxslt
-version=1.1.30
+version=1.1.33
 release=1
-source=(http://xmlsoft.org/sources/$name-$version.tar.gz
-	libxslt-1.1.30-glibc226.patch)
+source=(http://xmlsoft.org/sources/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
 
-	# https://github.com/GNOME/libxslt/commit/8b4babb8f742a1a189df4c4569e68eda308df68f
-	patch -p1 -i $SRC/libxslt-1.1.30-glibc226.patch
-	autoreconf
-
 	./configure \
 		--prefix=/usr \
 		--without-python \
diff --git a/libxslt/libxslt-1.1.30-glibc226.patch b/libxslt/libxslt-1.1.30-glibc226.patch
deleted file mode 100644
index e1e97229d..000000000
--- a/libxslt/libxslt-1.1.30-glibc226.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.in b/configure.in
-index d6aa366..20aafb8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -165,11 +165,11 @@ XSLT_LOCALE_XLOCALE=0
- XSLT_LOCALE_WINAPI=0
- 
- AC_CHECK_HEADERS([locale.h xlocale.h])
--if test $ac_cv_header_xlocale_h = yes; then
-+if test $ac_cv_header_locale_h = yes; then
- dnl
- dnl Check for generic locale_t declaration
- dnl
--AC_MSG_CHECKING([if xlocale program link])
-+AC_MSG_CHECKING([if locale program link])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #ifdef HAVE_LOCALE_H
- #include <locale.h>
-diff --git a/libxslt/xsltlocale.h b/libxslt/xsltlocale.h
-index 8a9ca15..2f64424 100644
---- a/libxslt/xsltlocale.h
-+++ b/libxslt/xsltlocale.h
-@@ -17,7 +17,9 @@
- #ifdef XSLT_LOCALE_XLOCALE
- 
- #include <locale.h>
-+#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 26
- #include <xlocale.h>
-+#endif
- 
- #ifdef __GLIBC__
- /*locale_t is defined only if _GNU_SOURCE is defined*/