From 192d5afa33fc92ae832148312e16613df4b98b5a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Mon, 11 Nov 2013 14:37:25 +0100 Subject: libxslt: upgrade to version 1.1.28 - from libxslt-configure.patch: * drop config.sub Android stuff (obsolete) * drop MinGW archive checks (obsolete) * split out libxslt-config.patch.1 * split out libxslt-freebsd.patch.1 - drop libxslt-aix.patch: presumably don't need special check for V7BETA since it's released now - drop libxslt-mingw.patch (it's for msys build so obsolete) - drop libxslt-win_manifest.patch: this can just be passed on configure.js command line so no need for a patch Change-Id: I8a2cad0a70a86ba1dffbe3c8fce60babb70a61f6 Reviewed-on: https://gerrit.libreoffice.org/6641 Tested-by: LibreOffice gerrit bot Reviewed-by: Michael Stahl --- external/libxslt/ExternalPackage_xslt.mk | 4 +- external/libxslt/ExternalProject_xslt.mk | 1 + external/libxslt/UnpackedTarball_xslt.mk | 6 +- external/libxslt/libxslt-aix.patch | 21 ------ external/libxslt/libxslt-config.patch.1 | 35 +++++++++ external/libxslt/libxslt-configure.patch | 99 ------------------------- external/libxslt/libxslt-freebsd.patch.1 | 28 +++++++ external/libxslt/libxslt-internal-symbols.patch | 12 ++- external/libxslt/libxslt-mingw.patch | 36 --------- external/libxslt/libxslt-win_manifest.patch | 11 --- 10 files changed, 73 insertions(+), 180 deletions(-) delete mode 100644 external/libxslt/libxslt-aix.patch create mode 100644 external/libxslt/libxslt-config.patch.1 delete mode 100644 external/libxslt/libxslt-configure.patch create mode 100644 external/libxslt/libxslt-freebsd.patch.1 delete mode 100644 external/libxslt/libxslt-mingw.patch delete mode 100644 external/libxslt/libxslt-win_manifest.patch (limited to 'external/libxslt') diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk index 5e318c83295c..602a281439dd 100644 --- a/external/libxslt/ExternalPackage_xslt.mk +++ b/external/libxslt/ExternalPackage_xslt.mk @@ -24,8 +24,8 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26)) -$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15)) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.28)) +$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.17)) endif endif # DISABLE_DYNLOADING diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index 3243fee6b35e..2b5e89c6bc8c 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ cscript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ + vcmanifest=yes \ lib=$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc \ && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk index b6b20b5136a8..4d79e1a3f540 100644 --- a/external/libxslt/UnpackedTarball_xslt.mk +++ b/external/libxslt/UnpackedTarball_xslt.mk @@ -12,11 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xslt)) $(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,xslt,\ - external/libxslt/libxslt-configure.patch \ - external/libxslt/libxslt-win_manifest.patch \ - external/libxslt/libxslt-mingw.patch \ + external/libxslt/libxslt-config.patch.1 \ + external/libxslt/libxslt-freebsd.patch.1 \ external/libxslt/libxslt-internal-symbols.patch \ - external/libxslt/libxslt-aix.patch \ external/libxslt/libxslt-vc10.patch \ external/libxslt/libxslt-1.1.26-memdump.patch \ $(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \ diff --git a/external/libxslt/libxslt-aix.patch b/external/libxslt/libxslt-aix.patch deleted file mode 100644 index fe38f7bb7e73..000000000000 --- a/external/libxslt/libxslt-aix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- misc/libxslt-1.1.26/config.guess 2010-09-16 02:40:03.000000000 -0500 -+++ misc/build/libxslt-1.1.26/config.guess 2010-09-16 02:41:43.000000000 -0500 -@@ -532,7 +532,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[45]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -544,6 +544,9 @@ - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi -+ if [ "$IBM_REV" == "V7BETA" ]; then -+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} -+ fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) diff --git a/external/libxslt/libxslt-config.patch.1 b/external/libxslt/libxslt-config.patch.1 new file mode 100644 index 000000000000..dc33871398cc --- /dev/null +++ b/external/libxslt/libxslt-config.patch.1 @@ -0,0 +1,35 @@ +Hack the xslt-config to return paths into WORKDIR. + +--- a/xslt-config.in Wed Jan 17 14:18:26 2007 ++++ b/xslt-config.in Wed Jun 25 13:06:05 2008 +@@ -1,10 +1,16 @@ + #! /bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ ++#prefix=@prefix@ ++#exec_prefix=@exec_prefix@ ++#exec_prefix_set=no ++#includedir=@includedir@ ++#libdir=@libdir@ ++ ++prefix=${WORKDIR}/UnpackedTarball/xslt ++exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc + exec_prefix_set=no +-includedir=@includedir@ +-libdir=@libdir@ ++includedir=${WORKDIR}/UnpackedTarball/xslt/libxslt ++libdir=${WORKDIR}/UnpackedTarball/xslt/libxslt/.libs + + usage() + { +@@ -89,7 +95,8 @@ + shift + done + +-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" ++#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@ @EXTRA_LIBS@" ++the_libs="-L${libdir} -lxslt -lm" + if test "$includedir" != "/usr/include"; then + the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" + else diff --git a/external/libxslt/libxslt-configure.patch b/external/libxslt/libxslt-configure.patch deleted file mode 100644 index 37b86cc9c251..000000000000 --- a/external/libxslt/libxslt-configure.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- misc/libxslt-1.1.26/config.sub 2008-01-30 21:27:02.000000000 +0100 -+++ misc/build/libxslt-1.1.26/config.sub 2011-09-26 23:35:00.000000000 +0200 -@@ -120,7 +120,7 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os -@@ -1218,7 +1218,7 @@ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ---- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007 -+++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008 -@@ -6195,9 +6195,9 @@ - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) -- current="$number_major" -- revision="$number_minor" -- age="0" -+ current=`expr $number_major + $number_minor` -+ age="$number_minor" -+ revision="$number_revision" - ;; - irix|nonstopux) - func_arith $number_major + $number_minor -@@ -6271,8 +6271,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix="$major.$age.$revision" - ;; - - irix | nonstopux) ---- misc/libxslt-1.1.26/xslt-config.in Wed Jan 17 14:18:26 2007 -+++ misc/build/libxslt-1.1.26/xslt-config.in Wed Jun 25 13:06:05 2008 -@@ -1,10 +1,16 @@ - #! /bin/sh - --prefix=@prefix@ --exec_prefix=@exec_prefix@ -+#prefix=@prefix@ -+#exec_prefix=@exec_prefix@ -+#exec_prefix_set=no -+#includedir=@includedir@ -+#libdir=@libdir@ -+ -+prefix=${WORKDIR}/UnpackedTarball/xslt -+exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc - exec_prefix_set=no --includedir=@includedir@ --libdir=@libdir@ -+includedir=${WORKDIR}/UnpackedTarball/xslt/libxslt -+libdir=${WORKDIR}/UnpackedTarball/xslt/libxslt/.libs - - usage() - { -@@ -89,7 +95,8 @@ - shift - done - --the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@" -+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@" -+the_libs="-L${libdir} -lxslt -lm" - if test "$includedir" != "/usr/include"; then - the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`" - else ---- misc/libxslt-1.1.26/configure 2008-05-14 00:40:54.000000000 +0900 -+++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900 -@@ -7437,7 +7437,7 @@ - - cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh -- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -@@ -7446,7 +7446,7 @@ - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - if ( file / ) >/dev/null 2>&1; then -- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' diff --git a/external/libxslt/libxslt-freebsd.patch.1 b/external/libxslt/libxslt-freebsd.patch.1 new file mode 100644 index 000000000000..2f454cb95850 --- /dev/null +++ b/external/libxslt/libxslt-freebsd.patch.1 @@ -0,0 +1,28 @@ +Usual patch to produce Linux-like .so files on FreeBSD + +--- a/ltmain.sh Wed Aug 29 14:28:46 2007 ++++ b/ltmain.sh Wed Jun 25 13:06:05 2008 +@@ -6195,9 +6195,9 @@ + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|qnx|sunos) +- current="$number_major" +- revision="$number_minor" +- age="0" ++ current=`expr $number_major + $number_minor` ++ age="$number_minor" ++ revision="$number_revision" + ;; + irix|nonstopux) + func_arith $number_major + $number_minor +@@ -6271,8 +6271,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current" ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) diff --git a/external/libxslt/libxslt-internal-symbols.patch b/external/libxslt/libxslt-internal-symbols.patch index 813c34f0386a..7023cb32354d 100644 --- a/external/libxslt/libxslt-internal-symbols.patch +++ b/external/libxslt/libxslt-internal-symbols.patch @@ -44,10 +44,8 @@ +#XSLT_REFACTORED xsltStyleStylesheetLevelGetExtData; # xsltInternals -- xsltTransStorageAdd; -- xsltTransStorageRemove; -+#NOT_IMPLEMENTED xsltTransStorageAdd; -+#NOT_IMPLEMENTED xsltTransStorageRemove; + # xsltTransStorageAdd; removed in 1.1.28 + # xsltTransStorageRemove; removed in 1.1.28 xsltUninit; - xsltXSLTAttrMarker; # variable +#XSLT_REFACTORED xsltXSLTAttrMarker; # variable @@ -56,11 +54,11 @@ LIBXML2_1.1.20 { @@ -475,5 +475,9 @@ - # transform - xsltProcessOneNode; + # xsltutils + xsltXPathCompileFlags; + +# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") + local: + *; - } LIBXML2_1.1.25; + } LIBXML2_1.1.26; diff --git a/external/libxslt/libxslt-mingw.patch b/external/libxslt/libxslt-mingw.patch deleted file mode 100644 index da8eee3b1098..000000000000 --- a/external/libxslt/libxslt-mingw.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- misc/libxslt-1.1.26/ltmain.sh 2010-06-06 14:43:28.785750000 +0900 -+++ misc/build/libxslt-1.1.26/ltmain.sh 2010-06-06 15:14:26.176375000 +0900 -@@ -2983,15 +2983,7 @@ - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in -- *mingw* ) # actually, msys -- # awkward: cmd appends spaces to result -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_path_tmp1=`( cmd //c echo "$1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -+ *cygwin* | *mingw* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` -@@ -3062,15 +3054,7 @@ - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` - case $build in -- *mingw* ) # Actually, msys. -- # Awkward: cmd appends spaces to result. -- lt_sed_strip_trailing_spaces="s/[ ]*\$//" -- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ -- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` -- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ -- $SED -e "$lt_sed_naive_backslashify"` -- ;; -- *cygwin* ) -+ *cygwin* | *mingw* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` diff --git a/external/libxslt/libxslt-win_manifest.patch b/external/libxslt/libxslt-win_manifest.patch deleted file mode 100644 index 43c14eb70b8b..000000000000 --- a/external/libxslt/libxslt-win_manifest.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- misc/libxslt-1.1.26/win32/configure.js 2007-08-03 15:41:02.000000000 +0200 -+++ misc/build/libxslt-1.1.26/win32/configure.js 2009-05-07 13:09:42.294993200 +0200 -@@ -52,7 +52,7 @@ - var dirSep = "\\"; - var compiler = "msvc"; - var cruntime = "/MD"; --var vcmanifest = false; -+var vcmanifest = true; - var buildDebug = 0; - var buildStatic = 0; - var buildPrefix = "."; -- cgit v1.2.3