commit 7b4b09d77a4fe153a27324950a84e7fdc4f7ad59 Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Jul 6 22:09:49 2018 +1000 libxslt-32: 1.1.29 -> 1.1.30 diff --git a/libxslt-32/.footprint b/libxslt-32/.footprint index c04e0f6..5f26974 100644 --- a/libxslt-32/.footprint +++ b/libxslt-32/.footprint @@ -2,15 +2,15 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libexslt.a -rwxr-xr-x root/root usr/lib32/libexslt.la -lrwxrwxrwx root/root usr/lib32/libexslt.so -> libexslt.so.0.8.17 -lrwxrwxrwx root/root usr/lib32/libexslt.so.0 -> libexslt.so.0.8.17 --rwxr-xr-x root/root usr/lib32/libexslt.so.0.8.17 +lrwxrwxrwx root/root usr/lib32/libexslt.so -> libexslt.so.0.8.18 +lrwxrwxrwx root/root usr/lib32/libexslt.so.0 -> libexslt.so.0.8.18 +-rwxr-xr-x root/root usr/lib32/libexslt.so.0.8.18 drwxr-xr-x root/root usr/lib32/libxslt-plugins/ -rw-r--r-- root/root usr/lib32/libxslt.a -rwxr-xr-x root/root usr/lib32/libxslt.la -lrwxrwxrwx root/root usr/lib32/libxslt.so -> libxslt.so.1.1.29 -lrwxrwxrwx root/root usr/lib32/libxslt.so.1 -> libxslt.so.1.1.29 --rwxr-xr-x root/root usr/lib32/libxslt.so.1.1.29 +lrwxrwxrwx root/root usr/lib32/libxslt.so -> libxslt.so.1.1.30 +lrwxrwxrwx root/root usr/lib32/libxslt.so.1 -> libxslt.so.1.1.30 +-rwxr-xr-x root/root usr/lib32/libxslt.so.1.1.30 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/libexslt.pc -rw-r--r-- root/root usr/lib32/pkgconfig/libxslt.pc diff --git a/libxslt-32/.md5sum b/libxslt-32/.md5sum index e4f716c..4f245e8 100644 --- a/libxslt-32/.md5sum +++ b/libxslt-32/.md5sum @@ -1 +1,2 @@ -a129d3c44c022de3b9dcf6d6f288d72e libxslt-1.1.29.tar.gz +ffa89c97ed7485a7636ed1a120089933 libxslt-1.1.30-glibc226.patch +70becbbcb1dad55f14de0b84171b91d5 libxslt-1.1.30.tar.gz diff --git a/libxslt-32/.signature b/libxslt-32/.signature index 571000d..bc13089 100644 --- a/libxslt-32/.signature +++ b/libxslt-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXfeHS/Srrn9IgN6uRLjIBt7tpr1x9t0ILAPKJnOXweQFw76NGiXeh+ImCY9LUMCg7vgxZzYMecK7080IfkBjFww= -SHA256 (Pkgfile) = f4fa6aa71eeeca5df0cfe92c16c9a600c6552df51436725a85f18c3d97a0c60d -SHA256 (.footprint) = 264c50eb4bdbf3d21ed8f3e1cb1d255fa3ae8fc77acda2a32926554679dcacc3 -SHA256 (libxslt-1.1.29.tar.gz) = b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce +RWSwxGo/zH7eXSe6TNJs73zV1zpoEnUEqdiUn2D+gD/wpjb0+eep0nnaOGFAqLmTP9cehE94kjWRTLOThKwO6KoooV3h/yDx7AY= +SHA256 (Pkgfile) = 9c3f31e64271dbf3ecd398d57a0b4cd4676d29e9ae7d169008c47d834fc36f76 +SHA256 (.footprint) = e529f2c8a38ae21d4940a40deaa14748ed4bebcdca512ad8469796e8faadc15e +SHA256 (libxslt-1.1.30.tar.gz) = ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3 +SHA256 (libxslt-1.1.30-glibc226.patch) = 02a57690c9e2d6c941877304a16f14e3bc6c82d002b7a043fa7461a5562f070e diff --git a/libxslt-32/Pkgfile b/libxslt-32/Pkgfile index 09b3fde..eb554e6 100644 --- a/libxslt-32/Pkgfile +++ b/libxslt-32/Pkgfile @@ -4,13 +4,18 @@ # Depends on: libxml2-32 libxslt name=libxslt-32 -version=1.1.29 +version=1.1.30 release=1 -source=(http://xmlsoft.org/sources/libxslt-$version.tar.gz) +source=(http://xmlsoft.org/sources/libxslt-$version.tar.gz + libxslt-1.1.30-glibc226.patch) build() { cd libxslt-$version + # https://github.com/GNOME/libxslt/commit/8b4babb8f742a1a189df4c4569e68eda308d... + patch -p1 -i $SRC/libxslt-1.1.30-glibc226.patch + autoreconf + sed -i -e 's/libgcrypt-config/&-32/g' configure ./configure \ diff --git a/libxslt-32/libxslt-1.1.30-glibc226.patch b/libxslt-32/libxslt-1.1.30-glibc226.patch new file mode 100644 index 0000000..e1e9722 --- /dev/null +++ b/libxslt-32/libxslt-1.1.30-glibc226.patch @@ -0,0 +1,32 @@ +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*/