commit b36410d9a86f4d9bd6861be1348cc567b058365b Author: Danny Rawlins <monster.romster@gmail.com> Date: Fri Jul 6 22:08:42 2018 +1000 libxslt: 1.1.29 -> 1.1.30 diff --git a/libxslt/.footprint b/libxslt/.footprint index b2cfcc075..0724a545e 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.17 -lrwxrwxrwx root/root usr/lib/libexslt.so.0 -> libexslt.so.0.8.17 --rwxr-xr-x root/root usr/lib/libexslt.so.0.8.17 +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 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.29 -lrwxrwxrwx root/root usr/lib/libxslt.so.1 -> libxslt.so.1.1.29 --rwxr-xr-x root/root usr/lib/libxslt.so.1.1.29 +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 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/.md5sum b/libxslt/.md5sum index e4f716c41..4f245e818 100644 --- a/libxslt/.md5sum +++ b/libxslt/.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/.signature b/libxslt/.signature index bbb0e34ba..da2c8d082 100644 --- a/libxslt/.signature +++ b/libxslt/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/cK697YWP1s+Rgs2un0uph7XnHZCzMvXsep2LHe6/4jMlEh2ecq9jD8/++RZB3y7wKjVqoG7Pd2TWObmMfTg3go= -SHA256 (Pkgfile) = d53af7b3dfe89e0495d362e3de484cbbbe653ae1d37662f3862b21f79a90c15e -SHA256 (.footprint) = 6d8b17f0af212bbf02e973d2c6b7c546f8c79ac93d529209b0388077b1acdcbc -SHA256 (libxslt-1.1.29.tar.gz) = b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce +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 diff --git a/libxslt/Pkgfile b/libxslt/Pkgfile index f73767a6b..5677a8d78 100644 --- a/libxslt/Pkgfile +++ b/libxslt/Pkgfile @@ -1,17 +1,21 @@ # Description: XSL Transformations library. # URL: http://xmlsoft.org/XSLT/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Tilman Sauerbeck, tilman at crux dot nu # Depends on: libxml2 name=libxslt -version=1.1.29 +version=1.1.30 release=1 -source=(http://xmlsoft.org/sources/$name-$version.tar.gz) +source=(http://xmlsoft.org/sources/$name-$version.tar.gz + libxslt-1.1.30-glibc226.patch) build() { cd $name-$version + # https://github.com/GNOME/libxslt/commit/8b4babb8f742a1a189df4c4569e68eda308d... + 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 new file mode 100644 index 000000000..e1e97229d --- /dev/null +++ b/libxslt/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*/