Author: truckman
Date: Sat Aug 25 22:23:46 2018
New Revision: 1839130
URL: http://svn.apache.org/viewvc?rev=1839130&view=rev
Log:
Upgrade bundled libxml2 to version 2.9.8 and libxslt to version
1.1.32. Some of the patches for the previous version of libxml2
have been picked up upstream and are no longer needed. One new
patch is needed for clean builds on Windows, so cherrypick it from
upstream.
Added:
openoffice/trunk/main/libxml2/libxml2-nan-inf-fix.patch
Removed:
openoffice/trunk/main/libxml2/libxml2-c99.patch
openoffice/trunk/main/libxml2/libxml2-long-path.patch
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/libxml2/libxml2-configure.patch
openoffice/trunk/main/libxml2/makefile.mk
openoffice/trunk/main/libxslt/libxslt-configure.patch
openoffice/trunk/main/libxslt/libxslt-win_manifest.patch
openoffice/trunk/main/libxslt/libxsltversion.mk
openoffice/trunk/main/libxslt/makefile.mk
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Sat Aug 25 22:23:46 2018
@@ -170,14 +170,14 @@ if ( true )
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
- MD5 = ae249165c173b1ff386ee8ad676815f5
- name = libxml2-2.9.4.tar.gz
+ MD5 = b786e353e2aa1b872d70d5d1ca0c740d
+ name = libxml2-2.9.8.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXSLT != YES)
- MD5 = a129d3c44c022de3b9dcf6d6f288d72e
- name = libxslt-1.1.29.tar.gz
+ MD5 = 1fc72f98e98bf4443f1651165f3aa146
+ name = libxslt-1.1.32.tar.gz
URL1 = http://xmlsoft.org/sources/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
Modified: openoffice/trunk/main/libxml2/libxml2-configure.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-configure.patch?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-configure.patch (original)
+++ openoffice/trunk/main/libxml2/libxml2-configure.patch Sat Aug 25 22:23:46
2018
@@ -1,6 +1,6 @@
-diff -ur misc/libxml2-2.9.4/include/libxml/xmlversion.h
misc/build/libxml2-2.9.4/include/libxml/xmlversion.h
---- misc/libxml2-2.9.4/include/libxml/xmlversion.h 2015-11-20
01:49:39.000000000 -0800
-+++ misc/build/libxml2-2.9.4/include/libxml/xmlversion.h 2016-03-26
09:46:21.124032000 -0700
+diff -ur misc/libxml2-2.9.8/include/libxml/xmlversion.h
misc/build/libxml2-2.9.8/include/libxml/xmlversion.h
+--- misc/libxml2-2.9.8/include/libxml/xmlversion.h 2018-03-05
07:54:29.000000000 -0800
++++ misc/build/libxml2-2.9.8/include/libxml/xmlversion.h 2018-08-22
22:53:15.488158000 -0700
@@ -273,7 +273,7 @@
*
* Whether iconv support is available
@@ -19,9 +19,9 @@ diff -ur misc/libxml2-2.9.4/include/libx
#define LIBXML_DEBUG_ENABLED
#endif
-diff -ur misc/libxml2-2.9.4/xml2-config.in
misc/build/libxml2-2.9.4/xml2-config.in
---- misc/libxml2-2.9.4/xml2-config.in 2015-05-06 05:04:36.000000000 -0700
-+++ misc/build/libxml2-2.9.4/xml2-config.in 2016-03-26 10:00:17.756184000
-0700
+diff -ur misc/libxml2-2.9.8/xml2-config.in
misc/build/libxml2-2.9.8/xml2-config.in
+--- misc/libxml2-2.9.8/xml2-config.in 2016-06-07 03:04:14.000000000 -0700
++++ misc/build/libxml2-2.9.8/xml2-config.in 2018-08-22 22:53:15.489086000
-0700
@@ -1,9 +1,14 @@
#! /bin/sh
Added: openoffice/trunk/main/libxml2/libxml2-nan-inf-fix.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/libxml2-nan-inf-fix.patch?rev=1839130&view=auto
==============================================================================
--- openoffice/trunk/main/libxml2/libxml2-nan-inf-fix.patch (added)
+++ openoffice/trunk/main/libxml2/libxml2-nan-inf-fix.patch Sat Aug 25 22:23:46
2018
@@ -0,0 +1,60 @@
+From 7abec671473b837f99181442d59edd0cc2ee01d1 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnho...@aevum.de>
+Date: Thu, 15 Mar 2018 19:33:52 +0100
+Subject: [PATCH] NaN and Inf fixes for pre-C99 compilers
+
+On some pre-C99 compilers, the NAN and INFINITY macros don't expand to
+constant expressions.
+
+Some MSVC versions complain about floating point division by zero in
+constants.
+
+Thanks to Fabrice Manfroi for the report.
+---
+ xpath.c | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff -ur misc/libxml2-2.9.8/xpath.c misc/build/libxml2-2.9.8/xpath.c
+--- misc/libxml2-2.9.8/xpath.c 2017-12-02 00:58:10.000000000 -0800
++++ misc/build/libxml2-2.9.8/xpath.c 2018-08-23 15:05:24.276900000 -0700
+@@ -477,27 +477,28 @@ int wrap_cmp( xmlNodePtr x, xmlNodePtr y );
+ * *
+ ************************************************************************/
+
+-#ifndef NAN
+-#define NAN (0.0 / 0.0)
++#ifndef INFINITY
++#define INFINITY (DBL_MAX * DBL_MAX)
+ #endif
+
+-#ifndef INFINITY
+-#define INFINITY HUGE_VAL
++#ifndef NAN
++#define NAN (INFINITY / INFINITY)
+ #endif
+
+-double xmlXPathNAN = NAN;
+-double xmlXPathPINF = INFINITY;
+-double xmlXPathNINF = -INFINITY;
++double xmlXPathNAN;
++double xmlXPathPINF;
++double xmlXPathNINF;
+
+ /**
+ * xmlXPathInit:
+ *
+ * Initialize the XPath environment
+- *
+- * Does nothing but must be kept as public function.
+ */
+ void
+ xmlXPathInit(void) {
++ xmlXPathNAN = NAN;
++ xmlXPathPINF = INFINITY;
++ xmlXPathNINF = -INFINITY;
+ }
+
+ /**
+--
+2.18.0
+
Modified: openoffice/trunk/main/libxml2/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxml2/makefile.mk?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/libxml2/makefile.mk (original)
+++ openoffice/trunk/main/libxml2/makefile.mk Sat Aug 25 22:23:46 2018
@@ -38,19 +38,18 @@ all:
# --- Files --------------------------------------------------------
-LIBXML2VERSION=2.9.4
+LIBXML2VERSION=2.9.8
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
-TARFILE_MD5=ae249165c173b1ff386ee8ad676815f5
+TARFILE_MD5=b786e353e2aa1b872d70d5d1ca0c740d
-PATCH_FILES=libxml2-configure.patch \
- libxml2-c99.patch
+PATCH_FILES=libxml2-configure.patch
# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
# libxml2-global-symbols.patch
.IF "$(OS)" == "WNT"
-PATCH_FILES+= libxml2-long-path.patch
+PATCH_FILES+= libxml2-nan-inf-fix.patch
.ENDIF
# This is only for UNX environment now
Modified: openoffice/trunk/main/libxslt/libxslt-configure.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxslt/libxslt-configure.patch?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/libxslt/libxslt-configure.patch (original)
+++ openoffice/trunk/main/libxslt/libxslt-configure.patch Sat Aug 25 22:23:46
2018
@@ -1,7 +1,7 @@
-diff -ur misc/libxslt-1.1.29/configure misc/build/libxslt-1.1.29/configure
---- misc/libxslt-1.1.29/configure 2016-05-23 18:49:13.000000000 -0700
-+++ misc/build/libxslt-1.1.29/configure 2016-08-11 11:06:10.448691000
-0700
-@@ -6691,7 +6691,7 @@
+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 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
@@ -10,9 +10,9 @@ diff -ur misc/libxslt-1.1.29/configure m
lt_cv_file_magic_cmd='func_win32_libid'
;;
-diff -ur misc/libxslt-1.1.29/xslt-config.in
misc/build/libxslt-1.1.29/xslt-config.in
---- misc/libxslt-1.1.29/xslt-config.in 2015-05-10 07:11:30.000000000 -0700
-+++ misc/build/libxslt-1.1.29/xslt-config.in 2016-08-11 11:06:10.442201000
-0700
+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
++++ misc/build/libxslt-1.1.32/xslt-config.in 2018-08-22 23:00:50.689988000
-0700
@@ -1,10 +1,15 @@
#! /bin/sh
Modified: openoffice/trunk/main/libxslt/libxslt-win_manifest.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxslt/libxslt-win_manifest.patch?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/libxslt/libxslt-win_manifest.patch (original)
+++ openoffice/trunk/main/libxslt/libxslt-win_manifest.patch Sat Aug 25
22:23:46 2018
@@ -1,7 +1,7 @@
-diff -ur misc/libxslt-1.1.29/win32/configure.js
misc/build/libxslt-1.1.29/win32/configure.js
---- misc/libxslt-1.1.29/win32/configure.js 2012-09-04 07:26:23.000000000
-0700
-+++ misc/build/libxslt-1.1.29/win32/configure.js 2016-08-11
12:06:45.212750000 -0700
-@@ -52,7 +52,7 @@
+diff -ur misc/libxslt-1.1.32/win32/configure.js
misc/build/libxslt-1.1.32/win32/configure.js
+--- misc/libxslt-1.1.32/win32/configure.js 2017-10-26 00:55:47.000000000
-0700
++++ misc/build/libxslt-1.1.32/win32/configure.js 2018-08-22
23:07:38.152976000 -0700
+@@ -51,7 +51,7 @@
var dirSep = "\\";
var compiler = "msvc";
var cruntime = "/MD";
Modified: openoffice/trunk/main/libxslt/libxsltversion.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxslt/libxsltversion.mk?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/libxslt/libxsltversion.mk (original)
+++ openoffice/trunk/main/libxslt/libxsltversion.mk Sat Aug 25 22:23:46 2018
@@ -25,5 +25,5 @@ LIBXSLT_MAJOR=1
# minor
LIBXSLT_MINOR=1
# micro
-LIBXSLT_MICRO=29
+LIBXSLT_MICRO=32
Modified: openoffice/trunk/main/libxslt/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/libxslt/makefile.mk?rev=1839130&r1=1839129&r2=1839130&view=diff
==============================================================================
--- openoffice/trunk/main/libxslt/makefile.mk (original)
+++ openoffice/trunk/main/libxslt/makefile.mk Sat Aug 25 22:23:46 2018
@@ -45,7 +45,7 @@ all:
LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-TARFILE_MD5=a129d3c44c022de3b9dcf6d6f288d72e
+TARFILE_MD5=1fc72f98e98bf4443f1651165f3aa146
# libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be
defined
PATCH_FILES=libxslt-configure.patch \
