[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - default_images/introabout external_deps.lst i18npool/source libxml2/libxml2-c99.patch libxml2/libxml2-configure.patch libxml2/libxml2-long-path.patch libxml2/libxml2-nan-inf-fix.patch libxml2/makefile.mk libxslt/libxslt-configure.patch libxslt/libxsltversion.mk libxslt/libxslt-win_manifest.patch libxslt/makefile.mk ooo_custom_images/dev ooo_custom_images/dev_nologo ooo_custom_images/nologo
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Aug 26 00:46:49 UTC 2018
default_images/introabout/beta/intro.png |binary
default_images/introabout/intro.png |binary
external_deps.lst | 8 +-
i18npool/source/localedata/data/de_CH.xml | 2
i18npool/source/localedata/data/de_LI.xml | 2
libxml2/libxml2-c99.patch | 48 -----------------
libxml2/libxml2-configure.patch | 12 ++--
libxml2/libxml2-long-path.patch | 18 ------
libxml2/libxml2-nan-inf-fix.patch | 60 ++++++++++++++++++++++
libxml2/makefile.mk | 9 +--
libxslt/libxslt-configure.patch | 14 ++---
libxslt/libxslt-win_manifest.patch | 8 +-
libxslt/libxsltversion.mk | 2
libxslt/makefile.mk | 2
ooo_custom_images/dev/introabout/intro.png |binary
ooo_custom_images/dev_nologo/introabout/intro.png |binary
ooo_custom_images/nologo/introabout/intro.png |binary
17 files changed, 89 insertions(+), 96 deletions(-)
New commits:
commit 67241ea617ce335cf7ce2dfef9bf9b94d589d229
Author: Don Lewis <truckman at apache.org>
AuthorDate: Sat Aug 25 22:23:46 2018 +0000
Commit: Don Lewis <truckman at apache.org>
CommitDate: Sat Aug 25 22:23:46 2018 +0000
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.
diff --git a/external_deps.lst b/external_deps.lst
index 4243d5be5c0e..d88a0f37b128 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -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)
diff --git a/libxml2/libxml2-c99.patch b/libxml2/libxml2-c99.patch
deleted file mode 100644
index 7ce8f805ef55..000000000000
--- a/libxml2/libxml2-c99.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d77e5fc4bcdb7da748c9cca116a601ae4df60d21 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei at src.gnome.org>
-Date: Tue, 31 May 2016 21:04:50 +0800
-Subject: relaxng.c, xmlschemas.c: Fix build on pre-C99 compilers
-
-Make sure that the variables are declared at the top of the block.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=767063
- ---
- relaxng.c | 3 ++-
- xmlschemas.c | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/relaxng.c b/relaxng.c
-index 56a3344..3d3e69c 100644
-diff -ur misc/libxml2-2.9.4/relaxng.c misc/build/libxml2-2.9.4/relaxng.c
---- misc/libxml2-2.9.4/relaxng.c 2016-05-23 00:25:25.000000000 -0700
-+++ misc/build/libxml2-2.9.4/relaxng.c 2016-08-28 00:37:26.017097000 -0700
-@@ -2088,6 +2088,7 @@
- const xmlChar * arg2)
- {
- char msg[1000];
-+ xmlChar *result;
-
- if (arg1 == NULL)
- arg1 = BAD_CAST "";
-@@ -2215,7 +2216,7 @@
- snprintf(msg, 1000, "Unknown error code %d\n", err);
- }
- msg[1000 - 1] = 0;
-- xmlChar *result = xmlCharStrdup(msg);
-+ result = xmlCharStrdup(msg);
- return (xmlEscapeFormatString(&result));
- }
-
-diff -ur misc/libxml2-2.9.4/xmlschemas.c misc/build/libxml2-2.9.4/xmlschemas.c
---- misc/libxml2-2.9.4/xmlschemas.c 2016-05-23 00:25:25.000000000 -0700
-+++ misc/build/libxml2-2.9.4/xmlschemas.c 2016-08-28 00:37:26.025519000 -0700
-@@ -3168,8 +3168,8 @@
- "valid.");
- }
- if (expected) {
-- msg = xmlStrcat(msg, BAD_CAST " Expected is '");
- xmlChar *expectedEscaped = xmlCharStrdup(expected);
-+ msg = xmlStrcat(msg, BAD_CAST " Expected is '");
- msg = xmlStrcat(msg, xmlEscapeFormatString(&expectedEscaped));
- FREE_AND_NULL(expectedEscaped);
- msg = xmlStrcat(msg, BAD_CAST "'.\n");
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index bc5bea2582a1..c074f0b8022e 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -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/libxml/xmlversion.h misc/build/libxml2-2.9.4
#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
diff --git a/libxml2/libxml2-long-path.patch b/libxml2/libxml2-long-path.patch
deleted file mode 100644
index 8435d572007e..000000000000
--- a/libxml2/libxml2-long-path.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/libxml2-2.9.4/uri.c 2015-11-02 23:28:09.000000000 -0800
-+++ misc/build/libxml2-2.9.4/uri.c 2016-03-26 10:19:45.838472000 -0700
-@@ -2412,6 +2412,15 @@
- return xmlStrdup((const xmlChar *) path);
- #endif
-
-+#if defined(_WIN32)
-+ //We must not change the backslashes to slashes if the the path starts with
-+ // \\?\
-+ //Those paths can be up to 32k characters long.
-+ len = xmlStrlen(path);
-+ if ((len > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') )
-+ return xmlStrdup((const xmlChar *) path);
-+#endif
-+
- /* sanitize filename starting with // so it can be used as URI */
- if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/'))
- path++;
diff --git a/libxml2/libxml2-nan-inf-fix.patch b/libxml2/libxml2-nan-inf-fix.patch
new file mode 100644
index 000000000000..b3037ed7754c
--- /dev/null
+++ b/libxml2/libxml2-nan-inf-fix.patch
@@ -0,0 +1,60 @@
+From 7abec671473b837f99181442d59edd0cc2ee01d1 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer at 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
+
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index bcb47108d072..cb7db8ccf28f 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -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
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 24567a6c99fe..1b7641879f7f 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -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 misc/build/libxslt-1.1.29/configure
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
diff --git a/libxslt/libxslt-win_manifest.patch b/libxslt/libxslt-win_manifest.patch
index be3f2d0e776c..838035398f60 100644
--- a/libxslt/libxslt-win_manifest.patch
+++ b/libxslt/libxslt-win_manifest.patch
@@ -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";
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
index 474f1a6ba182..b896b8fab58c 100644
--- a/libxslt/libxsltversion.mk
+++ b/libxslt/libxsltversion.mk
@@ -25,5 +25,5 @@ LIBXSLT_MAJOR=1
# minor
LIBXSLT_MINOR=1
# micro
-LIBXSLT_MICRO=29
+LIBXSLT_MICRO=32
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 4b06d2f55910..0a853a5b5557 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -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 \
commit 689f0e6f88d7a6a761af43cece22190bf5ad916f
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Aug 25 19:29:46 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Aug 25 19:29:46 2018 +0000
Re-added small gray border which got accidentally erased in parts
diff --git a/default_images/introabout/beta/intro.png b/default_images/introabout/beta/intro.png
index fd0909200a83..8ba0fe560c74 100755
Binary files a/default_images/introabout/beta/intro.png and b/default_images/introabout/beta/intro.png differ
diff --git a/default_images/introabout/intro.png b/default_images/introabout/intro.png
index 17f93842f3a3..69532517473c 100755
Binary files a/default_images/introabout/intro.png and b/default_images/introabout/intro.png differ
diff --git a/ooo_custom_images/dev/introabout/intro.png b/ooo_custom_images/dev/introabout/intro.png
index 214bb79be211..7c60f941e9ab 100755
Binary files a/ooo_custom_images/dev/introabout/intro.png and b/ooo_custom_images/dev/introabout/intro.png differ
diff --git a/ooo_custom_images/dev_nologo/introabout/intro.png b/ooo_custom_images/dev_nologo/introabout/intro.png
index 4fef9405c575..a0166b1c62b1 100755
Binary files a/ooo_custom_images/dev_nologo/introabout/intro.png and b/ooo_custom_images/dev_nologo/introabout/intro.png differ
diff --git a/ooo_custom_images/nologo/introabout/intro.png b/ooo_custom_images/nologo/introabout/intro.png
index 1d8ff0ed928b..542c3cbf6cfa 100755
Binary files a/ooo_custom_images/nologo/introabout/intro.png and b/ooo_custom_images/nologo/introabout/intro.png differ
commit 8569516f04dee3e3667f20ff104621b8025c6839
Author: Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Aug 25 19:24:14 2018 +0000
Commit: Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Aug 25 19:24:14 2018 +0000
Fixed LongDateDaySeparator
diff --git a/i18npool/source/localedata/data/de_CH.xml b/i18npool/source/localedata/data/de_CH.xml
index b056e17f0708..1924ded2df7f 100644
--- a/i18npool/source/localedata/data/de_CH.xml
+++ b/i18npool/source/localedata/data/de_CH.xml
@@ -43,7 +43,7 @@
<Time100SecSeparator>.</Time100SecSeparator>
<ListSeparator>;</ListSeparator>
<LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
- <LongDateDaySeparator>.</LongDateDaySeparator>
+ <LongDateDaySeparator>. </LongDateDaySeparator>
<LongDateMonthSeparator> </LongDateMonthSeparator>
<LongDateYearSeparator> </LongDateYearSeparator>
</Separators>
diff --git a/i18npool/source/localedata/data/de_LI.xml b/i18npool/source/localedata/data/de_LI.xml
index 699875e46dd7..4c496864d893 100644
--- a/i18npool/source/localedata/data/de_LI.xml
+++ b/i18npool/source/localedata/data/de_LI.xml
@@ -40,7 +40,7 @@
<Time100SecSeparator>.</Time100SecSeparator>
<ListSeparator>;</ListSeparator>
<LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
- <LongDateDaySeparator>.</LongDateDaySeparator>
+ <LongDateDaySeparator>. </LongDateDaySeparator>
<LongDateMonthSeparator> </LongDateMonthSeparator>
<LongDateYearSeparator> </LongDateYearSeparator>
</Separators>
More information about the Libreoffice-commits
mailing list