Author: jim
Date: Wed Aug 29 16:32:20 2018
New Revision: 1839591
URL: http://svn.apache.org/viewvc?rev=1839591&view=rev
Log:
carbon copy of aoo trunk
Modified:
openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch
openoffice/branches/AOO416/main/libxslt/libxslt-internal-symbols.patch
openoffice/branches/AOO416/main/libxslt/libxslt-mingw.patch
Modified: openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch?rev=1839591&r1=1839590&r2=1839591&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch (original)
+++ openoffice/branches/AOO416/main/libxslt/libxslt-configure.patch Wed Aug 29
16:32:20 2018
@@ -1,36 +1,14 @@
-<<<<<<< .working
-diff -ur misc/libxslt-1.1.32/ltmain.sh misc/build/libxslt-1.1.32/ltmain.sh
---- misc/libxslt-1.1.32/ltmain.sh 2012-11-20 23:21:48.000000000 -0800
-+++ misc/build/libxslt-1.1.32/ltmain.sh 2016-03-27 11:14:40.564087000
-0700
-@@ -7331,13 +7331,13 @@
- #
- case $version_type in
- # correct linux to gnu/linux during the next big refactor
-- darwin|linux|osf|windows|none)
-+ darwin|freebsd-elf|linux|osf|windows|none)
- func_arith $number_major + $number_minor
- current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
- ;;
-- freebsd-aout|freebsd-elf|qnx|sunos)
-+ freebsd-aout|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
-@@ -7414,8 +7414,8 @@
- ;;
diff -ur misc/libxslt-1.1.32/configure misc/build/libxslt-1.1.32/configure
--- misc/libxslt-1.1.32/configure 2017-11-02 13:34:22.000000000 -0700
+++ misc/build/libxslt-1.1.32/configure 2018-08-22 23:00:50.689433000
-0700
@@ -6698,7 +6698,7 @@
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current"
-+ major=.$(($current - $age))
-+ versuffix="$major.$age.$revision"
- ;;
+ 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'
+ ;;
diff -ur misc/libxslt-1.1.32/xslt-config.in
misc/build/libxslt-1.1.32/xslt-config.in
--- misc/libxslt-1.1.32/xslt-config.in 2015-05-10 07:11:30.000000000 -0700
@@ -65,33 +43,3 @@ diff -ur misc/libxslt-1.1.32/xslt-config
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
-diff -ur misc/libxslt-1.1.32/configure misc/build/libxslt-1.1.32/configure
---- misc/libxslt-1.1.32/configure 2012-11-20 23:11:21.000000000 -0800
-+++ misc/build/libxslt-1.1.32/configure 2016-03-27 12:43:44.464670000
-0700
-@@ -6462,7 +6462,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'
- ;;
-
-@@ -6472,7 +6472,7 @@
- # unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && 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
- # Keep this pattern in sync with the one in func_win32_libid.
-@@ -11635,7 +11635,7 @@
- version_type=freebsd-$objformat
- case $version_type in
- freebsd-elf*)
-- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext} $libname${shared_ext}'
-+ library_names_spec='$libname$release$shared_ext$versuffix
$libname$release$shared_ext$major $libname$shared_ext'
soname_spec='$libname$release$shared_ext$major'
- need_version=no
- need_lib_prefix=no
- ;;
Modified: openoffice/branches/AOO416/main/libxslt/libxslt-internal-symbols.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/libxslt-internal-symbols.patch?rev=1839591&r1=1839590&r2=1839591&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/libxslt/libxslt-internal-symbols.patch
(original)
+++ openoffice/branches/AOO416/main/libxslt/libxslt-internal-symbols.patch Wed
Aug 29 16:32:20 2018
@@ -1,5 +1,6 @@
---- misc/libxslt-1.1.32/libxslt/libxslt.syms Thu Sep 24 16:28:46 2009
-+++ misc/build/libxslt-1.1.32/libxslt/libxslt.syms Thu Jul 8 12:22:14 2010
+diff -ur misc/libxslt-1.1.29/libxslt/libxslt.syms
misc/build/libxslt-1.1.29/libxslt/libxslt.syms
+--- misc/libxslt-1.1.29/libxslt/libxslt.syms 2016-05-23 18:57:36.000000000
-0700
++++ misc/build/libxslt-1.1.29/libxslt/libxslt.syms 2016-08-11
12:05:20.834928000 -0700
@@ -107,7 +107,7 @@
xsltFreeCompMatchList;
xsltFreeTemplateHashes;
@@ -9,7 +10,7 @@
xsltTestCompMatchList;
# preproc
-@@ -406,7 +406,7 @@
+@@ -407,7 +407,7 @@
global:
# xsltInternals
@@ -18,7 +19,7 @@
xsltExtensionInstructionResultFinalize;
xsltExtensionInstructionResultRegister;
xsltInitCtxtKey;
-@@ -415,24 +415,24 @@
+@@ -416,24 +416,24 @@
xsltInit;
# xsltInternals
@@ -44,17 +45,15 @@
+#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
} LIBXML2_1.1.9;
LIBXML2_1.1.20 {
-@@ -475,5 +475,9 @@
+@@ -476,6 +476,10 @@
# transform
xsltProcessOneNode;
@@ -64,3 +63,4 @@
+ *;
} LIBXML2_1.1.25;
+ LIBXML2_1.1.27 {
Modified: openoffice/branches/AOO416/main/libxslt/libxslt-mingw.patch
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxslt/libxslt-mingw.patch?rev=1839591&r1=1839590&r2=1839591&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/libxslt/libxslt-mingw.patch (original)
+++ openoffice/branches/AOO416/main/libxslt/libxslt-mingw.patch Wed Aug 29
16:32:20 2018
@@ -1,5 +1,5 @@
---- misc/libxslt-1.1.32/ltmain.sh 2010-06-06 14:43:28.785750000 +0900
-+++ misc/build/libxslt-1.1.32/ltmain.sh 2010-06-06 15:14:26.176375000
+0900
+--- 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'
