subject:"\[Libreoffice\-commits\] core.git\: configure.ac download.lst"

[Libreoffice-commits] core.git: configure.ac download.lst external/libcmis

2023-11-13 Thread Caolán McNamara (via logerrit)

 configure.ac   
  |2 
 download.lst   
  |4 
 external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch
  |   31 --
 
external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
 |  142 --
 
external/libcmis/0003-HttpSession-fix-regression-setting-wrong-type-of-CUR.patch
 |   81 -
 external/libcmis/UnpackedTarball_libcmis.mk
  |3 
 6 files changed, 3 insertions(+), 260 deletions(-)

New commits:
commit 3368447e826d4204086e4d8bfe59af4412c16233
Author: Caolán McNamara 
AuthorDate: Mon Nov 13 10:13:50 2023 +
Commit: Caolán McNamara 
CommitDate: Mon Nov 13 13:02:52 2023 +0100

upgrade libcmis

Change-Id: Ie2d5f3f8208f9952db5be10905b5905cd03b91de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159366
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 0234537eb02b..8310001dcb3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7615,7 +7615,7 @@ AC_SUBST(GPERF)
 dnl ===
 dnl Check for system libcmis
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.0],enabled)
+libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.6 >= 0.6.1],enabled)
 
 dnl ===
 dnl C++11
diff --git a/download.lst b/download.lst
index d4c3eed3b9c6..60ac664205f9 100644
--- a/download.lst
+++ b/download.lst
@@ -60,8 +60,8 @@ DTOA_TARBALL := dtoa-20180411.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBCMIS_SHA256SUM := 
56df575f78dacc21b4cec7cec73d671fd235f7c2010a8bb7940ef1413dc899fd
-LIBCMIS_TARBALL := libcmis-0.6.0.tar.xz
+LIBCMIS_SHA256SUM := 
d54d19d86153dbc88e2d468f7136269a2cfe71b73227e12fded01d29ac268074
+LIBCMIS_TARBALL := libcmis-0.6.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch 
b/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch
deleted file mode 100644
index 8480913cdf20..
--- a/external/libcmis/0001-fix-regression-in-HttpSession-initProtocols.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5b9ed18e518a5214b4a1fb2766627c1d169b8d8c Mon Sep 17 00:00:00 2001
-From: Michael Stahl 
-Date: Mon, 6 Nov 2023 13:33:05 +0100
-Subject: [PATCH 1/2] fix regression in  HttpSession::initProtocols()
-
-(regression from commit 1b8a646b1d63bfa760d154dd7e51f6298d4a9899)

- src/libcmis/http-session.cxx | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libcmis/http-session.cxx b/src/libcmis/http-session.cxx
-index 3847a2c..9703427 100644
 a/src/libcmis/http-session.cxx
-+++ b/src/libcmis/http-session.cxx
-@@ -894,11 +894,12 @@ catch ( const libcmis::Exception& e )
- 
- void HttpSession::initProtocols( )
- {
--const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- #if (LIBCURL_VERSION_MAJOR > 7) || (LIBCURL_VERSION_MAJOR == 7 && 
LIBCURL_VERSION_MINOR >= 85)
-+auto const protocols = "https,http";
- curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS_STR, protocols);
- curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS_STR, protocols);
- #else
-+const unsigned long protocols = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- curl_easy_setopt(m_curlHandle, CURLOPT_PROTOCOLS, protocols);
- curl_easy_setopt(m_curlHandle, CURLOPT_REDIR_PROTOCOLS, protocols);
- #endif
--- 
-2.41.0
-
diff --git 
a/external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
 
b/external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
deleted file mode 100644
index b47ee4d195b2..
--- 
a/external/libcmis/0002-HttpSession-add-a-callback-that-can-be-used-to-confi.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 94012ca5b669e71ea35508159f63576364736dc2 Mon Sep 17 00:00:00 2001
-From: Michael Stahl 
-Date: Mon, 6 Nov 2023 14:18:59 +0100
-Subject: [PATCH 2/2] HttpSession: add a callback that can be used to configure
- libcurl
-

- inc/libcmis/session-factory.hxx | 7 +++
- src/libcmis/http-session.cxx| 8 +++-
- src/libcmis/http-session.hxx| 8 +++-
- src/libcmis/session-factory.cxx | 9 -
- 4 files changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/inc/libcmis/session-factory.hxx b/inc/libcmis/session-factory.hxx
-index 45abd8b..227ac4d 100644
 a/inc/libcmis/session-factory.hxx
-+++ b/inc/libcmis/session-factory.hxx
-@@ -38,6 +38,9 @@
- #include "libcmis/repository.hxx"
- #include "libcmis/session.hxx"
- 
-+// needed for a callback type
-+typedef void CURL;
-+
- namespace libcmis
- {
- /** This callback provides

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps

2023-09-25 Thread Taichi Haradaguchi (via logerrit)

 configure.ac|2 +-
 download.lst|4 ++--
 external/libwps/README  |2 +-
 external/libwps/inc/pch/precompiled_wps.hxx |3 ++-
 external/libwps/libtool.patch.0 |   13 ++---
 5 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 6acdde8006e6b59758b00bc178f15f32796a1987
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Sep 21 20:23:26 2023 +0900
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Mon Sep 25 09:20:24 2023 +0200

upload libwps 0.4.14

Change-Id: I0d10aafa17afaaef9b154255bf17638dd67070e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157149
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/configure.ac b/configure.ac
index 93e6bd11bfca..4931ad5bf4bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9589,7 +9589,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10])
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.14])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 1c65320be412..71ab2bd818d5 100644
--- a/download.lst
+++ b/download.lst
@@ -549,8 +549,8 @@ WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-WPS_SHA256SUM := 
e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
-WPS_VERSION_MICRO := 12
+WPS_SHA256SUM := 
365b968e270e85a8469c6b160aa6af5619a4e6c995dbb04c1ecc1b4dd13e80de
+WPS_VERSION_MICRO := 14
 WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libwps/README b/external/libwps/README
index 3ce52187d520..1354aaa24db2 100644
--- a/external/libwps/README
+++ b/external/libwps/README
@@ -1 +1 @@
-Microsoft Works file word processor format import library from 
[http://libwps.sourceforge.net/].
+Microsoft Works file word processor format import library from 
[https://sourceforge.net/projects/libwps/].
diff --git a/external/libwps/inc/pch/precompiled_wps.hxx 
b/external/libwps/inc/pch/precompiled_wps.hxx
index 77d92f7615b6..e25d81e9c6ca 100644
--- a/external/libwps/inc/pch/precompiled_wps.hxx
+++ b/external/libwps/inc/pch/precompiled_wps.hxx
@@ -13,13 +13,14 @@
  manual changes will be rewritten by the next run of update_pch.sh (which 
presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2019-10-13 10:00:18 using:
+ Generated on 2023-09-21 20:32:22 using:
  ./bin/update_pch external/libwps wps --cutoff=1 --exclude:system 
--include:module --include:local
 
  If after updating build fails, use the following command to locate 
conflicting headers:
  ./bin/update_pch_bisect ./external/libwps/inc/pch/precompiled_wps.hxx "make 
external/libwps.build" --find-conflicts
 */
 
+#include 
 #if PCH_LEVEL >= 1
 #include 
 #include 
diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0
index cc4b08ba2147..bccd0ebdbc06 100644
--- a/external/libwps/libtool.patch.0
+++ b/external/libwps/libtool.patch.0
@@ -1,12 +1,11 @@
 ltmain.sh.sav  2018-08-02 14:21:34.0 +0200
-+++ ltmain.sh  2019-05-05 22:04:15.433588776 +0200
-@@ -7277,7 +7277,8 @@ func_mode_link ()
-   # -stdlib=*select c++ std lib with clang
+--- ltmain.sh.sav  2023-05-03 21:29:15.0 +0900
 ltmain.sh  2023-09-21 20:13:31.766938069 +0900
+@@ -7277,7 +7277,7 @@ func_mode_link ()
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
--  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
-+  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-+  -fuse-ld=*|--ld-path=*)
+   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-  -fsanitize=*)
++  -fsanitize=*|-fuse-ld=*|--ld-path=*)
  func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
  func_append compile_command " $arg"

[Libreoffice-commits] core.git: configure.ac download.lst

2023-08-28 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c1586ef57b5770f80ef200ab38ff4538c2dfb145
Author: Michael Stahl 
AuthorDate: Mon Aug 28 10:13:28 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Aug 28 13:47:44 2023 +0200

python3: upgrade to release 3.8.18

Fixes CVE-2023-40217

Change-Id: Ie08af471009b7f5c42aa6875dd4f9d886ad1d617
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156183
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 9249c73ef1d2..5ce8454546c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9972,7 +9972,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.17
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 4e3f1f3798be..02adb7a75fd4 100644
--- a/download.lst
+++ b/download.lst
@@ -470,8 +470,8 @@ POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PYTHON_SHA256SUM := 
2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9
-PYTHON_TARBALL := Python-3.8.17.tar.xz
+PYTHON_SHA256SUM := 
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
+PYTHON_TARBALL := Python-3.8.18.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2023-06-27 Thread Taichi Haradaguchi (via logerrit)

 configure.ac|4 +--
 download.lst|8 +++
 external/icu/README |2 -
 external/icu/UnpackedTarball_icu.mk |1 
 external/icu/icu4c-khmerbreakengine.patch.1 |   23 ++--
 external/icu/ubsan.patch.1  |   31 
 6 files changed, 19 insertions(+), 50 deletions(-)

New commits:
commit 05c6cdb144d1732ca51d463845fa6ddef7c08265
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jun 26 01:57:09 2023 +0900
Commit: Eike Rathke 
CommitDate: Tue Jun 27 13:08:34 2023 +0200

Update ICU to 73.2

Remove external/icu/ubsan.patch.1 that was applied upstream.

See https://icu.unicode.org/download/73

Change-Id: Ic2bc450b093f1c0ddb09ebe915a9c3e70d7e0964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153574
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index ece7c7d40db8..eca7a5ad5cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10769,8 +10769,8 @@ fi
 dnl ===
 dnl Check for system icu
 dnl ===
-ICU_MAJOR=72
-ICU_MINOR=1
+ICU_MAJOR=73
+ICU_MINOR=2
 ICU_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/icu/source/i18n 
-I${WORKDIR}/UnpackedTarball/icu/source/common"
 ICU_LIBS_internal="-L${WORKDIR}/UnpackedTarball/icu/source/lib"
 libo_CHECK_SYSTEM_MODULE([icu],[ICU],[icu-i18n >= 66])
diff --git a/download.lst b/download.lst
index fce7592c6370..d38c37f48cf3 100644
--- a/download.lst
+++ b/download.lst
@@ -242,10 +242,10 @@ HYPHEN_TARBALL := 
5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ICU_SHA256SUM := 
a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
-ICU_TARBALL := icu4c-72_1-src.tgz
-ICU_DATA_SHA256SUM := 
ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea
-ICU_DATA_TARBALL := icu4c-72_1-data.zip
+ICU_SHA256SUM := 
818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1
+ICU_TARBALL := icu4c-73_2-src.tgz
+ICU_DATA_SHA256SUM := 
ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701
+ICU_DATA_TARBALL := icu4c-73_2-data.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/icu/README b/external/icu/README
index 484de1f41536..23cf5f0524ae 100644
--- a/external/icu/README
+++ b/external/icu/README
@@ -1 +1 @@
-Library providing Unicode support, from [http://site.icu-project.org/].
+Library providing Unicode support, from [https://icu.unicode.org/].
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index b5b072b1e1e6..655614447d53 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-clang-cl.patch.1 \
external/icu/gcc9.patch \
external/icu/c++20-comparison.patch.1 \
-   external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
external/icu/icu4c-emscripten-cross.patch.1 \
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 
b/external/icu/icu4c-khmerbreakengine.patch.1
index ea8f20f443ff..605914014e96 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -1,6 +1,6 @@
 diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
 icu.org/source/common/dictbe.cpp   2022-04-08 00:41:55.0 +0200
-+++ icu/source/common/dictbe.cpp   2022-05-16 13:56:43.426870900 +0200
+--- icu.org/source/common/dictbe.cpp   2023-06-14 06:23:55.0 +0900
 icu/source/common/dictbe.cpp   2023-06-26 17:43:53.034173100 +0900
 @@ -35,7 +35,19 @@
   **
   */
@@ -211,8 +211,8 @@ diff -ur icu.org/source/common/dictbe.cpp 
icu/source/common/dictbe.cpp
  int32_t start = (int32_t)utext_getNativeIndex(text);
  if (start != offset) {
  offset = start;
--count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, NULL, );
-+count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, NULL, , ignoreSet, minLength);
+-count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, nullptr, );
++count = dict->matches(text, rangeEnd-start, UPRV_LENGTHOF(cuLengths), 
cuLengths, cpLengths, nullptr, , ignoreSet, minLength);
  // Dictionary leaves text after longest prefix, not longest word. 
Back up.
  if (count <= 0) {
  utext_setNativeIndex(text, start);
@@ -748,8 +748,8 @@ diff -ur

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

2023-06-07 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 external/python3/python-3.3.0-darwin.patch.1 |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 734d53534a6ca023e9c2eb819cde889b01818f1b
Author: Michael Stahl 
AuthorDate: Wed Jun 7 11:16:03 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Jun 7 15:18:15 2023 +0200

python3: upgrade to release 3.8.17

Fixes CVE-2023-24329 and a few more obscure security issues.

Change-Id: I4b073ce02c0377e2791e4593d20f2b756de0c8cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152696
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 58c785f6f5d5..8b256fbbb0a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9951,7 +9951,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.17
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 9a0ac67b1bff..5366f5e1bbbd 100644
--- a/download.lst
+++ b/download.lst
@@ -465,8 +465,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
-PYTHON_TARBALL := Python-3.8.16.tar.xz
+PYTHON_SHA256SUM := 
2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9
+PYTHON_TARBALL := Python-3.8.17.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/python3/python-3.3.0-darwin.patch.1 
b/external/python3/python-3.3.0-darwin.patch.1
index 39d3c9180a19..d262d55cd5b3 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -49,7 +49,7 @@ diff -ru python3.orig/Mac/Resources/app/Info.plist.in 
python3/Mac/Resources/app/
 -  Python
 +  LibreOfficePython
CFBundleGetInfoString
-   %version%, (c) 2001-2020 Python Software Foundation.
+   %version%, (c) 2001-2023 Python Software Foundation.
CFBundleHelpBookFolder
 diff -ru python3.orig/Mac/Resources/framework/Info.plist.in 
python3/Mac/Resources/framework/Info.plist.in
 --- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 
18:50:07.0 +0200

[Libreoffice-commits] core.git: configure.ac download.lst

2022-12-09 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 05f55b3898407828bb24347be56247f58803f7bb
Author: Michael Stahl 
AuthorDate: Fri Dec 9 11:51:22 2022 +0100
Commit: Michael Stahl 
CommitDate: Fri Dec 9 12:09:22 2022 +

python3: upgrade to release 3.8.16

Fixes CVE-2022-37454 and a few other ones that look less relevant
including CVE-2022-45061 and CVE-2015-20107.

Change-Id: I10fd254f7f0801d47119234bb3436874e98d8c91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143849
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 5fc489a7e8c0..613604558eb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9987,7 +9987,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.16
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 814bbf7e744e..60af75d77aca 100644
--- a/download.lst
+++ b/download.lst
@@ -208,8 +208,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
 export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM := 
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
-export PYTHON_TARBALL := Python-3.8.15.tar.xz
+export PYTHON_SHA256SUM := 
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
+export PYTHON_TARBALL := Python-3.8.16.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18nutil/source include/svx svx/source

2022-10-24 Thread Eike Rathke (via logerrit)

 configure.ac|2 
 download.lst|8 
+-
 external/icu/UnpackedTarball_icu.mk |2 
 external/icu/c++20-comparison.patch.1   |   30 

 external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2 |   37 
--
 external/icu/strict_ansi.patch  |   15 

 i18nutil/source/utility/unicode.cxx |8 
++
 include/svx/strings.hrc |7 
+
 svx/source/dialog/charmap.cxx   |   24 
++
 9 files changed, 58 insertions(+), 75 deletions(-)

New commits:
commit 20ebccd6b349a1d9d3e057de55933c2805ff5d1a
Author: Eike Rathke 
AuthorDate: Tue Oct 25 00:34:34 2022 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 25 01:39:21 2022 +0200

Update to ICU 72.1

https://icu.unicode.org/download/72

Unicode 15

https://blog.unicode.org/2022/09/announcing-unicode-standard-version-150.html

CLDR 42
https://blog.unicode.org/2022/10/unicode-cldr-v42-available.html

New scripts:
USCRIPT_KAWI
USCRIPT_NAG_MUNDARI

New Unicode blocks:
UBLOCK_ARABIC_EXTENDED_C
UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_H
UBLOCK_CYRILLIC_EXTENDED_D
UBLOCK_DEVANAGARI_EXTENDED_A
UBLOCK_KAKTOVIK_NUMERALS
UBLOCK_KAWI
UBLOCK_NAG_MUNDARI

Change-Id: I8822791e914e6700358b817a1af94b7dcd16b26d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141788
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 064e0683637d..bacc245f9396 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10796,7 +10796,7 @@ fi
 dnl ===
 dnl Check for system icu
 dnl ===
-ICU_MAJOR=71
+ICU_MAJOR=72
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 1b855434d7f9..0db9970fcd5d 100644
--- a/download.lst
+++ b/download.lst
@@ -106,10 +106,10 @@ export HUNSPELL_SHA256SUM := 
b2d9c5369c2cc7f321cb5983fda2dbf007dce3d9e1751974684
 export HUNSPELL_TARBALL := hunspell-1.7.1.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
-export ICU_TARBALL := icu4c-71_1-src.tgz
-export ICU_DATA_SHA256SUM := 
e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804
-export ICU_DATA_TARBALL := icu4c-71_1-data.zip
+export ICU_SHA256SUM := 
a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68
+export ICU_TARBALL := icu4c-72_1-src.tgz
+export ICU_DATA_SHA256SUM := 
ee19f876507d6c23d9e0a2b631096f6b0eaa6fa61728c33a89efdb55e3385dea
+export ICU_DATA_TARBALL := icu4c-72_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index ccb1a1a8b9b2..f58223d5bc5f 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -36,11 +36,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/c++20-comparison.patch.1 \
external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
-   external/icu/strict_ansi.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
external/icu/icu4c-emscripten-cross.patch.1 \
external/icu/icu4c-use-pkgdata-single-ccode-file-mode.patch.1 \
-   external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2 
\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
diff --git a/external/icu/c++20-comparison.patch.1 
b/external/icu/c++20-comparison.patch.1
index 3d2d7c042951..fa10b048ce41 100644
--- a/external/icu/c++20-comparison.patch.1
+++ b/external/icu/c++20-comparison.patch.1
@@ -1,6 +1,6 @@
 diff -ur icu.org/source/i18n/unicode/rbtz.h icu/source/i18n/unicode/rbtz.h
 icu.org/source/i18n/unicode/rbtz.h 2021-10-28 18:04:57.0 +0200
-+++ icu/source/i18n/unicode/rbtz.h 2021-11-15 18:56:24.364137609 +0100
+--- icu.org/source/i18n/unicode/rbtz.h 2022-10-19

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

2022-10-24 Thread Taichi Haradaguchi (via logerrit)

 configure.ac   
|2 
 download.lst   
|4 
 
external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 |   59 --
 external/python3/i100492-freebsd.patch.1   
|6 -
 external/python3/internal-zlib.patch.0 
|6 -
 external/python3/macos-11.patch.0  
|6 -
 external/python3/python-3.3.0-darwin.patch.1   
|4 
 external/python3/python-3.3.3-disable-obmalloc.patch.0 
|4 
 external/python3/python-3.3.3-elf-rpath.patch.1
|4 
 external/python3/python-3.5.4-msvc-disable.patch.1 
|6 -
 external/python3/python-3.5.tweak.strip.soabi.patch
|2 
 external/python3/python-3.7.6-msvc-ssl.patch.1 
|2 
 external/python3/ubsan.patch.0 
|4 
 13 files changed, 25 insertions(+), 84 deletions(-)

New commits:
commit ea5843b67f1c2006aa1f68f2d00a991e1d463262
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Oct 24 00:52:04 2022 +0900
Commit: Caolán McNamara 
CommitDate: Mon Oct 24 21:01:48 2022 +0200

Python3: update to 3.8.15

* Fixes CVE-2022-40674
* Removed 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 
as fixed upstream

Change-Id: I8e71f9a6b013ca4c45bf8774b284be98eee71bab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141691
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index a40c08e16b29..064e0683637d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10026,7 +10026,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.15
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 8cda34cd6d51..07dbd60d2143 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
73876fdd3a517087340458dca4ce15b8d2a4dbceb334c0441424551ae6c4cded
 export POSTGRESQL_TARBALL := postgresql-13.8.tar.bz2
-export PYTHON_SHA256SUM := 
5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3
-export PYTHON_TARBALL := Python-3.8.14.tar.xz
+export PYTHON_SHA256SUM := 
5114fc7918a2a5e20eb5aac696b30c36f412c6ef24b13f5c9eb9e056982d9550
+export PYTHON_TARBALL := Python-3.8.15.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 
b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
deleted file mode 100644
index 489e5d0e89ee..
--- 
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001
-From: Christian Heimes 
-Date: Mon, 24 Sep 2018 14:38:31 +0200
-Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser
- (GH-9217) (GH-9512)
-
-The SAX parser no longer processes general external entities by default
-to increase security. Before, the parser created network connections
-to fetch remote files or loaded local files from the file system for DTD
-and entities.
-
-Signed-off-by: Christian Heimes 
-
-https://bugs.python.org/issue17239.
-(cherry picked from commit 17b1d5d4e36aa57a9b25a0e694affbd1ee637e45)
-
-Co-authored-by: Christian Heimes 
-
-
-
-https://bugs.python.org/issue17239

- Doc/library/xml.dom.pulldom.rst   | 14 +
- Doc/library/xml.rst   |  6 +-
- Doc/library/xml.sax.rst   |  8 +++
- Doc/whatsnew/3.6.rst  | 18 +-
- Lib/test/test_pulldom.py  |  7 +++
- Lib/test/test_sax.py  | 60 ++-
- Lib/test/test_xml_etree.py| 13 
- Lib/xml/sax/expatreader.py|  2 +-
-

[Libreoffice-commits] core.git: configure.ac download.lst

2022-09-13 Thread Taichi Haradaguchi (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 849601bdec341eaee3cafc46fbe3cf223f06fb7d
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 10 17:20:58 2022 +0900
Commit: Caolán McNamara 
CommitDate: Tue Sep 13 17:51:02 2022 +0200

Python3: upgrade to release 3.8.14

Fixes CVE-2020-10735.

Change-Id: I028bb1fe6154beffdd80c0190c9de40ab8a80c4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139747
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 0033ddc1b836..41d2c30a9816 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9984,7 +9984,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.14
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index c6f95a10d6a2..aa8550fbd2ff 100644
--- a/download.lst
+++ b/download.lst
@@ -216,8 +216,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM := 
6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57
-export PYTHON_TARBALL := Python-3.8.13.tar.xz
+export PYTHON_SHA256SUM := 
5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3
+export PYTHON_TARBALL := Python-3.8.14.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

2022-09-07 Thread Taichi Haradaguchi (via logerrit)

 configure.ac|2 +-
 download.lst|4 ++--
 external/python3/darwin.patch.0 |   12 
 3 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit c8fd50f9ec02a131fd4c99e80f7252b49015653a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Tue Sep 6 21:10:53 2022 +0900
Commit: Caolán McNamara 
CommitDate: Wed Sep 7 16:02:03 2022 +0200

python3: upgrade to release 3.8.13

Remove some code in external/python3/darwin.patch.0 as it was fixed 
upstream(https://bugs.python.org/issue45405).

Change-Id: Ie6bfb2456f96a63adbf0dbcb9c902dc56f1151ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139493
Tested-by: Jenkins
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index 61806988b94b..f9d52805053b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9984,7 +9984,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.12
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.13
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 371ff954e2ba..6a86898646d8 100644
--- a/download.lst
+++ b/download.lst
@@ -216,8 +216,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM := 
b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea
-export PYTHON_TARBALL := Python-3.8.12.tar.xz
+export PYTHON_SHA256SUM := 
6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57
+export PYTHON_TARBALL := Python-3.8.13.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/darwin.patch.0 b/external/python3/darwin.patch.0
index 30d20ed57578..139cdc9780bb 100644
--- a/external/python3/darwin.patch.0
+++ b/external/python3/darwin.patch.0
@@ -8,15 +8,3 @@
  .text
  
  /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
 configure
-+++ configure
-@@ -5167,7 +5167,9 @@
- fi
- 
- 
-+if test "$(uname -s)" = Darwin; then MULTIARCH=; else
- MULTIARCH=$($CC --print-multiarch 2>/dev/null)
-+fi
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the platform triplet 
based on compiler characteristics" >&5

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2022-05-16 Thread Eike Rathke (via logerrit)

 configure.ac|2 
 download.lst|8 +--
 external/icu/UnpackedTarball_icu.mk |4 -
 external/icu/icu4c-khmerbreakengine.patch.1 |   62 ++--
 4 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit f6e7b9a9921cc08ce603bb005deb187a7fdafb55
Author: Eike Rathke 
AuthorDate: Mon May 16 14:58:31 2022 +0200
Commit: Eike Rathke 
CommitDate: Mon May 16 18:36:19 2022 +0200

Update to ICU 71.1

No major changes.
See https://icu.unicode.org/download/71

Change-Id: I7929d175962ff13e4369005633a4135f17f97e8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134404
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 2f0f5a574ed6..79c8b20a5043 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10715,7 +10715,7 @@ fi
 dnl ===
 dnl Check for system icu
 dnl ===
-ICU_MAJOR=70
+ICU_MAJOR=71
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index bef96b45a1ce..567c5705d2c6 100644
--- a/download.lst
+++ b/download.lst
@@ -108,10 +108,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
-export ICU_TARBALL := icu4c-70_1-src.tgz
-export ICU_DATA_SHA256SUM := 
c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e
-export ICU_DATA_TARBALL := icu4c-70_1-data.zip
+export ICU_SHA256SUM := 
67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
+export ICU_TARBALL := icu4c-71_1-src.tgz
+export ICU_DATA_SHA256SUM := 
e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804
+export ICU_DATA_TARBALL := icu4c-71_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 25b4f1defa26..ccb1a1a8b9b2 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -39,11 +39,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/strict_ansi.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
external/icu/icu4c-emscripten-cross.patch.1 \
-   external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-use-pkgdata-single-ccode-file-mode.patch.1 \
+   external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2 
\
+   external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
-   external/icu/do-not-reset-useful-cache-to-empty-in-populateNear.patch.2 
\
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 
b/external/icu/icu4c-khmerbreakengine.patch.1
index 78cce146c2bf..ea8f20f443ff 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -1,7 +1,7 @@
 diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
 icu.org/source/common/dictbe.cpp   2021-10-28 18:04:57.0 +0200
-+++ icu/source/common/dictbe.cpp   2021-11-15 20:39:03.710870385 +0100
-@@ -32,7 +32,19 @@
+--- icu.org/source/common/dictbe.cpp   2022-04-08 00:41:55.0 +0200
 icu/source/common/dictbe.cpp   2022-05-16 13:56:43.426870900 +0200
+@@ -35,7 +35,19 @@
   **
   */
  
@@ -13,16 +13,16 @@ diff -ur icu.org/source/common/dictbe.cpp 
icu/source/common/dictbe.cpp
 +DictionaryBreakEngine::DictionaryBreakEngine(uint32_t breakTypes)
 +: fTypes(breakTypes), clusterLimit(3) {
 +UErrorCode status = U_ZERO_ERROR;
-+fViramaSet.applyPattern(UNICODE_STRING_SIMPLE("[[:ccc=VR:]]"), status);
++fViramaSet.applyPattern(UnicodeString(u"[[:ccc=VR:]]"), status);
 +
 +// note Skip Sets contain fIgnoreSet characters too.
-+
fSkipStartSet.applyPattern(UNICODE_STRING_SIMPLE("[[:lb=OP:][:lb=QU:]\\u200C\\u200D\\u2060]"),
 status);
-+

[Libreoffice-commits] core.git: configure.ac download.lst

2022-01-22 Thread Caolán McNamara (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5190b933ef6d3c5faa23d8165b2109c4ea21df42
Author: Caolán McNamara 
AuthorDate: Sat Jan 22 13:07:23 2022 +
Commit: Caolán McNamara 
CommitDate: Sat Jan 22 16:45:26 2022 +0100

upgrade to Python-3.8.12

Change-Id: I0dd1a767c5c65e5789e690e13958ba4ad92a7e16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128770
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index d657aed4a01e..3c7a17d0df78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9877,7 +9877,7 @@ if test \( "$cross_compiling" = yes -a -z 
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.12
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 9e5175aa362a..18987fca4dc9 100644
--- a/download.lst
+++ b/download.lst
@@ -214,8 +214,8 @@ export POPPLER_DATA_SHA256SUM := 
2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb
 export POPPLER_DATA_TARBALL := poppler-data-0.4.11.tar.gz
 export POSTGRESQL_SHA256SUM := 
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
 export POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
-export PYTHON_SHA256SUM := 
6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9
-export PYTHON_TARBALL := Python-3.8.10.tar.xz
+export PYTHON_SHA256SUM := 
b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea
+export PYTHON_TARBALL := Python-3.8.12.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw writerperfect/qa

2021-12-13 Thread David Tardon (via logerrit)

 configure.ac  |2 +-
 download.lst  |4 ++--
 external/libmwaw/Library_mwaw.mk  |3 +++
 writerperfect/qa/unit/WpftDrawFilterTest.cxx  |2 ++
 writerperfect/qa/unit/WpftWriterFilterTest.cxx|1 +
 writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 |binary
 writerperfect/qa/unit/data/draw/libmwaw/pass/Scoop_1  |binary
 writerperfect/qa/unit/data/writer/libmwaw/pass/ScriptWriter_1 |binary
 8 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit c74d59a8b47bb8228c297a60e6b5b0cc5e08aa53
Author: David Tardon 
AuthorDate: Mon Dec 13 21:39:46 2021 +0100
Commit: David Tardon 
CommitDate: Tue Dec 14 08:08:46 2021 +0100

upload libmwaw 0.3.21

Change-Id: Id28cd361237ce67b76a865ad4291ccece521af85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126768
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index c213ebfb6693..099817d7a1ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9397,7 +9397,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.20])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
diff --git a/download.lst b/download.lst
index 0e93fecf0e9d..8dd656fd5de9 100644
--- a/download.lst
+++ b/download.lst
@@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
-export MWAW_VERSION_MICRO := 20
+export MWAW_SHA256SUM := 
e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c
+export MWAW_VERSION_MICRO := 21
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 2f27a6113485..58d433f9d093 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,6 +201,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+   UnpackedTarball/libmwaw/src/lib/ReadySetGoParser \
+   UnpackedTarball/libmwaw/src/lib/ScoopParser \
+   UnpackedTarball/libmwaw/src/lib/ScriptWriterParser \
UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
diff --git a/writerperfect/qa/unit/WpftDrawFilterTest.cxx 
b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
index 3786315c4620..78168cdb9ce0 100644
--- a/writerperfect/qa/unit/WpftDrawFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftDrawFilterTest.cxx
@@ -46,6 +46,8 @@ void WpftDrawFilterTest::test()
 { "MacDraw_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "MacDraw_II.hqx", REQUIRE_MWAW_VERSION(0, 3, 3) },
 { "MacDraw_Pro_1.0.hqx", REQUIRE_MWAW_VERSION(0, 3, 4) },
+{ "ReadySetGo_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
+{ "Scoop_1", REQUIRE_MWAW_VERSION(0, 3, 21) },
 };
 const writerperfect::test::WpftOptionalMap_t aStarOfficeOptional{
 { "Draw_3.1.sda", REQUIRE_STAROFFICE_VERSION(0, 0, 1) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx 
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 543146169253..78d24dc99b17 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,7 @@ void WpftWriterFilterTest::test()
 { "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "RagTime_5.5.rag", REQUIRE_MWAW_VERSION(0, 3, 6) },
+{ "ScriptWriter", REQUIRE_MWAW_VERSION(0, 3, 21) },
 { "StudentWritingCenter", REQUIRE_MWAW_VERSION(0, 3, 20) },
 { "WordMaker", REQUIRE_MWAW_VERSION(0, 3, 20) },
 };
diff --git a/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1 
b/writerperfect/qa/unit/data/draw/libmwaw/pass/ReadySetGo_1
new file mode 100644
index ..71a2e7a91a5d
Binary files /dev/null and

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18npool/qa i18nutil/source include/svx svx/source

2021-11-16 Thread Eike Rathke (via logerrit)

 configure.ac  |2 
 download.lst  |8 
 external/icu/UnpackedTarball_icu.mk   |3 
 external/icu/c++20-comparison.patch   |  171 --
 external/icu/c++20-comparison.patch.1 |   82 
 external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 |  106 --
 external/icu/icu4c-aix.patch.1|   16 
 external/icu/icu4c-android.patch.1|   24 -
 external/icu/icu4c-khmerbreakengine.patch.1   |   89 ++---
 i18npool/qa/cppunit/test_breakiterator.cxx|   12 
 i18nutil/source/utility/unicode.cxx   |   17 
 include/svx/strings.hrc   |   12 
 svx/source/dialog/charmap.cxx |   40 ++
 13 files changed, 230 insertions(+), 352 deletions(-)

New commits:
commit 263961306ede0656ebb7904034a2172615ce81d0
Author: Eike Rathke 
AuthorDate: Tue Nov 16 14:53:14 2021 +0100
Commit: Eike Rathke 
CommitDate: Tue Nov 16 20:23:45 2021 +0100

Update to ICU 70.1

Unicode 14, 5 new scripts, 12 new Unicode blocks.

In i18npool/qa/cppunit/test_breakiterator.cxx
TestBreakIterator::testLao() had to be disabled/adapted.
Needs to be investigated, see comments there.
As is, Lao script word break has regressions.

Correct UBLOCK_TANGUT_SUPPLEMENT Unicode range endpoint to
0x18D7F, see
https://www.unicode.org/versions/Unicode14.0.0/erratafixed.html
for which ublock_getCode(0x18D8F) now returned UBLOCK_NO_BLOCK and
thus luckily the assert in svx/source/dialog/charmap.cxx hit.

Change-Id: I4bad16ecfab3f44be365b8f884c57f34af68218e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125322
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 4ef19213c15d..1872faaafbd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10476,7 +10476,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=69
+ICU_MAJOR=70
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index d70e256a2c26..df1aab85fc23 100644
--- a/download.lst
+++ b/download.lst
@@ -112,10 +112,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
-export ICU_TARBALL := icu4c-69_1-src.tgz
-export ICU_DATA_SHA256SUM := 
4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf
-export ICU_DATA_TARBALL := icu4c-69_1-data.zip
+export ICU_SHA256SUM := 
8d205428c17bf13bb535300669ed28b338a157b1c01ae66d31d0d3e2d47c3fd5
+export ICU_TARBALL := icu4c-70_1-src.tgz
+export ICU_DATA_SHA256SUM := 
c72723ddba3300ffb231d6b09e2a728ea6e89de10ed5927f74bacbd77042336e
+export ICU_DATA_TARBALL := icu4c-70_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index b47d519b1ae2..c0ffe47dad3e 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-clang-cl.patch.1 \
external/icu/gcc9.patch \
-   external/icu/c++20-comparison.patch \
+   external/icu/c++20-comparison.patch.1 \
external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
external/icu/strict_ansi.patch \
@@ -42,7 +42,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
-   external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/c++20-comparison.patch 
b/external/icu/c++20-comparison.patch
deleted file mode 100644
index 44053e6719ca..
--- a/external/icu/c++20-comparison.patch
+++ /dev/null
@@ -1,171 +0,0 @@
 source/common/uvector.cpp
-+++

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa

2021-08-23 Thread David Tardon (via logerrit)

 configure.ac|2 +-
 download.lst|4 ++--
 external/libmwaw/Library_mwaw.mk|2 ++
 solenv/flatpak-manifest.in  |6 
+++---
 writerperfect/qa/unit/WpftWriterFilterTest.cxx  |2 ++
 writerperfect/qa/unit/data/writer/libmwaw/pass/StudentWritingCenter |binary
 writerperfect/qa/unit/data/writer/libmwaw/pass/WordMaker|binary
 7 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 65d717368cb3ada843421700aadc00a1b71598c5
Author: David Tardon 
AuthorDate: Tue Aug 17 20:13:50 2021 +0200
Commit: David Tardon 
CommitDate: Tue Aug 24 07:10:00 2021 +0200

upload libmwaw 0.3.20

Change-Id: Ia73117e06f843bcdd228da018fe3f34af6405653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120621
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index ac226fd46ace..6be3e031c348 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9335,7 +9335,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.20])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
diff --git a/download.lst b/download.lst
index cfeb4bd27fed..8c3f9a41fd1f 100644
--- a/download.lst
+++ b/download.lst
@@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af
-export MWAW_VERSION_MICRO := 19
+export MWAW_SHA256SUM := 
14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21
+export MWAW_VERSION_MICRO := 20
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 6fdcded16190..2f27a6113485 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -201,11 +201,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTimeStruct \
UnpackedTarball/libmwaw/src/lib/RagTimeText \
+   UnpackedTarball/libmwaw/src/lib/StudentWritingCParser \
UnpackedTarball/libmwaw/src/lib/StyleParser \
UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
UnpackedTarball/libmwaw/src/lib/WingzGraph \
UnpackedTarball/libmwaw/src/lib/WingzParser \
+   UnpackedTarball/libmwaw/src/lib/WordMakerParser \
UnpackedTarball/libmwaw/src/lib/WriteNowEntry \
UnpackedTarball/libmwaw/src/lib/WriteNowParser \
UnpackedTarball/libmwaw/src/lib/WriteNowText \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index dd2fe0e7c0f6..6f623a7ce3c5 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -306,11 +306,11 @@
 "dest-filename": "libmspub-0.1.4.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz;,
-"sha256": 
"b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af",
+"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.20.tar.xz;,
+"sha256": 
"14c38b06214f277ccd1450e22e6e32648955018d7695896bc560165748c8cd21",
 "type": "file",
 "dest": "external/tarballs",
-"dest-filename": "libmwaw-0.3.19.tar.xz"
+"dest-filename": "libmwaw-0.3.20.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz;,
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx 
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index d0a4ae68cdcf..543146169253 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -44,6 +44,8 @@ void WpftWriterFilterTest::test()
 { "RagTime_2.1.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "RagTime_3.2.hqx", REQUIRE_MWAW_VERSION(0, 3, 2) },
 { "RagTime_5.5.rag",

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

2021-06-25 Thread Jan-Marek Glogowski (via logerrit)

 configure.ac  |2 +-
 download.lst  |4 ++--
 external/python3/macos-11.patch.0 |   36 
 3 files changed, 3 insertions(+), 39 deletions(-)

New commits:
commit c22fc8e1f60bb98a87d22e7ff9bd3290dbb9fe02
Author: Jan-Marek Glogowski 
AuthorDate: Thu Jun 24 08:26:33 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Jun 25 10:59:47 2021 +0200

python3: update to 3.8.10

So we don't build 3.8.8rc1 anymore. I didn't look into 3.9.

Change-Id: Ife7d898c913b9b164168b0ef23a055deea55815f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117757
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/configure.ac b/configure.ac
index f2053c85f503..7a9eaf39b24b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9734,7 +9734,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.8
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 503c666b1ce6..05b5b8b8e8fc 100644
--- a/download.lst
+++ b/download.lst
@@ -220,8 +220,8 @@ export POPPLER_DATA_SHA256SUM := 
6e2fcef66ec8c44625f94292ccf8af9f1d918b410d5aa69
 export POPPLER_DATA_TARBALL := poppler-data-0.4.10.tar.gz
 export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
 export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
-export PYTHON_SHA256SUM := 
bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d78e6ed1df3d767b6
-export PYTHON_TARBALL := Python-3.8.8rc1.tar.xz
+export PYTHON_SHA256SUM := 
6af24a66093dd840bcccf371d4044a3027e655cf24591ce26e48022bc79219d9
+export PYTHON_TARBALL := Python-3.8.10.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/macos-11.patch.0 
b/external/python3/macos-11.patch.0
index 3c42d515f6bd..e2f13ac4c426 100644
--- a/external/python3/macos-11.patch.0
+++ b/external/python3/macos-11.patch.0
@@ -1,27 +1,3 @@
--*- Mode: diff -*-
 configure
-+++ configure
-@@ -9372,6 +9275,9 @@
-   esac
- else
-   case `/usr/bin/arch` in
-+  arm64)
-+  MACOSX_DEFAULT_ARCH="arm64"
-+  ;;
-   i386)
-   MACOSX_DEFAULT_ARCH="x86_64"
-   ;;
 Mac/Tools/pythonw.c
-+++ Mac/Tools/pythonw.c
-@@ -121,6 +121,8 @@
- cpu_types[0] = CPU_TYPE_POWERPC;
- #elif defined(__i386__)
- cpu_types[0] = CPU_TYPE_X86;
-+#elif defined(__arm64__)
-+cpu_types[0] = CPU_TYPE_ARM64;
- #else
- #   error "Unknown CPU"
- #endif
 --- setup.py
 +++ setup.py
 @@ -670,7 +670,10 @@
@@ -36,18 +12,6 @@
  system_include_dirs = ['/usr/include']
  # lib_dirs and inc_dirs are used to search for files;
  # if a file is found in one of those directories, it can
 Modules/_decimal/libmpdec/mpdecimal.h
-+++ Modules/_decimal/libmpdec/mpdecimal.h
-@@ -135,6 +135,9 @@
-   #elif defined(__x86_64__)
- #define CONFIG_64
- #define ASM
-+  #elif defined(__arm64__)
-+#define CONFIG_64
-+#define ANSI
-   #else
- #error "unknown architecture for universal build."
-   #endif
 --- Modules/_posixsubprocess.c
 +++ Modules/_posixsubprocess.c
 @@ -31,6 +31,8 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/libetonyek solenv/flatpak-manifest.in

2021-05-20 Thread David Tardon (via logerrit)

 configure.ac   
 |2 
 download.lst   
 |4 
 external/libetonyek/0001-add-missing-include-for-std-for_each.patch
 |   33 -
 external/libetonyek/0001-fix-build-with-MSVC.patch.1   
 |   28 
 external/libetonyek/0002-fix-build-with-MSVC.patch.1   
 |   55 
 external/libetonyek/Library_etonyek.mk 
 |1 
 external/libetonyek/UnpackedTarball_libetonyek.mk  
 |4 
 
external/libetonyek/glm-force-dmat3-initialization-needed-from-v0.9.9.0.patch.1 
|   62 --
 solenv/flatpak-manifest.in 
 |6 
 9 files changed, 92 insertions(+), 103 deletions(-)

New commits:
commit 5471dc3238e8005fa146cfa0a81c5784ea018e95
Author: David Tardon 
AuthorDate: Tue May 18 20:18:42 2021 +0200
Commit: David Tardon 
CommitDate: Thu May 20 08:46:37 2021 +0200

upload libetonyek 0.1.10

Change-Id: Iad586802e89b19701a20bebff06b238b617af2a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115769
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 3d14c5e4258c..faa4d810e8da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9237,7 +9237,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 
0.3.1])
 libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
 
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
 
diff --git a/download.lst b/download.lst
index e43c9cfe86e8..0da12b5b88cf 100644
--- a/download.lst
+++ b/download.lst
@@ -47,8 +47,8 @@ export EPM_SHA256SUM := 
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
 export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
-export ETONYEK_SHA256SUM := 
e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
-export ETONYEK_VERSION_MICRO := 9
+export ETONYEK_SHA256SUM := 
b430435a6e8487888b761dc848b7981626eb814884963ffe25eb26a139301e9a
+export ETONYEK_VERSION_MICRO := 10
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 export EXPAT_SHA256SUM := 
9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102
 export EXPAT_TARBALL := expat-2.2.8.tar.bz2
diff --git 
a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch 
b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
deleted file mode 100644
index 09aaba58b7e3..
--- a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001
-From: Roland Illig 
-Date: Tue, 19 May 2020 08:43:39 +0200
-Subject: [PATCH] add missing include for std::for_each
-
-On NetBSD 8.0 x86_64, gcc complains:
- NUM3Parser.cpp: In member function 'virtual bool 
libetonyek::NUM3Parser::parseDocument()':
- NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std'
-   std::for_each(sheetListRefs.begin(), sheetListRefs.end(), 
std::bind(::parseSheet, this, std::placeholders::_1));
-
-Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65
-Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450
-Tested-by: Thorsten Behrens 
-Reviewed-by: Thorsten Behrens 

- src/lib/NUM3Parser.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git src/lib/NUM3Parser.cpp src/lib/NUM3Parser.cpp
-index 66fb195..c19b611 100644
 src/lib/NUM3Parser.cpp
-+++ src/lib/NUM3Parser.cpp
-@@ -7,6 +7,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  */
- 
-+#include 
- #include 
- 
- #include "NUM3Parser.h"
--- 
-2.28.0
-
diff --git a/external/libetonyek/0001-fix-build-with-MSVC.patch.1 
b/external/libetonyek/0001-fix-build-with-MSVC.patch.1
new file mode 100644
index ..2a72844dc79a
--- /dev/null
+++ b/external/libetonyek/0001-fix-build-with-MSVC.patch.1
@@ -0,0 +1,28 @@
+From 1aa22c746b41a688296f4daf4fc35710d2045a33 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 19 May 2021 19:43:43 +0200
+Subject: [PATCH] fix build with MSVC
+
+error C2664: 'libetonyek::IWORKFormula::IWORKFormula(const 
boost::optional &)': cannot convert argument 1 from 'int' to 
'const boost::optional &'
+
+Change-Id: Iaa3de2d0ef8f960495e5d5afebb75c5063955177
+---
+ src/lib/IWAParser.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
+index 7fd95c3..a2bd292 100644
+--- a/src/lib/IWAParser.cpp
 b/src/lib/IWAParser.cpp
+@@ -3403,7

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2021-05-12 Thread Eike Rathke (via logerrit)

 configure.ac|2 -
 download.lst|8 ++---
 external/icu/UnpackedTarball_icu.mk |4 +-
 external/icu/icu4c-khmerbreakengine.patch.1 |   28 
 external/icu/ubsan.patch.1  |   38 
 5 files changed, 19 insertions(+), 61 deletions(-)

New commits:
commit c2a3a1f1ad3b48b294203da6b4aff125d2cee229
Author: Eike Rathke 
AuthorDate: Tue May 11 23:34:24 2021 +0200
Commit: Eike Rathke 
CommitDate: Wed May 12 15:27:04 2021 +0200

Update to ICU 69.1

Change-Id: I32836175a877349777dcbb6eb7b0d813aa31199a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115479
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 34e8d0535d65..1c54aeac5d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10403,7 +10403,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=68
+ICU_MAJOR=69
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index c0940921376e..e43c9cfe86e8 100644
--- a/download.lst
+++ b/download.lst
@@ -112,10 +112,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d
-export ICU_TARBALL := icu4c-68_1-src.tgz
-export ICU_DATA_SHA256SUM := 
03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510
-export ICU_DATA_TARBALL := icu4c-68_1-data.zip
+export ICU_SHA256SUM := 
4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
+export ICU_TARBALL := icu4c-69_1-src.tgz
+export ICU_DATA_SHA256SUM := 
4fc2d8cfc3343673123586fca3967404abd4e346fba5515829204533b3bae4bf
+export ICU_DATA_TARBALL := icu4c-69_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index a59d6e8b97d7..2e455a7dcc24 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/c++20-comparison.patch \
external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
-   external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/strict_ansi.patch \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
+   external/icu/icu4c-emscripten-cross.patch.1 \
+   external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
-   external/icu/icu4c-emscripten-cross.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-khmerbreakengine.patch.1 
b/external/icu/icu4c-khmerbreakengine.patch.1
index 272d0b8ab204..0ce46ac473ec 100644
--- a/external/icu/icu4c-khmerbreakengine.patch.1
+++ b/external/icu/icu4c-khmerbreakengine.patch.1
@@ -1,6 +1,6 @@
 diff -ur icu.org/source/common/dictbe.cpp icu/source/common/dictbe.cpp
 icu.org/source/common/dictbe.cpp   2020-04-22 22:04:20.0 +0200
-+++ icu/source/common/dictbe.cpp   2020-05-11 18:55:07.702282061 +0200
+--- icu.org/source/common/dictbe.cpp   2021-04-08 02:10:27.0 +0200
 icu/source/common/dictbe.cpp   2021-05-11 22:41:25.504455054 +0200
 @@ -32,7 +32,19 @@
   **
   */
@@ -216,7 +216,7 @@ diff -ur icu.org/source/common/dictbe.cpp 
icu/source/common/dictbe.cpp
  // Dictionary leaves text after longest prefix, not longest word. 
Back up.
  if (count <= 0) {
  utext_setNativeIndex(text, start);
-@@ -815,53 +990,30 @@
+@@ -803,53 +978,30 @@
   * KhmerBreakEngine
   */
  
@@ -282,7 +282,7 @@ diff -ur icu.org/source/common/dictbe.cpp 
icu/source/common/dictbe.cpp
  UTRACE_EXIT_STATUS(status);
  }
  
-@@ -874,180 +1026,204 @@
+@@ -862,176 +1014,204 @@
  int32_t rangeStart,
  int32_t rangeEnd,
  UVector32  ) 
const {
@@ -357,13 +357,9 @@ diff -ur icu.org/source/common/dictbe.cpp 
icu/source/common/dictbe.cpp
 -

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in

2021-05-10 Thread David Tardon (via logerrit)

 configure.ac|2 -
 download.lst|4 +--
 external/libmwaw/0001-drop-unneeded-include.patch.1 |   25 
 external/libmwaw/Library_mwaw.mk|2 +
 external/libmwaw/UnpackedTarball_libmwaw.mk |4 ---
 solenv/flatpak-manifest.in  |6 ++--
 6 files changed, 8 insertions(+), 35 deletions(-)

New commits:
commit 158737c2aa29904b726829399f9f5b24345dd013
Author: David Tardon 
AuthorDate: Mon May 10 19:16:20 2021 +0200
Commit: David Tardon 
CommitDate: Mon May 10 20:19:45 2021 +0200

upload libmwaw 0.3.19

Change-Id: Ibb26390e6cc13c925f499bf95cfc6177d8c9b735
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115355
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index f40314d09853..34e8d0535d65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9235,7 +9235,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.18])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 974b54cb67ed..df523338840d 100644
--- a/download.lst
+++ b/download.lst
@@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f
-export MWAW_VERSION_MICRO := 18
+export MWAW_SHA256SUM := 
b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af
+export MWAW_VERSION_MICRO := 19
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-drop-unneeded-include.patch.1 
b/external/libmwaw/0001-drop-unneeded-include.patch.1
deleted file mode 100644
index 505f38daf80a..
--- a/external/libmwaw/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From db0450c5bacdf0f3970a8838ff989b7e5390 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 8 Apr 2021 23:07:13 +0200
-Subject: [PATCH] drop unneeded include
-

- src/lib/Canvas5StyleManager.cxx | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/lib/Canvas5StyleManager.cxx b/src/lib/Canvas5StyleManager.cxx
-index 7cb368f0..f6b3338a 100644
 a/src/lib/Canvas5StyleManager.cxx
-+++ b/src/lib/Canvas5StyleManager.cxx
-@@ -31,8 +31,6 @@
- * instead of those above.
- */
- 
--#include 
--
- #include 
- #include 
- #include 
--- 
-2.30.2
-
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index d92a1b729b81..6fdcded16190 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -41,7 +41,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \
UnpackedTarball/libmwaw/src/lib/BeagleWksText \
+   UnpackedTarball/libmwaw/src/lib/Canvas5BMParser \
UnpackedTarball/libmwaw/src/lib/Canvas5Graph \
+   UnpackedTarball/libmwaw/src/lib/Canvas5Image \
UnpackedTarball/libmwaw/src/lib/Canvas5Parser \
UnpackedTarball/libmwaw/src/lib/Canvas5Structure \
UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index e15768e91623..935cbc1eb1c3 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
-   external/libmwaw/0001-drop-unneeded-include.patch.1 \
-))
-
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 734e72c5dfc6..032806239230 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -273,10 +273,10 @@
 "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.18.tar.xz;,
-

[Libreoffice-commits] core.git: configure.ac download.lst external/serf RepositoryExternal.mk

2021-04-14 Thread Luboš Luňák (via logerrit)

 RepositoryExternal.mk |   27 +--
 configure.ac  |8 
 download.lst  |4 +-
 external/serf/ExternalProject_serf.mk |   52 --
 external/serf/Module_serf.mk  |2 -
 external/serf/StaticLibrary_serf.mk   |   58 ++
 external/serf/UnpackedTarball_serf.mk |5 --
 external/serf/windows.build.patch.1   |   29 -
 8 files changed, 85 insertions(+), 100 deletions(-)

New commits:
commit af6674ce681b8427d0171a88f212a7034334c9e1
Author: Luboš Luňák 
AuthorDate: Wed Apr 14 20:37:13 2021 +0200
Commit: Andras Timar 
CommitDate: Wed Apr 14 23:59:04 2021 +0200

update serf to 1.3.9

Its build system has switches to scons, so build the library
using gbuild.

Change-Id: I45b784e65e4987c25baf3fa1477816c744663bf0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114107
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e30fe9a1bb57..7b49abb2757d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1107,21 +1107,40 @@ endif
 
 endef
 
+ifneq ($(SYSTEM_SERF),)
+
 define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_add_defs,$(1),\
+   $(filter-out -I% -isystem%,$(subst -isystem 
/,-isystem/,$(SERF_CFLAGS))) \
+)
+
 $(call gb_LinkTarget_set_include,$(1),\
-   $(SERF_CFLAGS) \
+   $(subst -isystem/,-isystem /,$(filter -I% -isystem%,$(subst -isystem 
/,-isystem/,$(SERF_CFLAGS \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
$(SERF_LIBS) \
 )
 
-ifeq ($(SYSTEM_SERF),)
-$(call gb_LinkTarget_use_external_project,$(1),serf)
-endif
+endef
+
+else # !SYSTEM_SERF
+
+define gb_LinkTarget__use_serf
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,serf) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   serf \
+)
 
 endef
 
+endif # SYSTEM_SERF
+
 else ifeq ($(WITH_WEBDAV),neon)
 
 ifneq ($(SYSTEM_NEON),)
diff --git a/configure.ac b/configure.ac
index 3a4d0eb795ce..bf93113fabdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10607,13 +10607,7 @@ serf)
 fi
 
 # Check for system serf
-libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 
1.1.0],["-I${WORKDIR}/UnpackedTarball/serf"],
- ["-L${WORKDIR}/UnpackedTarball/serf/.libs 
-lserf-1"])
-if test "$COM" = "MSC"; then
-SERF_LIB_DIR="Release"
-test -n "${MSVC_USE_DEBUG_RUNTIME}" && SERF_LIB_DIR="Debug"
-SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib"
-fi
+libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 1.3.9])
 ;;
 neon)
 AC_MSG_RESULT([neon])
diff --git a/download.lst b/download.lst
index cf97f1ff8d3c..6f38dd67f360 100644
--- a/download.lst
+++ b/download.lst
@@ -233,8 +233,8 @@ export REVENGE_VERSION_MICRO := 4
 export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
-export SERF_TARBALL := serf-1.2.1.tar.bz2
+export SERF_SHA256SUM := 
549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
+export SERF_TARBALL := serf-1.3.9.tar.bz2
 export SKIA_SHA256SUM := 
abe0b94d54edb717c58d74263f4ed3d27824d2ce9e9f2ce85a21ab38d993f94d
 export SKIA_TARBALL := skia-m90-45c57e116ee0ce214bdf78405a4762722e4507d9.tar.xz
 export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
diff --git a/external/serf/ExternalProject_serf.mk 
b/external/serf/ExternalProject_serf.mk
deleted file mode 100644
index 043045654956..
--- a/external/serf/ExternalProject_serf.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,serf))
-
-$(eval $(call gb_ExternalProject_use_externals,serf,\
-   apr \
-))
-
-$(eval $(call gb_ExternalProject_register_targets,serf,\
-   build \
-))
-
-$(eval $(call gb_ExternalProject_use_nmake,serf,build))
-
-ifeq ($(COM),MSC)
-$(call gb_ExternalProject_get_state_target,serf,build):
-   $(call gb_Trace_StartRange,serf,EXTERNAL)
-   $(call gb_ExternalProject_run,build,\
-   APR_SRC="..\apr" \
-   APRUTIL_SRC="..\apr_util" \
-   OPENSSL_SRC="..\openssl" \
-   ZLIB_SRC="..\zlib" \
-   nmake -nologo -f serf.mak \
-   $(if

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in

2021-04-08 Thread David Tardon (via logerrit)

 configure.ac|2 -
 download.lst|4 +--
 external/libmwaw/0001-drop-unneeded-include.patch.1 |   25 
 external/libmwaw/Library_mwaw.mk|4 +++
 external/libmwaw/UnpackedTarball_libmwaw.mk |4 +++
 solenv/flatpak-manifest.in  |6 ++--
 6 files changed, 39 insertions(+), 6 deletions(-)

New commits:
commit 5e27230f45c7ecf32a98076302179d96f4f65219
Author: David Tardon 
AuthorDate: Thu Apr 8 20:32:19 2021 +0200
Commit: David Tardon 
CommitDate: Fri Apr 9 07:58:09 2021 +0200

upload libmwaw 0.3.18

Change-Id: I6ffa01f092455f79bb3690875e1b286ae2298832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113819
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 3df488a662c2..3a03dd38290f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9116,7 +9116,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.17])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.18])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 3c3462552d74..45fdc3a0e5ff 100644
--- a/download.lst
+++ b/download.lst
@@ -186,8 +186,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c
-export MWAW_VERSION_MICRO := 17
+export MWAW_SHA256SUM := 
fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f
+export MWAW_VERSION_MICRO := 18
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-drop-unneeded-include.patch.1 
b/external/libmwaw/0001-drop-unneeded-include.patch.1
new file mode 100644
index ..505f38daf80a
--- /dev/null
+++ b/external/libmwaw/0001-drop-unneeded-include.patch.1
@@ -0,0 +1,25 @@
+From db0450c5bacdf0f3970a8838ff989b7e5390 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Thu, 8 Apr 2021 23:07:13 +0200
+Subject: [PATCH] drop unneeded include
+
+---
+ src/lib/Canvas5StyleManager.cxx | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/lib/Canvas5StyleManager.cxx b/src/lib/Canvas5StyleManager.cxx
+index 7cb368f0..f6b3338a 100644
+--- a/src/lib/Canvas5StyleManager.cxx
 b/src/lib/Canvas5StyleManager.cxx
+@@ -31,8 +31,6 @@
+ * instead of those above.
+ */
+ 
+-#include 
+-
+ #include 
+ #include 
+ #include 
+-- 
+2.30.2
+
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index bb1a880fd9ce..d92a1b729b81 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -41,6 +41,10 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \
UnpackedTarball/libmwaw/src/lib/BeagleWksText \
+   UnpackedTarball/libmwaw/src/lib/Canvas5Graph \
+   UnpackedTarball/libmwaw/src/lib/Canvas5Parser \
+   UnpackedTarball/libmwaw/src/lib/Canvas5Structure \
+   UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \
UnpackedTarball/libmwaw/src/lib/CanvasGraph \
UnpackedTarball/libmwaw/src/lib/CanvasParser \
UnpackedTarball/libmwaw/src/lib/CanvasStyleManager \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index 935cbc1eb1c3..e15768e91623 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
+   external/libmwaw/0001-drop-unneeded-include.patch.1 \
+))
+
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 152c3775828f..7904d7fe15ad 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -273,10 +273,10 @@
 "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
 },
 {
-"url":

[Libreoffice-commits] core.git: configure.ac download.lst external/neon solenv/flatpak-manifest.in solenv/README.md

2021-04-02 Thread Jan-Marek Glogowski (via logerrit)

 configure.ac   |4 ++--
 download.lst   |4 ++--
 external/neon/configs/config.h |   10 +-
 solenv/README.md   |7 +++
 solenv/flatpak-manifest.in |6 +++---
 5 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit c974b23ff78dbe11a7b23f7317fdd096ab8cb282
Author: Jan-Marek Glogowski 
AuthorDate: Fri Apr 2 02:20:57 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Apr 2 19:35:07 2021 +0200

tdf#140229 neon: update to release 0.31.2

I didn't check all commits, but the most likely fix was "Fix hang
on SSL connection close with IIS (issue #11)". The server from
this bug report is a "Microsoft-IIS/10.0", according to the output
from "curl --dump-header".

Not sure this bug is critical enough to bump the neon dependency
in configure.

Change-Id: I3e20bad1aa732641e6f8a83316e58fc7513186c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113495
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/configure.ac b/configure.ac
index 92aa16f13ef3..d8d336860b29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10607,11 +10607,11 @@ serf)
 neon)
 AC_MSG_RESULT([neon])
 # Check for system neon
-libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.1])
+libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.31.2])
 if test "$with_system_neon" = "yes"; then
 NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
 else
-NEON_VERSION=0311
+NEON_VERSION=0312
 fi
 AC_SUBST(NEON_VERSION)
 ;;
diff --git a/download.lst b/download.lst
index adf73ca23d30..3c3462552d74 100644
--- a/download.lst
+++ b/download.lst
@@ -191,8 +191,8 @@ export MWAW_VERSION_MICRO := 17
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
-export NEON_SHA256SUM := 
c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d
-export NEON_TARBALL := neon-0.31.1.tar.gz
+export NEON_SHA256SUM := 
cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678
+export NEON_TARBALL := neon-0.31.2.tar.gz
 export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
 export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 
55200027fd46623b9b38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h
index 3f93d1e68132..af8408ad9ad3 100644
--- a/external/neon/configs/config.h
+++ b/external/neon/configs/config.h
@@ -1,4 +1,4 @@
-/* Contents kept in sync with config.h.in from neon 0.31.1 */
+/* Contents kept in sync with config.h.in from neon 0.31.2 */
 
 /* Define if building universal (internal helper macro) */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -370,7 +370,7 @@
 #define NEON_IS_LIBRARY 1
 
 /* Define to be the neon version string */
-#define NEON_VERSION "0.31.1"
+#define NEON_VERSION "0.31.2"
 
 /* Define to enable debugging */
 /* #undef NE_DEBUGGING */
@@ -435,7 +435,7 @@
 #define NE_VERSION_MINOR (31)
 
 /* Define to be neon library patch version */
-#define NE_VERSION_PATCH (1)
+#define NE_VERSION_PATCH (2)
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "n...@webdav.org"
@@ -444,13 +444,13 @@
 #define PACKAGE_NAME "neon"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "neon 0.31.1"
+#define PACKAGE_STRING "neon 0.31.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "neon"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.31.1"
+#define PACKAGE_VERSION "0.31.2"
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
diff --git a/solenv/README.md b/solenv/README.md
index 68e58e8bc774..b5a730746674 100644
--- a/solenv/README.md
+++ b/solenv/README.md
@@ -32,3 +32,10 @@ src/
 useful standard / re-usable component map files for components
 which shouldn't export anything more than a few registration
 symbols.
+
+flatpak-manifest.in
+This file is used by flatpak/build.sh from the LO dev-tools
+repository to generate the flatpak package. download.lst is
+a Makefile snippet, so there seems to be no easy way to use
+download.lst for the manifest generation (build.sh uses sed),
+and its information must be kept in sync manually.
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c86fc663388f..152c3775828f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -357,10 +357,10 @@
 "dest-filename": "external/tarballs/mdds-1.7.0.tar.bz2"
 },
 {
-"url":

[Libreoffice-commits] core.git: configure.ac download.lst

2021-02-19 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a0c8dc42335764d07c16a017c6b00486ec17ae53
Author: Michael Stahl 
AuthorDate: Fri Feb 19 11:53:27 2021 +0100
Commit: Michael Stahl 
CommitDate: Fri Feb 19 15:02:20 2021 +0100

python3: upgrade to release 3.8.8rc1

Fixes CVE-2021-3177 plus these less important ones:
CVE-2021-23336 CVE-2020-27619 CVE-2020-26116 CVE-2019-20907

Change-Id: Idbe072a9db1faf8363b4f7795b9fde71c26969f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111208
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 368ef699159b..9e0085370d2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9494,7 +9494,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.8
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 57325a8d30c2..cdc3bb3a2e99 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ export POPPLER_SHA256SUM := 
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f
 export POPPLER_TARBALL := poppler-21.01.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
 export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
-export PYTHON_SHA256SUM := 
5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37
-export PYTHON_TARBALL := Python-3.8.4.tar.xz
+export PYTHON_SHA256SUM := 
bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d78e6ed1df3d767b6
+export PYTHON_TARBALL := Python-3.8.8rc1.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
 export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/icu external/libcdr external/libebook

2020-11-17 Thread Eike Rathke (via logerrit)

 configure.ac  |2 -
 download.lst  |8 ++--
 external/icu/UnpackedTarball_icu.mk   |7 +--
 external/icu/icu4c-link-scrptrun.patch.2  |   43 --
 external/icu/icu4c-mkdir.patch.1  |   20 ++
 external/icu/icu4c-warnings.patch.1   |8 ++--
 external/icu/ubsan.patch.1|   27 +
 external/libcdr/UnpackedTarball_libcdr.mk |1 
 external/libcdr/libcdr-no-icu-boolean.patch.1 |   12 ++
 external/libebook/UnpackedTarball_libebook.mk |4 ++
 external/libebook/libebook-no-icu-boolean.patch.1 |   12 ++
 11 files changed, 57 insertions(+), 87 deletions(-)

New commits:
commit 8335c8c20765d4f167d9b48e6a2757864a3bc7fd
Author: Eike Rathke 
AuthorDate: Mon Nov 16 23:26:56 2020 +0100
Commit: Eike Rathke 
CommitDate: Tue Nov 17 16:33:33 2020 +0100

Update to ICU 68.1

Also made it necessary to adapt two places in libcdr and libebook
that used UBool TRUE which is gone now to use standard true
instead.

Change-Id: I1c1df3030f8b883bec6045756907ee0b78060382
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105964
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index 0b382e8f5bf2..8f104514ec19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10245,7 +10245,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=67
+ICU_MAJOR=68
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 759dfc6650dc..1c932acc04f8 100644
--- a/download.lst
+++ b/download.lst
@@ -114,10 +114,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
-export ICU_TARBALL := icu4c-67_1-src.tgz
-export ICU_DATA_SHA256SUM := 
7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e
-export ICU_DATA_TARBALL := icu4c-67_1-data.zip
+export ICU_SHA256SUM := 
a9f2e3d8b4434b8e53878b4308bd1e6ee51c9c7042e2b1a376abefb6fbb29f2d
+export ICU_TARBALL := icu4c-68_1-src.tgz
+export ICU_DATA_SHA256SUM := 
03ea8b4694155620548c8c0ba20444f1e7db246cc79e3b9c4fc7a960b160d510
+export ICU_DATA_TARBALL := icu4c-68_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 002b7d28cab5..435382fa7988 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -28,20 +28,19 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-macosx.patch.1 \
external/icu/icu4c-solarisgcc.patch.1 \
external/icu/icu4c-mkdir.patch.1 \
-   external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
external/icu/icu4c-ubsan.patch.1 \
external/icu/icu4c-scriptrun.patch.1 \
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-clang-cl.patch.1 \
-   $(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/gcc9.patch \
external/icu/c++20-comparison.patch \
-   external/icu/ubsan.patch \
+   external/icu/ubsan.patch.1 \
external/icu/Wdeprecated-copy-dtor.patch \
external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/strict_ansi.patch \
-   external/icu/icu4c-link-scrptrun.patch.2 \
external/icu/icu4c-windows-cygwin-cross.patch.1 \
+   external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch.1 \
+   $(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-link-scrptrun.patch.2 
b/external/icu/icu4c-link-scrptrun.patch.2
deleted file mode 100644
index 8c94361a163c..
--- a/external/icu/icu4c-link-scrptrun.patch.2
+++ /dev/null
@@ -1,43 +0,0 @@
-Based on: 
https://github.com/unicode-org/icu/commit/e3f2c0dd70018d924bf22a9b3f0cbf387316b50b.patch
-
-From e3f2c0dd70018d924bf22a9b3f0cbf387316b50b Mon Sep 17 00:00:00 2001
-From: Paul Smith 
-Date: Wed, 5 Aug 2020 13:18:30 -0400
-Subject: [PATCH] ICU-21217 Windows: Fix link command for extra/scrptrun
-

-

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa

2020-09-28 Thread David Tardon (via logerrit)

 configure.ac|2 
 download.lst|4 
 external/libmwaw/Library_mwaw.mk|6 
 solenv/flatpak-manifest.in  |6 
 writerperfect/qa/unit/WpftCalcFilterTest.cxx|1 
 writerperfect/qa/unit/WpftDrawFilterTest.cxx|2 
 writerperfect/qa/unit/WpftWriterFilterTest.cxx  |1 
 writerperfect/qa/unit/data/calc/libmwaw/pass/JazzLotus.hqx  |   39 
 writerperfect/qa/unit/data/draw/libmwaw/pass/Canvas_2.hqx   |  407 
++
 writerperfect/qa/unit/data/draw/libmwaw/pass/DrawingTable_1.hqx |  196 
 writerperfect/qa/unit/data/writer/libmwaw/pass/JazzLotus.hqx|   40 
 11 files changed, 698 insertions(+), 6 deletions(-)

New commits:
commit 050e95e50d44a5cbb74bb5de481cb30551f83136
Author: David Tardon 
AuthorDate: Sun Sep 27 19:07:48 2020 +0200
Commit: David Tardon 
CommitDate: Mon Sep 28 08:58:06 2020 +0200

upload libmwaw 0.3.17

Change-Id: I24c6c5a5d93a76a9fcc2213cd48beb8e5a5ca479
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103519
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 0db50672d5fa..7aeb5ef1588e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8846,7 +8846,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.17])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 560e004ed80c..a4782bb2b9ef 100644
--- a/download.lst
+++ b/download.lst
@@ -186,8 +186,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
-export MWAW_VERSION_MICRO := 16
+export MWAW_SHA256SUM := 
8e1537eb1de1b4714f4bf0a20478f342c5d71a65bf99307a694b1e9e30bb911c
+export MWAW_VERSION_MICRO := 17
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 880a70861e24..bb1a880fd9ce 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -41,6 +41,9 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \
UnpackedTarball/libmwaw/src/lib/BeagleWksText \
+   UnpackedTarball/libmwaw/src/lib/CanvasGraph \
+   UnpackedTarball/libmwaw/src/lib/CanvasParser \
+   UnpackedTarball/libmwaw/src/lib/CanvasStyleManager \
UnpackedTarball/libmwaw/src/lib/ClarisDrawGraph \
UnpackedTarball/libmwaw/src/lib/ClarisDrawParser \
UnpackedTarball/libmwaw/src/lib/ClarisDrawStyleManager \
@@ -63,6 +66,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/CricketDrawParser \
UnpackedTarball/libmwaw/src/lib/DocMkrParser \
UnpackedTarball/libmwaw/src/lib/DocMkrText \
+   UnpackedTarball/libmwaw/src/lib/DrawTableParser \
UnpackedTarball/libmwaw/src/lib/EDocParser \
UnpackedTarball/libmwaw/src/lib/FreeHandParser \
UnpackedTarball/libmwaw/src/lib/FullWrtGraph \
@@ -83,6 +87,8 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/HanMacWrdKGraph \
UnpackedTarball/libmwaw/src/lib/HanMacWrdKParser \
UnpackedTarball/libmwaw/src/lib/HanMacWrdKText \
+   UnpackedTarball/libmwaw/src/lib/JazzSSParser \
+   UnpackedTarball/libmwaw/src/lib/JazzWriterParser \
UnpackedTarball/libmwaw/src/lib/LightWayTxtGraph \
UnpackedTarball/libmwaw/src/lib/LightWayTxtParser \
UnpackedTarball/libmwaw/src/lib/LightWayTxtText \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index df77597b7158..9ac394f22049 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -273,10 +273,10 @@
 "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz;,
-

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in

2020-09-27 Thread David Tardon (via logerrit)

 configure.ac|2 +-
 download.lst|4 ++--
 external/libwps/Library_wps.mk  |1 +
 external/libwps/libtool.patch.0 |9 +
 solenv/flatpak-manifest.in  |6 +++---
 5 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 61b05af30133622cc67304c694edad31ebff446c
Author: David Tardon 
AuthorDate: Wed Sep 9 09:07:38 2020 +0200
Commit: David Tardon 
CommitDate: Sun Sep 27 19:02:07 2020 +0200

upload libwps 0.4.12

Change-Id: Ib787098b98f68185c1b3f6b414efbec36cad02dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102332
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 1ea6b255bb23..0db50672d5fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8837,7 +8837,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.11])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 659879a530a3..560e004ed80c 100644
--- a/download.lst
+++ b/download.lst
@@ -260,8 +260,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 
99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
 export WPG_VERSION_MICRO := 3
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 
a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1
-export WPS_VERSION_MICRO := 11
+export WPS_SHA256SUM := 
e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb
+export WPS_VERSION_MICRO := 12
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 349bdbe83c43..8986ae6e6288 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/LotusStyleManager \
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Multiplan \
+   UnpackedTarball/libwps/src/lib/PocketWord \
UnpackedTarball/libwps/src/lib/Quattro \
UnpackedTarball/libwps/src/lib/Quattro9 \
UnpackedTarball/libwps/src/lib/Quattro9Graph \
diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0
index f2e10ac3822f..cc4b08ba2147 100644
--- a/external/libwps/libtool.patch.0
+++ b/external/libwps/libtool.patch.0
@@ -1,11 +1,12 @@
 --- ltmain.sh.sav  2018-08-02 14:21:34.0 +0200
 +++ ltmain.sh  2019-05-05 22:04:15.433588776 +0200
-@@ -7277,7 +7277,7 @@ func_mode_link ()
+@@ -7277,7 +7277,8 @@ func_mode_link ()
+   # -stdlib=*select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \

-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-   
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
--  -fsanitize=*)
-+  -fsanitize=*|-fuse-ld=*|--ld-path=*)
+-  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++  
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++  -fuse-ld=*|--ld-path=*)
  func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
  func_append compile_command " $arg"
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 50cf723eb057..df77597b7158 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -327,10 +327,10 @@
 "dest-filename": "external/tarballs/libwpg-0.3.3.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libwps-0.4.11.tar.xz;,
-"sha256": 
"a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1",
+"url": 
"https://dev-www.libreoffice.org/src/libwps-0.4.12.tar.xz;,
+"sha256": 
"e21afb52a06d03b774c5a8c72679687ab64891b91ce0c3bdf2d3e97231534edb",
 "type": "file",
-"dest-filename": "external/tarballs/libwps-0.4.11.tar.xz"
+"dest-filename": "external/tarballs/libwps-0.4.12.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

2020-09-11 Thread Kohei Yoshida (via logerrit)

 RepositoryExternal.mk|4 
 configure.ac |2 
 download.lst |4 
 external/liborcus/0001-Mark-all-untentionally-unused-variables.patch |  376 
++
 external/liborcus/ExternalPackage_liborcus.mk|8 
 external/liborcus/ExternalProject_liborcus.mk|4 
 external/liborcus/Library_orcus-parser.mk|1 
 external/liborcus/Library_orcus.mk   |4 
 external/liborcus/UnpackedTarball_liborcus.mk|1 
 external/liborcus/libtool.patch.0|   10 
 external/liborcus/windows-constants-hack.patch   |2 
 sc/source/filter/inc/orcusinterface.hxx  |   21 
 sc/source/filter/orcus/interface.cxx |   82 +-
 sc/source/filter/orcus/xmlcontext.cxx|7 
 sc/source/ui/xmlsource/xmlsourcedlg.cxx  |6 
 15 files changed, 480 insertions(+), 52 deletions(-)

New commits:
commit 109ed8f775dddfede012d56d078abd70b45490c0
Author: Kohei Yoshida 
AuthorDate: Wed Sep 9 21:23:48 2020 -0400
Commit: Kohei Yoshida 
CommitDate: Sat Sep 12 05:49:10 2020 +0200

Upgrade liborcus to 0.16.0.

Change-Id: Iae29fb26417dfc161698a81bee84e81545969065
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102502
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d9fa980d7f24..1f0a91de142a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3270,7 +3270,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.15 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.16 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3289,7 +3289,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.15 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.16 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 8e8d5eb662d9..06398bfa99a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10126,7 +10126,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.16 >= 0.16.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index ee4ba8a1c83b..345ddd19537b 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
 export OPENSSL_TARBALL := openssl-1.1.1g.tar.gz
-export ORCUS_SHA256SUM := 
cfb2aa60825f2a78589ed030c07f46a1ee16ef8a2d1bf2279192fbc1ae5a5f61
-export ORCUS_TARBALL := liborcus-0.15.4.tar.bz2
+export ORCUS_SHA256SUM := 
854c6ec167ace59baa2984e175bac7b5b2af91bfde4bb10d2088b87a51ed76ec
+export ORCUS_TARBALL := liborcus-0.16.0.tar.bz2
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git 
a/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch 
b/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch
new file mode 100644
index ..b0f6a572aff7
--- /dev/null
+++ b/external/liborcus/0001-Mark-all-untentionally-unused-variables.patch
@@ -0,0 +1,376 @@
+From 6d34c41b661a9e8dddf6d08bf1f3c1fd4f5581da Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Fri, 11 Sep 2020 21:39:09 -0400
+Subject: [PATCH] Mark all untentionally unused variables.
+
+---
+ include/orcus/css_parser.hpp   | 70 --
+ include/orcus/csv_parser.hpp   |  5 ++-
+ include/orcus/json_parser.hpp  | 15 +--
+ include/orcus/sax_parser.hpp   | 35 ---
+ include/orcus/sax_token_parser.hpp | 20 +++--
+ include/orcus/yaml_parser.hpp  | 10 -
+ 6 files changed, 124 insertions(+), 31 deletions(-)
+
+diff --git a/include/orcus/css_parser.hpp

[Libreoffice-commits] core.git: configure.ac download.lst external/libffi external/openssl external/python3 RepositoryExternal.mk

2020-07-17 Thread Jan-Marek Glogowski (via logerrit)

 RepositoryExternal.mk  |2 
 configure.ac   |4 
 download.lst   |4 
 external/libffi/ExternalPackage_libffi.mk  |2 
 external/openssl/ExternalPackage_openssl.mk|8 
 external/python3/ExternalPackage_python3.mk|  278 ++---
 external/python3/ExternalProject_python3.mk|   24 +
 external/python3/UnpackedTarball_python3.mk|1 
 external/python3/internal-zlib.patch.0 |   16 -
 external/python3/python-3.3.0-clang.patch.1|   13 
 external/python3/python-3.3.0-darwin.patch.1   |   18 -
 external/python3/python-3.3.3-elf-rpath.patch.1|   12 
 external/python3/python-3.5.4-msvc-disable.patch.1 |4 
 13 files changed, 188 insertions(+), 198 deletions(-)

New commits:
commit b4dfba947768834ffecc09056992019878711c8b
Author: Jan-Marek Glogowski 
AuthorDate: Tue Jul 14 23:35:57 2020 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Fri Jul 17 10:15:06 2020 +0200

python3: update to 3.8.4

With all the prerequisites in place, LO can be updated to the
current Python release. Interestingly I found that Cygwin always
seems to use LC_COLLATE=C, probably because the default collation
rules are missing.

Then there are the changes introduced in "PEP 587 -- Python
Initialization Configuration", which appearingly have modified the
DLL search path behaviour on Windows, so the OpenSLL DLLs aren't
found anymore in the program directory. As a workaround, the
OpenSLL and libffi DLLs are now (also) installed into the Python
lib dir on Windows.

Change-Id: Ib82f7b77213da9c525f8c79a13d128d9eec9ca64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98437
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 28e009af194d..096fbea6bebf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3193,7 +3193,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
 else
 $(call gb_LinkTarget_add_libs,$(1),\
-L$(call gb_UnpackedTarball_get_dir,python3) \
-   -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \
+   -lpython$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \
 )
 endif
 
diff --git a/configure.ac b/configure.ac
index 9575faf112e2..7dae274f3e43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9045,8 +9045,8 @@ int main(int argc, char **argv) {
 internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
-PYTHON_VERSION_MINOR=7
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION_MINOR=8
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index a77fbff0f460..9023dbd208fc 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ export POPPLER_SHA256SUM := 
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1
 export POPPLER_TARBALL := poppler-0.82.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
-export PYTHON_SHA256SUM := 
06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
-export PYTHON_TARBALL := Python-3.7.7.tar.xz
+export PYTHON_SHA256SUM := 
5f41968a95afe9bc12192d7e6861aab31e80a46c46fa59d3d837def6a4cd4d37
+export PYTHON_TARBALL := Python-3.8.4.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
 export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git a/external/libffi/ExternalPackage_libffi.mk 
b/external/libffi/ExternalPackage_libffi.mk
index 212e63aa36af..61b0a1ca460c 100644
--- a/external/libffi/ExternalPackage_libffi.mk
+++ b/external/libffi/ExternalPackage_libffi.mk
@@ -12,7 +12,7 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,libffi,libffi))
 $(eval $(call gb_ExternalPackage_use_external_project,libffi,libffi))
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER),\
+$(eval $(call 
gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib,
 \
 $(HOST_PLATFORM)/.libs/libffi-7.dll \
 ))
 endif
diff --git a/external/openssl/ExternalPackage_openssl.mk 
b/external/openssl/ExternalPackage_openssl.mk
index de77f53f33b9..d0c0dbaab975 100644
--- a/external/openssl/ExternalPackage_openssl.mk
+++ b/external/openssl/ExternalPackage_openssl.mk
@@ -16,6 +16,14 @@ $(eval $(call 
gb_ExternalPackage_add_files,openssl,$(LIBO_LIB_FOLDER),\
 libcrypto-1_1.dll \
 libssl-1_1.dll \
 ))
+ifneq ($(DISABLE_PYTHON),TRUE)
+ifneq

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2020-05-11 Thread Eike Rathke (via logerrit)

 configure.ac  |2 
 download.lst  |8 
 external/icu/UnpackedTarball_icu.mk   |4 
 external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 |  118 
 external/icu/char8_t.patch|   19 
 external/icu/icu4c-khmerbreakengine.patch.1   |  269 --
 6 files changed, 30 insertions(+), 390 deletions(-)

New commits:
commit 8a31ac7264d7a11146d4a29034e97b564164f635
Author: Eike Rathke 
AuthorDate: Mon May 11 19:45:42 2020 +0200
Commit: Eike Rathke 
CommitDate: Mon May 11 21:19:11 2020 +0200

Upgrade to internal ICU 67

Change-Id: I9b8d5cb6d6f4610f2b20c0e0f49eb674d55ce3b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94009
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index c53f15b5e08e..06b0dd704f4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9703,7 +9703,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=65
+ICU_MAJOR=67
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index b7b3244b563e..7ad6e642c93e 100644
--- a/download.lst
+++ b/download.lst
@@ -112,10 +112,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948
-export ICU_TARBALL := icu4c-65_1-src.tgz
-export ICU_DATA_SHA256SUM := 
06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6
-export ICU_DATA_TARBALL := icu4c-65_1-data.zip
+export ICU_SHA256SUM := 
94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+export ICU_TARBALL := icu4c-67_1-src.tgz
+export ICU_DATA_SHA256SUM := 
7c16a59cc8c06128b7ecc1dc4fc056b36b17349312829b17408b9e67b05c4a7e
+export ICU_DATA_TARBALL := icu4c-67_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 96dcd45c30a4..72fae09b1625 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -34,13 +34,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-rtti.patch.1 \
external/icu/icu4c-clang-cl.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
-   external/icu/icu4c-khmerbreakengine.patch.1 \
external/icu/gcc9.patch \
-   external/icu/char8_t.patch \
external/icu/c++20-comparison.patch \
external/icu/ubsan.patch \
external/icu/Wdeprecated-copy-dtor.patch \
-   external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 \
+   external/icu/icu4c-khmerbreakengine.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2 
b/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2
deleted file mode 100644
index 07b3db6774be..
--- a/external/icu/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca.patch.2
+++ /dev/null
@@ -1,118 +0,0 @@
-From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001
-From: Frank Tang 
-Date: Sat, 1 Feb 2020 02:39:04 +
-Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append
-
-See #971

- icu4c/source/common/unistr.cpp  |  6 ++-
- icu4c/source/test/intltest/ustrtest.cpp | 62 +
- icu4c/source/test/intltest/ustrtest.h   |  1 +
- 3 files changed, 68 insertions(+), 1 deletion(-)
-
-diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp
-index 901bb3358ba..077b4d6ef20 100644
 a/icu4c/source/common/unistr.cpp
-+++ b/icu4c/source/common/unistr.cpp
-@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t 
srcStart, int32_t srcLeng
-   }
- 
-   int32_t oldLength = length();
--  int32_t newLength = oldLength + srcLength;
-+  int32_t newLength;
-+  if (uprv_add32_overflow(oldLength, srcLength, )) {
-+setToBogus();
-+return *this;
-+  }
- 
-   // Check for append onto ourself
-   const UChar* oldArray = getArrayStart();
-diff --git a/icu4c/source/test/intltest/ustrtest.cpp 
b/icu4c/source/test/intltest/ustrtest.cpp
-index b6515ea813c..ad38bdf53a3 100644

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in

2020-04-18 Thread David Tardon (via logerrit)

 configure.ac   |   
 2 
 download.lst   |   
 4 
 external/libwps/0001-Make-comparison-operator-member-functions-const.patch |   
49 
 external/libwps/Library_wps.mk |   
 1 
 external/libwps/UnpackedTarball_libwps.mk  |   
 4 
 external/libwps/libwps-lotus-version-tdf127887-upstream.patch  |  
111 --
 solenv/flatpak-manifest.in |   
 6 
 7 files changed, 7 insertions(+), 170 deletions(-)

New commits:
commit 7664ba694c5667c7fdb75e1a6fa505d3e8baa536
Author: David Tardon 
AuthorDate: Sat Apr 18 14:27:56 2020 +0200
Commit: David Tardon 
CommitDate: Sat Apr 18 15:25:48 2020 +0200

upload libwps 0.4.11

Change-Id: I068c7fe1ecf28755b095c5502d4c2dd42a54489c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92473
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index e5888dff7ccb..b5cde04404d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8546,7 +8546,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.10])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.11])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index dc556960d0d6..bfb417bd2919 100644
--- a/download.lst
+++ b/download.lst
@@ -253,8 +253,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 
99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
 export WPG_VERSION_MICRO := 3
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 
1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
-export WPS_VERSION_MICRO := 10
+export WPS_SHA256SUM := 
a8fdaabc28654a975fa78c81873ac503ba18f0d1cdbb942f470a21d29284b4d1
+export WPS_VERSION_MICRO := 11
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git 
a/external/libwps/0001-Make-comparison-operator-member-functions-const.patch 
b/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
deleted file mode 100644
index c7bfb1e40aa2..
--- a/external/libwps/0001-Make-comparison-operator-member-functions-const.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 555b3e0c18ba16843541867d036da782ecdcdeb1 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann 
-Date: Mon, 21 Oct 2019 16:19:13 +0200
-Subject: [PATCH] Make comparison operator member functions const
-
-...which avoids overload resolution ambiguities in C++20, when a synthesized
-candidate of operator == for a reversed-argument rewrite conflicts with the
-actual operator ==, due to the asymmetric const-ness of the implicit object
-parameter and the RHS parameter.  (As observed with recent Clang 10 trunk with
--std=c++2a when building libwps as part of LibreOffice:
-
-> QuattroDosChart.cpp:399:18: error: use of overloaded operator '!=' is 
ambiguous (with operand types 'WKSChart::Position' and 'WKSChart::Position')
-> if (ranges[0]!=ranges[1])
-> ~^ ~
-> ./WKSChart.h:78:8: note: candidate function
-> bool operator!=(Position ) const
->  ^
-> ./WKSChart.h:73:8: note: candidate function
-> bool operator==(Position ) const
->  ^
-> ./WKSChart.h:73:8: note: candidate function (with reversed parameter order)
-
-)

- src/lib/WKSChart.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/WKSChart.h b/src/lib/WKSChart.h
-index 268fa4a..e490357 100644
 a/src/lib/WKSChart.h
-+++ b/src/lib/WKSChart.h
-@@ -70,12 +70,12 @@ public:
-   //! operator<<
-   friend std::ostream <<(std::ostream , Position const 
);
-   //! operator==
--  bool operator==(Position ) const
-+  bool operator==(Position const ) const
-   {
-   return m_pos==pos.m_pos && m_sheetName==pos.m_sheetName;
-   }
-   //! operator!=
--  bool operator!=(Position ) const
-+  bool operator!=(Position const ) const
-   {
-   return !(operator==(pos));
-   }
--- 
-2.21.0
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 500a9ab196b2..349bdbe83c43 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -93,6 +93,7

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in

2020-04-18 Thread David Tardon (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 external/libmwaw/Library_mwaw.mk |4 
 solenv/flatpak-manifest.in   |6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 56c638c0ebb21711b02d1ff235a3ffd3f232
Author: David Tardon 
AuthorDate: Sat Apr 18 13:54:18 2020 +0200
Commit: David Tardon 
CommitDate: Sat Apr 18 15:25:23 2020 +0200

upload libmwaw 0.3.16

Change-Id: Idc7ed6bbcd3298138fb92c81ddf7dd6278d201dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92472
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 9fd64a41bcb9..e5888dff7ccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8555,7 +8555,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.15])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.16])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index d64ecd0493bc..dc556960d0d6 100644
--- a/download.lst
+++ b/download.lst
@@ -179,8 +179,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1
-export MWAW_VERSION_MICRO := 15
+export MWAW_SHA256SUM := 
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
+export MWAW_VERSION_MICRO := 16
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index fc874fcb5e45..880a70861e24 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -120,6 +120,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \
UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \
+   UnpackedTarball/libmwaw/src/lib/MWAWStream \
UnpackedTarball/libmwaw/src/lib/MWAWStringStream \
UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \
UnpackedTarball/libmwaw/src/lib/MWAWTable \
@@ -173,10 +174,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \
UnpackedTarball/libmwaw/src/lib/RagTime5Chart \
UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \
+   UnpackedTarball/libmwaw/src/lib/RagTime5Document \
+   UnpackedTarball/libmwaw/src/lib/RagTime5Formula \
UnpackedTarball/libmwaw/src/lib/RagTime5Graph \
UnpackedTarball/libmwaw/src/lib/RagTime5Layout \
UnpackedTarball/libmwaw/src/lib/RagTime5Parser \
UnpackedTarball/libmwaw/src/lib/RagTime5Pipeline \
+   UnpackedTarball/libmwaw/src/lib/RagTime5SSParser \
UnpackedTarball/libmwaw/src/lib/RagTime5Spreadsheet \
UnpackedTarball/libmwaw/src/lib/RagTime5StructManager \
UnpackedTarball/libmwaw/src/lib/RagTime5StyleManager \
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6511d62c5130..2201e6fe6071 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -267,10 +267,10 @@
 "dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz;,
-"sha256": 
"0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1",
+"url": 
"https://dev-www.libreoffice.org/src/libmwaw-0.3.16.tar.xz;,
+"sha256": 
"0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868",
 "type": "file",
-"dest-filename": "external/tarballs/libmwaw-0.3.15.tar.xz"
+"dest-filename": "external/tarballs/libmwaw-0.3.16.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2;,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice solenv/flatpak-manifest.in

2020-04-18 Thread David Tardon (via logerrit)

 configure.ac   
   |2 
 download.lst   
   |4 
 external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1
   |   56 --
 external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
   |   24 
 
external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1
 |   26 
 external/libstaroffice/UnpackedTarball_libstaroffice.mk
   |   10 -
 solenv/flatpak-manifest.in 
   |6 -
 7 files changed, 6 insertions(+), 122 deletions(-)

New commits:
commit 3e9230bcd4b9c541c0391a3646ed3691140afea2
Author: David Tardon 
AuthorDate: Sat Apr 18 13:36:37 2020 +0200
Commit: David Tardon 
CommitDate: Sat Apr 18 15:13:15 2020 +0200

upload libstaroffice 0.0.7

Change-Id: I3a12e75c61671a17653b7feb2147dfe4aff47613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92471
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index c3ef52dc65c1..9fd64a41bcb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8574,7 +8574,7 @@ libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0])
 libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
 
 libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.6])
+libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7])
 
 dnl ===
 dnl Check for system lcms2
diff --git a/download.lst b/download.lst
index fce6e1195fd2..d64ecd0493bc 100644
--- a/download.lst
+++ b/download.lst
@@ -236,8 +236,8 @@ export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1e
 export SERF_TARBALL := serf-1.2.1.tar.bz2
 export SKIA_SHA256SUM := 
d724dd60d4375359aa4751ea39950ad833592f01774914873f6d033f14e1c63f
 export SKIA_TARBALL := skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz
-export STAROFFICE_SHA256SUM := 
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
-export STAROFFICE_VERSION_MICRO := 6
+export STAROFFICE_SHA256SUM := 
f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db
+export STAROFFICE_VERSION_MICRO := 7
 export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
 export SWING_SHA256SUM := 
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
diff --git 
a/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 
b/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1
deleted file mode 100644
index 27fd97727e25..
--- a/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9c0ff663659a28720c4ee3f5752bb8ce8121648f Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann 
-Date: Mon, 21 Oct 2019 17:17:48 +0200
-Subject: [PATCH] Fix equality operator arguments
-
-...which avoids overload resolution ambiguities in C++20, when a synthesized
-candidate of operator == for a reversed-argument rewrite conflicts with the
-actual operator ==, as one is a template specialization for int and the other
-for float.  (As observed with recent Clang 10 trunk with -std=c++2a when
-building libstaroffice as part of LibreOffice:
-
-> STOFFChart.cxx:230:63: error: use of overloaded operator '==' is ambiguous 
(with operand types 'STOFFVec2f' (aka 'STOFFVec2') and 'STOFFVec2i' (aka 
'STOFFVec2'))
-> bool autoPlace=m_legendPosition==STOFFBox2f()||m_dimension==STOFFVec2i();
->~~~^ 
-> ./libstaroffice_internal.hxx:687:8: note: candidate function
->   bool operator==(STOFFVec2 const ) const
->^
-> ./libstaroffice_internal.hxx:687:8: note: candidate function (with reversed 
parameter order)
-> STOFFChart.cxx:270:63: error: use of overloaded operator '==' is ambiguous 
(with operand types 'STOFFVec2f' (aka 'STOFFVec2') and 'STOFFVec2i' (aka 
'STOFFVec2'))
->   bool autoPlace=m_plotAreaPosition==STOFFBox2f()||m_dimension==STOFFVec2i();
->~~~^ 
-> ./libstaroffice_internal.hxx:687:8: note: candidate function
->   bool operator==(STOFFVec2 const ) const
->^
-> ./libstaroffice_internal.hxx:687:8: note: candidate function (with reversed 
parameter order)
-
-)

- src/lib/STOFFChart.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx
-index 3e7310c..b861762 100644
 a/src/lib/STOFFChart.cxx
-+++ b/src/lib/STOFFChart.cxx
-@@ -227,7 +227,7 @@ void STOFFChart::sendChart(STOFFSpreadsheetListenerPtr 
, librevenge::RV
- 
-   // legend
-   if

[Libreoffice-commits] core.git: configure.ac download.lst

2020-03-23 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 74c811da0dedb205976eae69d8589fd91bbaefa2
Author: Michael Stahl 
AuthorDate: Mon Mar 23 14:30:26 2020 +0100
Commit: Michael Stahl 
CommitDate: Mon Mar 23 16:09:52 2020 +0100

python3: upgrade to release 3.7.7

Fixes CVE-2020-8315; this only affects Windows 7 and is a regression in
Python 3.6.

Change-Id: Ic1706e064a1b03ca1de6361794ed4586a89821d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90916
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 2e074cf50b78..ec8c92af30f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9005,7 +9005,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=7
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 1734dbd3ae27..906e69c5ffd5 100644
--- a/download.lst
+++ b/download.lst
@@ -217,8 +217,8 @@ export POPPLER_SHA256SUM := 
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1
 export POPPLER_TARBALL := poppler-0.82.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
-export PYTHON_SHA256SUM := 
55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f
-export PYTHON_TARBALL := Python-3.7.6.tar.xz
+export PYTHON_SHA256SUM := 
06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
+export PYTHON_TARBALL := Python-3.7.7.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
 export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/nss external/python3 Makefile.fetch

2020-03-23 Thread Luboš Luňák (via logerrit)

 Makefile.fetch |1 
 configure.ac   |4 
 download.lst   |2 
 external/nss/ExternalProject_nss.mk|   26 +
 external/nss/Module_nss.mk |1 
 external/nss/UnpackedTarball_gyp.mk|   18 +++
 external/nss/UnpackedTarball_nss.mk|2 
 external/nss/buildsystem.patch.0   |   32 ++
 external/nss/fix-cc-detect-with-ccache.patch.0 |   11 ++
 external/nss/gyp-buildsystem.patch.0   |  119 +
 external/nss/setup-python  |3 
 external/python3/ExternalPackage_python3.mk|1 
 12 files changed, 219 insertions(+), 1 deletion(-)

New commits:
commit 8512f4ca090c85477a6670438aeefe7fdfcf8a98
Author: Luboš Luňák 
AuthorDate: Wed Feb 19 22:54:50 2020 +0100
Commit: Luboš Luňák 
CommitDate: Mon Mar 23 14:31:04 2020 +0100

build nss using their new build system (gyp/ninja-based)

This requires installed ninja, gyp is included as source. This
allows nss be built as a parallel build, unlike the old Makefile
build system.
Since gyp internally uses python, even recursively, this requires
more complicated setup in case our internal python is used. Moreover
gyp itself seems to be kind of deprecated itself and hasn't
been ported to python3 yet, so that needs patching too.
So far only easy Unix-like systems are converted, Windows I'll
do later, the more complicated systems I'll leave to whoever
has access to them.

Change-Id: I358baad7690d2aa6df44bafa9244dc7cc828fc3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90115
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/Makefile.fetch b/Makefile.fetch
index cfa3dc58c3a5..13661978de06 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -131,6 +131,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,GLM,GLM_TARBALL) \
$(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
+   $(call fetch_Optional,GYP,GYP_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
$(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \
$(call fetch_Optional,HUNSPELL,HUNSPELL_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 1cf56da09c0a..34708eab7e8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9667,6 +9667,10 @@ if test $_os != iOS -a "$enable_fuzzers" != "yes"; then
 AC_DEFINE(HAVE_FEATURE_NSS)
 ENABLE_NSS="TRUE"
 AC_DEFINE(ENABLE_NSS)
+# internal nss uses gyp
+if test -z "$SYSTEM_NSS"; then
+   BUILD_TYPE="$BUILD_TYPE GYP"
+fi
 elif test $_os != iOS ; then
 with_tls=openssl
 fi
diff --git a/download.lst b/download.lst
index 9983fc0386b1..1734dbd3ae27 100644
--- a/download.lst
+++ b/download.lst
@@ -99,6 +99,8 @@ export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e64
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
 export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
 export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
+export GYP_SHA256SUM := 
53cb1f2b19048544950422cd86c6093ba2c4ff9748e27cc560dfff9791700c9d
+export GYP_TARBALL := gyp-e87d37d6bce611abed35e854d5ae1a401e9ce04c.tar.xz
 export HARFBUZZ_SHA256SUM := 
9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
 export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index acf418805772..daee76fc8fa9 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -34,7 +34,31 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalExecuta
,nss)
$(call gb_Trace_EndRange,nss,EXTERNAL)
 
-else # OS!=WNT
+else ifneq (,$(filter FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS))) # non-WNT 
gyp-based
+
+# The nss build system uses 'python', so make it find our internal python if 
necessary.
+nss_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/python
+nss_SETUP_PYTHON := $(call gb_UnpackedTarball_get_dir,nss)/setup-python
+
+$(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecutable_get_dependencies,python)
+   $(call gb_Trace_StartRange,nss,EXTERNAL)
+   echo "#! /bin/sh" > $(nss_PYTHON)
+   pythondir=$$($(call gb_ExternalExecutable_get_command,python) -c 
'import sys; import os; sys.stdout.write(os.path.dirname(sys.executable))') \
+   && echo PATH=\"$$pythondir:\$$PATH\" >>$(nss_PYTHON)
+   echo '$(call gb_ExternalExecutable_get_command,python)' \"$$\@\" $(if 
$(ICECREAM_RUN), | sed 's/$(ICECREAM_RUN)//') >>

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

2019-11-19 Thread Michael Stahl (via logerrit)

 configure.ac  |2 -
 download.lst  |4 +-
 external/python3/ExternalProject_python3.mk   |6 +--
 external/python3/UnpackedTarball_python3.mk   |1 
 external/python3/python-3.3.5-pyexpat-symbols.patch.1 |   28 --
 5 files changed, 5 insertions(+), 36 deletions(-)

New commits:
commit b0930d56130fdddfe65e92b081a8afad77974076
Author: Michael Stahl 
AuthorDate: Mon Nov 18 18:45:46 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Nov 19 12:22:59 2019 +0100

python3: upgrade to release 3.5.9

Fixes CVE-2019-9948 CVE-2019-9740 CVE-2019-10160 CVE-2019-16056
and expat CVE-2019-15903.

python-3.3.5-pyexpat-symbols.patch.1 fails to apply, and it's a
mystery why --with-system-expat is used everywhere but on MacOSX,
where 292af048ace2d4b455b2da3a22c784cb05db1d09 disabled it for no
obvious reason, so try to remove the special case and get rid of the
patch.

Change-Id: I5ba4532eb6e7c2fb90daba95d132dcc7c9013d96
Reviewed-on: https://gerrit.libreoffice.org/83117
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 10707b8dae23..08bdbc06c9ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8759,7 +8759,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.9
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 502470eb451a..c8b5e0bd8083 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM := 
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82
 export POPPLER_TARBALL := poppler-0.74.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
-export PYTHON_SHA256SUM := 
285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
-export PYTHON_TARBALL := Python-3.5.7.tar.xz
+export PYTHON_SHA256SUM := 
c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
+export PYTHON_TARBALL := Python-3.5.9.tar.xz
 export QRCODEGEN_SHA256SUM := 
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
 export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git a/external/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
index dafeb1ca5ae8..b03b09a83bc4 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -44,9 +44,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
 
 else
 
-# this was added in 2004, hopefully is obsolete now (and why only intel 
anyway)? $(if $(filter SOLARIS-INTEL,$(OS)$(CPUNAME)),--disable-ipv6)
-
-# --with-system-expat: this should find the one in the solver (or system)
+# --with-system-expat: this should find the one in the workdir (or system)
 
 # create a symlink "LO_lib" because the .so are in a directory with platform
 # specific name like build/lib.linux-x86_64-3.3
@@ -68,7 +66,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(ENABLE_VALGRIND),--with-valgrind) \
--prefix=/python-inst \
-   $(if $(filter MACOSX,$(OS)),,--with-system-expat) \
+   --with-system-expat \
$(if $(filter AIX,$(OS)), \
--disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3 
-Wall", \
$(if $(gb_Module_CURRENTMODULE_DEBUG_ENABLED), \
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 09bd9fa2edf6..29d417e57833 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
-   external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \
external/python3/darwin.patch.0 \
diff --git a/external/python3/python-3.3.5-pyexpat-symbols.patch.1 
b/external/python3/python-3.3.5-pyexpat-symbols.patch.1
deleted file mode 100644
index c04c78cf36e7..
--- a/external/python3/python-3.3.5-pyexpat-symbols.patch.1
+++

[Libreoffice-commits] core.git: configure.ac download.lst external/harfbuzz external/icu external/libfreehand

2019-10-30 Thread Eike Rathke (via logerrit)

 configure.ac   |4 
 download.lst   |8 
 external/harfbuzz/UnpackedTarball_harfbuzz.mk  |3 
 external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 |   12 
 external/icu/ExternalProject_icu.mk|2 
 external/icu/UnpackedTarball_icu.mk|2 
 external/icu/gcc9.patch|9 
 external/icu/icu4c-61-werror-shadow.patch.1|   35 -
 external/icu/icu4c-64-54558d1dd01b29c763ca12b6327108fe3ac66637.patch.2 |  268 
--
 external/icu/icu4c-android.patch.1 |8 
 external/icu/icu4c-scriptrun.patch.1   |4 
 external/icu/icu4c-ubsan.patch.1   |   12 
 external/icu/icu4c-warnings.patch.1|8 
 external/libfreehand/UnpackedTarball_libfreehand.mk|8 
 external/libfreehand/icu-65-api-macros-with-semicolon.patch.1  |   12 
 15 files changed, 62 insertions(+), 333 deletions(-)

New commits:
commit 369cb79a994dc52de0e1ee02c2d824efcc0c18d3
Author: Eike Rathke 
AuthorDate: Tue Oct 29 00:16:18 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Oct 30 09:14:48 2019 +0100

Upgrade to ICU 65.1

sberg says:  On Windows, implicit --enable-extras first causes a build 
breaker
in workdir/UnpackedTarball/icu/source/extras/scrptrun when linking, because
Windows link.exe doesn't understand -o.  But even with a patch

> --- source/extra/scrptrun/Makefile.in
> +++ source/extra/scrptrun/Makefile.in
> @@ -74,7 +74,7 @@
>&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) 
./config.status
>
>  $(TARGET) : $(OBJECTS)
> - $(LINK.cc) -o $@ $^ $(LIBS)
> + $(LINK.cc) $(OUTOPT)$@ $^ $(LIBS)
>   $(POST_BUILD_STEP)
>
>  invoke:

linking would still fail with a missing ../../lib/icuucdd.lib, which is
apparently expanded from $(LIBS) there, but I have no idea where it should 
be
built but isn't.  Lets hope that --disable-extras is sufficient for our 
needs.

Change-Id: I6d0117b230caa41abf488fcd069028e3474700f8
Reviewed-on: https://gerrit.libreoffice.org/81632
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index eb6ce10a8846..e7825f93b9a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9480,8 +9480,8 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=64
-ICU_MINOR=2
+ICU_MAJOR=65
+ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
 ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
diff --git a/download.lst b/download.lst
index 6ba33582c0c2..001690293bc0 100644
--- a/download.lst
+++ b/download.lst
@@ -104,10 +104,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c
-export ICU_TARBALL := icu4c-64_2-src.tgz
-export ICU_DATA_SHA256SUM := 
fba0e89f5b3f285d722a83317647bffee69b6f1eb8d067d5da03c5677c45e510
-export ICU_DATA_TARBALL := icu4c-64_2-data.zip
+export ICU_SHA256SUM := 
53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948
+export ICU_TARBALL := icu4c-65_1-src.tgz
+export ICU_DATA_SHA256SUM := 
06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6
+export ICU_DATA_TARBALL := icu4c-65_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index eea793322965..adec72ed0d57 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,8 +15,11 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
+# icu-65-api-macros-with-semicolon.patch.1
+#   See http://site.icu-project.org/download/65  Migration Issues
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/ubsan.patch \
+external/harfbuzz/icu-65-api-macros-with-semicolon.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18nutil/source include/svx svx/source

2019-10-28 Thread Eike Rathke (via logerrit)

 configure.ac   |4 
 download.lst   |8 
 external/icu/CVE-2018-18928.patch.2|   63 
--
 external/icu/UnpackedTarball_icu.mk|3 
 external/icu/clang-cl.patch|   37 -
 external/icu/icu4c-64-54558d1dd01b29c763ca12b6327108fe3ac66637.patch.2 |  268 
++
 external/icu/icu4c-build.patch.1   |2 
 external/icu/icu4c-khmerbreakengine.patch.1|   60 
--
 external/icu/icu4c-mkdir.patch.1   |8 
 external/icu/icu4c-rpath.patch.1   |4 
 i18nutil/source/utility/unicode.cxx|   14 
 include/svx/strings.hrc|9 
 svx/source/dialog/charmap.cxx  |   29 +
 13 files changed, 339 insertions(+), 170 deletions(-)

New commits:
commit 398e1e6ae83999eea8fb8c845190667695ac115f
Author: Eike Rathke 
AuthorDate: Mon Oct 28 16:14:18 2019 +0100
Commit: Eike Rathke 
CommitDate: Mon Oct 28 18:01:27 2019 +0100

Upgrade to ICU 64.2

As an interim step to upgrade to ICU 65.1
Adds new scripts and Unicode blocks from Unicode 12.

Change-Id: Idc4a6b29ffb04bcb424522fcbd29a8db0428c056
Reviewed-on: https://gerrit.libreoffice.org/81611
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 0850870ca809..eb6ce10a8846 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9480,8 +9480,8 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=63
-ICU_MINOR=1
+ICU_MAJOR=64
+ICU_MINOR=2
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
 ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
diff --git a/download.lst b/download.lst
index 0d06a0463d93..6ba33582c0c2 100644
--- a/download.lst
+++ b/download.lst
@@ -104,10 +104,10 @@ export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b
 export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
-export ICU_TARBALL := icu4c-63_1-src.tgz
-export ICU_DATA_SHA256SUM := 
9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c
-export ICU_DATA_TARBALL := icu4c-63_1-data.zip
+export ICU_SHA256SUM := 
627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c
+export ICU_TARBALL := icu4c-64_2-src.tgz
+export ICU_DATA_SHA256SUM := 
fba0e89f5b3f285d722a83317647bffee69b6f1eb8d067d5da03c5677c45e510
+export ICU_DATA_TARBALL := icu4c-64_2-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/CVE-2018-18928.patch.2 
b/external/icu/CVE-2018-18928.patch.2
deleted file mode 100644
index f92cee05ceed..
--- a/external/icu/CVE-2018-18928.patch.2
+++ /dev/null
@@ -1,63 +0,0 @@
-From 6cbd62e59e30f73b444be89ea71fd74275ac53a4 Mon Sep 17 00:00:00 2001
-From: Shane Carr 
-Date: Mon, 29 Oct 2018 23:52:44 -0700
-Subject: [PATCH] ICU-20246 Fixing another integer overflow in number parsing.
-
-(cherry picked from commit 53d8c8f3d181d87a6aa925b449b51c4a2c922a51)

- icu4c/source/i18n/fmtable.cpp  |  2 +-
- icu4c/source/i18n/number_decimalquantity.cpp   |  5 -
- icu4c/source/test/intltest/numfmtst.cpp|  8 
- .../icu/impl/number/DecimalQuantity_AbstractBCD.java   |  5 -
- .../impl/number/DecimalQuantity_DualStorageBCD.java| 10 +-
- .../com/ibm/icu/dev/test/format/NumberFormatTest.java  |  5 +
- 6 files changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/icu4c/source/i18n/fmtable.cpp b/icu4c/source/i18n/fmtable.cpp
-index 45c7024fc29..8601d95f4a6 100644
 a/icu4c/source/i18n/fmtable.cpp
-+++ b/icu4c/source/i18n/fmtable.cpp
-@@ -734,7 +734,7 @@ CharString *Formattable::internalGetCharString(UErrorCode 
) {
-   // not print scientific notation for magnitudes greater than -5 and 
smaller than some amount (+5?).
-   if (fDecimalQuantity->isZero()) {
- fDecimalStr->append("0", -1, status);
--  } else if (std::abs(fDecimalQuantity->getMagnitude()) < 5) {
-+  } else if (fDecimalQuantity->getMagnitude() != INT32_MIN && 
std::abs(fDecimalQuantity->getMagnitude()) < 5) {
-

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/inc sc/qa sc/source svl/source

2019-08-14 Thread Kohei Yoshida (via logerrit)

 RepositoryExternal.mk   |4 -
 configure.ac|4 -
 download.lst|8 +-
 external/liborcus/0001-Prevent-unsigned-integer-underflow.patch |   27 
--
 external/liborcus/ExternalPackage_liborcus.mk   |8 +-
 external/liborcus/ExternalProject_liborcus.mk   |4 -
 external/liborcus/Library_orcus-parser.mk   |2 
 external/liborcus/Library_orcus.mk  |7 ++
 external/liborcus/UnpackedTarball_liborcus.mk   |3 -
 external/liborcus/version.patch.0   |   11 
 sc/inc/mtvelements.hxx  |8 +-
 sc/inc/orcusxml.hxx |1 
 sc/qa/unit/dataproviders_test.cxx   |1 
 sc/source/core/tool/scmatrix.cxx|8 +-
 sc/source/filter/inc/orcusinterface.hxx |2 
 sc/source/filter/orcus/interface.cxx|8 ++
 sc/source/filter/orcus/orcusfiltersimpl.cxx |4 -
 sc/source/filter/orcus/xmlcontext.cxx   |9 ++-
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |6 ++
 svl/source/misc/gridprinter.cxx |2 
 20 files changed, 58 insertions(+), 69 deletions(-)

New commits:
commit 56ffe3c0a1261cd98a3d42b8b08d5f8eb013ead4
Author: Kohei Yoshida 
AuthorDate: Mon Aug 12 13:57:34 2019 -0400
Commit: Kohei Yoshida 
CommitDate: Thu Aug 15 06:09:52 2019 +0200

Switch mdds to 1.5.0 and liborcus to 0.15.0.

Change-Id: Ibff9a5e0f0771e4cf12b4dc3985661a01195e265
Reviewed-on: https://gerrit.libreoffice.org/77482
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 54ab1dbfdcc3..57f66b8f344a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3262,7 +3262,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.14 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.15 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3281,7 +3281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.14 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.15 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 1510daf22454..d0e6759b1f52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9291,7 +9291,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.1], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.5 >= 1.5.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===
 dnl Check for system glm
@@ -9597,7 +9597,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.15 >= 0.15.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index b57ed794d2a6..59b58f96347c 100644
--- a/download.lst
+++ b/download.lst
@@ -168,8 +168,8 @@ export LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a
 export LXML_TARBALL := lxml-4.1.1.tgz
 export MARIADB_CONNECTOR_C_SHA256SUM := 
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
 export MARIADB_CONNECTOR_C_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_SHA256SUM := 
25ce3d5af9f6609e1de05bb22b2316e57b74a72a5b686fbb2da199da72349c81
-export MDDS_TARBALL := mdds-1.4.3.tar.bz2
+export MDDS_SHA256SUM := 
74cda018d5aa39a2f91652608efb066fd225f3597ce54733e6ab1e99e52606f7
+export MDDS_TARBALL := mdds-1.5.0.tar.bz2
 export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
@@ -194,8 +194,8 @@ export OPENLDAP_SHA256SUM :=

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa

2019-04-21 Thread David Tardon (via logerrit)

 configure.ac|2 
 download.lst|4 -
 external/libmwaw/0001-ssize_t-is-not-std-type.patch.1   |   27 
--
 external/libmwaw/Library_mwaw.mk|1 
 external/libmwaw/UnpackedTarball_libmwaw.mk |4 -
 external/libmwaw/libmwaw-bundled-soname.patch.0 |6 +-
 solenv/flatpak-manifest.in  |6 +-
 writerperfect/qa/unit/WpftDrawFilterTest.cxx|2 
 writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_10|binary
 writerperfect/qa/unit/data/draw/libmwaw/pass/CorelPainter_3_win.rif |binary
 10 files changed, 12 insertions(+), 40 deletions(-)

New commits:
commit d077b19a3f617f5ef3d65fc20a136a9107c47199
Author: David Tardon 
AuthorDate: Thu Apr 18 20:04:51 2019 +0200
Commit: David Tardon 
CommitDate: Sun Apr 21 09:44:57 2019 +0200

upload libmwaw 0.3.15

Change-Id: I496204ead6c495c4fee2cee18a5b9d0fd22eb8c0
Reviewed-on: https://gerrit.libreoffice.org/70951
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 04e7389eebd9..567746177490 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8231,7 +8231,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.14])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.15])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 82a2413da94d..0d9f9b719aa5 100644
--- a/download.lst
+++ b/download.lst
@@ -174,8 +174,8 @@ export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
 export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
-export MWAW_VERSION_MICRO := 14
+export MWAW_SHA256SUM := 
0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1
+export MWAW_VERSION_MICRO := 15
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 
b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
deleted file mode 100644
index e33f2a19d560..
--- a/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4458a5e93736a324251a356362f0e80e7c42d5be Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Wed, 25 Apr 2018 12:53:37 +0200
-Subject: [PATCH] ssize_t is not std type
-

- src/lib/WriterPlsParser.cxx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
-index 00dc969b..33b1fa49 100644
 a/src/lib/WriterPlsParser.cxx
-+++ b/src/lib/WriterPlsParser.cxx
-@@ -316,8 +316,8 @@ bool WindowsInfo::getColumnLimitsFor(int line, 
std::vector )
- if (m_columns[i].m_firstLine == line+2) {
-   numCols=m_columns[i].m_numCol;
-   firstColumn = i;
--  if (numCols > ssize_t(numColumns - firstColumn))
--numCols = int(ssize_t(numColumns - firstColumn));
-+  if (numCols > int(unsigned(numColumns - firstColumn)))
-+numCols = int(unsigned(numColumns - firstColumn));
-   if (numCols <= 1 || m_columns[i].m_col != 1) return false;
-   break;
- }
--- 
-2.14.3
-
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index fbdd9e1cf1da..f9615bf59f81 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -57,6 +57,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/ClarisWksStyleManager \
UnpackedTarball/libmwaw/src/lib/ClarisWksTable \
UnpackedTarball/libmwaw/src/lib/ClarisWksText \
+   UnpackedTarball/libmwaw/src/lib/CorelPainterParser \
UnpackedTarball/libmwaw/src/lib/CricketDrawParser \
UnpackedTarball/libmwaw/src/lib/DocMkrParser \
UnpackedTarball/libmwaw/src/lib/DocMkrText \
diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk 
b/external/libmwaw/UnpackedTarball_libmwaw.mk
index bb39a27382b9..cd1551a1fe97 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,8 +37,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
 ))
 endif
 
-$(eval $(call

[Libreoffice-commits] core.git: configure.ac download.lst

2019-04-03 Thread Michael Stahl (via logerrit)

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Michael Stahl 
CommitDate: Wed Apr 3 12:59:35 2019 +0200

python3: upgrade to release 3.5.7

Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647

Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
Reviewed-on: https://gerrit.libreoffice.org/70182
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index a20732568ce9..f35fe56c02f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8598,7 +8598,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index b6f8308d6b5c..4bcc0dda2bf7 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM := 
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82
 export POPPLER_TARBALL := poppler-0.74.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
-export PYTHON_SHA256SUM := 
f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
-export PYTHON_TARBALL := Python-3.5.6.tar.xz
+export PYTHON_SHA256SUM := 
285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc
+export PYTHON_TARBALL := Python-3.5.7.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst

2019-01-17 Thread Libreoffice Gerrit user

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eb5f725c3eceec7221b058e1479147883eeb38e4
Author: Caolán McNamara 
AuthorDate: Thu Jan 17 10:50:42 2019 +
Commit: Caolán McNamara 
CommitDate: Thu Jan 17 13:08:00 2019 +0100

upgrade to python 3.5.6

Change-Id: I6cdfc50b2385c426e20ce0e9b216b18c763249b8
Reviewed-on: https://gerrit.libreoffice.org/66506
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/configure.ac b/configure.ac
index d8e8e673977c..fe0d792ba7fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8445,7 +8445,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index c54a0e8987b5..5d4b8f06c4f3 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM := 
e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112
 export POPPLER_TARBALL := poppler-0.73.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
-export PYTHON_SHA256SUM := 
063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009
-export PYTHON_TARBALL := Python-3.5.5.tar.xz
+export PYTHON_SHA256SUM := 
f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f
+export PYTHON_TARBALL := Python-3.5.6.tar.xz
 export QXP_SHA256SUM := 
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
 export QXP_TARBALL := libqxp-0.0.2.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/hunspell

2018-11-12 Thread Libreoffice Gerrit user

 configure.ac   
   |2 
 download.lst   
   |4 
 
external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
 |   55 
 
external/hunspell/0001-Extend-dotless-i-and-dotted-I-rules-to-Crimean-Tatar.patch
 |   66 
 external/hunspell/0001-FORBIDDENWORD-precedes-BREAK.patch  
   |   27 
 external/hunspell/0001-Hunspell-patches-for-missing-OCONV-conversion.patch 
   |  175 
 external/hunspell/0001-Recent-Hunspell-fixes-and-improvements.patch
   | 1605 
 external/hunspell/0001-Remove-forbidden-words-from-dash-suggestion-list.patch  
   |   29 
 external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch   
   |61599 --
 
external/hunspell/0001-add-SPELLML-support-for-run-time-dictionary-extensio.patch
 |   40 
 
external/hunspell/0001-fix-compound-handling-for-new-Hungarian-orthography.patch
  |   43 
 external/hunspell/0001-fix-compound-word-part-pa.patch 
   |   26 
 
external/hunspell/0001-recent-Hunspell-fixes-for-suggestion-spelling-and-an.patch
 | 1166 
 
external/hunspell/0001-tdf-116586-fix-LibreOffice-crash-by-Hungarian-person.patch
 |   62 
 external/hunspell/UnpackedTarball_hunspell.mk  
   |   12 
 15 files changed, 3 insertions(+), 64908 deletions(-)

New commits:
commit a20a2d7e0d28658f2d9089da076961a599833a28
Author: László Németh 
AuthorDate: Wed Nov 7 13:18:36 2018 +0100
Commit: László Németh 
CommitDate: Mon Nov 12 23:30:20 2018 +0100

bump hunspell to 1.7

Change-Id: Ia8d1f4831e651b3a8d5115f78e5a5239b56c71c4
Reviewed-on: https://gerrit.libreoffice.org/63015
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/configure.ac b/configure.ac
index 45e1fe83876e..442ada332ada 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9614,7 +9614,7 @@ else
 if test "$COM" = "MSC"; then
 HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
 else
-
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.6"
+
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.7"
 fi
 BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/download.lst b/download.lst
index a09ba1a7444b..cf56a183c165 100644
--- a/download.lst
+++ b/download.lst
@@ -100,8 +100,8 @@ export HARFBUZZ_SHA256SUM := 
3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45
 export HARFBUZZ_TARBALL := harfbuzz-1.8.4.tar.bz2
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4
-export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
+export HUNSPELL_SHA256SUM := 
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
+export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 export ICU_SHA256SUM := 
05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
diff --git 
a/external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
 
b/external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
deleted file mode 100644
index b4b04385c935..
--- 
a/external/hunspell/0001-Allow-dotted-I-in-dictionary-and-disable-bad-capital.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 88cf975c295e3ec808efb77bb1a2a031d77f0c89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?=
- 
-Date: Thu, 5 Oct 2017 12:24:02 +0200
-Subject: [PATCH] Allow dotted I in dictionary, and disable bad capitalization
- of i.
-
-Dictionary words weren't recognized with dotted I, but dictionary
-words with the letter i were recognized with dotted I, too.

- src/hunspell/hunspell.cxx | 18 +-
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx
-index 1ef11df..5c98f8a 100644
 a/src/hunspell/hunspell.cxx
-+++ b/src/hunspell/hunspell.cxx
-@@ -562,11 +562,15 @@ bool HunspellImpl::spell(const std::string& word, int* 
info, std::string* root)
-   }
- }
- case INITCAP: {
--
-+  // handle special capitalization of dotted I
-+  bool Idot = (utf8 && (unsigned char) scw[0] == 0xc4 && (unsigned char) 
scw[1] == 0xb0);
-   *info += SPELL_ORIGCAP;
--  mkallsmall2(scw, sunicw);
--  std::string u8buffer(scw);
--  mkinitcap2(scw, sunicw);
-+  if (captype == ALLCAP) {
-+  mkallsmall2(scw, sunicw);
-+  mkinitcap2(scw, sunicw);
-+  if (Idot)
-+ scw.replace(0, 1, "\xc4\xb0");
-+  }
-

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2018-10-20 Thread Libreoffice Gerrit user

 configure.ac|2 -
 download.lst|8 ++--
 external/icu/icu4c-android.patch.1  |   53 ++--
 external/icu/icu4c-clang-cl.patch.1 |2 -
 external/icu/icu4c-khmerbreakengine.patch.1 |   24 ++--
 5 files changed, 45 insertions(+), 44 deletions(-)

New commits:
commit 190a1394c2dd2aa338559c99a23ec3c62d29a2eb
Author: Eike Rathke 
AuthorDate: Sat Oct 20 01:57:10 2018 +0200
Commit: Eike Rathke 
CommitDate: Sat Oct 20 13:08:31 2018 +0200

Upgrade to ICU 63.1

Change-Id: I3b73fca39f51809f608dd78865c2566357a7b8a1
Reviewed-on: https://gerrit.libreoffice.org/62034
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index a20e0be6c688..334c4c10759a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9106,7 +9106,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=62
+ICU_MAJOR=63
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 48bf64aa74f2..46afd8e9cd89 100644
--- a/download.lst
+++ b/download.lst
@@ -104,10 +104,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3
-export ICU_TARBALL := icu4c-62_1-src.tgz
-export ICU_DATA_SHA256SUM := 
93bcaf58cfa9223972da79cb8e0f94819ace4995db6041b84f4d9bd810246d1d
-export ICU_DATA_TARBALL := icu4c-62_1-data.zip
+export ICU_SHA256SUM := 
05c490b69454fce5860b7e8e2821231674af0a11d7ef2febea9a32512998cb9d
+export ICU_TARBALL := icu4c-63_1-src.tgz
+export ICU_DATA_SHA256SUM := 
9bef2bf28ec4fdc86a3bd88d7ac4d509fef6dfbe9c6798299e55b9d4343e960c
+export ICU_DATA_TARBALL := icu4c-63_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/icu4c-android.patch.1 
b/external/icu/icu4c-android.patch.1
index 1f1fdcff2fb9..b012b0c11cd2 100644
--- a/external/icu/icu4c-android.patch.1
+++ b/external/icu/icu4c-android.patch.1
@@ -1,9 +1,9 @@
 diff -ur icu.org/source/common/unicode/platform.h 
icu/source/common/unicode/platform.h
 icu.org/source/common/unicode/platform.h   2017-03-22 20:06:26.0 
+0100
-+++ icu/source/common/unicode/platform.h   2017-04-21 22:32:31.656693147 
+0200
-@@ -818,7 +818,7 @@
- #elif defined(U_STATIC_IMPLEMENTATION)
- #   define U_EXPORT
+--- icu.org/source/common/unicode/platform.h   2018-10-02 00:39:56.0 
+0200
 icu/source/common/unicode/platform.h   2018-10-20 00:36:24.598886605 
+0200
+@@ -789,7 +789,7 @@
+ #elif defined(_MSC_VER) || (__has_declspec_attribute(dllexport) && 
__has_declspec_attribute(dllimport))
+ #   define U_EXPORT __declspec(dllexport)
  #elif defined(__GNUC__)
 -#   define U_EXPORT __attribute__((visibility("default")))
 +#   define U_EXPORT
@@ -11,8 +11,8 @@ diff -ur icu.org/source/common/unicode/platform.h 
icu/source/common/unicode/plat
 || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) 
  #   define U_EXPORT __global
 diff -ur icu.org/source/config/mh-linux icu/source/config/mh-linux
 icu.org/source/config/mh-linux 2016-06-15 20:58:17.0 +0200
-+++ icu/source/config/mh-linux 2017-04-21 22:32:31.653693154 +0200
+--- icu.org/source/config/mh-linux 2018-09-29 02:34:41.0 +0200
 icu/source/config/mh-linux 2018-10-20 00:33:36.558130876 +0200
 @@ -27,7 +27,7 @@
  
  ## Compiler switch to embed a library name
@@ -23,9 +23,9 @@ diff -ur icu.org/source/config/mh-linux 
icu/source/config/mh-linux
  #SH# LD_SONAME=
  
 diff -ur icu.org/source/configure icu/source/configure
 icu.org/source/configure   2017-04-07 09:40:30.0 +0200
-+++ icu/source/configure   2017-04-21 22:32:31.656693147 +0200
-@@ -5134,7 +5134,7 @@
+--- icu.org/source/configure   2018-10-02 00:39:56.0 +0200
 icu/source/configure   2018-10-20 00:33:36.559130874 +0200
+@@ -5207,7 +5207,7 @@
else
icu_cv_host_frag=mh-linux-va
fi ;;
@@ -34,7 +34,7 @@ diff -ur icu.org/source/configure icu/source/configure
  i[34567]86-*-cygwin)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-cygwin
-@@ -6358,6 +6358,10 @@
+@@ -6400,6 +6400,10 @@
  # Check to see if genccode can generate simple assembly.
  GENCCODE_ASSEMBLY=
  case "${host}" in
@@ -45,7 +45,7 @@ diff -ur icu.org/source/configure icu/source/configure

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

2018-08-31 Thread Libreoffice Gerrit user

 RepositoryExternal.mk   |4 
 configure.ac|2 
 download.lst|4 
 external/liborcus/0001-Missing-header-for-std-tolower.patch |   24 
 external/liborcus/ExternalPackage_liborcus.mk   |8 
 external/liborcus/ExternalProject_liborcus.mk   |4 
 external/liborcus/Library_orcus.mk  |2 
 external/liborcus/UnpackedTarball_liborcus.mk   |1 
 external/liborcus/gcc9.patch.0  |3 
 sc/source/filter/inc/orcusinterface.hxx |  107 +++
 sc/source/filter/orcus/interface.cxx|  322 
 sc/source/filter/orcus/xmlcontext.cxx   |5 
 12 files changed, 360 insertions(+), 126 deletions(-)

New commits:
commit 1d0727a104d76210814f41c1169df318e40c9d80
Author: Kohei Yoshida 
AuthorDate: Mon Aug 27 11:06:17 2018 -0400
Commit: Kohei Yoshida 
CommitDate: Sat Sep 1 01:34:10 2018 +0200

Update orcus to 0.14.0.

And make all necessary adjustments for the new version of orcus.

Change-Id: I0dc207162a3ddfaad6da198a3d13b65f530757d5
Reviewed-on: https://gerrit.libreoffice.org/59884
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cec79cc105e8..f172765a84f8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3295,7 +3295,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.13 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.14 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3314,7 +3314,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.13 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.14 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 3c9e5dc5e908..a60a3e72689f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9196,7 +9196,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.3])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.14 >= 0.14.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index 1ed75b36f3b3..3532e2be3aa3 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d
 export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz
-export ORCUS_SHA256SUM := 
bc01b1b3e9091416f498840d3c19a1aa2704b448100e7f6b80eefe88aab06d5b
-export ORCUS_TARBALL := liborcus-0.13.4.tar.gz
+export ORCUS_SHA256SUM := 
7bcfac3f4f490540292cfc87d3fde7b47eafa8450afa1e1a2c181d8293dcd4ef
+export ORCUS_TARBALL := liborcus-0.14.0.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/liborcus/0001-Missing-header-for-std-tolower.patch 
b/external/liborcus/0001-Missing-header-for-std-tolower.patch
new file mode 100644
index ..2e00be92a872
--- /dev/null
+++ b/external/liborcus/0001-Missing-header-for-std-tolower.patch
@@ -0,0 +1,24 @@
+From 3a6bb93a382b4d5f1463ee3fdd54cab7048ff996 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Fri, 31 Aug 2018 16:07:06 -0400
+Subject: [PATCH] Missing header for std::tolower.
+
+---
+ src/parser/sax_token_parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser/sax_token_parser.cpp b/src/parser/sax_token_parser.cpp
+index 9790b498..44ba5844 100644
+--- a/src/parser/sax_token_parser.cpp
 b/src/parser/sax_token_parser.cpp
+@@ -9,6 +9,7 @@
+ #include "orcus/tokens.hpp"
+ 
+ #include 
++#include 
+ 
+ namespace orcus {
+ 
+-- 
+2.17.1
+
diff --git a/external/liborcus/ExternalPackage_liborcus.mk 
b/external/liborcus/ExternalPackage_liborcus.mk
index 32382b7d89a1..ffa0b38bea19 100644
--- a/external/liborcus/ExternalPackage_liborcus.mk
+++ b/external/liborcus/ExternalPackage_liborcus.mk
@@ -12,11 +12,11 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,liborcus,liborcus))
 $(eval $(call

[Libreoffice-commits] core.git: configure.ac download.lst Makefile.fetch

2018-08-26 Thread Libreoffice Gerrit user

 Makefile.fetch |1 -
 configure.ac   |1 -
 download.lst   |2 --
 3 files changed, 4 deletions(-)

New commits:
commit 44f878924648c23f5332e8a759b8c419b88724e1
Author: Caolán McNamara 
AuthorDate: Sun Aug 26 14:41:17 2018 +0100
Commit: Caolán McNamara 
CommitDate: Sun Aug 26 17:50:33 2018 +0200

MYSQL_CONNECTOR_CPP not built anymore

since...

commit 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1
Author: Tamas Bunth 
Date:   Thu Aug 16 16:35:17 2018 +0200

Moving mysqlc into connectivity as a library

Additionally I erased the remains of the old mysql C++ connector.

Also update the code where the clang plugins were unhappy after moving
the mysqlc module.

Remove mysql-cpp-connector external.

so we don't need the source to it

Change-Id: I0436e9f5a9cce87d0294cf3163a97a19566df1f4
Reviewed-on: https://gerrit.libreoffice.org/59605
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/Makefile.fetch b/Makefile.fetch
index 44f5031aac4a..2d1aa0481735 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -188,7 +188,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
-   $(call 
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
$(call fetch_Optional,MYTHES,MYTHES_TARBALL) \
$(call fetch_Optional,NEON,NEON_TARBALL) \
$(call fetch_Optional,NSS,NSS_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 0bd0b862729e..f6f25837bcbb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8451,7 +8451,6 @@ int main(int argc, char **argv) {
 LIBS=$save_LIBS
 else
 AC_MSG_RESULT([internal])
-BUILD_TYPE="$BUILD_TYPE MYSQL_CONNECTOR_CPP"
 SYSTEM_MYSQL_CONNECTOR_CPP=
 fi
 AC_LANG_POP([C++])
diff --git a/download.lst b/download.lst
index ca63722e90d4..7245bba4c7ce 100644
--- a/download.lst
+++ b/download.lst
@@ -175,8 +175,6 @@ export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
 export MWAW_SHA256SUM := 
aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
 export MWAW_VERSION_MICRO := 14
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
-export MYSQL_CONNECTOR_CPP_SHA256SUM := 
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
-export MYSQL_CONNECTOR_CPP_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps solenv/flatpak-manifest.in

2018-08-08 Thread Libreoffice Gerrit user

 configure.ac   
 |2 
 download.lst   
 |4 
 
external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1 
|   56 --
 external/libwps/Library_wps.mk 
 |6 +
 external/libwps/UnpackedTarball_libwps.mk  
 |4 
 solenv/flatpak-manifest.in 
 |6 -
 6 files changed, 12 insertions(+), 66 deletions(-)

New commits:
commit ca8d5f5478b02fd9ef6f2c80479c381af841e269
Author: David Tardon 
AuthorDate: Tue Aug 7 20:59:52 2018 +0200
Commit: David Tardon 
CommitDate: Wed Aug 8 13:11:29 2018 +0200

upload libwps 0.4.10

Change-Id: Ib29c429a34a3895fa0747a54194dcd60ad41e45d
Reviewed-on: https://gerrit.libreoffice.org/58704
Tested-by: Jenkins
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index abbd9b8975b0..fbb74238379b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7884,7 +7884,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.9])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.10])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 04a70ea84e0c..ca63722e90d4 100644
--- a/download.lst
+++ b/download.lst
@@ -244,8 +244,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
 export WPG_VERSION_MICRO := 2
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 
13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922
-export WPS_VERSION_MICRO := 9
+export WPS_SHA256SUM := 
1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
+export WPS_VERSION_MICRO := 10
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git 
a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
 
b/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
deleted file mode 100644
index 46983dd9eed2..
--- 
a/external/libwps/0001-avoid-name-clash-with-MultiplanParser-from-libmwaw.patch.1
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9181ad021cf1c200bc80edb9f5a6df5b780be046 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 26 Apr 2018 14:24:55 +0200
-Subject: [PATCH] avoid name clash with MultiplanParser from libmwaw
-

- src/lib/Multiplan.cpp | 5 -
- src/lib/Multiplan.h   | 5 +
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/Multiplan.cpp b/src/lib/Multiplan.cpp
-index 278f699..26ceca3 100644
 a/src/lib/Multiplan.cpp
-+++ b/src/lib/Multiplan.cpp
-@@ -44,7 +44,8 @@
- 
- #include "Multiplan.h"
- 
--using namespace libwps;
-+namespace libwps
-+{
- 
- //! Internal: namespace to define internal class of MultiplanParser
- namespace MultiplanParserInternal
-@@ -2912,4 +2913,6 @@ RVNGInputStreamPtr 
MultiplanParser::decodeStream(RVNGInputStreamPtr input)
-   return res;
- }
- 
-+}
-+
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
-diff --git a/src/lib/Multiplan.h b/src/lib/Multiplan.h
-index 87e0565..83c83f2 100644
 a/src/lib/Multiplan.h
-+++ b/src/lib/Multiplan.h
-@@ -34,6 +34,9 @@
- 
- #include "WKSParser.h"
- 
-+namespace libwps
-+{
-+
- namespace MultiplanParserInternal
- {
- struct State;
-@@ -127,5 +130,7 @@ protected:
-   std::shared_ptr m_state;
- };
- 
-+}
-+
- #endif /* WPS4_H */
- /* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
--- 
-2.14.3
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 60709ab77603..9c4f5330fd69 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -40,9 +40,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Multiplan \
UnpackedTarball/libwps/src/lib/Quattro \
+   UnpackedTarball/libwps/src/lib/Quattro9 \
+   UnpackedTarball/libwps/src/lib/Quattro9Graph \
+   UnpackedTarball/libwps/src/lib/Quattro9Spreadsheet \
UnpackedTarball/libwps/src/lib/QuattroDos \
UnpackedTarball/libwps/src/lib/QuattroDosChart \
UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \
+   UnpackedTarball/libwps/src/lib/QuattroFormula \
UnpackedTarball/libwps/src/lib/QuattroGraph \
UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18nutil/source include/svx svx/source

2018-07-16 Thread Libreoffice Gerrit user

 configure.ac|2 +-
 download.lst|8 
 external/icu/UnpackedTarball_icu.mk |1 -
 external/icu/icu4c-mkdir.patch.1|6 +++---
 external/icu/ofz4860.patch.2|   25 -
 i18nutil/source/utility/unicode.cxx |   23 +++
 include/svx/strings.hrc |   11 +++
 svx/source/dialog/charmap.cxx   |   35 +++
 8 files changed, 77 insertions(+), 34 deletions(-)

New commits:
commit 86dfa34c6d83b70923d462fecad316dafd9a1fc4
Author: Eike Rathke 
AuthorDate: Mon Jul 16 15:20:32 2018 +0200
Commit: Eike Rathke 
CommitDate: Mon Jul 16 17:36:35 2018 +0200

Upgrade to ICU 62.1

Change-Id: I9426e77aa85cfe068df59db47b8ac50b59cd4eb3
Reviewed-on: https://gerrit.libreoffice.org/57500
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 23b3fd4953c9..2fd11a9b3d19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9066,7 +9066,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=61
+ICU_MAJOR=62
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index dd3519b74a8d..0d4e974ed105 100644
--- a/download.lst
+++ b/download.lst
@@ -102,10 +102,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
d007f89ae8a2543a53525c74359b65b36412fa84b3349f1400be6dcf409fafef
-export ICU_TARBALL := icu4c-61_1-src.tgz
-export ICU_DATA_SHA256SUM := 
d149ed0985b5a6e16a9d8ed66f105dd58fd334c276779f74241cfa656ed2830a
-export ICU_DATA_TARBALL := icu4c-61_1-data.zip
+export ICU_SHA256SUM := 
3dd9868d666350dda66a6e305eecde9d479fb70b30d5b55d78a1deffb97d5aa3
+export ICU_TARBALL := icu4c-62_1-src.tgz
+export ICU_DATA_SHA256SUM := 
93bcaf58cfa9223972da79cb8e0f94819ace4995db6041b84f4d9bd810246d1d
+export ICU_DATA_TARBALL := icu4c-62_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index c789e6eb8d84..6800c1fb5ea8 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-clang-cl.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/icu4c-khmerbreakengine.patch.1 \
-   external/icu/ofz4860.patch.2 \
external/icu/icu4c-61-werror-shadow.patch.1 \
 ))
 
diff --git a/external/icu/icu4c-mkdir.patch.1 b/external/icu/icu4c-mkdir.patch.1
index 3234f151b677..7de4cf51174c 100644
--- a/external/icu/icu4c-mkdir.patch.1
+++ b/external/icu/icu4c-mkdir.patch.1
@@ -1,10 +1,10 @@
 diff -ur icu.org/source/data/Makefile.in icu/source/data/Makefile.in
 icu.org/source/data/Makefile.in2016-06-15 20:58:17.0 +0200
-+++ icu/source/data/Makefile.in2017-04-21 22:29:00.747158002 +0200
+--- icu.org/source/data/Makefile.in2018-06-21 11:39:15.0 +0200
 icu/source/data/Makefile.in2018-07-16 13:18:26.928109541 +0200
 @@ -367,6 +367,7 @@
  ifeq ($(PKGDATA_MODE),dll)
  SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
- $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
+ $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc | build-dir
 +  mkdir -p $(OUTTMPDIR)
  ifeq ($(MSYS_RC_MODE),1)
rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) 
$<
diff --git a/external/icu/ofz4860.patch.2 b/external/icu/ofz4860.patch.2
deleted file mode 100644
index 14114d52878b..
--- a/external/icu/ofz4860.patch.2
+++ /dev/null
@@ -1,25 +0,0 @@
-From 529ba01ee606940ca273b187be8ce9ba31cf2d90 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Fri, 19 Jan 2018 10:41:02 +0100
-Subject: [PATCH] ofz#4860 fix past-the-end read from array
-

- icu4c/source/common/locmap.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/icu4c/source/common/locmap.cpp b/icu4c/source/common/locmap.cpp
-index cbb2b810a..6d62d8310 100644
 a/icu4c/source/common/locmap.cpp
-+++ b/icu4c/source/common/locmap.cpp
-@@ -1015,7 +1015,7 @@ static const char*
- getPosixID(const ILcidPosixMap *this_0, uint32_t hostID)
- {
- uint32_t i;
--for (i = 0; i <= this_0->numRegions; i++)
-+for (i = 0; i < this_0->numRegions; i++)
- {
- if

[Libreoffice-commits] core.git: configure.ac download.lst

2018-06-29 Thread Michael Stahl

 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 744feb55a11263ae0947ab59db76b949b5863acf
Author: Michael Stahl 
Date:   Thu Jun 28 18:30:28 2018 +0200

python3: upgrade to release 3.5.5

Fixes CVE-2017-1000158.

Change-Id: I1871f031e3431253a3403f2ea2b586bcc4aa1016
Reviewed-on: https://gerrit.libreoffice.org/56609
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index cdc5322c460e..a20c103328cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8272,7 +8272,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index d8fb26541253..1186f2a6f586 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,8 @@ export POPPLER_SHA256SUM := 
2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3
 export POPPLER_TARBALL := poppler-0.66.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44
-export PYTHON_TARBALL := Python-3.5.4.tgz
+export PYTHON_SHA256SUM := 
063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009
+export PYTHON_TARBALL := Python-3.5.5.tar.xz
 export QXP_SHA256SUM := 
8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
 export QXP_TARBALL := libqxp-0.0.1.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice solenv/flatpak-manifest.in

2018-04-26 Thread David Tardon

 configure.ac | 
   2 
 download.lst | 
   4 -
 external/libstaroffice/0001-add-missing-include-for-std-max.patch.1  | 
  24 ++
 external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 | 
  35 --
 external/libstaroffice/Library_staroffice.mk | 
   2 
 external/libstaroffice/UnpackedTarball_libstaroffice.mk  | 
   4 -
 solenv/flatpak-manifest.in   | 
   6 -
 7 files changed, 34 insertions(+), 43 deletions(-)

New commits:
commit 488f70e0c5209fd092b67252fdebb784efa04673
Author: David Tardon 
Date:   Thu Apr 26 08:41:52 2018 +0200

upload libstaroffice 0.0.6

Change-Id: Id3a845174e7cebad999895bc57e2d05f36f3d597
Reviewed-on: https://gerrit.libreoffice.org/53499
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index bdc3efa59172..56e9b01811a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7881,7 +7881,7 @@ libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0])
 libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
 
 libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.4])
+libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.6])
 
 dnl ===
 dnl Check for system lcms2
diff --git a/download.lst b/download.lst
index e61ba6be9fae..c05c99ba4dc0 100644
--- a/download.lst
+++ b/download.lst
@@ -225,8 +225,8 @@ export RHINO_SHA256SUM := 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_SHA256SUM := 
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export STAROFFICE_SHA256SUM := 
315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982
-export STAROFFICE_VERSION_MICRO := 5
+export STAROFFICE_SHA256SUM := 
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
+export STAROFFICE_VERSION_MICRO := 6
 export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
 export SWING_SHA256SUM := 
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
diff --git 
a/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 
b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
new file mode 100644
index ..2445d2a4a8e3
--- /dev/null
+++ b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1
@@ -0,0 +1,24 @@
+From d6c34e98a6adb060ad42b9f1c60a1e8036bc27ff Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Thu, 26 Apr 2018 14:21:06 +0200
+Subject: [PATCH] add missing include for std::max
+
+---
+ src/lib/STOFFChart.cxx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx
+index cd1566f..3e7310c 100644
+--- a/src/lib/STOFFChart.cxx
 b/src/lib/STOFFChart.cxx
+@@ -37,6 +37,7 @@
+  *
+  */
+ 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.14.3
+
diff --git 
a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1 
b/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
deleted file mode 100644
index 658f6797940d..
--- 
a/external/libstaroffice/0001-fix-null-ptr-deref.-if-decryption-failed.patch.1
+++ /dev/null
@@ -1,35 +0,0 @@
-From 59f29dd735bf5890ea29fdde809afcf111463a65 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Mon, 12 Mar 2018 20:33:54 +0100
-Subject: [PATCH] fix null ptr deref. if decryption failed
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Thanks to Antti Levomäki and Christian Jalio from Forcepoint.

- src/lib/StarObjectDraw.cxx | 7 ---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx
-index fd3411a..8a19b1c 100644
 a/src/lib/StarObjectDraw.cxx
-+++ b/src/lib/StarObjectDraw.cxx
-@@ -199,10 +199,11 @@ try
-if the user mask does correspond to the real mask.
- */
- input=StarEncryption::decodeStream(input, 
StarEncryption::getMaskToDecodeStream(firstByte, 0x44));
--if (input) {
--  zone.setInput(input);
--  input->seek(0, librevenge::RVNG_SEEK_SET);
-+if (!input) {
-+  STOFF_DEBUG_MSG(("StarObjectDraw::readDrawDocument: decryption 
failed\n"));
-+  return false;
- }
-+zone.setInput(input);
-   }
-   input->seek(0, librevenge::RVNG_SEEK_SET);
-   std::shared_ptr model(new StarObjectModel(*this, true));
--- 
-2.14.3
-
diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps filter/Configuration_filter.mk filter/source solenv/flatpak-manifest.in writerperfect/qa writerperfect/source

2018-04-26 Thread David Tardon

 configure.ac   
   |2 
 download.lst   
   |4 -
 
external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
 |   27 -
 external/libwps/0001-drop-unneeded-include.patch.1 
   |   24 
 external/libwps/Library_wps.mk 
   |1 
 external/libwps/UnpackedTarball_libwps.mk  
   |5 -
 filter/Configuration_filter.mk 
   |2 
 filter/source/config/fragments/filters/MS_Multiplan.xcu
   |   29 ++
 filter/source/config/fragments/types/calc_MS_Multiplan.xcu 
   |   26 
 solenv/flatpak-manifest.in 
   |6 +-
 writerperfect/qa/unit/WpftCalcFilterTest.cxx   
   |1 
 writerperfect/qa/unit/data/calc/libwps/pass/Multiplan_3
   |binary
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx  
   |5 +
 13 files changed, 70 insertions(+), 62 deletions(-)

New commits:
commit 9739749ba8da87001b73027136f120ef532f0b2b
Author: David Tardon 
Date:   Wed Apr 25 07:02:54 2018 +0200

upload libwps 0.4.9

Change-Id: I9571d91d6ce81d7e8752f24c3220f858a5303986
Reviewed-on: https://gerrit.libreoffice.org/53431
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index d0ca94754b0f..bdc3efa59172 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7853,7 +7853,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.9])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 897a6c83498e..0fa8763fdeae 100644
--- a/download.lst
+++ b/download.lst
@@ -242,8 +242,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
 export WPG_SHA256SUM := 
57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
 export WPG_VERSION_MICRO := 2
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 
e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e
-export WPS_VERSION_MICRO := 8
+export WPS_SHA256SUM := 
13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922
+export WPS_VERSION_MICRO := 9
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git 
a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
 
b/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
deleted file mode 100644
index 40c929ab8ea0..
--- 
a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2a3465442d1305c7fec55e986c9793a86e571baa Mon Sep 17 00:00:00 2001
-From: osnola 
-Date: Fri, 24 Nov 2017 12:32:30 +0100
-Subject: [PATCH] Lotus .123: do no assume that a file containing a fdc's
- structure is   a Mac file :-~
-

- src/lib/Lotus.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/lib/Lotus.cpp b/src/lib/Lotus.cpp
-index d145014..514faad 100644
 a/src/lib/Lotus.cpp
-+++ b/src/lib/Lotus.cpp
-@@ -3046,8 +3046,7 @@ bool 
LotusParser::readMacFontName(std::shared_ptr stream, long endPos
-   }
-   else if (nameOk && !name.empty())
-   {
--  auto encoding=name!="Symbol" ? 
libwps_tools_win::Font::MAC_ROMAN : libwps_tools_win::Font::MAC_SYMBOL;
--  LotusParserInternal::Font font(encoding);
-+  LotusParserInternal::Font font(getDefaultFontType());
-   font.m_name=name;
-   m_state->m_fontsMap.insert(std::map::value_type(id,font));
-   }
--- 
-2.14.3
-
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1 
b/external/libwps/0001-drop-unneeded-include.patch.1
deleted file mode 100644
index 4d7b5a494530..
--- a/external/libwps/0001-drop-unneeded-include.patch.1
+++ /dev/null
@@ -1,24 +0,0 @@
-From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Mon, 27 Nov 2017 19:32:53 +0100
-Subject: [PATCH] drop unneeded include
-

- src/lib/QuattroSpreadsheet.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw solenv/flatpak-manifest.in writerperfect/qa

2018-04-25 Thread David Tardon

 configure.ac |2 
 download.lst |4 
 external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1  |   25 -
 external/libmwaw/0001-ssize_t-is-not-std-type.patch.1|   27 ++
 external/libmwaw/Library_mwaw.mk |2 
 external/libmwaw/UnpackedTarball_libmwaw.mk  |4 
 solenv/flatpak-manifest.in   |6 -
 writerperfect/qa/unit/WpftCalcFilterTest.cxx |5 -
 writerperfect/qa/unit/data/calc/libmwaw/pass/Multiplan_1.hqx |   46 +++
 9 files changed, 87 insertions(+), 34 deletions(-)

New commits:
commit e24f6397e34a6bb02dfb80316060f11e7f179263
Author: David Tardon 
Date:   Tue Apr 24 17:25:07 2018 +0200

upload libmwaw 0.3.14

Change-Id: I727171251964eaf7a14595abaaa2d08fb783258c
Reviewed-on: https://gerrit.libreoffice.org/53419
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 7ccc9f1997c6..c3b24edee347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7862,7 +7862,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.14])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
diff --git a/download.lst b/download.lst
index 3e9e1be3aa15..897a6c83498e 100644
--- a/download.lst
+++ b/download.lst
@@ -170,8 +170,8 @@ export MDNSRESPONDER_SHA256SUM := 
4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_SHA256SUM := 
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
 export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
-export MWAW_SHA256SUM := 
db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea
-export MWAW_VERSION_MICRO := 13
+export MWAW_SHA256SUM := 
aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9
+export MWAW_VERSION_MICRO := 14
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYSQL_CONNECTOR_CPP_SHA256SUM := 
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
 export MYSQL_CONNECTOR_CPP_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
diff --git a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 
b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
deleted file mode 100644
index 2036fa869f86..
--- a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Wed, 15 Nov 2017 13:15:44 +0100
-Subject: [PATCH] fix call of explicit ctor
-

- src/lib/libmwaw_internal.hxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 2875a0fb..b844a9d5 100644
 a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -1027,7 +1027,7 @@ public:
-   }
-   //! generic constructor
-   template  explicit MWAWBox2(MWAWBox2 const )
--: m_data(p.min(), p.max())
-+: m_data(MWAWVec2(p.min()), MWAWVec2(p.max()))
-   {
-   }
- 
--- 
-2.14.3
-
diff --git a/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1 
b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
new file mode 100644
index ..e33f2a19d560
--- /dev/null
+++ b/external/libmwaw/0001-ssize_t-is-not-std-type.patch.1
@@ -0,0 +1,27 @@
+From 4458a5e93736a324251a356362f0e80e7c42d5be Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 25 Apr 2018 12:53:37 +0200
+Subject: [PATCH] ssize_t is not std type
+
+---
+ src/lib/WriterPlsParser.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
+index 00dc969b..33b1fa49 100644
+--- a/src/lib/WriterPlsParser.cxx
 b/src/lib/WriterPlsParser.cxx
+@@ -316,8 +316,8 @@ bool WindowsInfo::getColumnLimitsFor(int line, 
std::vector )
+ if (m_columns[i].m_firstLine == line+2) {
+   numCols=m_columns[i].m_numCol;
+   firstColumn = i;
+-  if (numCols > ssize_t(numColumns - firstColumn))
+-numCols = int(ssize_t(numColumns - firstColumn));
++  if (numCols > int(unsigned(numColumns - firstColumn)))
++numCols = int(unsigned(numColumns - firstColumn));
+   if (numCols <= 1 || m_columns[i].m_col != 1) return false;
+   break;
+ }
+-- 
+2.14.3
+
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index 91280f47460d..0b28836cdb80 100644
---

[Libreoffice-commits] core.git: configure.ac download.lst writerperfect/qa

2018-04-22 Thread David Tardon

 configure.ac |2 +-
 download.lst |4 ++--
 writerperfect/qa/unit/WpftImpressFilterTest.cxx  |1 +
 writerperfect/qa/unit/WpftWriterFilterTest.cxx   |1 +
 writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key |binary
 writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages  |binary
 6 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit aa3d62173be3b0621f87e77f34c65e59825a1a40
Author: David Tardon 
Date:   Sat Apr 21 20:48:16 2018 +0200

upload libetonyek 0.1.8

Change-Id: Id7c15e4ee902016dec70e44cd2495ee17fd6d263
Reviewed-on: https://gerrit.libreoffice.org/53291
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index f52b0b2b0310..d0240806303f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7855,7 +7855,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 
0.3.1])
 libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])
 
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
 
diff --git a/download.lst b/download.lst
index 9e0e21fc3a16..3e9e1be3aa15 100644
--- a/download.lst
+++ b/download.lst
@@ -39,9 +39,9 @@ export EPM_SHA256SUM := 
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 
730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633
 export EPUBGEN_TARBALL := libepubgen-0.1.0.tar.bz2
-export ETONYEK_SHA256SUM := 
8a70cc83a9ee031444f9c891609b1cc11e20e2d6b41ae02d17d8f1ca8a68c4f2
+export ETONYEK_SHA256SUM := 
9dc92347aee0cc9ed57b175a3e21f9d96ebe55d30fecb10e841d1050794ed82d
 export ETONYEK_VERSION_MICRO := 8
-export ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO)-snapshot1.tar.xz
+export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 export EXPAT_SHA256SUM := 
d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
 export EXPAT_TARBALL := expat-2.2.5.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx 
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index 261085f97cdf..4156f394665a 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -31,6 +31,7 @@ WpftImpressFilterTest::WpftImpressFilterTest()
 void WpftImpressFilterTest::test()
 {
 const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
+{ "Keynote_1.key", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
 { "v2.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
 { "v3.zip", REQUIRE_ETONYEK_VERSION(0, 1, 1) },
 { "v6.zip", REQUIRE_ETONYEK_VERSION(0, 1, 4) },
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx 
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 0ec335da6c00..8bc4c7cadbb3 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -35,6 +35,7 @@ void WpftWriterFilterTest::test()
 };
 const writerperfect::test::WpftOptionalMap_t aEtonyekOptional{
 { "Pages_4.pages", REQUIRE_ETONYEK_VERSION(0, 1, 2) },
+{ "Pages_5.pages", REQUIRE_ETONYEK_VERSION(0, 1, 8) },
 };
 const writerperfect::test::WpftOptionalMap_t aMWAWOptional{
 { "MaxWrite_1.hqx", REQUIRE_MWAW_VERSION(0, 3, 8) },
diff --git a/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key 
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key
new file mode 100644
index ..f59ccfab0595
Binary files /dev/null and 
b/writerperfect/qa/unit/data/impress/libetonyek/pass/Keynote_1.key differ
diff --git a/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages 
b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages
new file mode 100644
index ..cd4438a34b45
Binary files /dev/null and 
b/writerperfect/qa/unit/data/writer/libetonyek/pass/Pages_5.pages differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus

2018-02-14 Thread Kohei Yoshida

 configure.ac  |2 +-
 download.lst  |4 ++--
 external/liborcus/UnpackedTarball_liborcus.mk |4 
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 45a4e70484e7d90dab07a677914ada2d948b415c
Author: Kohei Yoshida 
Date:   Wed Feb 14 21:04:28 2018 -0500

Update orcus to 0.13.3.

This will be the new baseline for master, since, though this change
is a fully API-compatible, one bug fix wrt the alpha value handling
unfortunately would break some unit tests when using an earlier
version.

Change-Id: I5a17ce4085d3311a165748154d107d12b95e2c71
Reviewed-on: https://gerrit.libreoffice.org/49784
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/configure.ac b/configure.ac
index 101050c2ae3c..e0cbf939 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9026,7 +9026,7 @@ AC_SUBST(ENABLE_FUZZERS)
 dnl ===
 dnl Orcus
 dnl ===
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.13 >= 0.13.3])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index 70b6833e7e63..12a5f1482c7c 100644
--- a/download.lst
+++ b/download.lst
@@ -190,8 +190,8 @@ export OPENLDAP_SHA256SUM := 
cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb89
 export OPENLDAP_TARBALL := openldap-2.4.45.tgz
 export OPENSSL_SHA256SUM := 
8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f
 export OPENSSL_TARBALL := openssl-1.0.2m.tar.gz
-export ORCUS_SHA256SUM := 
0f8e85dc163881c358bd175227a970e3c70443109e2bb0d8d422439c31641df2
-export ORCUS_TARBALL := liborcus-0.13.2.tar.gz
+export ORCUS_SHA256SUM := 
62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9
+export ORCUS_TARBALL := liborcus-0.13.3.tar.gz
 export OWNCLOUD_ANDROID_LIB_SHA256SUM := 
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_SHA256SUM := 
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk 
b/external/liborcus/UnpackedTarball_liborcus.mk
index 92e461f95e57..3ab387e734be 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -18,10 +18,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,liborcus))
 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
external/liborcus/0001-workaround-a-linking-problem-on-windows.patch \
external/liborcus/rpath.patch.0 \
-   
external/liborcus/0001-Alpha-value-of-0-means-fully-transparent.-I-m-sure-2.patch
 \
-   
external/liborcus/0002-We-are-supposed-to-use-the-foreground-color-for-soli.patch
 \
-   external/liborcus/0001-xls-xml-Pick-up-border-colors.patch \
-   external/liborcus/0001-xls-xml-Import-hidden-row-and-column-flags.patch 
\
 ))
 
 ifeq ($(OS),WNT)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst

2017-12-14 Thread Eike Rathke

 configure.ac |2 +-
 download.lst |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 318af9e4276d9ae84a673153182d45d353206f84
Author: Eike Rathke 
Date:   Thu Dec 14 17:00:05 2017 +0100

Upgrade to ICU 60.2

Change-Id: I1a5653669f5d15b5cdca0967c82263f0b7d17b3c
Reviewed-on: https://gerrit.libreoffice.org/46470
Reviewed-by: Eike Rathke 
Tested-by: Jenkins 

diff --git a/configure.ac b/configure.ac
index 20e1fb48e45b..6645af1aab51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8881,7 +8881,7 @@ SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
 ICU_MAJOR=60
-ICU_MINOR=1
+ICU_MINOR=2
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
 ICU_RECLASSIFIED_HEBREW_LETTER="TRUE"
diff --git a/download.lst b/download.lst
index 32e9ae786d4d..b1ccc5016b64 100644
--- a/download.lst
+++ b/download.lst
@@ -92,10 +92,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
-export ICU_TARBALL := icu4c-60_1-src.tgz
-export ICU_DATA_SHA256SUM := 
bbb920c6e67de8d9dcc0f0ec5554870170d0cb5eff6f0bc9881efc605f68210c
-export ICU_DATA_TARBALL := icu4c-60_1-data.zip
+export ICU_SHA256SUM := 
f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418
+export ICU_TARBALL := icu4c-60_2-src.tgz
+export ICU_DATA_SHA256SUM := 
68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9
+export ICU_DATA_TARBALL := icu4c-60_2-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/glib2 external/Module_external.mk Makefile.fetch

2017-12-05 Thread Thorsten Behrens

 Makefile.fetch  |1 
 configure.ac|3 
 download.lst|2 
 external/Module_external.mk |1 
 external/glib2/ExternalPackage_glib2.mk |   14 
 external/glib2/ExternalProject_glib2.mk |   33 
 external/glib2/Makefile |7 
 external/glib2/Module_glib2.mk  |   18 
 external/glib2/README   |1 
 external/glib2/UnpackedTarball_glib2.mk |   21 
 external/glib2/glib-disable-libintl.patch.1 |   26 
 external/glib2/glib-fix-broken-includes.patch.1 |   24 
 external/glib2/glib-remove-wgetmainargs.patch.1 |   83 
 external/glib2/glib-upgrade-vs12.patch.1| 5509 
 14 files changed, 2 insertions(+), 5741 deletions(-)

New commits:
commit 2488ea55e9355cbfc15b2da4138661f0a0362c86
Author: Thorsten Behrens 
Date:   Tue Dec 5 18:34:44 2017 +0100

Revert "gpg4libre: add glib2 dependency for Windows"

As it turns out, gpgme works perfectly fine w/o glib (though it
really wants it configured out of the box)

This reverts commit daee5fc5569c1807f5c8dae502d305eb06141e8b.

Change-Id: I60002bf3b524696eeae397a26c280a67dcdbfd7a
Reviewed-on: https://gerrit.libreoffice.org/45908
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git a/Makefile.fetch b/Makefile.fetch
index a88a508b3fcb..3944ac75c7b2 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -128,7 +128,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
$(call fetch_Optional,GLM,GLM_TARBALL) \
-   $(call fetch_Optional,GLIB2,GLIB2_TARBALL) \
$(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
diff --git a/configure.ac b/configure.ac
index ace6b04ae26e..874a21e95ce0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10187,8 +10187,9 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" -o "$_os" 
= "WINNT" ; then
 [AC_MSG_ERROR([gpgme headers not found, install gpgme development 
package])], [])
 else
 AC_MSG_RESULT([internal])
-AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
 BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
+AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
+
 GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
 LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
 if test "$_os" != "WINNT"; then
diff --git a/download.lst b/download.lst
index 983dffde299d..342c245320ba 100644
--- a/download.lst
+++ b/download.lst
@@ -78,8 +78,6 @@ export FREEHAND_SHA256SUM := 
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d909
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 export FREETYPE_SHA256SUM := 
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
 export FREETYPE_TARBALL := freetype-2.8.1.tar.bz2
-export GLIB2_SHA256SUM := 
4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
-export GLIB2_TARBALL := glib-2.28.8.tar.xz
 export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 6cde6d90d5aa..59c709838e0f 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,FREEHAND,libfreehand) \
$(call gb_Helper_optional,FREETYPE,freetype) \
-   $(call gb_Helper_optional,GLIB2,glib2) \
$(call gb_Helper_optional,GLM,glm) \
$(call gb_Helper_optional,GPGMEPP,gpgmepp) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
diff --git a/external/glib2/ExternalPackage_glib2.mk 
b/external/glib2/ExternalPackage_glib2.mk
deleted file mode 100644
index d527feeceb13..
--- a/external/glib2/ExternalPackage_glib2.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,glib2,glib2))
-
-$(eval $(call

[Libreoffice-commits] core.git: configure.ac download.lst external/glib2 external/Module_external.mk Makefile.fetch

2017-11-20 Thread Thorsten Behrens

 Makefile.fetch  |1 
 configure.ac|5 
 download.lst|2 
 external/Module_external.mk |1 
 external/glib2/ExternalPackage_glib2.mk |   14 
 external/glib2/ExternalProject_glib2.mk |   33 
 external/glib2/Makefile |7 
 external/glib2/Module_glib2.mk  |   18 
 external/glib2/README   |1 
 external/glib2/UnpackedTarball_glib2.mk |   21 
 external/glib2/glib-disable-libintl.patch.1 |   26 
 external/glib2/glib-fix-broken-includes.patch.1 |   24 
 external/glib2/glib-remove-wgetmainargs.patch.1 |   83 
 external/glib2/glib-upgrade-vs12.patch.1| 5509 
 14 files changed, 5744 insertions(+), 1 deletion(-)

New commits:
commit daee5fc5569c1807f5c8dae502d305eb06141e8b
Author: Thorsten Behrens 
Date:   Fri Nov 17 04:37:29 2017 +0100

gpg4libre: add glib2 dependency for Windows

Change-Id: Ib6b5393323a4dbfe94ea89689ac9170f8afa3899
Reviewed-on: https://gerrit.libreoffice.org/44856
Reviewed-by: Siegmund Gorr 
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/Makefile.fetch b/Makefile.fetch
index 3944ac75c7b2..a88a508b3fcb 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -128,6 +128,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
$(call fetch_Optional,GLM,GLM_TARBALL) \
+   $(call fetch_Optional,GLIB2,GLIB2_TARBALL) \
$(call fetch_Optional,GPGMEPP,GPGME_TARBALL) \
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 92cbf7eedc6d..0d2b8aca01a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10151,8 +10151,11 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
 [AC_MSG_ERROR([gpgme headers not found, install gpgme development 
package])], [])
 else
 AC_MSG_RESULT([internal])
-BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
 AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
+BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
+if test "$_os" = "WINNT"; then
+BUILD_TYPE="$BUILD_TYPE GLIB2"
+fi
 
 GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
 GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs 
-lgpg-error"
diff --git a/download.lst b/download.lst
index 18bbeefbd5ee..98dd3526f783 100644
--- a/download.lst
+++ b/download.lst
@@ -78,6 +78,8 @@ export FREEHAND_SHA256SUM := 
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d909
 export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
 export FREETYPE_SHA256SUM := 
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
 export FREETYPE_TARBALL := freetype-2.8.1.tar.bz2
+export GLIB2_SHA256SUM := 
4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
+export GLIB2_TARBALL := glib-2.28.8.tar.xz
 export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 8f87fe70a5b3..498d95bef4ca 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FONTCONFIG,fontconfig) \
$(call gb_Helper_optional,FREEHAND,libfreehand) \
$(call gb_Helper_optional,FREETYPE,freetype) \
+   $(call gb_Helper_optional,GLIB2,glib2) \
$(call gb_Helper_optional,GLM,glm) \
$(call gb_Helper_optional,GPGMEPP,gpgme) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
diff --git a/external/glib2/ExternalPackage_glib2.mk 
b/external/glib2/ExternalPackage_glib2.mk
new file mode 100644
index ..d527feeceb13
--- /dev/null
+++ b/external/glib2/ExternalPackage_glib2.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,glib2,glib2))
+
+$(eval $(call gb_ExternalPackage_use_external_project,glib2,glib2))
+
+# vim: set noet sw=4 ts=4:
diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/firebird external/icu i18npool/source i18nutil/source include/svx svx/source

2017-11-20 Thread Eike Rathke

 configure.ac|2 
 download.lst|8 
 external/firebird/ExternalProject_firebird.mk   |6 
 external/icu/UnpackedTarball_icu.mk |3 
 external/icu/icu4c-59-icu13329-xlocale.patch.1  |   14 -
 external/icu/icu4c-59-werror-shadow.patch.1 |   42 
 external/icu/icu4c-59-werror-undef.patch.1  |   13 -
 external/icu/icu4c-changeset-39671.patch.1  |  155 
 external/icu/icu4c-changeset-40324.patch.1  |   11 -
 external/icu/icu4c-khmerbreakengine.patch.1 |   12 -
 external/icu/icu4c-ubsan.patch.1|   80 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   21 ++
 i18nutil/source/utility/unicode.cxx |   11 +
 include/svx/strings.hrc |7 
 svx/source/dialog/charmap.cxx   |   23 ++
 15 files changed, 79 insertions(+), 329 deletions(-)

New commits:
commit 9206a08ada00e8762c4a634f242bd566028964bb
Author: Eike Rathke 
Date:   Fri Nov 17 11:03:45 2017 +0100

Upgrade to ICU 60.1

Change-Id: I6d90f51ee88c4e1005edbaa93d23cfb94cb2acfb
Reviewed-on: https://gerrit.libreoffice.org/44871
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index a1842ce57d58..92cbf7eedc6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8827,7 +8827,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=59
+ICU_MAJOR=60
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index b857dc49dfe8..18bbeefbd5ee 100644
--- a/download.lst
+++ b/download.lst
@@ -92,10 +92,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
-export ICU_TARBALL := icu4c-59_1-src.tgz
-export ICU_DATA_SHA256SUM := 
38a84c1289c32a96924ff286a2f33edc97671b4cc90e8c99708553a6b5a9e70a
-export ICU_DATA_TARBALL := icu4c-59_1-data.zip
+export ICU_SHA256SUM := 
f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
+export ICU_TARBALL := icu4c-60_1-src.tgz
+export ICU_DATA_SHA256SUM := 
bbb920c6e67de8d9dcc0f0ec5554870170d0cb5eff6f0bc9881efc605f68210c
+export ICU_DATA_TARBALL := icu4c-60_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/firebird/ExternalProject_firebird.mk 
b/external/firebird/ExternalProject_firebird.mk
index 17d4f55c6641..8f2b576de115 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -26,6 +26,10 @@ ifneq ($(OS),WNT)
 INVOKE_FPA:="CPU=\$$(EMPTY) $${FB_CPU_ARG}"
 endif
 
+ifeq ($(COM_IS_CLANG),TRUE)
+firebird_NO_CXX11_NARROWING := -Wno-c++11-narrowing
+endif
+
 MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call 
gb_UnpackedTarball_get_dir,icu)/source/lib) LC_ALL=C
 
 MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \
@@ -70,6 +74,8 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \
-L$(call gb_UnpackedTarball_get_dir,libtommath) 
\
) \
+   $(CXXFLAGS_CXX11) \
+   $(firebird_NO_CXX11_NARROWING) \
" \
&& export LDFLAGS=" \
$(if $(SYSTEM_ICU),$(ICU_LIBS), \
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 7bf2926e5a83..499650976a55 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -34,10 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-clang-cl.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/icu4c-khmerbreakengine.patch.1 \
-   external/icu/icu4c-59-werror-undef.patch.1 \
external/icu/icu4c-59-werror-shadow.patch.1 \
-   external/icu/icu4c-59-icu13329-xlocale.patch.1 \
-   external/icu/icu4c-changeset-40324.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18npool/source i18nutil/source include/svx svx/source

2017-11-16 Thread Eike Rathke

 configure.ac|2 
 download.lst|8 
 external/icu/UnpackedTarball_icu.mk |3 
 external/icu/icu4c-59-icu13329-xlocale.patch.1  |   14 +
 external/icu/icu4c-59-werror-shadow.patch.1 |   42 
 external/icu/icu4c-59-werror-undef.patch.1  |   13 +
 external/icu/icu4c-changeset-39671.patch.1  |  155 
 external/icu/icu4c-changeset-40324.patch.1  |   11 +
 external/icu/icu4c-khmerbreakengine.patch.1 |   12 -
 external/icu/icu4c-ubsan.patch.1|   80 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   21 --
 i18nutil/source/utility/unicode.cxx |   11 -
 include/svx/strings.hrc |7 
 svx/source/dialog/charmap.cxx   |   23 --
 14 files changed, 329 insertions(+), 73 deletions(-)

New commits:
commit 0f73433b13ba9e3f38193ddd86f4b9b767a36bb2
Author: Eike Rathke 
Date:   Fri Nov 17 02:24:52 2017 +0200

Revert "Upgrade to ICU 60.1"

This reverts commit f643e1f687e27e7f46c53d7298772d4dddb3e660.

Failing in firebird, back to the drawing board..

Change-Id: I087d2fa6e81cf713458b1c9645edc7c1facf148c
Reviewed-on: https://gerrit.libreoffice.org/44843
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index dd4f8a4c0a95..993d85794802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8827,7 +8827,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=60
+ICU_MAJOR=59
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 6f054754f587..dca14ac081be 100644
--- a/download.lst
+++ b/download.lst
@@ -92,10 +92,10 @@ export HUNSPELL_SHA256SUM := 
3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce
 export HUNSPELL_TARBALL := hunspell-1.6.2.tar.gz
 export HYPHEN_SHA256SUM := 
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM := 
f8f5a6c8fbf32c015a467972bdb1477dc5f5d5dfea908b6ed218715eeb5ee225
-export ICU_TARBALL := icu4c-60_1-src.tgz
-export ICU_DATA_SHA256SUM := 
bbb920c6e67de8d9dcc0f0ec5554870170d0cb5eff6f0bc9881efc605f68210c
-export ICU_DATA_TARBALL := icu4c-60_1-data.zip
+export ICU_SHA256SUM := 
7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
+export ICU_TARBALL := icu4c-59_1-src.tgz
+export ICU_DATA_SHA256SUM := 
38a84c1289c32a96924ff286a2f33edc97671b4cc90e8c99708553a6b5a9e70a
+export ICU_DATA_TARBALL := icu4c-59_1-data.zip
 export JFREEREPORT_FLOW_ENGINE_SHA256SUM := 
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_SHA256SUM := 
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 499650976a55..7bf2926e5a83 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -34,7 +34,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-clang-cl.patch.1 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.patch.1) \
external/icu/icu4c-khmerbreakengine.patch.1 \
+   external/icu/icu4c-59-werror-undef.patch.1 \
external/icu/icu4c-59-werror-shadow.patch.1 \
+   external/icu/icu4c-59-icu13329-xlocale.patch.1 \
+   external/icu/icu4c-changeset-40324.patch.1 \
 ))
 
 $(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
diff --git a/external/icu/icu4c-59-icu13329-xlocale.patch.1 
b/external/icu/icu4c-59-icu13329-xlocale.patch.1
new file mode 100644
index ..93e14d23fa5a
--- /dev/null
+++ b/external/icu/icu4c-59-icu13329-xlocale.patch.1
@@ -0,0 +1,14 @@
+# xlocale.h is gone with glibc 2.26 and should never had been included.
+# https://ssl.icu-project.org/trac/ticket/13329
+diff -ur icu.org/source/i18n/digitlst.cpp icu/source/i18n/digitlst.cpp
+--- icu.org/source/i18n/digitlst.cpp   2017-01-20 01:20:31.0 +0100
 icu/source/i18n/digitlst.cpp   2017-09-13 13:25:59.980160603 +0200
+@@ -63,6 +63,8 @@
+ #if U_USE_STRTOD_L
+ # if U_PLATFORM_USES_ONLY_WIN32_API || U_PLATFORM == U_PF_CYGWIN
+ #   include 
++# elif U_PLATFORM_IS_LINUX_BASED
++#   include// should be for all POSIX.2008 compliant platforms, 
but..
+ # else
+ #   include 
+ # endif
diff --git a/external/icu/icu4c-59-werror-shadow.patch.1 
b/external/icu/icu4c-59-werror-shadow.patch.1
index fb88244aff13..2031f80cb908 100644
---

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw

2017-11-15 Thread David Tardon

 configure.ac | 
   2 
 download.lst | 
   4 
 external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1  | 
  25 +
 external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 | 
  46 --
 external/libmwaw/ExternalProject_libmwaw.mk  | 
   1 
 external/libmwaw/UnpackedTarball_libmwaw.mk  | 
   2 
 6 files changed, 29 insertions(+), 51 deletions(-)

New commits:
commit a3df638a0c8ec1a5a318df96760119d99d2d66dc
Author: David Tardon 
Date:   Tue Nov 14 20:07:09 2017 +0100

upload libmwaw 0.3.13

Change-Id: I9af801efd81bbe64117de52359491c05069c1947
Reviewed-on: https://gerrit.libreoffice.org/44736
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 63ae44336fec..ffb1fdf0c850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7698,7 +7698,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.11])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7])
diff --git a/download.lst b/download.lst
index 78bac45c9514..dca14ac081be 100644
--- a/download.lst
+++ b/download.lst
@@ -158,8 +158,8 @@ export MDNSRESPONDER_SHA256SUM := 
4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_SHA256SUM := 
26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_SHA256SUM := 
7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7
-export MWAW_VERSION_MICRO := 12
+export MWAW_SHA256SUM := 
db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea
+export MWAW_VERSION_MICRO := 13
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYSQL_CONNECTOR_CPP_SHA256SUM := 
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
 export MYSQL_CONNECTOR_CPP_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
diff --git a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 
b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
new file mode 100644
index ..2036fa869f86
--- /dev/null
+++ b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1
@@ -0,0 +1,25 @@
+From 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 15 Nov 2017 13:15:44 +0100
+Subject: [PATCH] fix call of explicit ctor
+
+---
+ src/lib/libmwaw_internal.hxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
+index 2875a0fb..b844a9d5 100644
+--- a/src/lib/libmwaw_internal.hxx
 b/src/lib/libmwaw_internal.hxx
+@@ -1027,7 +1027,7 @@ public:
+   }
+   //! generic constructor
+   template  explicit MWAWBox2(MWAWBox2 const )
+-: m_data(p.min(), p.max())
++: m_data(MWAWVec2(p.min()), MWAWVec2(p.max()))
+   {
+   }
+ 
+-- 
+2.14.3
+
diff --git 
a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 
b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
deleted file mode 100644
index dbbe6bfd204c..
--- 
a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From a7648cda4017551c1c97c61362eb52d95fbe68e7 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Mon, 17 Jul 2017 10:43:01 +0200
-Subject: [PATCH] make MWAW_FALLTHROUGH decl. more verbose again
-
-... because older clang doesn't like the former one:
-./libmwaw_internal.hxx:122:58: error: token is not a valid binary operator in 
a preprocessor subexpression
-  ~~~^

- src/lib/libmwaw_internal.hxx | 13 -
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
-index 4c9580d..cbf0fc0 100644
 a/src/lib/libmwaw_internal.hxx
-+++ b/src/lib/libmwaw_internal.hxx
-@@ -117,17 +117,20 @@ struct MWAW_shared_ptr_noop_deleter {
- #endif
- 
- /** fall through attributes */
--#define MWAW_FALLTHROUGH
--#if defined(__clang__)
-+#if defined(__clang__) && defined(__has_cpp_attribute)
--#  if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
--#undef MWAW_FALLTHROUGH
-+#  if __has_cpp_attribute(clang::fallthrough)
- #define MWAW_FALLTHROUGH [[clang::fallthrough]]
-+#  else
-+#define MWAW_FALLTHROUGH
- #

[Libreoffice-commits] core.git: configure.ac download.lst external/libetonyek

2017-10-23 Thread David Tardon

 configure.ac |2 
 download.lst |6 -
 external/libetonyek/0001-add-missing-include-for-std-min.patch.1 |   25 +++
 external/libetonyek/0001-fix-brain-fart.patch.1  |   35 
--
 external/libetonyek/UnpackedTarball_libetonyek.mk|3 
 external/libetonyek/silence-libxml.patch |   24 --
 6 files changed, 30 insertions(+), 65 deletions(-)

New commits:
commit 688dddcd843b85eeadaea49b8ddb7c90c05c4a9f
Author: David Tardon 
Date:   Mon Oct 23 10:21:50 2017 +0200

upload libetonyek 0.1.7

Change-Id: Iabca84c1ba3a14716b7707541434efcc82581a78
Reviewed-on: https://gerrit.libreoffice.org/43709
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 07df6eb7d9f0..a47fc48f10e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7702,7 +7702,7 @@ libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 
0.3.1])
 libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.11])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
+libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7])
 
 libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
 
diff --git a/download.lst b/download.lst
index f254a7cb27fb..25f8060c392a 100644
--- a/download.lst
+++ b/download.lst
@@ -40,9 +40,9 @@ export EPM_SHA256SUM := 
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 export EPUBGEN_SHA256SUM := 
eea910b042526ed52f7ab9292b7fa31fca32f9e042285818074ff33664db4fa2
 export EPUBGEN_TARBALL := libepubgen-0.0.1.tar.bz2
-export ETONYEK_SHA256SUM := 
032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78
-export ETONYEK_VERSION_MICRO := 6
-export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
+export ETONYEK_SHA256SUM := 
69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac
+export ETONYEK_VERSION_MICRO := 7
+export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 export EXPAT_SHA256SUM := 
b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f
 export EXPAT_TARBALL := expat-2.2.3.tar.bz2
 export FIREBIRD_SHA256SUM := 
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
diff --git a/external/libetonyek/0001-add-missing-include-for-std-min.patch.1 
b/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
new file mode 100644
index ..dc3e70988d56
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-include-for-std-min.patch.1
@@ -0,0 +1,25 @@
+From cc71d75b4d9b88b5c920cd039bab3e707e71568b Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Mon, 23 Oct 2017 12:55:43 +0200
+Subject: [PATCH] add missing include for std::min
+
+Change-Id: I2088057657f3ce23b91dbbc7b4f5840914dbcaa8
+---
+ src/lib/IWASnappyStream.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/IWASnappyStream.cpp b/src/lib/IWASnappyStream.cpp
+index 7b28681..9cc84c3 100644
+--- a/src/lib/IWASnappyStream.cpp
 b/src/lib/IWASnappyStream.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "IWASnappyStream.h"
+ 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.14.1
+
diff --git a/external/libetonyek/0001-fix-brain-fart.patch.1 
b/external/libetonyek/0001-fix-brain-fart.patch.1
deleted file mode 100644
index 441e275c5f45..
--- a/external/libetonyek/0001-fix-brain-fart.patch.1
+++ /dev/null
@@ -1,35 +0,0 @@
-From 649f459c499ceab07446ed913ae661c31e13044a Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 14 Jan 2016 09:16:16 +0100
-Subject: [PATCH] fix brain fart
-
-Change-Id: If7c5e3c6cebe2f97f1c9f5793cf25cea135a7735

- src/lib/IWORKText.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp
-index 20d7c5b..ef34b4b 100644
 a/src/lib/IWORKText.cpp
-+++ b/src/lib/IWORKText.cpp
-@@ -763,7 +763,7 @@ void IWORKText::insertBlockContent(const 
IWORKOutputElements )
- {
-   if (m_inPara)
- closePara();
--  if (!m_inSection and needsSection())
-+  if (!m_inSection && needsSection())
- openSection();
-   m_elements.append(elements);
-   m_ignoreEmptyPara = true;
-@@ -817,7 +817,7 @@ void IWORKText::openPara()
- {
-   assert(!m_inPara);
- 
--  if (!m_inSection and needsSection())
-+  if (!m_inSection && needsSection())
- openSection();
-   handleListLevelChange(m_listLevel);
- 
--- 
-2.5.0
-
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 3d6cce2bab7b..f178b469e028 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,8 +19,7 @@ $(eval $(call

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw writerperfect/qa

2017-04-01 Thread David Tardon

 configure.ac |2 +-
 download.lst |4 ++--
 external/libmwaw/Library_mwaw.mk |4 
 writerperfect/qa/unit/WpftImpressFilterTest.cxx  |1 +
 writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt |binary
 5 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit e405f496cb199f758a777a3bc7459a0ff80e4619
Author: David Tardon 
Date:   Fri Mar 31 21:36:17 2017 +0200

upload libmwaw 0.3.11

Change-Id: Ie244411dd155af245c83e758f432237ce72fa623
Reviewed-on: https://gerrit.libreoffice.org/35981
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 83aaf0a71b71..49ffc7f4b232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7760,7 +7760,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.10])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.11])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
diff --git a/download.lst b/download.lst
index 15e211bc8d71..56c372210c56 100644
--- a/download.lst
+++ b/download.lst
@@ -153,8 +153,8 @@ export MDNSRESPONDER_SHA256SUM := 
4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_SHA256SUM := 
26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_SHA256SUM := 
b246a0c15fcf98076f2a1f2cf4d44a714f5c8eb39690442fc7fbbd01fa34f220
-export MWAW_VERSION_MICRO := 10
+export MWAW_SHA256SUM := 
4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a
+export MWAW_VERSION_MICRO := 11
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
 export MYSQLCPPCONN_SHA256SUM := 
a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk
index f9cdf7c2be10..91280f47460d 100644
--- a/external/libmwaw/Library_mwaw.mk
+++ b/external/libmwaw/Library_mwaw.mk
@@ -164,6 +164,10 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/PowerPoint1Parser \
UnpackedTarball/libmwaw/src/lib/PowerPoint3OLE \
UnpackedTarball/libmwaw/src/lib/PowerPoint3Parser \
+   UnpackedTarball/libmwaw/src/lib/PowerPoint7Graph \
+   UnpackedTarball/libmwaw/src/lib/PowerPoint7Parser \
+   UnpackedTarball/libmwaw/src/lib/PowerPoint7Struct \
+   UnpackedTarball/libmwaw/src/lib/PowerPoint7Text \
UnpackedTarball/libmwaw/src/lib/RagTime5Chart \
UnpackedTarball/libmwaw/src/lib/RagTime5ClusterManager \
UnpackedTarball/libmwaw/src/lib/RagTime5Graph \
diff --git a/writerperfect/qa/unit/WpftImpressFilterTest.cxx 
b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
index d4d4b6f8d95b..ebcc1f1d2d1d 100644
--- a/writerperfect/qa/unit/WpftImpressFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftImpressFilterTest.cxx
@@ -47,6 +47,7 @@ void WpftImpressFilterTest::test()
 {"PowerPoint_2.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
 {"PowerPoint_3.ppt", REQUIRE_MWAW_VERSION(0, 3, 9)},
 {"PowerPoint_4.ppt", REQUIRE_MWAW_VERSION(0, 3, 10)},
+{"PowerPoint_7.ppt", REQUIRE_MWAW_VERSION(0, 3, 11)},
 };
 
 doTest("org.libreoffice.comp.Impress.KeynoteImportFilter", 
"/writerperfect/qa/unit/data/impress/libetonyek/", aEtonyekOptional);
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt 
b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt
new file mode 100755
index ..0556e51c6851
Binary files /dev/null and 
b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst writerperfect/qa

2017-03-27 Thread David Tardon

 configure.ac|2 +-
 download.lst|6 +++---
 writerperfect/qa/unit/WpftCalcFilterTest.cxx|1 +
 writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 |binary
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 2753797c98d56a51666b3a6c75e1eb43495c5134
Author: David Tardon 
Date:   Mon Mar 27 19:00:39 2017 +0200

upload libwps 0.4.6

Change-Id: Icd1ce144733d2f5e907a19bb6ef307d50becb49d
Reviewed-on: https://gerrit.libreoffice.org/35769
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 12ab4421f004..c81983c042c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7751,7 +7751,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.5])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.6])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index 3428fbbd9687..15e211bc8d71 100644
--- a/download.lst
+++ b/download.lst
@@ -223,9 +223,9 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_SHA256SUM := 
29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_SHA256SUM := 
9192ad0c0ad22bfc24ace884286820029c0decc26ad37e0bed0efbd91ff72ea9
-export WPS_VERSION_MICRO := 5
-export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
+export WPS_SHA256SUM := 
e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0
+export WPS_VERSION_MICRO := 6
+export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
 export XSLTML_SHA256SUM := 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_SHA256SUM := 
4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx 
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 29c3111be937..7a7dc531826c 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -38,6 +38,7 @@ void WpftCalcFilterTest::test()
 const writerperfect::test::WpftOptionalMap_t aWpsOptional
 {
 {"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
+{"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)},
 };
 
 doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libmwaw/");
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123
new file mode 100755
index ..1d3a7e752cb1
Binary files /dev/null and 
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/Module_external.mk external/python33

2017-03-02 Thread David Ostrovsky

 configure.ac|   85 -
 download.lst|7 
 external/Module_external.mk |2 
 external/python33/ExternalPackage_python3.mk|  826 --
 external/python33/ExternalProject_python3.mk|  145 -
 external/python33/GeneratedPackage_python3.mk   |   18 
 external/python33/Makefile  |7 
 external/python33/Module_python33.mk|   22 
 external/python33/README|1 
 external/python33/UnpackedTarball_python3.mk|   61 
 external/python33/clang-cl.patch.0  |   11 
 external/python33/i100492-freebsd.patch.1   |   80 -
 external/python33/python-3.3.0-clang.patch.1|   13 
 external/python33/python-3.3.0-darwin.patch.1   |   85 -
 external/python33/python-3.3.0-gcc-4.8.patch.1  |   15 
 external/python33/python-3.3.0-i42553.patch.2   |   18 
 external/python33/python-3.3.0-msvc-disable.patch.1 |   47 
 external/python33/python-3.3.0-msvc-x64.patch.1 |  289 ---
 external/python33/python-3.3.0-msvc2012.patch.1 |   72 
 external/python33/python-3.3.0-pythreadstate.patch.1|   15 
 external/python33/python-3.3.0-ssl.patch.1  |  208 --
 external/python33/python-3.3.3-aix.patch.1  |  145 -
 external/python33/python-3.3.3-disable-obmalloc.patch.0 |   21 
 external/python33/python-3.3.3-elf-rpath.patch.1|   13 
 external/python33/python-3.3.3-msvc2012-winxp.patch.1   |  117 -
 external/python33/python-3.3.3-py17797.patch.1  |   45 
 external/python33/python-3.3.5-darwin-gnu-xargs.patch.1 |   12 
 external/python33/python-3.3.5-pyexpat-symbols.patch.1  |   28 
 external/python33/python-3.3.5-vs2013.patch.1   |   14 
 external/python33/python-lsan.patch.0   |   19 
 external/python33/python-msvc-disable-sse2.patch.1  |   23 
 external/python33/python-vc2013.patch.1 | 1213 
 external/python33/ubsan.patch.0 |   79 -
 33 files changed, 27 insertions(+), 3729 deletions(-)

New commits:
commit 84b36c704d73362d4d86dc9e9c0efa0625958347
Author: David Ostrovsky 
Date:   Sun Jan 22 22:54:44 2017 +0100

Drop support for MSVC 2013

Change-Id: Ibf47c9ff7b5fb098e284a58c547b61286264dd80
Reviewed-on: https://gerrit.libreoffice.org/22588
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 8756e52..76da4e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2097,10 +2097,9 @@ libo_FUZZ_ARG_WITH(doxygen,
 ,with_doxygen=yes)
 
 AC_ARG_WITH(visual-studio,
-AS_HELP_STRING([--with-visual-studio=<2013/2015/2017>],
+AS_HELP_STRING([--with-visual-studio=<2015/2017>],
 [Specify which Visual Studio version to use in case several are
- installed. If not specified, only 2013 is detected automatically
- because 2015 and 2017 support is currently experimental.]),
+ installed. If not specified, defaults to 2015.]),
 ,)
 
 AC_ARG_WITH(windows-sdk,
@@ -3269,8 +3268,6 @@ map_vs_year_to_version()
 unset vsversion
 
 case $1 in
-2013)
-vsversion=12.0;;
 2015)
 vsversion=14.0;;
 2017)
@@ -3291,8 +3288,8 @@ vs_versions_to_check()
 map_vs_year_to_version "$1"
 vsversions=$vsversion
 else
-# By default we prefer 2013/2015/2017, in this order
-vsversions="12.0 14.0 15.0"
+# By default we prefer 2015/2017, in this order
+vsversions="14.0 15.0"
 fi
 }
 
@@ -3348,7 +3345,7 @@ find_ucrt()
 
 find_msvc()
 {
-# Find Visual C++ 2013/2015/2017
+# Find Visual C++ 2015/2017
 # Args: $1 (optional) : The VS version year
 # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot, $vcbuildnumber
 
@@ -3382,10 +3379,6 @@ find_msvc()
 if test -n "$vctest"; then
 vcnumwithdot=$ver
 case "$vcnumwithdot" in
-12.0)
-vcyear=2013
-vcnum=120
-;;
 14.0)
 vcyear=2015
 vcnum=140
@@ -3415,7 +3408,7 @@ if test "$_os" = "WINNT"; then
 if test -n "$with_visual_studio"; then
 AC_MSG_ERROR([No Visual Studio $with_visual_studio installation 
found])
 else
-AC_MSG_ERROR([No Visual Studio 2013/2015/2017 installation found])
+AC_MSG_ERROR([No Visual Studio 2015/2017 installation found])
 fi
 fi
 
@@ -3454,27 +3447,21 @@ if test "$_os" = "WINNT"; then
 UCRTSDKDIR=
 UCRTVERSION=
 
-AC_MSG_CHECKING([whether UCRT is needed for this compiler version])
-if test "$vcnum" = "120"; then
-AC_MSG_RESULT([No])
-else
-AC_MSG_RESULT([Yes])
-AC_MSG_CHECKING([for UCRT location])
-

[Libreoffice-commits] core.git: configure.ac download.lst external/libstaroffice

2017-02-22 Thread David Tardon

 configure.ac   
  |2 
 download.lst   
  |6 -
 
external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1
 |   54 --
 external/libstaroffice/Library_staroffice.mk   
  |2 
 external/libstaroffice/UnpackedTarball_libstaroffice.mk
  |1 
 5 files changed, 6 insertions(+), 59 deletions(-)

New commits:
commit ac956e0424c79b59bb5ad433d18b3016bd47b9b2
Author: David Tardon 
Date:   Wed Feb 22 10:28:43 2017 +0100

upload libstaroffice 0.0.3

Change-Id: I5cb29e5cc8635988e84f0285164cf139ed4a62b0
Reviewed-on: https://gerrit.libreoffice.org/34536
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 0928c15..7715f1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7761,7 +7761,7 @@ 
libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
 libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
 
 libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.2])
+libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.3])
 
 dnl ===
 dnl Check for system libcmis
diff --git a/download.lst b/download.lst
index 2d885d3..38d14be 100644
--- a/download.lst
+++ b/download.lst
@@ -163,9 +163,9 @@ export REVENGE_TARBALL := 
librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
 export SERF_TARBALL := serf-1.2.1.tar.bz2
-export STAROFFICE_MD5SUM := 4012950240c2bf768c9b29ad376123d7
-export STAROFFICE_VERSION_MICRO := 2
-export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.bz2
+export STAROFFICE_MD5SUM := 1478e222b842fad9eb88ecddee39058d
+export STAROFFICE_VERSION_MICRO := 3
+export STAROFFICE_TARBALL := 
libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 export VISIO_MD5SUM := cbee198a78b842b2087f32d33c522818
diff --git 
a/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1
 
b/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1
deleted file mode 100644
index 1c579b3..000
--- 
a/external/libstaroffice/0001-error-C2512-StarObject-no-appropriate-default-constr.patch.1
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1bbb89aff70e81d47af617bb1407e70545a2f99a Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Wed, 10 Aug 2016 18:52:46 +0200
-Subject: [PATCH] error C2512: 'StarObject' : no appropriate default
- constructor available
-

- src/lib/StarObjectChart.cxx   | 2 +-
- src/lib/StarObjectDraw.cxx| 2 +-
- src/lib/StarObjectSpreadsheet.cxx | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/StarObjectChart.cxx b/src/lib/StarObjectChart.cxx
-index 3438beb..d9b1604 100644
 a/src/lib/StarObjectChart.cxx
-+++ b/src/lib/StarObjectChart.cxx
-@@ -71,7 +71,7 @@ struct State {
- 
- // constructor/destructor, ...
- 
--StarObjectChart::StarObjectChart(StarObject const , bool duplicateState) 
: StarObject::StarObject(orig, duplicateState), m_chartState(new 
StarObjectChartInternal::State)
-+StarObjectChart::StarObjectChart(StarObject const , bool duplicateState) 
: StarObject(orig, duplicateState), m_chartState(new 
StarObjectChartInternal::State)
- {
- }
- 
-diff --git a/src/lib/StarObjectDraw.cxx b/src/lib/StarObjectDraw.cxx
-index bb660a9..4e4fdc2 100644
 a/src/lib/StarObjectDraw.cxx
-+++ b/src/lib/StarObjectDraw.cxx
-@@ -76,7 +76,7 @@ struct State {
- 
- // constructor/destructor, ...
- 
--StarObjectDraw::StarObjectDraw(StarObject const , bool duplicateState) : 
StarObject::StarObject(orig, duplicateState), m_drawState(new 
StarObjectDrawInternal::State)
-+StarObjectDraw::StarObjectDraw(StarObject const , bool duplicateState) : 
StarObject(orig, duplicateState), m_drawState(new StarObjectDrawInternal::State)
- {
- }
- 
-diff --git a/src/lib/StarObjectSpreadsheet.cxx 
b/src/lib/StarObjectSpreadsheet.cxx
-index 58409c8..c8bd71b 100644
 a/src/lib/StarObjectSpreadsheet.cxx
-+++ b/src/lib/StarObjectSpreadsheet.cxx
-@@ -521,7 +521,7 @@ void SubDocument::parse(STOFFListenerPtr , 
libstoff::SubDocumentType /*
-

[Libreoffice-commits] core.git: configure.ac download.lst external/gpgme external/libassuan external/libgpg-error external/Module_external.mk Makefile.fetch

2017-02-03 Thread Katarina Behrens

 Makefile.fetch|3 +++
 configure.ac  |4 +++-
 download.lst  |6 ++
 external/Module_external.mk   |3 +++
 external/gpgme/Makefile   |   14 ++
 external/gpgme/Module_gpgme.mk|   16 
 external/gpgme/README |2 ++
 external/gpgme/UnpackedTarball_gpgme.mk   |   14 ++
 external/libassuan/Makefile   |   14 ++
 external/libassuan/Module_libassuan.mk|   16 
 external/libassuan/README |3 +++
 external/libassuan/UnpackedTarball_libassuan.mk   |   14 ++
 external/libgpg-error/Makefile|   14 ++
 external/libgpg-error/Module_libgpg-error.mk  |   16 
 external/libgpg-error/README  |2 ++
 external/libgpg-error/UnpackedTarball_libgpg-error.mk |   14 ++
 16 files changed, 154 insertions(+), 1 deletion(-)

New commits:
commit c6315e162ab7e44cd710df3d0d1d7af423bf48bc
Author: Katarina Behrens 
Date:   Mon Jan 30 18:01:18 2017 +0100

gpg4libre: Download external gpgme and dependent libs

in particular, libgpg-error and libassuan
This only downloads and unpacks the tarball. Building them needs
some work still

Change-Id: I562fd01571929ddfb47a319038f88ea8dbfb4bdd
Reviewed-on: https://gerrit.libreoffice.org/33712
Reviewed-by: Siegmund Gorr 
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/Makefile.fetch b/Makefile.fetch
index b01fdd6..edb1fd2 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -131,6 +131,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
$(call fetch_Optional,EPOXY,EPOXY_TARBALL) \
$(call fetch_Optional,GLM,GLM_TARBALL) \
+   $(call fetch_Optional,GPGME,GPGME_TARBALL) \
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
$(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \
@@ -153,8 +154,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \
$(call fetch_Optional,LCMS2,LCMS2_TARBALL) \
$(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \
+   $(call fetch_Optional,LIBASSUAN,LIBASSUAN_TARBALL) \
$(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
$(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \
+   $(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \
$(call fetch_Optional,LIBPNG,PNG_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 6219c5d..5f23f29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10652,7 +10652,9 @@ if test "$_os" = "Linux"; then
 GPGME_CFLAGS=`$GPGMECONFIG --cflags`
 GPGME_LIBS=`$GPGMECONFIG --libs`
 else
-AC_MSG_RESULT([none])
+# This is work in progress, please DO NOT MODIFY OR REMOVE
+AC_MSG_RESULT([internal])
+BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGME"
 fi
 fi
 AC_SUBST(SYSTEM_GPGME)
diff --git a/download.lst b/download.lst
index 7f48a49..8d2efcf 100644
--- a/download.lst
+++ b/download.lst
@@ -59,6 +59,8 @@ export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
 export FREETYPE_MD5SUM := b3230110e0cab777e0df7631837ac36e
 export FREETYPE_TARBALL := freetype-2.7.1.tar.bz2
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+export GPGME_TARBALL := gpgme-1.8.0.tar.bz2
+export GPGME_MD5SUM := 722a4153904b9b5dc15485a22d29263b
 export GRAPHITE_TARBALL := 
3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz
 export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5
 export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
@@ -86,6 +88,8 @@ export LANGTAGREG_TARBALL := 
language-subtag-registry-2016-07-19.tar.bz2
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_MD5SUM := 87a5913f1a52464190bb655ad230539c
 export LCMS2_TARBALL := lcms2-2.8.tar.gz
+export LIBASSUAN_MD5SUM := 8e01a7c72d3e5d154481230668e6eb5a
+export LIBASSUAN_TARBALL := libassuan-2.4.3.tar.bz2
 export LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL :=

[Libreoffice-commits] core.git: configure.ac download.lst external/hunspell

2017-01-24 Thread Caolán McNamara

 configure.ac   
   |4 
 download.lst   
   |2 
 external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch   
   |61599 ++
 external/hunspell/0001-unroll-this-a-bit.patch 
   |  116 
 external/hunspell/0002-rename-std-vector-w_char-to-wide-string.patch   
   |  912 
 
external/hunspell/0003-Related-hunspell-406-use-a-basic_string-w_char-inste.patch
 |   37 
 
external/hunspell/0004-use-a-per-hashmgr-persistent-wide-string-scratch-buf.patch
 |  117 
 
external/hunspell/0005-use-a-per-hashmgr-persistent-wide-string-scratch-buf.patch
 |  168 
 external/hunspell/ExternalProject_hunspell.mk  
   |4 
 external/hunspell/UnpackedTarball_hunspell.mk  
   |9 
 external/hunspell/clangcl-werror.patch 
   |   11 
 11 files changed, 62962 insertions(+), 17 deletions(-)

New commits:
commit f0b38738d82dbbc11e9507ee79339cb6563efaa1
Author: CaolÃ¡n McNamara 
Date:   Mon Jan 23 12:28:25 2017 +

Related: tdf#105426 upgrade to hunspell-1.6.0

Change-Id: I275222d1a7d78cbfb1ca046562fc8a3c314b0fae
Reviewed-on: https://gerrit.libreoffice.org/33454
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/configure.ac b/configure.ac
index 6c34a30..e8551c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9543,7 +9543,7 @@ if test "$with_system_hunspell" = "yes"; then
 HUNSPELL_LIBS=-lhunspell
 fi
 AC_LANG_POP([C++])
-libo_MINGW_CHECK_DLL([libhunspell-1.5])
+libo_MINGW_CHECK_DLL([libhunspell-1.6])
 HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${HUNSPELL_LIBS}"
 HUNSPELL_LIBS="${filteredlibs}"
@@ -9554,7 +9554,7 @@ else
 if test "$COM" = "MSC"; then
 HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
 else
-
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.5"
+
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.6"
 fi
 BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/download.lst b/download.lst
index 2e238f4..dd2a24d 100644
--- a/download.lst
+++ b/download.lst
@@ -60,7 +60,7 @@ export GRAPHITE_TARBALL := 
3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.
 export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5
 export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_TARBALL := 
9849a2381bacbeb2714034ad825bede8-hunspell-1.5.4.tar.gz
+export HUNSPELL_TARBALL := 
047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
diff --git 
a/external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch 
b/external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch
new file mode 100644
index 000..ab6b19d
--- /dev/null
+++ b/external/hunspell/0001-Revert-Remove-autotools-autogenerated-files.patch
@@ -0,0 +1,61599 @@
+From dbac0be3ac61fc73f557ff5c95d8d5d93c272191 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
+Date: Mon, 23 Jan 2017 16:02:59 +
+Subject: [PATCH] Revert "Remove autotools autogenerated files"
+
+This reverts commit f53fc2c5f5a79b32010a76216fcdc0838243cc3f.
+---
+ Makefile.in  |   951 ++
+ aclocal.m4   |  1290 ++
+ compile  |   347 +
+ config.guess |  1421 +++
+ config.h.in  |   572 +
+ config.sub   |  1807 +++
+ configure| 25046 +
+ depcomp  |   791 ++
+ install-sh   |   501 +
+ ltmain.sh| 11147 +
+ m4/Makefile.in   |   518 +
+ m4/isc-posix.m4  |26 +
+ m4/libtool.m4|  8372 +
+ m4/ltoptions.m4  |   437 +
+ m4/ltsugar.m4|   124 +
+ m4/ltversion.m4  |23 +
+ m4/lt~obsolete.m4|99 +
+ man/Makefile.in  |   862 ++
+ man/hu/Makefile.in   |   638 +
+ missing  |   215 +
+ mkinstalldirs|   162 +
+ src/Makefile.in  |   690 +
+ src/hunspell/Makefile.in |   791 ++
+ src/parsers/Makefile.in  |   721 ++
+

[Libreoffice-commits] core.git: configure.ac download.lst writerperfect/qa

2017-01-12 Thread David Tardon

 configure.ac   |2 +-
 download.lst   |4 ++--
 writerperfect/qa/unit/WpftCalcFilterTest.cxx   |6 +-
 writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 |binary
 4 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit fbbb4850dc12ccae3a2140814115e4cd7985b116
Author: David Tardon 
Date:   Wed Jan 11 15:22:18 2017 +0100

upload libwps 0.4.5

Change-Id: Ifab6f95d22d0d335d68bb367dca12a92b864cdd9

diff --git a/configure.ac b/configure.ac
index 24cb7a8..422b090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7836,7 +7836,7 @@ 
libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
 libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
 
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.4])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.5])
 
 libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
 
diff --git a/download.lst b/download.lst
index c28b972..46584d0 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_MD5SUM := dcfd1d18bfa9818cf3ab21663ba857a3
-export WPS_VERSION_MICRO := 4
+export WPS_MD5SUM := 3807cbf177d15a69532e653476919d42
+export WPS_VERSION_MICRO := 5
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx 
b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index ce79995..29c3111 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -35,9 +35,13 @@ void WpftCalcFilterTest::test()
 {
 {"Numbers_2.numbers", REQUIRE_ETONYEK_VERSION(0, 1, 2)},
 };
+const writerperfect::test::WpftOptionalMap_t aWpsOptional
+{
+{"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
+};
 
 doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libmwaw/");
-doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libwps/");
+doTest("com.sun.star.comp.Calc.MSWorksCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libwps/", aWpsOptional);
 doTest("org.libreoffice.comp.Calc.NumbersImportFilter", 
"/writerperfect/qa/unit/data/calc/libetonyek/", aEtonyekOptional);
 doTest("org.libreoffice.comp.Calc.StarOfficeCalcImportFilter", 
"/writerperfect/qa/unit/data/calc/libstaroffice/");
 }
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123
new file mode 100755
index 000..fa21549
Binary files /dev/null and 
b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/msc-externals Makefile.fetch Repository.mk

2017-01-02 Thread Matúš Kukan

 Makefile.fetch |1 -
 Repository.mk  |1 -
 configure.ac   |7 ---
 download.lst   |1 -
 external/msc-externals/Module_msc-externals.mk |1 -
 external/msc-externals/Package_dbghelp.mk  |   14 --
 6 files changed, 25 deletions(-)

New commits:
commit 35bc9668567a8c61763715f0854a42324dc5a4f4
Author: MatÃºÅ¡ Kukan 
Date:   Fri Dec 23 23:22:25 2016 +0100

Remove package with dbghelp.dll

ENABLE_CRASHDUMP is always empty.
dbghelp.dll was removed from scp2 in
8ab4d2f29fdd2c058db23f6ee7b2200655d4c6f6

Change-Id: I5c47ce4b4cafb2f24185ddd9a31eb1a3176fa176
Reviewed-on: https://gerrit.libreoffice.org/32395
Tested-by: Jenkins 
Reviewed-by: MatÃºÅ¡ Kukan 

diff --git a/Makefile.fetch b/Makefile.fetch
index cf31e5b..db62719 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -214,7 +214,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,ZMF,ZMF_TARBALL) \
,$(call fetch_Download_item,http://dev-www.libreoffice.org/src,$(item)))
$(foreach item, \
-   $(call fetch_Optional,DBGHELP,DBGHELP_DLL) \
$(call fetch_Optional,ODK,UNOWINREG_DLL) \
$(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \
$(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \
diff --git a/Repository.mk b/Repository.mk
index 8e296ec..8305c97 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -774,7 +774,6 @@ endif
 $(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
-   $(if $(and $(filter MSC,$(COM)),$(ENABLE_CRASHDUMP)),dbghelp) \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
extras_fonts \
diff --git a/configure.ac b/configure.ac
index 6fc1487..79e643b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3653,13 +3653,6 @@ AC_SUBST(DISABLE_ACTIVEX)
 AC_SUBST(DISABLE_ATL)
 
 #
-# dbghelp.dll
-#
-if test "$_os" = "WINNT"; then
-BUILD_TYPE="$BUILD_TYPE DBGHELP"
-fi
-
-#
 # unowinreg.dll
 #
 UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
diff --git a/download.lst b/download.lst
index 31ec1ce..da57096 100644
--- a/download.lst
+++ b/download.lst
@@ -26,7 +26,6 @@ export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
 export CURL_MD5SUM := 490e19a8ccd1f4a244b50338a0eb9456
 export CURL_TARBALL := curl-7.51.0.tar.gz
-export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
 export EPOXY_MD5SUM := 96f6620a9b005a503e7b44b0b528287d
diff --git a/external/msc-externals/Module_msc-externals.mk 
b/external/msc-externals/Module_msc-externals.mk
index 002dcf5..789c7bd 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,msc-externals))
 
 $(eval $(call gb_Module_add_targets,msc-externals,\
-   $(if $(ENABLE_CRASHDUMP),Package_dbghelp) \
Package_msvc_dlls \
 ))
 
diff --git a/external/msc-externals/Package_dbghelp.mk 
b/external/msc-externals/Package_dbghelp.mk
deleted file mode 100644
index d039b07..000
--- a/external/msc-externals/Package_dbghelp.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION)))
-
-$(eval $(call 
gb_Package_add_file,dbghelp,$(LIBO_LIB_FOLDER)/dbghelp.dll,$(DBGHELP_DLL)))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/hunspell lingucomponent/source

2016-12-14 Thread Caolán McNamara

 configure.ac |4 -
 download.lst |2 
 external/hunspell/UnpackedTarball_hunspell.mk|5 --
 external/hunspell/hunspell-solaris.patch |   12 -
 external/hunspell/hunspell-windows.patch |   21 -
 lingucomponent/source/spellcheck/spell/sspellimp.cxx |   44 +++
 6 files changed, 39 insertions(+), 49 deletions(-)

New commits:
commit d423121dba0ad19d307fe8aebfcf566a8b44dc1a
Author: CaolÃ¡n McNamara 
Date:   Tue Aug 30 09:27:05 2016 +0100

update to latest hunspell 1-5 release

Change-Id: Ifb412506f2e36878d44d0e4f6360ae8d070ffa15
Reviewed-on: https://gerrit.libreoffice.org/28488
Tested-by: Jenkins 
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/configure.ac b/configure.ac
index 251d048..62cb35e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9562,7 +9562,7 @@ if test "$with_system_hunspell" = "yes"; then
 HUNSPELL_LIBS=-lhunspell
 fi
 AC_LANG_POP([C++])
-libo_MINGW_CHECK_DLL([libhunspell-1.4])
+libo_MINGW_CHECK_DLL([libhunspell-1.5])
 HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${HUNSPELL_LIBS}"
 HUNSPELL_LIBS="${filteredlibs}"
@@ -9573,7 +9573,7 @@ else
 if test "$COM" = "MSC"; then
 HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
 else
-
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.4"
+
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.5"
 fi
 BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/download.lst b/download.lst
index 9d7af4f..855f5b6 100644
--- a/download.lst
+++ b/download.lst
@@ -61,7 +61,7 @@ export GRAPHITE_TARBALL := 
3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.
 export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5
 export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_TARBALL := 
33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
+export HUNSPELL_TARBALL := 
9849a2381bacbeb2714034ad825bede8-hunspell-1.5.4.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk 
b/external/hunspell/UnpackedTarball_hunspell.mk
index e70e33f..127ca5d 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -11,11 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hunspell))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
-   external/hunspell/hunspell-solaris.patch \
-   external/hunspell/hunspell-windows.patch \
-))
-
 ifeq ($(COM),MSC)
 $(eval $(call gb_UnpackedTarball_set_post_action,hunspell,\
touch src/hunspell/config.h \
diff --git a/external/hunspell/hunspell-solaris.patch 
b/external/hunspell/hunspell-solaris.patch
deleted file mode 100644
index b07bbb2..000
--- a/external/hunspell/hunspell-solaris.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 misc/hunspell-1.3.2.orig/src/tools/hunspell.cxx2010-02-27 
23:42:05.0 +
-+++ misc/build/hunspell-1.3.2/src/tools/hunspell.cxx   2010-02-27 
23:43:02.0 +
-@@ -10,6 +10,9 @@
- #include "hunspell.hxx"
- #include "csutil.hxx"
- 
-+// switch off iconv support for tests (fixing Solaris problems)
-+#undef HAVE_ICONV
-+
- #ifndef HUNSPELL_EXTRA
- #define suggest_auto suggest
- #endif
diff --git a/external/hunspell/hunspell-windows.patch 
b/external/hunspell/hunspell-windows.patch
deleted file mode 100644
index 357272d..000
--- a/external/hunspell/hunspell-windows.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 /dev/null  2016-03-15 09:11:25.292954614 +
-+++ misc/hunspell-1.3.4/src/hunspell/hunvisapi.h   2016-04-06 
16:40:47.181698825 +0100
-@@ -0,0 +1,18 @@
-+#ifndef _HUNSPELL_VISIBILITY_H_
-+#define _HUNSPELL_VISIBILITY_H_
-+
-+#if defined(HUNSPELL_STATIC)
-+#  define LIBHUNSPELL_DLL_EXPORTED
-+#elif defined(_MSC_VER)
-+#  if defined(BUILDING_LIBHUNSPELL)
-+#define LIBHUNSPELL_DLL_EXPORTED __declspec(dllexport)
-+#  else
-+#define LIBHUNSPELL_DLL_EXPORTED __declspec(dllimport)
-+#  endif
-+#elif defined(BUILDING_LIBHUNSPELL) && 1
-+#  define LIBHUNSPELL_DLL_EXPORTED __attribute__((__visibility__("default")))
-+#else
-+#  define LIBHUNSPELL_DLL_EXPORTED
-+#endif
-+
-+#endif
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw

2016-11-23 Thread David Tardon

 configure.ac  |2 
 download.lst  |4 
 external/libmwaw/0001-fix-build-with-MSVC.patch.1 |  106 ++
 external/libmwaw/0001-fix-build-with-msvc.patch.1 |   54 ---
 external/libmwaw/Library_mwaw.mk  |2 
 external/libmwaw/UnpackedTarball_libmwaw.mk   |2 
 6 files changed, 112 insertions(+), 58 deletions(-)

New commits:
commit 14fc834aebdf4de9276a93e9f595b150a86ee16f
Author: David Tardon 
Date:   Tue Nov 22 21:37:48 2016 +0100

upload libmwaw 0.3.9

Change-Id: I22d6fe02bfb122f060cfe2f8f0ba5259eb5cd60b
Reviewed-on: https://gerrit.libreoffice.org/31088
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index 7e152a4..7ed5c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7868,7 +7868,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
 libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
 
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.8])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.9])
 
 libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
 libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.5])
diff --git a/download.lst b/download.lst
index f114ba2..9392459 100644
--- a/download.lst
+++ b/download.lst
@@ -104,8 +104,8 @@ export MDNSRESPONDER_MD5SUM := 
940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := 72ad446d76b157e30c1baf39bb288b99
-export MWAW_VERSION_MICRO := 8
+export MWAW_MD5SUM := d8532ad5630d3f3b2189a7ec5639151b
+export MWAW_VERSION_MICRO := 9
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-fix-build-with-MSVC.patch.1 
b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
new file mode 100644
index 000..ab60358
--- /dev/null
+++ b/external/libmwaw/0001-fix-build-with-MSVC.patch.1
@@ -0,0 +1,106 @@
+From ae8f006018f6cfc79b86f327116f6ceed71692f9 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 23 Nov 2016 09:06:35 +0100
+Subject: [PATCH] fix build with MSVC
+
+---
+ src/lib/PowerPoint3Parser.cxx | 30 +++---
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx
+index 9ecbe1b..51348d6 100644
+--- a/src/lib/PowerPoint3Parser.cxx
 b/src/lib/PowerPoint3Parser.cxx
+@@ -1076,15 +1076,15 @@ bool PowerPoint3Parser::readDocInfo(MWAWEntry const 
)
+   f << "],";
+   for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2));
+   if (!m_state->m_isMacFile) {
+-std::swap(dim[0],dim[1]);
+-std::swap(dim[2],dim[3]);
++std::swap(dim[0],dim[1]);
++std::swap(dim[2],dim[3]);
+   }
+   MWAWBox2i pageBox(MWAWVec2i(dim[1],dim[0]),MWAWVec2i(dim[3],dim[2]));
+   f << "dim[page]=" << pageBox << ",";
+   for (int i=0; i<4; ++i) dim[i]=int(input->readLong(2));
+   if (!m_state->m_isMacFile) {
+-std::swap(dim[0],dim[1]);
+-std::swap(dim[2],dim[3]);
++std::swap(dim[0],dim[1]);
++std::swap(dim[2],dim[3]);
+   }
+   MWAWBox2i 
paperBox=MWAWBox2i(MWAWVec2i(dim[0],dim[1]),MWAWVec2i(dim[2],dim[3]));
+   f << "dim[paper]=" << paperBox << ",";
+@@ -1673,16 +1673,16 @@ bool PowerPoint3Parser::readSlideFormats(MWAWEntry 
const , std::vectorreadLong(2));
+-if (!isMacFile) std::swap(dim[0],dim[1]);
++if (!isMacFile) std::swap(dim[0],dim[1]);
+ f << "dim0=" << MWAWVec2i(dim[1], dim[0]) << ",";
+ format.m_gradientOffset=int(input->readLong(2));
+ if (format.m_gradientOffset) f << "grad[col,offset]=" << 
format.m_gradientOffset << ",";
+ for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2));
+-if (!isMacFile) std::swap(dim[0],dim[1]);
++if (!isMacFile) std::swap(dim[0],dim[1]);
+ format.m_margins=MWAWVec2i(dim[1], dim[0]);
+ f << "box[margins]=" << format.m_margins << ",";
+ for (int j=0; j<2; ++j) dim[j]=int(input->readLong(2));
+-if (!isMacFile) std::swap(dim[0],dim[1]);
++if (!isMacFile) std::swap(dim[0],dim[1]);
+ format.m_shadowOffset=MWAWVec2i(dim[1], dim[0]);
+ if (format.m_shadowOffset!=MWAWVec2i(0,0))
+   f << "shadow[offset]=" << format.m_shadowOffset << ",";
+@@ -1727,15 +1727,15 @@ bool PowerPoint3Parser::readSlidePolygons(MWAWEntry 
const , std::vectorreadLong(2));
+ if (!isMacFile) {
+-  std::swap(dim[0],dim[1]);
+-  std::swap(dim[2],dim[3]);
++  std::swap(dim[0],dim[1]);
++  std::swap(dim[2],dim[3]);
+ }
+

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18npool/source i18nutil/source include/svx svx/source

2016-11-02 Thread Eike Rathke

 configure.ac|2 
 download.lst|2 
 external/icu/icu-ubsan.patch.0  |   11 
 external/icu/icu4c-warnings.patch   |   12 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   12 
 i18nutil/source/utility/unicode.cxx |   26 +
 include/svx/ucsubset.hrc|   11 
 svx/source/dialog/charmap.cxx   |   35 
 svx/source/dialog/ucsubset.src  |   44 
 9 files changed, 130 insertions(+), 25 deletions(-)

New commits:
commit 3e42714c76b1347babfdea0564009d8d82a83af4
Author: Eike Rathke 
Date:   Wed Nov 2 13:07:48 2016 +0100

upgrade to ICU 58

Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
Reviewed-on: https://gerrit.libreoffice.org/30487
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index f06ef8e..66a11a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=57
+ICU_MAJOR=58
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 4571338..0770a4d 100644
--- a/download.lst
+++ b/download.lst
@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
+export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 6d1d3bc..8a47242 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -151,14 +151,3 @@
length(len), next(subNode) {}
  virtual UBool operator==(const Node ) const;
  virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
 source/common/unifiedcache.h
-+++ source/common/unifiedcache.h
-@@ -139,7 +139,7 @@
-: CacheKey(other), fLoc(other.fLoc) { }
-virtual ~LocaleCacheKey() { }
-virtual int32_t hashCode() const {
--   return 37 *CacheKey::hashCode() + fLoc.hashCode();
-+   return 37U *CacheKey::hashCode() + fLoc.hashCode();
-}
-virtual UBool operator == (const CacheKeyBase ) const {
-// reflexive
diff --git a/external/icu/icu4c-warnings.patch 
b/external/icu/icu4c-warnings.patch
index d146093..96608d7 100644
--- a/external/icu/icu4c-warnings.patch
+++ b/external/icu/icu4c-warnings.patch
@@ -8,15 +8,3 @@
  } \
  }
  
 misc/icu/source/common/unicode/utypes.h
-+++ misc/build/icu/source/common/unicode/utypes.h
-@@ -399,7 +399,7 @@
-  * some Linux/Unix compilers have problems with defining global new/delete.
-  * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher.
-  */
--#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && 
(_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && 
(defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || 
defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || 
defined(U_LAYOUTEX_IMPLEMENTATION))
-+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined 
(_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && 
(defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || 
defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || 
defined(U_LAYOUTEX_IMPLEMENTATION))
- 
- #ifndef U_HIDE_INTERNAL_API
- /**
-
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 3b0b227..76ae209 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
 class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
 {
 public:
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+// RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
 inline void publicSetBreakType(int32_t type)
 {
 setBreakType(type);
 };
+#endif
 OOoRuleBasedBreakIterator(UDataMemory* image,
   UErrorCode )
 : RuleBasedBreakIterator(image, status)
@@

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps

2016-10-17 Thread David Tardon

 configure.ac   |2 +-
 download.lst   |4 ++--
 external/libwps/Library_wps.mk |4 
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit ea7b023115f228406b702c0e6328878b7944d8af
Author: David Tardon 
Date:   Mon Oct 17 15:25:16 2016 +0200

upload libwps 0.4.4

Change-Id: I7dc8b6412fd1a9d7bc2edf28cb23307c2eebd669

diff --git a/configure.ac b/configure.ac
index 02b00df..7cf9ec57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7996,7 +7996,7 @@ dnl 
===
 dnl Check for system libwps
 dnl ===
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.3])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.4])
 
 dnl ===
 dnl Check for system libwpg
diff --git a/download.lst b/download.lst
index 08d1005..222f7e7 100644
--- a/download.lst
+++ b/download.lst
@@ -166,8 +166,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_MD5SUM := 027fb17fb9e43553aa6624dc18f830ac
-export WPS_VERSION_MICRO := 3
+export WPS_MD5SUM := dcfd1d18bfa9818cf3ab21663ba857a3
+export WPS_VERSION_MICRO := 4
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 79e5774..4089c8b 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/Quattro \
UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
UnpackedTarball/libwps/src/lib/WKS4 \
+   UnpackedTarball/libwps/src/lib/WKS4Format \
UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \
UnpackedTarball/libwps/src/lib/WKSContentListener \
UnpackedTarball/libwps/src/lib/WKSParser \
@@ -63,10 +64,13 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/WPSGraphicStyle \
UnpackedTarball/libwps/src/lib/WPSHeader \
UnpackedTarball/libwps/src/lib/WPSList \
+   UnpackedTarball/libwps/src/lib/WPSOLE1Parser \
UnpackedTarball/libwps/src/lib/WPSOLEParser \
UnpackedTarball/libwps/src/lib/WPSPageSpan \
UnpackedTarball/libwps/src/lib/WPSParagraph \
UnpackedTarball/libwps/src/lib/WPSParser \
+   UnpackedTarball/libwps/src/lib/WPSStream \
+   UnpackedTarball/libwps/src/lib/WPSStringStream \
UnpackedTarball/libwps/src/lib/WPSSubDocument \
UnpackedTarball/libwps/src/lib/WPSTable \
UnpackedTarball/libwps/src/lib/WPSTextParser \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/harfbuzz

2016-09-30 Thread Khaled Hosny

 configure.ac  |4 ++--
 download.lst  |4 ++--
 external/harfbuzz/ExternalProject_harfbuzz.mk |5 +++--
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |1 -
 external/harfbuzz/no-freetype.patch   |   13 -
 5 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit 281bd0b08a1c678209befd2355c29d823a2e85d3
Author: Khaled Hosny 
Date:   Wed Sep 28 08:52:45 2016 +0200

Update HarfBuzz to 1.3.2

* Only build the library, makes no-freetype patch redundant.
* Donât build ICU support as a separate library, otherwise we would also
  build the alternative UCDN Unicode functions which we do not use.
* Donât build FontConfig support stuff that was added a few releases ago
  as we donât need it as well.

Change-Id: Ia5f296c61a6ce2a589b1c521b3c2c7c75dbcf74d
Reviewed-on: https://gerrit.libreoffice.org/29342
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/configure.ac b/configure.ac
index 97e6e0f..56f5ebe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9341,9 +9341,9 @@ if test "$with_harfbuzz" = "yes" -o \( $_os != WINNT -a 
$_os != Darwin -a $_os !
 AC_MSG_RESULT([yes])
 ENABLE_HARFBUZZ="TRUE"
 if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
 -lharfbuzz -lharfbuzz-icu"])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.18],["-I${WORKDIR}/UnpackedTarball/harfbuzz/src"],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
 -lharfbuzz"])
 else
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 
0.9.10],[-I${WORKDIR}/UnpackedTarball/harfbuzz/src],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
 -lharfbuzz -lharfbuzz-icu"])
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz >= 
0.9.10],[-I${WORKDIR}/UnpackedTarball/harfbuzz/src],["-L${WORKDIR}/UnpackedTarball/harfbuzz/src/.libs
 -lharfbuzz"])
 fi
 else
 AC_MSG_RESULT([no])
diff --git a/download.lst b/download.lst
index 018679e..ef4fc15 100644
--- a/download.lst
+++ b/download.lst
@@ -57,8 +57,8 @@ export GLEW_TARBALL := 
3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GLYPHY_TARBALL := 5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2
 export GRAPHITE_TARBALL := 
4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz
-export HARFBUZZ_MD5SUM := a82d49ff67197bc3c96ea34b98880c52
-export HARFBUZZ_TARBALL := 
a82d49ff67197bc3c96ea34b98880c52-harfbuzz-1.3.0.tar.bz2
+export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5
+export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk 
b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 9e01833..1bee5bb 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -28,14 +28,15 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
--disable-shared \
--disable-gtk-doc \
--with-pic \
-   --with-icu=yes \
+   --with-icu=builtin \
--with-freetype=no \
+   --with-fontconfig=no \
--with-cairo=no \
--with-glib=no \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter LINUX,$(OS)),CXXFLAGS="$(CXXFLAGS) 
-fvisibility=hidden") \
-   && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
+   && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 1514fd8..9a5560f 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
 external/harfbuzz/ubsan.patch \
-external/harfbuzz/no-freetype.patch \
 ))
 
 ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
diff --git a/external/harfbuzz/no-freetype.patch 
b/external/harfbuzz/no-freetype.patch
deleted file mode 100644
index

[Libreoffice-commits] core.git: configure.ac download.lst external/libmwaw writerperfect/qa

2016-06-24 Thread David Tardon

 configure.ac   
|2 
 download.lst   
|4 
 external/libmwaw/0001-fix-build-with-msvc.patch.1  
|   54 
 
external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1
 |   56 
 external/libmwaw/Library_mwaw.mk   
|9 
 external/libmwaw/UnpackedTarball_libmwaw.mk
|4 
 writerperfect/qa/unit/WpftDrawFilterTest.cxx   
|4 
 writerperfect/qa/unit/WpftWriterFilterTest.cxx 
|2 
 writerperfect/qa/unit/data/draw/libmwaw/pass/CricketDraw_1.0.hqx   
|  133 ++
 writerperfect/qa/unit/data/draw/libmwaw/pass/CricketDraw_1.1.hqx   
|   72 +
 writerperfect/qa/unit/data/draw/libmwaw/pass/FreeHand_1.0.hqx  
|   75 +
 writerperfect/qa/unit/data/draw/libmwaw/pass/FreeHand_2.0.hqx  
|   49 +++
 writerperfect/qa/unit/data/writer/libmwaw/pass/MaxWrite_1.hqx  
|   12 
 writerperfect/qa/unit/data/writer/libmwaw/pass/MouseWrite_1.hqx
|   58 
 14 files changed, 473 insertions(+), 61 deletions(-)

New commits:
commit 2ff98b560cfaa747b19e013857d89d16fe99fd76
Author: David Tardon 
Date:   Thu Jun 23 14:51:30 2016 +0200

upload libmwaw 0.3.8

Change-Id: I4779d538199ecccb8997e3bfdbf97d7b0ea9679b

diff --git a/configure.ac b/configure.ac
index c5e484b..d99b4b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7865,7 +7865,7 @@ dnl 
===
 dnl Check for system libmwaw
 dnl ===
 libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.7])
+libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.8])
 
 dnl ===
 dnl Check for system libpagemaker
diff --git a/download.lst b/download.lst
index 7741265..b2d72fb 100644
--- a/download.lst
+++ b/download.lst
@@ -103,8 +103,8 @@ export MDNSRESPONDER_MD5SUM := 
940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
-export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
-export MWAW_VERSION_MICRO := 7
+export MWAW_MD5SUM := 72ad446d76b157e30c1baf39bb288b99
+export MWAW_VERSION_MICRO := 8
 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.bz2
 export MYSQLCPPCONN_TARBALL := 
7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
diff --git a/external/libmwaw/0001-fix-build-with-msvc.patch.1 
b/external/libmwaw/0001-fix-build-with-msvc.patch.1
new file mode 100644
index 000..95b5e0c
--- /dev/null
+++ b/external/libmwaw/0001-fix-build-with-msvc.patch.1
@@ -0,0 +1,54 @@
+From 01495bf788fe32723f222599e34ba1779ca3d594 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Fri, 24 Jun 2016 14:01:14 +0200
+Subject: [PATCH] fix build with msvc
+
+---
+ src/lib/CricketDrawParser.cxx | 4 ++--
+ src/lib/FreeHandParser.cxx| 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/CricketDrawParser.cxx b/src/lib/CricketDrawParser.cxx
+index f04be91..9fe5a32 100644
+--- a/src/lib/CricketDrawParser.cxx
 b/src/lib/CricketDrawParser.cxx
+@@ -930,12 +930,12 @@ bool CricketDrawParser::readShape()
+ MWAWBox2f box(shape.m_vertices[0], shape.m_vertices[2]);
+ int angle[2] = { shape.m_angles[0], shape.m_angles[1] };
+ if (box.min()[1]>box.max()[1]) {
+-  std::swap(box.min()[1],box.max()[1]);
++  std::swap(box.min()[1],box.max()[1]);
+   angle[0]=180-shape.m_angles[1];
+   angle[1]=180-shape.m_angles[0];
+ }
+ if (angle[1]<=angle[0])
+-  std::swap(angle[0],angle[1]);
++  std::swap(angle[0],angle[1]);
+ if (angle[1]>360) {
+   int numLoop=int(angle[1]/360)-1;
+   angle[0]-=numLoop*360;
+diff --git a/src/lib/FreeHandParser.cxx b/src/lib/FreeHandParser.cxx
+index 78d8b08..e97e6e3 100644
+--- a/src/lib/FreeHandParser.cxx
 b/src/lib/FreeHandParser.cxx
+@@ -999,7 +999,7 @@ bool FreeHandParser::checkHeader(MWAWHeader *header, bool 
strict)
+ getPageSpan().setFormOrientation(MWAWPageSpan::LANDSCAPE);
+ for (int j=0; j<4; ++j) {
+   if (j==1) continue;
+-  std::swap(dim[2*j],dim[2*j+1]);
++  std::swap(dim[2*j],dim[2*j+1]);
+ }
+ val &= 0xFFDF;
+   }
+@@ -1016,7 +1016,7 @@ bool

[Libreoffice-commits] core.git: configure.ac download.lst external/mdds sc/inc sc/source svl/source

2016-05-12 Thread Kohei Yoshida

 configure.ac   |4 +-
 download.lst   |8 ++---
 external/mdds/0001-Fix-some-build-snuffs.patch |   38 -
 external/mdds/UnpackedTarball_mdds.mk  |1 
 sc/inc/mtvelements.hxx |2 +
 sc/source/core/tool/scmatrix.cxx   |9 ++---
 svl/source/misc/gridprinter.cxx|8 +
 7 files changed, 15 insertions(+), 55 deletions(-)

New commits:
commit db729f3b685fd832a3ec7387b339cf2bbeb4bd4d
Author: Kohei Yoshida 
Date:   Wed May 11 21:45:56 2016 -0400

Update mdds to 1.2.0.  Note that the API version is also up.

liborcus-0.11.2 is out only to make it buildable with mdds-1.2.

Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70
Reviewed-on: https://gerrit.libreoffice.org/24944
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/configure.ac b/configure.ac
index 3f1b7f0..6dea282 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8832,7 +8832,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.1.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===
 dnl Check for system glm
@@ -9148,7 +9148,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
 ENABLE_ORCUS="TRUE"
 AC_DEFINE(ENABLE_ORCUS)
 
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.2])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index a2483c2..ddd6edc 100644
--- a/download.lst
+++ b/download.lst
@@ -97,8 +97,8 @@ export LIBXML_TARBALL := 
daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_MD5SUM := c300541adac09008aa4a305eacd1dca6
-export MDDS_TARBALL := mdds-1.1.0.tar.bz2
+export MDDS_MD5SUM := 9f3383fb7bae825eab69f3a6ec1d74b2
+export MDDS_TARBALL := mdds-1.2.0.tar.bz2
 export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
@@ -118,8 +118,8 @@ export OPENCOLLADA_TARBALL := 
OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_MD5SUM := 9392e65072ce4b614c1392eefc1f23d0
 export OPENSSL_TARBALL := openssl-1.0.2h.tar.gz
-export ORCUS_MD5SUM := 2bff8a3683caa70a438d5cdfda4cfb4f
-export ORCUS_TARBALL := liborcus-0.11.1.tar.gz
+export ORCUS_MD5SUM := 205badaee72adf99422add8c4c49d669
+export ORCUS_TARBALL := liborcus-0.11.2.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c
diff --git a/external/mdds/0001-Fix-some-build-snuffs.patch 
b/external/mdds/0001-Fix-some-build-snuffs.patch
deleted file mode 100644
index 5f32a98..000
--- a/external/mdds/0001-Fix-some-build-snuffs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cbd1fb07b96f48ec9ed3c3806a18dbd8a7fd5703 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida 
-Date: Thu, 11 Feb 2016 22:20:41 -0500
-Subject: [PATCH] Fix some build snuffs.
-

- include/mdds/multi_type_vector_def.inl | 1 -
- include/mdds/sorted_string_map_def.inl | 2 +-
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/include/mdds/multi_type_vector_def.inl 
b/include/mdds/multi_type_vector_def.inl
-index a2d2fe0..549502b 100644
 include/mdds/multi_type_vector_def.inl
-+++ include/mdds/multi_type_vector_def.inl
-@@ -1936,7 +1936,6 @@ multi_type_vector<_CellBlockFunc, 
_EventFunc>::transfer_multi_blocks(
- else
- {
- // Just move the whole block over.
--block* blk = m_blocks[block_index2];
- dest.m_blocks[dest_block_pos] = blk;
- if (blk->mp_data)
- {
-diff --git a/include/mdds/sorted_string_map_def.inl 
b/include/mdds/sorted_string_map_def.inl
-index 1983460..1509e30 100644
 include/mdds/sorted_string_map_def.inl
-+++

[Libreoffice-commits] core.git: configure.ac download.lst external/hunspell

2016-04-15 Thread Caolán McNamara

 configure.ac  |4 ++--
 download.lst  |2 +-
 external/hunspell/UnpackedTarball_hunspell.mk |2 --
 external/hunspell/hunspell-windows.patch  |   21 -
 external/hunspell/ubsan.patch.0   |   11 ---
 5 files changed, 3 insertions(+), 37 deletions(-)

New commits:
commit 1098921996c81a4d6dc917bbc16d5f834ebf6728
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 15 13:07:55 2016 +0100

test pre 1.4.0 hunspell

Change-Id: Ied87b41ec02b993fd08ac13f325b9489b6f07456

diff --git a/configure.ac b/configure.ac
index 028a22d..3c61c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9567,7 +9567,7 @@ if test "$with_system_hunspell" = "yes"; then
 HUNSPELL_LIBS=-lhunspell
 fi
 AC_LANG_POP([C++])
-libo_MINGW_CHECK_DLL([libhunspell-1.3])
+libo_MINGW_CHECK_DLL([libhunspell-1.4])
 HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${HUNSPELL_LIBS}"
 HUNSPELL_LIBS="${filteredlibs}"
@@ -9578,7 +9578,7 @@ else
 if test "$COM" = "MSC"; then
 HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
 else
-
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.3"
+
HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs 
-lhunspell-1.4"
 fi
 BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/download.lst b/download.lst
index 133433e..19f727f 100644
--- a/download.lst
+++ b/download.lst
@@ -61,7 +61,7 @@ export GRAPHITE_TARBALL := 
4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.
 export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2
 export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_TARBALL := 
423cff69e68c87ac11e4aa8462951954-hunspell-1.3.4.tar.gz
+export HUNSPELL_TARBALL := 
29de3467b11bde5a7743a93abeb8c0c8-hunspell-1.4.0.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk 
b/external/hunspell/UnpackedTarball_hunspell.mk
index 7ce4aea..943e788 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -13,8 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
external/hunspell/hunspell-solaris.patch \
-   external/hunspell/hunspell-windows.patch \
-   external/hunspell/ubsan.patch.0 \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/external/hunspell/hunspell-windows.patch 
b/external/hunspell/hunspell-windows.patch
deleted file mode 100644
index 357272d..000
--- a/external/hunspell/hunspell-windows.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 /dev/null  2016-03-15 09:11:25.292954614 +
-+++ misc/hunspell-1.3.4/src/hunspell/hunvisapi.h   2016-04-06 
16:40:47.181698825 +0100
-@@ -0,0 +1,18 @@
-+#ifndef _HUNSPELL_VISIBILITY_H_
-+#define _HUNSPELL_VISIBILITY_H_
-+
-+#if defined(HUNSPELL_STATIC)
-+#  define LIBHUNSPELL_DLL_EXPORTED
-+#elif defined(_MSC_VER)
-+#  if defined(BUILDING_LIBHUNSPELL)
-+#define LIBHUNSPELL_DLL_EXPORTED __declspec(dllexport)
-+#  else
-+#define LIBHUNSPELL_DLL_EXPORTED __declspec(dllimport)
-+#  endif
-+#elif defined(BUILDING_LIBHUNSPELL) && 1
-+#  define LIBHUNSPELL_DLL_EXPORTED __attribute__((__visibility__("default")))
-+#else
-+#  define LIBHUNSPELL_DLL_EXPORTED
-+#endif
-+
-+#endif
diff --git a/external/hunspell/ubsan.patch.0 b/external/hunspell/ubsan.patch.0
deleted file mode 100644
index af25d6a..000
--- a/external/hunspell/ubsan.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
 src/hunspell/csutil.cxx
-+++ src/hunspell/csutil.cxx
-@@ -281,7 +281,7 @@
-   u2->h = ((*u8 & 0x0f) << 4) + ((*(u8 + 1) & 0x3f) >> 2);
-   u8++;
-   if ((*(u8 + 1) & 0xc0) == 0x80) {
--u2->l = (*u8 << 6) + (*(u8 + 1) & 0x3f);
-+u2->l = (static_cast(*u8) << 6) + (*(u8 + 1) & 
0x3f);
- u8++;
-   } else {
- HUNSPELL_WARNING(stderr,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2016-04-13 Thread Eike Rathke

 configure.ac|2 +-
 download.lst|2 +-
 external/icu/UnpackedTarball_icu.mk |3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit c58655c5a221d986fa3c3eed2f28810269205721
Author: Eike Rathke 
Date:   Wed Apr 13 22:24:25 2016 +0200

upgrade to ICU 57

This does not apply patches

external/icu/khmerbreakengine.patch
external/icu/khmerdict.dict

anymore, as the khmerbreakengine.patch failed to apply with several
hunks of which one was 16k. Asking the patch contributor to follow-up on
this.

Change-Id: I78d4371d04a7b03417d402a222bcd384f02a619e
Reviewed-on: https://gerrit.libreoffice.org/24067
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/configure.ac b/configure.ac
index d8f67a2..028a22d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9072,7 +9072,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=56
+ICU_MAJOR=57
 ICU_MINOR=1
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
 ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index c76e00a..133433e 100644
--- a/download.lst
+++ b/download.lst
@@ -63,7 +63,7 @@ export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
423cff69e68c87ac11e4aa8462951954-hunspell-1.3.4.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz
+export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 4a6a114..c48d025 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -27,9 +27,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/clang-cl.patch.0 \
$(if $(filter-out 
ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
$(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
-   external/icu/khmerbreakengine.patch \
 ))
 
-$(eval $(call 
gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/openssl Makefile.fetch

2016-03-09 Thread Tor Lillqvist

 Makefile.fetch  |1 -
 configure.ac|9 -
 download.lst|2 --
 external/openssl/ExternalProject_openssl.mk |4 +---
 4 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit b04a27ad6fa1088cc6887ccadab3165c43dfab02
Author: Tor Lillqvist 
Date:   Wed Mar 9 12:24:32 2016 +0200

Revert "Add --with-prebuilt-openssl"

Building OpenSSL works fine for me now with a fresh Cygwin.

Change-Id: Ic824704746ab59324e7a533b6c5545b6f1aa59f6

diff --git a/Makefile.fetch b/Makefile.fetch
index 633202e..3884f7f 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -194,7 +194,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \
$(call fetch_Optional,POPPLER,POPPLER_TARBALL) \
$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
-   $(call 
fetch_Optional,PREBUILT_OPENSSL,PREBUILT_OPENSSL_TARBALL) \
$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
$(call fetch_Optional,REDLAND,RAPTOR_TARBALL) \
$(call fetch_Optional,REDLAND,RASQAL_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 7b5cedd..cd3d79a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1492,11 +1492,6 @@ AC_ARG_ENABLE(openssl,
  use only if you are hacking on it.]),
 ,enable_openssl=yes)
 
-AC_ARG_WITH(prebuilt-openssl,
-AS_HELP_STRING([--with-prebuilt-openssl],
-[Don't build OpenSSL but use prebuilt binaries. Only for use on 
Windows, when you can't build it,
- thanks to the Cygwin fork() problem when running the Perl disaster in 
OpenSSL's build system.]))
-
 AC_ARG_ENABLE(library-bin-tar,
 AS_HELP_STRING([--enable-library-bin-tar],
 [Enable the building and reused of tarball of binary build for some 
'external' libraries.
@@ -9022,10 +9017,6 @@ if test "$with_system_nss" = "yes"; then
 libo_MINGW_CHECK_DLL([ssl3])
 fi
 
-if test $_os = WINNT -a -z "$ENABLE_RELEASE_BUILD" -a "$with_prebuilt_openssl" 
= yes; then
-BUILD_TYPE="$BUILD_TYPE PREBUILT_OPENSSL"
-fi
-
 dnl ===
 dnl Check for system sane
 dnl ===
diff --git a/download.lst b/download.lst
index 475112b..600ae5b 100644
--- a/download.lst
+++ b/download.lst
@@ -129,8 +129,6 @@ export PNG_TARBALL := libpng-1.6.19.tar.gz
 export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
 export POPPLER_TARBALL := poppler-0.26.4.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PREBUILT_OPENSSL_MD5SUM=b91f5c21ab18e8ad993b94092479c39a
-export PREBUILT_OPENSSL_TARBALL=prebuilt-openssl.tar.bz2
 
 ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index 92c751e..9ae7a13 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -60,8 +60,6 @@ OPENSSL_PLATFORM := \
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,openssl,build):
-   $(if $(filter PREBUILT_OPENSSL,$(BUILD_TYPE)),\
-   cd $(BUILDDIR) && $(GNUTAR) -x -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(PREBUILT_OPENSSL_TARBALL),\
$(call gb_ExternalProject_run,build,\
export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
&& export PERL="$(shell cygpath -w $(PERL))" \
@@ -71,7 +69,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
&& unset MAKEFLAGS \
&& nmake -f "ms\ntdll.mak" \
&& mv inc32/* include/ \
-   ))
+   )
 
 else
 $(call gb_ExternalProject_get_state_target,openssl,build):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/boost external/liborcus RepositoryExternal.mk sc/Library_scfilt.mk sc/source

2016-03-07 Thread Kohei Yoshida

 RepositoryExternal.mk |   19 
 configure.ac  |2 
 download.lst  |4 
 external/boost/Module_boost.mk|1 
 external/boost/StaticLibrary_boost_filesystem.mk  |   36 
 external/liborcus/0001-Fix-for-OSX-build-inside-LibreOffice.patch | 1175 
++
 external/liborcus/0001-Get-it-to-build-on-Windows.patch   |  212 +
 external/liborcus/ExternalPackage_liborcus.mk |8 
 external/liborcus/ExternalProject_liborcus.mk |   22 
 external/liborcus/Library_orcus-parser.mk |3 
 external/liborcus/Library_orcus.mk|   18 
 external/liborcus/UnpackedTarball_liborcus.mk |   11 
 external/liborcus/fix-crash-ooo55043-1.patch.0|   17 
 external/liborcus/unusedheader.patch.0|   11 
 external/liborcus/windows-constants-hack.patch|   15 
 sc/Library_scfilt.mk  |1 
 sc/source/filter/inc/orcusinterface.hxx   |2 
 sc/source/filter/orcus/filterdetect.cxx   |2 
 sc/source/filter/orcus/interface.cxx  |   63 
 19 files changed, 1544 insertions(+), 78 deletions(-)

New commits:
commit b325b4c286b56a63316063a3ac4648bf7b7efcbe
Author: Kohei Yoshida 
Date:   Sat Mar 5 20:09:34 2016 -0500

Update liborcus to 0.11.0.

Markus did half of this, and I simply carried the torch.

Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins 
Reviewed-by: Kohei Yoshida 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5b497ee..c6fe371 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -743,6 +743,21 @@ $(call gb_LinkTarget_set_include,$(1),\
 
 endef
 
+define gb_LinkTarget__use_boost_filesystem
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DBOOST_ALL_NO_LIB \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   boost_filesystem \
+)
+
+endef
+
+define gb_ExternalProject__use_boost_filesystem
+$(call gb_ExternalProject_use_static_libraries,$(1),boost_filesystem)
+endef
+
 define gb_ExternalProject__use_boost_headers
 $(call gb_ExternalProject_use_unpacked,$(1),boost)
 
@@ -3129,7 +3144,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.10 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.11 \
 )
 
 $(if $(SYSTEM_BOOST), \
@@ -3148,7 +3163,7 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 
 $(call gb_LinkTarget_add_libs,$(1),\
-   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.10 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.11 \
 )
 
 endef
diff --git a/configure.ac b/configure.ac
index 934d43a..dab1919 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9196,7 +9196,7 @@ if test -z "$enable_orcus" -o "$enable_orcus" != no; then
 ENABLE_ORCUS="TRUE"
 AC_DEFINE(ENABLE_ORCUS)
 
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 >= 0.9.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.11 >= 0.11.0])
 if test "$with_system_orcus" != "yes"; then
 if test "$SYSTEM_BOOST" = "TRUE"; then
 # ===
diff --git a/download.lst b/download.lst
index 906a579..475112b 100644
--- a/download.lst
+++ b/download.lst
@@ -117,8 +117,8 @@ export OPENCOLLADA_TARBALL := 
OpenCOLLADA-master-6509aa13af.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_MD5SUM := f3c710c045cdee5fd114feb69feba7aa
 export OPENSSL_TARBALL := openssl-1.0.2g.tar.gz
-export ORCUS_MD5SUM := e6efcbe50a5fd4d50d513c9a7a4139b0
-export ORCUS_TARBALL := liborcus-0.9.2.tar.gz
+export ORCUS_MD5SUM := ca1e5d486b29cd519bb1d9845a6a768e
+export ORCUS_TARBALL := liborcus-0.11.0.tar.gz
 export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2
 export OWNCLOUD_ANDROID_LIB_TARBALL := 
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
 export PAGEMAKER_MD5SUM := 5c4985a68be0b79d3f809da5e12b143c
diff --git a/external/boost/Module_boost.mk b/external/boost/Module_boost.mk
index 5bac25e..ae407f5 100644
--- a/external/boost/Module_boost.mk
+++ b/external/boost/Module_boost.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,boost))
 
 $(eval $(call gb_Module_add_targets,boost,\
StaticLibrary_boostdatetime \
+   StaticLibrary_boost_filesystem \

[Libreoffice-commits] core.git: configure.ac download.lst external/libwps writerperfect/qa writerperfect/source

2016-02-15 Thread David Tardon

 configure.ac   |2 
 download.lst   |4 -
 external/libwps/0001-add-missing-include.patch |   24 
--
 external/libwps/Library_wps.mk |1 
 external/libwps/UnpackedTarball_libwps.mk  |1 
 writerperfect/qa/unit/WpftWriterFilterTest.cxx |1 
 writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc |binary
 writerperfect/source/writer/MSWorksImportFilter.cxx|1 
 8 files changed, 6 insertions(+), 28 deletions(-)

New commits:
commit 4db6402917bb5aecfb2bfc5fcd093abbb79a8ed3
Author: David Tardon 
Date:   Mon Feb 15 09:29:24 2016 +0100

upload libwps 0.4.3

Change-Id: I4f147c3d55de86eb4bd56bb4c728df19c925b376
Reviewed-on: https://gerrit.libreoffice.org/22366
Tested-by: Jenkins 
Reviewed-by: David Tardon 

diff --git a/configure.ac b/configure.ac
index bf96369..5895855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7842,7 +7842,7 @@ dnl 
===
 dnl Check for system libwps
 dnl ===
 libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.2])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.3])
 
 dnl ===
 dnl Check for system libwpg
diff --git a/download.lst b/download.lst
index 815fba0..7bf361b 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,8 @@ export WPD_TARBALL := 
libwpd-0.10.$(WPD_VERSION_MICRO).tar.bz2
 export WPG_MD5SUM := dfd066658ec9d2fb2262417039a8a1c3
 export WPG_VERSION_MICRO := 1
 export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.bz2
-export WPS_MD5SUM := 8a6c55542ce80203dd6d3b1cba99d4e5
-export WPS_VERSION_MICRO := 2
+export WPS_MD5SUM := 027fb17fb9e43553aa6624dc18f830ac
+export WPS_VERSION_MICRO := 3
 export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_MD5SUM := 44d667c142d7cda120332623eab69f40
diff --git a/external/libwps/0001-add-missing-include.patch 
b/external/libwps/0001-add-missing-include.patch
deleted file mode 100644
index 9afe2aa..000
--- a/external/libwps/0001-add-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 53c03b23520005aac0fb9b3036a200d63c7a8f06 Mon Sep 17 00:00:00 2001
-From: Sean Young 
-Date: Tue, 6 Oct 2015 09:16:11 +0100
-Subject: [PATCH] add missing include
-

- src/lib/MSWrite.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/MSWrite.cpp b/src/lib/MSWrite.cpp
-index 2bc2511..ab5fdd6 100644
 a/src/lib/MSWrite.cpp
-+++ b/src/lib/MSWrite.cpp
-@@ -32,6 +32,7 @@
- 
- #include "MSWrite.h"
- 
-+#include 
- #include 
- 
- namespace MSWriteParserInternal
--- 
-2.1.4
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 337f862..79e5774 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_add_defs,wps,\
 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
 
 $(eval $(call gb_Library_add_generated_exception_objects,wps,\
+   UnpackedTarball/libwps/src/lib/DosWord \
UnpackedTarball/libwps/src/lib/Lotus \
UnpackedTarball/libwps/src/lib/LotusGraph \
UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
diff --git a/external/libwps/UnpackedTarball_libwps.mk 
b/external/libwps/UnpackedTarball_libwps.mk
index 754bd59..8551ef9 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -14,7 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
-   external/libwps/0001-add-missing-include.patch \
$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))
 
diff --git a/writerperfect/qa/unit/WpftWriterFilterTest.cxx 
b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
index 9e8bd02..99a6ab1 100644
--- a/writerperfect/qa/unit/WpftWriterFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftWriterFilterTest.cxx
@@ -47,6 +47,7 @@ void WpftWriterFilterTest::test()
 };
 const writerperfect::test::WpftOptionalMap_t aWpsOptional
 {
+{"Word_5.0_DOS.doc", REQUIRE_WPS_VERSION(0, 4, 3)},
 {"Write_3.1.wri", REQUIRE_WPS_VERSION(0, 4, 2)},
 };
 
diff --git a/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc 
b/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc
new file mode 100644
index 000..5e5e459
Binary files /dev/null and 
b/writerperfect/qa/unit/data/writer/libwps/pass/Word_5.0_DOS.doc differ
diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/mdds

2016-02-11 Thread Kohei Yoshida

 configure.ac   |2 -
 download.lst   |4 +-
 external/mdds/0001-Fix-some-build-snuffs.patch |   38 +
 external/mdds/UnpackedTarball_mdds.mk  |4 +-
 4 files changed, 43 insertions(+), 5 deletions(-)

New commits:
commit 6cc5d37d87406671ac76e94a43f8a57f346caaaf
Author: Kohei Yoshida 
Date:   Thu Feb 11 21:51:12 2016 -0500

Update mdds to 1.1.0.

Change-Id: I89b9b2e562f5e934df25498f5587a339db23388f
Reviewed-on: https://gerrit.libreoffice.org/22304
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/configure.ac b/configure.ac
index 3b780b6..07bf6fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8779,7 +8779,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.1.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===
 dnl Check for system glm
diff --git a/download.lst b/download.lst
index 051c20e..815fba0 100644
--- a/download.lst
+++ b/download.lst
@@ -93,8 +93,8 @@ export LIBXML_TARBALL := 
daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
-export MDDS_TARBALL := mdds_1.0.0.tar.bz2
+export MDDS_MD5SUM := c300541adac09008aa4a305eacd1dca6
+export MDDS_TARBALL := mdds-1.1.0.tar.bz2
 export MDNSRESPONDER_MD5SUM := 940057ac8b513b00e8e9ca12ef796762
 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
diff --git a/external/mdds/0001-Fix-some-build-snuffs.patch 
b/external/mdds/0001-Fix-some-build-snuffs.patch
new file mode 100644
index 000..5f32a98
--- /dev/null
+++ b/external/mdds/0001-Fix-some-build-snuffs.patch
@@ -0,0 +1,38 @@
+From cbd1fb07b96f48ec9ed3c3806a18dbd8a7fd5703 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida 
+Date: Thu, 11 Feb 2016 22:20:41 -0500
+Subject: [PATCH] Fix some build snuffs.
+
+---
+ include/mdds/multi_type_vector_def.inl | 1 -
+ include/mdds/sorted_string_map_def.inl | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_def.inl 
b/include/mdds/multi_type_vector_def.inl
+index a2d2fe0..549502b 100644
+--- include/mdds/multi_type_vector_def.inl
 include/mdds/multi_type_vector_def.inl
+@@ -1936,7 +1936,6 @@ multi_type_vector<_CellBlockFunc, 
_EventFunc>::transfer_multi_blocks(
+ else
+ {
+ // Just move the whole block over.
+-block* blk = m_blocks[block_index2];
+ dest.m_blocks[dest_block_pos] = blk;
+ if (blk->mp_data)
+ {
+diff --git a/include/mdds/sorted_string_map_def.inl 
b/include/mdds/sorted_string_map_def.inl
+index 1983460..1509e30 100644
+--- include/mdds/sorted_string_map_def.inl
 include/mdds/sorted_string_map_def.inl
+@@ -65,7 +65,7 @@ sorted_string_map<_ValueT>::sorted_string_map(const entry* 
entries, size_type en
+ m_entry_end(m_entries+m_entry_size)
+ {
+ #ifdef _GLIBCXX_DEBUG
+-assert(std::is_sorted(m_entries, m_entry_end, compare<_ValueT>));
++assert(std::is_sorted(m_entries, m_entry_end, detail::compare<_ValueT>));
+ #endif
+ }
+ 
+-- 
+1.9.1
+
diff --git a/external/mdds/UnpackedTarball_mdds.mk 
b/external/mdds/UnpackedTarball_mdds.mk
index 2627257..2e4af67 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -11,10 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
-   external/mdds/mdds-c++98.patch.0 \
+   external/mdds/0001-Fix-some-build-snuffs.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/openssl Makefile.fetch

2015-12-10 Thread Tor Lillqvist

 Makefile.fetch  |1 +
 configure.ac|9 +
 download.lst|2 ++
 external/openssl/ExternalProject_openssl.mk |4 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit cf029192e4ac9ce0e24ddfd880f5f9d557cf9c28
Author: Tor Lillqvist 
Date:   Thu Dec 10 16:57:36 2015 +0200

Add --with-prebuilt-openssl

Don't ask.

Oh well, if you want to know: For some people, like me, Cygwin and its
Perl run into horrible trouble with the fork() emulation when building
OpenSSL. (But my Cygwin works fine for all else in the build. Go
figure.)

So I came up with a way to use prebuilt OpenSSL binaries. Not to be
used for release builds, of course (and the configury checks for
that), as long as our policy is to build all we can from sources.

Change-Id: Ic303bdf0c620c5122aca3d646fa1f0587221e70f

diff --git a/Makefile.fetch b/Makefile.fetch
index cbc51b2..4816ed6 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -193,6 +193,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \
$(call fetch_Optional,POPPLER,POPPLER_TARBALL) \
$(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \
+   $(call 
fetch_Optional,PREBUILT_OPENSSL,PREBUILT_OPENSSL_TARBALL) \
$(call fetch_Optional,PYTHON,PYTHON_TARBALL) \
$(call fetch_Optional,REDLAND,RAPTOR_TARBALL) \
$(call fetch_Optional,REDLAND,RASQAL_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 3e1c51a..157e7bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1473,6 +1473,11 @@ AC_ARG_ENABLE(openssl,
  use only if you are hacking on it.]),
 ,enable_openssl=yes)
 
+AC_ARG_WITH(prebuilt-openssl,
+AS_HELP_STRING([--with-prebuilt-openssl],
+[Don't build OpenSSL but use prebuilt binaries. Only for use on 
Windows, when you can't build it,
+ thanks to the Cygwin fork() problem when running the Perl disaster in 
OpenSSL's build system.]))
+
 AC_ARG_ENABLE(library-bin-tar,
 AS_HELP_STRING([--enable-library-bin-tar],
 [Enable the building and reused of tarball of binary build for some 
'external' libraries.
@@ -8943,6 +8948,10 @@ if test "$with_system_nss" = "yes"; then
 libo_MINGW_CHECK_DLL([ssl3])
 fi
 
+if test $_os = WINNT -a -z "$ENABLE_RELEASE_BUILD" -a "$with_prebuilt_openssl" 
= yes; then
+BUILD_TYPE="$BUILD_TYPE PREBUILT_OPENSSL"
+fi
+
 dnl ===
 dnl Check for system mozilla headers
 dnl ===
diff --git a/download.lst b/download.lst
index be68617..0b22720 100755
--- a/download.lst
+++ b/download.lst
@@ -126,6 +126,8 @@ export PNG_TARBALL := libpng-1.6.19.tar.gz
 export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12
 export POPPLER_TARBALL := poppler-0.26.4.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
+export PREBUILT_OPENSSL_MD5SUM=b91f5c21ab18e8ad993b94092479c39a
+export PREBUILT_OPENSSL_TARBALL=prebuilt-openssl.tar.bz2
 
 ifeq ($(PYTHON_VERSION_MINOR),3)
 export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021
diff --git a/external/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
index ea5f8b2..c22ec7b 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -60,6 +60,8 @@ OPENSSL_PLATFORM := \
 
 ifeq ($(COM),MSC)
 $(call gb_ExternalProject_get_state_target,openssl,build):
+   $(if $(filter PREBUILT_OPENSSL,$(BUILD_TYPE)),\
+   cd $(BUILDDIR) && $(GNUTAR) -x -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(PREBUILT_OPENSSL_TARBALL),\
$(call gb_ExternalProject_run,build,\
export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter 
-%,$(CC))" \
&& export PERL="$(shell cygpath -w $(PERL))" \
@@ -68,7 +70,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
&& cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \
&& unset MAKEFLAGS \
&& nmake -f "ms\ntdll.mak" \
-   )
+   ))
 
 else
 $(call gb_ExternalProject_get_state_target,openssl,build):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/mdnsresponder external/Module_external.mk Makefile.fetch RepositoryExternal.mk sd/CppunitTest_sd_uimpress.mk sd/Library_sd.mk sd/sour

2015-11-30 Thread Michael Stahl

 Makefile.fetch  |1 
 RepositoryExternal.mk   |   12 
 configure.ac|5 
 download.lst|2 
 external/Module_external.mk |1 
 external/mdnsresponder/Makefile |7 
 external/mdnsresponder/Module_mdnsresponder.mk  |   20 
 external/mdnsresponder/README   |4 
 external/mdnsresponder/StaticLibrary_mDNSResponder.mk   |   37 
 external/mdnsresponder/UnpackedTarball_mDNSResponder.mk |   14 
 sd/CppunitTest_sd_uimpress.mk   |1 
 sd/Library_sd.mk|9 
 sd/source/ui/remotecontrol/WINNetworkService.cxx|1 
 sd/source/ui/remotecontrol/WINNetworkService.hxx|2 
 sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h   | 1213 
 sd/source/ui/remotecontrol/mDNSResponder/DebugServices.c| 2978 
 sd/source/ui/remotecontrol/mDNSResponder/DebugServices.h| 1576 --
 sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.c|  319 -
 sd/source/ui/remotecontrol/mDNSResponder/GenLinkedList.h|   90 
 sd/source/ui/remotecontrol/mDNSResponder/dllmain.c  |  113 
 sd/source/ui/remotecontrol/mDNSResponder/dns_sd.h   | 2459 -
 sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientlib.c  |  366 -
 sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c | 2219 
 sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.c|  161 
 sd/source/ui/remotecontrol/mDNSResponder/dnssd_ipc.h|  222 
 25 files changed, 105 insertions(+), 11727 deletions(-)

New commits:
commit 9ec0e6d9cbb0b61e5cf37917baee31f2af1a2897
Author: Michael Stahl 
Date:   Fri Nov 27 23:54:40 2015 +0100

sd: replace embedded mDNSResponder code with proper external tarball

The diff against the 379.37 release is 2500 lines, one of which
actually does anything at runtime (missing va_end()).

Change-Id: I1824e61fd4ac6c3ce28084913a2661134a03fd51
Reviewed-on: https://gerrit.libreoffice.org/20248
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Makefile.fetch b/Makefile.fetch
index 8b2da4e..cbc51b2 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -165,6 +165,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
$(call fetch_Optional,MARIADB,MARIADB_TARBALL) \
$(call fetch_Optional,MDDS,MDDS_TARBALL) \
+   $(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2c00a33..cba5316 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2442,6 +2442,18 @@ gb_LinkTarget__use_coinmp :=
 
 endif # ENABLE_COINMP
 
+ifneq (,$(filter MDNSRESPONDER,$(BUILD_TYPE)))
+
+define gb_LinkTarget__use_mDNSResponder
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,mDNSResponder)/mDNSShared \
+   $$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_static_libraries,$(1),mDNSResponder)
+endef
+
+endif # MDNSRESPONDER
+
 ifeq ($(ENABLE_GIO),TRUE)
 
 define gb_LinkTarget__use_gio
diff --git a/configure.ac b/configure.ac
index 9a13921..eb569d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11805,7 +11805,10 @@ AC_SUBST(CAIRO_LIBS)
 dnl ===
 dnl Test whether to use avahi
 dnl ===
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_avahi" = "yes"; 
then
+if test "$_os" = "WINNT"; then
+# Windows uses bundled mDNSResponder
+BUILD_TYPE="$BUILD_TYPE MDNSRESPONDER"
+elif test "$_os" != "Darwin" -a "$enable_avahi" = "yes"; then
 PKG_CHECK_MODULES([AVAHI], [avahi-client >= 0.6.10],
   [ENABLE_AVAHI="TRUE"])
 AC_DEFINE(HAVE_FEATURE_AVAHI)
diff --git a/download.lst b/download.lst
index 8774343..0201a61e 100755
--- a/download.lst
+++ b/download.lst
@@ -95,6 +95,8 @@ export LPSOLVE_TARBALL := 
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
 export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
 export MDDS_TARBALL := mdds_1.0.0.tar.bz2
+export MDNSRESPONDER_MD5SUM := dd557e1058b51ac2f29cd01d67be0145
+export MDNSRESPONDER_TARBALL := mDNSResponder-379.37.tar.gz
 export MSPUB_MD5SUM :=

[Libreoffice-commits] core.git: configure.ac download.lst external/libetonyek external/mdds

2015-11-27 Thread Markus Mohrhard

 configure.ac   |   
 2 
 download.lst   |   
 4 
 external/libetonyek/ExternalProject_libetonyek.mk  |   
 2 
 external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 |   
55 --
 external/mdds/UnpackedTarball_mdds.mk  |   
 2 
 external/mdds/mdds_0.6.0.patch |   
54 -
 6 files changed, 4 insertions(+), 115 deletions(-)

New commits:
commit a7c3a2a9be83686657c06f37d521f9f6d2004ddd
Author: Markus Mohrhard 
Date:   Fri Oct 9 01:03:29 2015 +0200

update to mdds 1.0

Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972
Reviewed-on: https://gerrit.libreoffice.org/20251
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/configure.ac b/configure.ac
index 57a41f7..e00df959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], 
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
 
 dnl ===
 dnl Check for system glm
diff --git a/download.lst b/download.lst
index eabdbcf..8774343 100755
--- a/download.lst
+++ b/download.lst
@@ -93,8 +93,8 @@ export LIBXML_TARBALL := 
daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
-export MDDS_TARBALL := mdds_0.12.1.tar.bz2
+export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
+export MDDS_TARBALL := mdds_1.0.0.tar.bz2
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
 export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk 
b/external/libetonyek/ExternalProject_libetonyek.mk
index d296a1e..c98889b 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
--disable-werror \
--disable-weffc \
--without-tools \
-   --with-mdds=0.x \
+   --with-mdds=1.0 \
$(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell 
cygpath -m /usr/bin/mkdir) -p") \
$(if 
$(verbose),--disable-silent-rules,--enable-silent-rules) \
$(if $(filter LINUX,$(OS)), \
diff --git 
a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 
b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
deleted file mode 100644
index bed9c9c..000
--- a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Mon, 29 Jun 2015 14:28:42 +0200
-Subject: [PATCH] another step to allow fst to use any value type
-
-For some reason this is not a problem on modern compilers...

- include/mdds/flat_segment_tree.hpp | 1 -
- include/mdds/flat_segment_tree_def.inl | 2 +-
- src/flat_segment_tree_test.cpp | 4 
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/include/mdds/flat_segment_tree.hpp 
b/include/mdds/flat_segment_tree.hpp
-index b656bc3..02cf87e 100644
 a/include/mdds/flat_segment_tree.hpp
-+++ b/include/mdds/flat_segment_tree.hpp
-@@ -32,7 +32,6 @@
- #include 
- #include 
- #include 
--#include 
- 
- #include "mdds/node.hpp"
- #include "mdds/flat_segment_tree_itr.hpp"
-diff --git a/include/mdds/flat_segment_tree_def.inl 
b/include/mdds/flat_segment_tree_def.inl
-index ebfee99..5fef1c3 100644
 a/include/mdds/flat_segment_tree_def.inl
-+++ b/include/mdds/flat_segment_tree_def.inl
-@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type 
min_val, key_type ma
- // We don't ever use the value of the right leaf node, but we need the
- // value to be always the same, to make it easier to check for
- // equality.
--

[Libreoffice-commits] core.git: configure.ac download.lst external/libetonyek writerperfect/qa

2015-11-18 Thread David Tardon

 configure.ac   
 |2 
 dev/null   
 |binary
 download.lst   
 |4 
 external/libetonyek/0001-add-missing-include.patch.1   
 |   25 
 
external/libetonyek/0001-std-containers-of-incomplete-types-are-not-allowed.patch.1
 |   58 
 external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1   
 |   45 
 external/libetonyek/ExternalProject_libetonyek.mk  
 |3 
 external/libetonyek/Library_etonyek.mk 
 |   19 
 external/libetonyek/UnpackedTarball_libetonyek.mk  
 |4 
 external/libetonyek/assert.patch   
 |   11 
 external/libetonyek/inc/IWORKToken.inc 
 | 1016 ++
 external/libetonyek/inc/KEY1Token.inc  
 |  540 +
 external/libetonyek/inc/KEY2Token.inc  
 |  224 ++
 external/libetonyek/inc/NUM1Token.inc  
 |  147 +
 external/libetonyek/inc/PAG1Token.inc  
 |  180 +
 external/libetonyek/win_build.patch.1  
 |2 
 writerperfect/qa/unit/data/impress/libetonyek/pass/v6.zip  
 |binary
 17 files changed, 2189 insertions(+), 91 deletions(-)

New commits:
commit c0e04644a1703f4c6529e88b7c208126d2a2b1ec
Author: David Tardon 
Date:   Tue Nov 17 22:02:45 2015 +0100

upload libetonyek 0.1.4

Change-Id: I21eb802e65c7054cfbf73a90c0d63a007829ebcf

diff --git a/configure.ac b/configure.ac
index b87fe11..f142a57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7709,7 +7709,7 @@ 
libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1 >= 0.1.1])
 dnl ===
 dnl Check for system libetonyek
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.2])
+libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1 >= 0.1.4])
 
 dnl ===
 dnl Check for system libfreehand
diff --git a/download.lst b/download.lst
index 8bf98e7..4b12005 100755
--- a/download.lst
+++ b/download.lst
@@ -27,8 +27,8 @@ export DBGHELP_DLL := 
13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export ETONYEK_MD5SUM := e5947373dd7834f27e93f1636faa419f
-export ETONYEK_VERSION_MICRO := 3
+export ETONYEK_MD5SUM := b542e4d3072e89d0c627956d6747e1d2
+export ETONYEK_VERSION_MICRO := 4
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 export FIREBIRD_MD5SUM := 7a17ec9889424b98baa29e001a054434
diff --git a/external/libetonyek/0001-add-missing-include.patch.1 
b/external/libetonyek/0001-add-missing-include.patch.1
deleted file mode 100644
index 9c80674..000
--- a/external/libetonyek/0001-add-missing-include.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 00f7e36ce2a3996ebef672561014ab101eee7f3a Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Thu, 25 Jun 2015 12:00:49 +0200
-Subject: [PATCH] add missing include
-
-Change-Id: I8bfcacb064b3d0f9d7d5db9d2f32108b0ceea792

- src/lib/IWORKTypes_fwd.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/IWORKTypes_fwd.h b/src/lib/IWORKTypes_fwd.h
-index f7a4fb2..1096df8 100644
 a/src/lib/IWORKTypes_fwd.h
-+++ b/src/lib/IWORKTypes_fwd.h
-@@ -9,6 +9,7 @@
- #ifndef IWORKTYPES_FWD_H_INCLUDED
- #define IWORKTYPES_FWD_H_INCLUDED
- 
-+#include 
- #include 
- 
- #include 
--- 
-2.4.2
-
diff --git 
a/external/libetonyek/0001-std-containers-of-incomplete-types-are-not-allowed.patch.1
 
b/external/libetonyek/0001-std-containers-of-incomplete-types-are-not-allowed.patch.1
new file mode 100644
index 000..f758370
--- /dev/null
+++ 
b/external/libetonyek/0001-std-containers-of-incomplete-types-are-not-allowed.patch.1
@@ -0,0 +1,58 @@
+From 0beaf8ae8d9fc9049ac684ca169295357275eb85 Mon Sep 17 00:00:00 2001
+From: David Tardon 
+Date: Wed, 18 Nov 2015 13:19:17 +0100
+Subject: [PATCH] std containers of incomplete types are not allowed
+
+Change-Id: Icd916b4b0e2e2ae87014b6b53dbba5e56aa43846
+---
+ configure.ac   |  1 +
+ src/lib/IWAField.h | 11 +++
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/lib/IWAField.h

[Libreoffice-commits] core.git: configure.ac download.lst external/Module_external.mk external/python3 external/python33 pyuno/source

2015-10-25 Thread David Ostrovsky

 configure.ac|   11 
 download.lst|7 
 external/Module_external.mk |2 
 external/python3/ExternalPackage_python3.mk |  160 +-
 external/python3/ExternalProject_python3.mk |3 
 external/python3/UnpackedTarball_python3.mk |   12 
 external/python3/i100492-freebsd.patch.1|   36 
 external/python3/python-3.3.0-darwin.patch.1|  100 -
 external/python3/python-3.3.0-gcc-4.8.patch.1   |7 
 external/python3/python-3.3.0-msvc-disable.patch.1  |   22 
 external/python3/python-3.3.0-ssl.patch.1   |  196 --
 external/python3/python-3.3.3-aix.patch.1   |   50 
 external/python3/python-3.3.3-elf-rpath.patch.1 |   13 
 external/python3/python-3.3.3-py17797.patch.1   |   38 
 external/python3/python-3.5.0-tcltk.disable.patch   |   16 
 external/python3/python-3.5.tweak.strip.soabi.patch |   12 
 external/python3/ubsan.patch.0  |   49 
 external/python33/ExternalPackage_python3.mk|  829 ++
 external/python33/ExternalProject_python3.mk|  148 +
 external/python33/GeneratedPackage_python3.mk   |   18 
 external/python33/Makefile  |7 
 external/python33/Module_python33.mk|   24 
 external/python33/README|1 
 external/python33/UnpackedTarball_python3.mk|   60 
 external/python33/i100492-freebsd.patch.1   |   80 +
 external/python33/python-3.3.0-clang.patch.1|   13 
 external/python33/python-3.3.0-darwin.patch.1   |   85 +
 external/python33/python-3.3.0-gcc-4.8.patch.1  |   15 
 external/python33/python-3.3.0-i42553.patch.2   |   18 
 external/python33/python-3.3.0-msvc-disable.patch.1 |   47 
 external/python33/python-3.3.0-msvc-x64.patch.1 |  289 +++
 external/python33/python-3.3.0-msvc2012.patch.1 |   72 
 external/python33/python-3.3.0-pythreadstate.patch.1|   15 
 external/python33/python-3.3.0-ssl.patch.1  |  208 ++
 external/python33/python-3.3.3-aix.patch.1  |  145 +
 external/python33/python-3.3.3-disable-obmalloc.patch.0 |   21 
 external/python33/python-3.3.3-elf-rpath.patch.1|   13 
 external/python33/python-3.3.3-msvc2012-winxp.patch.1   |  117 +
 external/python33/python-3.3.3-py17797.patch.1  |   45 
 external/python33/python-3.3.5-darwin-gnu-xargs.patch.1 |   12 
 external/python33/python-3.3.5-pyexpat-symbols.patch.1  |   28 
 external/python33/python-3.3.5-vs2013.patch.1   |   14 
 external/python33/python-lsan.patch.0   |   19 
 external/python33/python-msvc-disable-sse2.patch.1  |   23 
 external/python33/python-vc2013.patch.1 | 1213 
 external/python33/ubsan.patch.0 |   79 +
 pyuno/source/module/pyuno.cxx   |4 
 47 files changed, 3985 insertions(+), 411 deletions(-)

New commits:
commit 147cb6a2ae63debed3dd500e19b2776cebbc0031
Author: David Ostrovsky 
Date:   Sun Jul 26 21:38:38 2015 +0200

Bump python to 3.5

3.5 release is needed for MSVC 14.0 (aka VS 2015) support. Python 3.5
removed build toolchain support for MSVC 2013. Because we still need
to support it, we duplicate the Python directory in externals and
copy old patches and dispatch to this directory for MSVC 2013. Once
the support for MSVC 2013 is dropped on master, this directory can be
removed again.

Change-Id: Idf7bc351239582f583ecbdb53c923cbdcf968089
Reviewed-on: https://gerrit.libreoffice.org/17352
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index cd3b983..7f81a2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8055,8 +8055,15 @@ int main(int argc, char **argv) {
 internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
-PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
+# On windows we are supporting two different python versions: 3.3 and 3.5.
+# We msut do it as long as we support MSVC 2013. Python 3.3 can be removed
+# when MSVC 2013 support was dropped.
+if test "$COM" = "MSC" -a $VCVER = 120; then
+PYTHON_VERSION_MINOR=3
+else
+PYTHON_VERSION_MINOR=5
+fi
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
 AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
 BUILD_TYPE="$BUILD_TYPE PYTHON"
 # Embedded Python dies without Home set
diff --git a/download.lst b/download.lst
old mode 100644
new mode 100755
index 62d93da..b1ebb89
--- a/download.lst
+++ b/download.lst
@@ -123,8 +123,15 @@ export PNG_TARBALL :=

[Libreoffice-commits] core.git: configure.ac download.lst external/liblangtag

2015-07-16 Thread Eike Rathke

 configure.ac   
|2 
 download.lst   
|2 
 external/liblangtag/UnpackedTarball_langtag.mk 
|   20 
 
external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
 |   49 --
 external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch   
|   25 -
 external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
|   12 --
 external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch   
|   15 ---
 external/liblangtag/liblangtag-0.5.1-msvc-warning.patch
|   21 
 external/liblangtag/liblangtag-0.5.1-scope-declaration.patch   
|   13 --
 external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch  
|   14 --
 external/liblangtag/liblangtag-0.5.1-unistd.patch  
|   12 --
 external/liblangtag/liblangtag-0.5.1-vsnprintf.patch   
|   18 ---
 
external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch 
   |   16 ---
 external/liblangtag/liblangtag-leak.patch.0
|   10 --
 14 files changed, 5 insertions(+), 224 deletions(-)

New commits:
commit 67bded9f0b63f722ff44bd2e653841cce389119b
Author: Eike Rathke er...@redhat.com
Date:   Wed Jul 15 16:54:41 2015 +0200

update to liblangtag-0.5.7

Change-Id: I46bf74efb52435313eb17e0db8b1cf103a329004
Reviewed-on: https://gerrit.libreoffice.org/17078
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: Eike Rathke er...@redhat.com

diff --git a/configure.ac b/configure.ac
index 87d7990..e7f6872 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12047,8 +12047,6 @@ if test $enable_liblangtag = yes -o \( 
$enable_liblangtag =  -a $_os !=
 SYSTEM_LIBLANGTAG=
 AC_MSG_RESULT([no])
 BUILD_TYPE=$BUILD_TYPE LIBLANGTAG
-dnl TODO: remove when liblangtag is updated to 0.5.5
-AC_DEFINE([LIBLANGTAG_INLINE_FIX])
 if test $COM = MSC; then
 
LIBLANGTAG_LIBS=${WORKDIR}/UnpackedTarball/langtag/liblangtag/.libs/liblangtag.lib
 else
diff --git a/download.lst b/download.lst
index 07959ae..ceee956 100644
--- a/download.lst
+++ b/download.lst
@@ -95,7 +95,7 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
-export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+export LIBLANGTAG_TARBALL := 
80d063d6db4c010e18c606af8aed6231-liblangtag-0.5.7.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 2951368..541baa3 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -15,22 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
$(GNUTAR) -x -j -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
 ))
 
-# external/liblangtag/liblangtag-leak.patch.0 upstream:
-#  https://bitbucket.org/tagoh/liblangtag/pull-request/8/fix-memory-leak/diff
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-   external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \
-   external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \
-   external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \
-   external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \
-   external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \
-   external/liblangtag/liblangtag-0.5.1-scope-declaration.patch \
-   external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \
-   external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \
-   
external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch 
\
-   external/liblangtag/liblangtag-0.5.1-unistd.patch \
-   
external/liblangtag/liblangtag-0.5.1-include-last-record-in-language-subtag-registry.patch
 \
-   external/liblangtag/liblangtag-leak.patch.0 \
-))
+# Currently no patches applied, if there were it would be:
+#$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+#  external/liblangtag/your-modification.patch \
+#))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
diff --git

[Libreoffice-commits] core.git: configure.ac download.lst external/liborcus RepositoryExternal.mk sc/source

2015-06-04 Thread David Tardon

 RepositoryExternal.mk|   
55 
 configure.ac |
2 
 download.lst |
2 
 external/liborcus/0001-fix-dllexport-decls.patch |  
101 
 external/liborcus/0001-mark-more-symbols-as-public.patch |   
52 
 external/liborcus/0001-these-functions-are-implemented-in-liborcus.patch |   
36 
 external/liborcus/0001-workaround-a-linking-problem-on-windows.patch |   
45 
 external/liborcus/ExternalPackage_liborcus.mk|   
22 
 external/liborcus/ExternalProject_liborcus.mk|
4 
 external/liborcus/Library_orcus-parser.mk|   
55 
 external/liborcus/Library_orcus.mk   |  
104 
 external/liborcus/Module_liborcus.mk |   
17 
 external/liborcus/UnpackedTarball_liborcus.mk|   
25 
 external/liborcus/liborcus_0.1.0-configure.patch |   
20 
 external/liborcus/liborcus_0.1.0-dllimport.patch |   
24 
 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0  | 
1800 --
 external/liborcus/visibility.patch   |   
11 
 sc/source/filter/html/htmlpars.cxx   |   
30 
 sc/source/filter/inc/orcusinterface.hxx  |   
10 
 sc/source/filter/orcus/interface.cxx |   
48 
 20 files changed, 572 insertions(+), 1891 deletions(-)

New commits:
commit edb38d702dd5a058ae0702b73a43328318b94649
Author: David Tardon dtar...@redhat.com
Date:   Thu Jun 4 16:09:48 2015 +0200

update to liborcus 0.9.1

Includes switching to dynamic libs.

Change-Id: I959c4e9430f8cf95f50d48e1b01d8323dba4af81

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 47e4d17..726ef75 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3209,35 +3209,78 @@ endef
 
 else # !SYSTEM_LIBORCUS
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+   orcus \
+   orcus-parser \
+))
+
+define gb_LinkTarget__use_orcus
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+   orcus \
+)
+
+endef
+
+define gb_LinkTarget__use_orcus-parser
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+   orcus-parser \
+)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+   liborcus \
+))
+
 define gb_LinkTarget__use_orcus
-$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_use_package,$(1),liborcus)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs/liborcus-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/liborcus/.libs 
-lorcus-0.10 \
 )
 
 $(if $(SYSTEM_BOOST), \
-$(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
-$(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
+   $(call gb_LinkTarget_add_ldflags,$(1),$(BOOST_LDFLAGS)) \
+   $(call gb_LinkTarget_add_libs,$(1),$(BOOST_SYSTEM_LIB)) \
 )
 
 endef
 
 define gb_LinkTarget__use_orcus-parser
-$(call gb_LinkTarget_use_external_project,$(1),liborcus)
+$(call gb_LinkTarget_use_package,$(1),liborcus)
+
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,liborcus/include) \
$$(INCLUDE) \
 )
+
 $(call gb_LinkTarget_add_libs,$(1),\
-   $(call 
gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs/liborcus-parser-0.8$(gb_StaticLibrary_PLAINEXT)
 \
+   -L$(call gb_UnpackedTarball_get_dir,liborcus)/src/parser/.libs 
-lorcus-parser-0.10 \
 )
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_LIBORCUS
 
 else # ENABLE_ORCUS != TRUE
diff --git a/configure.ac b/configure.ac
index c7483a0..ac00539 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9012,7 +9012,7 @@ if test -z $enable_orcus -o $enable_orcus != no; then
 ENABLE_ORCUS=TRUE
 AC_DEFINE(ENABLE_ORCUS)
 
-libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.8 = 0.7.0])
+libo_CHECK_SYSTEM_MODULE([orcus],[ORCUS],[liborcus-0.10 = 0.9.0])
 if test $with_system_orcus != yes; then
 if test $SYSTEM_BOOST = TRUE; then
 # ===
diff --git a/download.lst b/download.lst
index 86ce10c..7b4bfe4 100644
---

[Libreoffice-commits] core.git: configure.ac download.lst

2015-02-16 Thread Markus Mohrhard

 configure.ac |2 +-
 download.lst |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a30e2cb912c6bae240ced35a392151e34090665b
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date:   Tue Feb 17 04:11:53 2015 +0100

update mdds to 0.12.0

Change-Id: I2de5ec5e705a7c2cbd3ccd5d494dafc5c939448a
Reviewed-on: https://gerrit.libreoffice.org/14515
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/configure.ac b/configure.ac
index fa23b70..1051d20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8558,7 +8558,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.3], 
[-I${WORKDIR}/UnpackedTarball/mdds/include])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.12.0], 
[-I${WORKDIR}/UnpackedTarball/mdds/include])
 
 dnl ===
 dnl Check for system glm
diff --git a/download.lst b/download.lst
index ef1af63..58d1fe0 100644
--- a/download.lst
+++ b/download.lst
@@ -99,7 +99,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
-export MDDS_TARBALL := cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2
+export MDDS_TARBALL := 17edb780d4054e4205cd956910672b83-mdds_0.12.0.tar.bz2
 export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
 export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
 export MWAW_MD5SUM := edb8a92a4b6746efbd45bde5006f71b9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/icu i18nutil/source include/svx svx/source

2014-12-19 Thread Caolán McNamara

 configure.ac |2 
 download.lst |2 
 external/icu/UnpackedTarball_icu.mk  |3 
 external/icu/icu-ubsan.patch.0   |   20 
 external/icu/icu4c-aix.patch |9 --
 external/icu/icu4c-buffer-overflow.patch |   30 ---
 external/icu/icu4c-build.patch   |   43 +-
 external/icu/icu4c-icu11054.patch.1  |   44 --
 external/icu/icu4c-icu11100.patch.1  |2 
 external/icu/icu4c-icu11131.patch.1  |   68 
 external/icu/icu4c-mkdir.patch   |9 --
 i18nutil/source/utility/unicode.cxx  |   20 
 include/svx/ucsubset.hrc |   32 +++
 svx/source/dialog/charmap.cxx|   99 +++
 svx/source/dialog/ucsubset.src   |  128 +++
 15 files changed, 311 insertions(+), 200 deletions(-)

New commits:
commit f9d3e0f57c173494d250aadd0022abb738634f43
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Dec 19 11:04:49 2014 +

upgrade to icu 54

Change-Id: I4d32ac386ff8b69bee4319e673769917045d9450
Reviewed-on: https://gerrit.libreoffice.org/13547
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/configure.ac b/configure.ac
index 021c7de..276fe1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8781,7 +8781,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=53
+ICU_MAJOR=54
 ICU_MINOR=1
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS=TRUE
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY=TRUE
diff --git a/download.lst b/download.lst
index c2e5949..2bb91ca 100644
--- a/download.lst
+++ b/download.lst
@@ -65,7 +65,7 @@ export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
+export ICU_TARBALL := e844caed8f2ca24c088505b0d6271bc0-icu4c-54_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index af9c751..e0d18b5 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -19,12 +19,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
external/icu/icu4c-macosx.patch \
external/icu/icu4c-solarisgcc.patch \
external/icu/icu4c-mkdir.patch \
-   external/icu/icu4c-buffer-overflow.patch \
external/icu/icu4c-$(if $(filter ANDROID,$(OS)),android,rpath).patch \
external/icu/icu-ubsan.patch.0 \
-   external/icu/icu4c-icu11054.patch.1 \
external/icu/icu4c-icu11100.patch.1 \
-   external/icu/icu4c-icu11131.patch.1 \
external/icu/icu4c-scriptrun.patch \
external/icu/icu4c-icu11451.patch.1 \
 ))
diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
index 479007b..c6baaed 100644
--- a/external/icu/icu-ubsan.patch.0
+++ b/external/icu/icu-ubsan.patch.0
@@ -138,23 +138,3 @@
  }
  
  /* INTERNAL: compares two entries */
 source/common/ustring.cpp
-+++ source/common/ustring.cpp
-@@ -1486,7 +1486,7 @@
- */
- 
- #define STRING_HASH(TYPE, STR, STRLEN, DEREF) \
--int32_t hash = 0; \
-+uint32_t hash = 0; \
- const TYPE *p = (const TYPE*) STR;\
- if (p != NULL) {  \
- int32_t len = (int32_t)(STRLEN);  \
-@@ -1497,7 +1497,7 @@
- p += inc; \
- } \
- } \
--return hash
-+return static_castint32_t(hash)
- 
- /* Used by UnicodeString to compute its hashcode - Not public API. */
- U_CAPI int32_t U_EXPORT2
diff --git a/external/icu/icu4c-aix.patch b/external/icu/icu4c-aix.patch
index 580a8fc..f4a449f 100644
--- a/external/icu/icu4c-aix.patch
+++ b/external/icu/icu4c-aix.patch
@@ -114,16 +114,16 @@
  ## BIR  - bind with internal references [so app data and icu data doesn't 
collide]
 --- misc/icu/source/tools/pkgdata/pkgdata.cpp  2013-04-06 20:56:00.935656635 
+0100
 +++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp2013-10-31 
20:38:10.623984554 +0700
-@@ -888,7 +888,7 @@
+@@ -902,7 +902,7 @@
  
  uprv_strcat(pkgDataFlags[SO_EXT], .);
  uprv_strcat(pkgDataFlags[SO_EXT], pkgDataFlags[A_EXT]);
 -#elif U_PLATFORM == U_PF_OS400 || defined(_AIX)
 +#elif U_PLATFORM == U_PF_OS400
- sprintf(libFileNames[LIB_FILE_VERSION_TMP], %s.%s,

[Libreoffice-commits] core.git: configure.ac download.lst external/apache-commons external/jfreereport reportbuilder/java RepositoryExternal.mk swext/Extension_wiki-publisher.mk

2014-08-16 Thread Thomas Arnhold

 RepositoryExternal.mk|4 
++--
 configure.ac |4 
++--
 download.lst |3 ++-
 external/apache-commons/ExternalPackage_apache_commons_logging.mk|2 +-
 external/apache-commons/ExternalProject_apache_commons_httpclient.mk |2 +-
 external/apache-commons/patches/logging.patch|8 

 external/jfreereport/ExternalProject_jfreereport_flow_engine.mk  |2 +-
 external/jfreereport/ExternalProject_jfreereport_liblayout.mk|2 +-
 reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf|2 +-
 swext/Extension_wiki-publisher.mk|2 +-
 10 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 439354a0b4641bc2ee8e403e8b9e84ac4a0ec6a9
Author: Thomas Arnhold tho...@arnhold.org
Date:   Thu Aug 14 23:20:27 2014 +0200

upgrade to apache-commons-1.2

Change-Id: Ic356c6a23f42b5fe37be1075e8508bb168eac9a1
Reviewed-on: https://gerrit.libreoffice.org/10927
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 621ff41..16772512 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3512,7 +3512,7 @@ else # !SYSTEM_APACHE_COMMONS
 
 ifeq ($(ENABLE_JAVA),TRUE)
 $(eval $(call gb_Helper_register_jars_for_install,OOO,reportbuilder,\
-   commons-logging-1.1.3 \
+   commons-logging-1.2 \
 ))
 endif
 $(eval $(call gb_Helper_register_jars,OXT,\
@@ -3553,7 +3553,7 @@ endef
 
 define gb_Jar__use_commons-logging
 $(call gb_Jar_use_external_project,$(1),apache_commons_logging)
-$(call gb_Jar_use_jar,$(1),commons-logging-1.1.3)
+$(call gb_Jar_use_jar,$(1),commons-logging-1.2)
 endef
 define gb_ExternalProject__use_commons-logging
 $(call gb_ExternalProject_use_external_project,$(1),apache_commons_logging)
diff --git a/configure.ac b/configure.ac
index b5d7373..1189229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10930,8 +10930,8 @@ if test $ENABLE_MEDIAWIKI = TRUE -o 
$ENABLE_REPORTBUILDER = TRUE; then
 fi
 if test $ENABLE_MEDIAWIKI = TRUE -o $ENABLE_REPORTBUILDER = 
TRUE; then
 if test -z $COMMONS_LOGGING_JAR; then
-AC_CHECK_FILE(/usr/share/java/commons-logging-1.1.3.jar,
-   [ 
COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.3.jar ],
+AC_CHECK_FILE(/usr/share/java/commons-logging-1.2.jar,
+   [ 
COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.2.jar ],
[
 AC_CHECK_FILE(/usr/share/java/commons-logging.jar,
 [ 
COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar ],
diff --git a/download.lst b/download.lst
index 9eb59ac..bd66376 100644
--- a/download.lst
+++ b/download.lst
@@ -9,7 +9,8 @@ export APACHE_COMMONS_LANG_TARBALL := $(if $(filter 
TRUE,$(HAVE_JAVA6))\
   ,8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz\
   ,625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz\
 )
-export APACHE_COMMONS_LOGGING_TARBALL := 
e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
+export APACHE_COMMONS_LOGGING_MD5SUM := ce977548f1cbf46918e93cd38ac35163
+export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
 export APR_MD5SUM := eff9d741b0999a9bbab96862dd2a2a3d
 export APR_TARBALL := apr-1.4.8.tar.gz
 export APR_UTIL_MD5SUM := 71a11d037240b292f824ba1eb537b4e3
diff --git a/external/apache-commons/ExternalPackage_apache_commons_logging.mk 
b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
index b89a394..ce72112 100644
--- a/external/apache-commons/ExternalPackage_apache_commons_logging.mk
+++ b/external/apache-commons/ExternalPackage_apache_commons_logging.mk
@@ -11,6 +11,6 @@ $(eval $(call 
gb_ExternalPackage_ExternalPackage,apache_commons_logging,apache_c
 
 $(eval $(call 
gb_ExternalPackage_use_external_project,apache_commons_logging,apache_commons_logging))
 
-$(eval $(call 
gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.1.3.jar,target/commons-logging-1.1.3.jar))
+$(eval $(call 
gb_ExternalPackage_add_file,apache_commons_logging,$(LIBO_SHARE_JAVA_FOLDER)/commons-logging-1.2.jar,target/commons-logging-1.2.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git 
a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk 
b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
index f8cec74..ff2733a 100644
--- a/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/external/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -23,7 +23,7 @@ $(call 
gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
-q \
-f build.xml \

[Libreoffice-commits] core.git: configure.ac download.lst external/libmariadb

2014-08-11 Thread Lionel Elie Mamane

 configure.ac   |6 
 download.lst   |2 
 external/libmariadb/UnpackedTarball_mariadb.mk |1 
 external/libmariadb/mariadb-trunk-101.patch|242797 
-
 4 files changed, 3 insertions(+), 242803 deletions(-)

New commits:
commit 35836d2494d67d129f305e2294fc60fed062c9c7
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Aug 11 13:03:27 2014 +0200

switch internal mariadb client to version 2

and reenable it: hopefully the worst bugs are fixed now

Change-Id: I8033ef87d02ba6619e5f778b5255fa803ba63c5b

diff --git a/configure.ac b/configure.ac
index 7126012..0e88287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8244,12 +8244,11 @@ if test $ENABLE_MARIADBC = TRUE; then
 if test $with_system_mariadb = yes; then
 AC_MSG_RESULT([external])
 SYSTEM_MARIADB=TRUE
-#AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
+AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
 if test -z $MARIADBCONFIG; then
 AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
 if test -z $MARIADBCONFIG; then
-#AC_MSG_ERROR([mariadb_config and mysql_config are missing. 
Install MariaDB or MySQL package.])
-AC_MSG_ERROR([mysql_config is missing. Install MySQL client 
library development package.])
+AC_MSG_ERROR([mariadb_config and mysql_config are missing. 
Install MariaDB or MySQL development package.])
 fi
 fi
 AC_MSG_CHECKING([MariaDB version])
@@ -8302,7 +8301,6 @@ if test $ENABLE_MARIADBC = TRUE; then
 fi
 else
 AC_MSG_RESULT([internal])
-AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use 
libmysqlclient])
 SYSTEM_MARIADB=
 MARIADB_CFLAGS=-I${WORKDIR}/UnpackedTarball/mariadb/include
 MARIADB_LIBS=-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib
diff --git a/download.lst b/download.lst
index 36bc91f..1708e1a 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,7 @@ export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
+export MARIADB_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
 export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
 export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
 export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
diff --git a/external/libmariadb/UnpackedTarball_mariadb.mk 
b/external/libmariadb/UnpackedTarball_mariadb.mk
index 489477c..c3c5ed4 100644
--- a/external/libmariadb/UnpackedTarball_mariadb.mk
+++ b/external/libmariadb/UnpackedTarball_mariadb.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
 # non-static inline local_thr_alarm in libmariadb/net.c:
 $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 external/libmariadb/mariadb-swap.patch \
-external/libmariadb/mariadb-trunk-101.patch \
 external/libmariadb/mariadb-msvc.patch.1 \
 ))
 
diff --git a/external/libmariadb/mariadb-trunk-101.patch 
b/external/libmariadb/mariadb-trunk-101.patch
deleted file mode 100644
index 75cf434..000
--- a/external/libmariadb/mariadb-trunk-101.patch
+++ /dev/null
@@ -1,242797 +0,0 @@
-diff -x .bzr -u --recursive -N 
mariadb-native-client.release/cmake/CheckFunctions.cmake 
mariadb-native-client.trunk/cmake/CheckFunctions.cmake
 mariadb/cmake/CheckFunctions.cmake 1970-01-01 01:00:00.0 +0100
-+++ mariadb/cmake/CheckFunctions.cmake 2013-10-19 07:29:16.0 +0200
-@@ -0,0 +1,108 @@
-+# This file is included by CMakeLists.txt and
-+# checks for various functions.
-+# include/my_config.h.in
-+# You will find the appropiate defines in 
-+
-+INCLUDE(CheckFunctionExists)
-+
-+CHECK_FUNCTION_EXISTS (access HAVE_ACCESS)
-+CHECK_FUNCTION_EXISTS (aiowait HAVE_AIOWAIT)
-+CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM)
-+CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
-+CHECK_FUNCTION_EXISTS (bcmp HAVE_BCMP)
-+CHECK_FUNCTION_EXISTS (bfill HAVE_BFILL)
-+CHECK_FUNCTION_EXISTS (bmove HAVE_BMOVE)
-+CHECK_FUNCTION_EXISTS (bzero HAVE_BZERO)
-+CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
-+CHECK_FUNCTION_EXISTS (compress HAVE_COMPRESS)
-+CHECK_FUNCTION_EXISTS (crypt HAVE_CRYPT)
-+CHECK_FUNCTION_EXISTS (dlerror HAVE_DLERROR)
-+CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN)
-+CHECK_FUNCTION_EXISTS (fchmod HAVE_FCHMOD)
-+CHECK_FUNCTION_EXISTS (fcntl HAVE_FCNTL)
-+CHECK_FUNCTION_EXISTS (fconvert HAVE_FCONVERT)
-+CHECK_FUNCTION_EXISTS (fdatasync HAVE_FDATASYNC)
-+CHECK_FUNCTION_EXISTS (fesetround HAVE_FESETROUND)
-+CHECK_FUNCTION_EXISTS (finite HAVE_FINITE)

[Libreoffice-commits] core.git: configure.ac download.lst external/libgltf vcl/source

2014-07-23 Thread Markus Mohrhard

 configure.ac|2 +-
 download.lst|2 +-
 external/libgltf/ExternalProject_libgltf.mk |2 ++
 external/libgltf/UnpackedTarball_libgltf.mk |1 -
 vcl/source/opengl/OpenGLContext.cxx |1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 887c088f20fe36b9b15484d0a5ec9416ba6cd310
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Jul 18 19:11:14 2014 +0200

make libgltf compile on OSX

Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8

diff --git a/configure.ac b/configure.ac
index d820cfd..45f77ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10600,7 +10600,7 @@ dnl Check whether to enable glTF support
 dnl ===
 AC_MSG_CHECKING([whether to enable glTF support])
 ENABLE_GLTF=
-if test x$enable_gltf != xno -a $_os != Darwin -a $_os != iOS -a $_os != 
Android; then
+if test x$enable_gltf != xno -a $_os != iOS -a $_os != Android; then
 ENABLE_GLTF=TRUE
 AC_MSG_RESULT([yes])
 AC_DEFINE(HAVE_FEATURE_GLTF,1)
diff --git a/download.lst b/download.lst
index ee8cf9c..c4e1d7d 100644
--- a/download.lst
+++ b/download.lst
@@ -87,7 +87,7 @@ export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
-export LIBGLTF_TARBALL := 
3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2
+export LIBGLTF_TARBALL := 
c1af7fbc6dde8fcbdca4ec22dd78c4c1-libgltf-0.0.0.tar.bz2
 export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index dfbe271..d68582f 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -58,6 +58,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG= \
 ./configure \
+   --disable-shared \
+   --enable-static \
--with-pic \
$(if $(filter 
TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \
--disable-werror \
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index a7565ea..176c1d1 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,7 +16,6 @@ $(eval $(call 
gb_UnpackedTarball_set_patchflags,libgltf,--binary))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
-   external/libgltf/pathces/fix_rendering_of_resized_model.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index bf63d09..ee916bb 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -475,6 +475,7 @@ bool OpenGLContext::ImplInit()
 #elif defined( MACOSX )
 
 CGLPixelFormatAttribute pixelFormatAttributes[] = {
+kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) 
kCGLOGLPVersion_3_2_Core,
 kCGLPFAColorSize, (CGLPixelFormatAttribute) 24,
 kCGLPFAAlphaSize, (CGLPixelFormatAttribute) 8,
 kCGLPFADoubleBuffer,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/libgltf external/Module_external.mk Makefile.fetch RepositoryExternal.mk

2014-04-18 Thread Zolnai Tamás

 Makefile.fetch   |1 
 RepositoryExternal.mk|   18 +
 configure.ac |1 
 download.lst |1 
 external/Module_external.mk  |1 
 external/libgltf/Makefile|   14 
 external/libgltf/Module_libgltf.mk   |   17 +
 external/libgltf/README  |1 
 external/libgltf/StaticLibrary_libgltf.mk|   47 ++
 external/libgltf/UnpackedTarball_libgltf.mk  |   28 
 external/libgltf/patches/adress_of_temporary.patch   |   13 
 external/libgltf/patches/extra_qualification.patch   |   12 +++
 external/libgltf/patches/include_path_freetype.patch |   12 +++
 external/libgltf/patches/include_path_glew.patch |   48 +++
 external/libgltf/patches/include_typo_texture.patch  |   12 +++
 external/libgltf/patches/missing_include_cstring.patch   |   11 +++
 external/libgltf/patches/unneeded_context_handling.patch |   12 +++
 external/libgltf/patches/win_only_variables.patch|   40 
 18 files changed, 288 insertions(+), 1 deletion(-)

New commits:
commit 62fd63050c355b06b449e58134fa482866102134
Author: Zolnai TamÃ¡s tamas.zol...@collabora.com
Date:   Fri Apr 18 12:55:56 2014 +0200

Integrate libgltf for rendering gltf models

Change-Id: I7c30dbcf276052c01bb15f3b8c77a2406260aa7b

diff --git a/Makefile.fetch b/Makefile.fetch
index 636a924..3efe2b5 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -146,6 +146,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,LANGUAGETOOL,$(LANGUAGETOOL_TARBALL)) \
$(call fetch_Optional,LCMS2,$(LCMS2_TARBALL)) \
$(call fetch_Optional,LIBEXTTEXTCAT,$(LIBEXTTEXTCAT_TARBALL)) \
+   $(call fetch_Optional,LIBGLTF,$(LIBGLTF_TARBALL)) \
$(call fetch_Optional,LIBLANGTAG,$(LIBLANGTAG_TARBALL)) \
$(call fetch_Optional,LIBXML2,$(LIBXML_TARBALL)) \
$(LIBXMLSEC_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a371f2f..c9e04fa 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -21,7 +21,7 @@
 # depending on the configure options these may be taken from the system,
 # or the internal/bundled copy may be built.
 
-# for every external, a function gb_LinkTarget_use__FOO is defined,
+# for every external, a function gb_LinkTarget__use_FOO is defined,
 # once for the system case, once for the internal case.
 
 # in the system case, no libraries should be registered, but the target-local
@@ -3087,6 +3087,22 @@ endif # SYSTEM_NSS
 
 endif # DESKTOP
 
+
+ifeq ($(ENABLE_GLTF),TRUE)
+
+define gb_LinkTarget__use_libgltf
+$(call gb_LinkTarget_set_include,$(1),\
+-I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \
+$$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+   libgltf \
+)
+endef
+
+endif
+
 ### Jars 
 
 ifneq ($(SYSTEM_HSQLDB),)
diff --git a/configure.ac b/configure.ac
index 50c8117..693d102 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10368,6 +10368,7 @@ AC_MSG_CHECKING([whether to enable glTF support])
 if test $enable_opengl = yes; then
 ENABLE_GLTF=TRUE
 AC_MSG_RESULT([yes])
+BUILD_TYPE=$BUILD_TYPE LIBGLTF
 if test $test_freetype = no; then
 BUILD_TYPE=$BUILD_TYPE FREETYPE
 fi
diff --git a/download.lst b/download.lst
index 40f9ff2..b3b48fa 100644
--- a/download.lst
+++ b/download.lst
@@ -88,6 +88,7 @@ export JPEG_TARBALL := 
52654eb3b2e60c35731ea8fc87f1bd29-jpegsrc.v8d.tar.gz
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_TARBALL := 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
 export LIBEXTTEXTCAT_TARBALL := 
ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+export LIBGLTF_TARBALL := 8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
 export LIBLANGTAG_TARBALL := 
36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
diff --git a/external/Module_external.mk b/external/Module_external.mk
index e9e90c4..02f6595 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,LIBEOT,libeot) \
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
+   $(call gb_Helper_optional,LIBGLTF,libgltf) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \

[Libreoffice-commits] core.git: configure.ac download.lst

2014-02-12 Thread Kohei Yoshida

 configure.ac |2 +-
 download.lst |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 07e2c31831ad265b018e5fdf59bdde048fbb4d35
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Feb 12 09:43:48 2014 -0500

fdo#74824: Update mdds to 0.10.2 which fixes one crasher bug.

Change-Id: If05c7573530c892dc063dfb7accec1c24a322ddd

diff --git a/configure.ac b/configure.ac
index e21d49e..87b0d4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8777,7 +8777,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.1])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.2])
 
 dnl ===
 dnl Determine which hash container mdds shall use
diff --git a/download.lst b/download.lst
index cea2517..41a74c6 100644
--- a/download.lst
+++ b/download.lst
@@ -84,7 +84,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
+export MDDS_TARBALL := 47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/mdds

2014-01-08 Thread Kohei Yoshida

 configure.ac |
2 
 download.lst |
2 
 external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch |   
54 --
 external/mdds/0001-Workaround-for-an-old-gcc-bug.patch   |   
27 -
 external/mdds/UnpackedTarball_mdds.mk|
2 
 5 files changed, 2 insertions(+), 85 deletions(-)

New commits:
commit 12890dd7adfc70bc562bb2760084515cc1269a38
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Jan 8 10:50:26 2014 -0500

Update mdds to 0.10.1, set it as the required baseline.

This update will obsolete two patches that were previously applied.

Change-Id: I521e939905e473ca5d440dea3b03faeb9af4c0fb

diff --git a/configure.ac b/configure.ac
index 67efcce..fcf8fd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8760,7 +8760,7 @@ AC_SUBST(SYSTEM_BOOST)
 dnl ===
 dnl Check for system mdds
 dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.9.1])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds = 0.10.1])
 
 dnl ===
 dnl Determine which hash container mdds shall use
diff --git a/download.lst b/download.lst
index e8ccd54..5049b0d 100644
--- a/download.lst
+++ b/download.lst
@@ -80,7 +80,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 26272a8e8c984d21ba800b4edcd3ada8-mdds_0.10.0.tar.bz2
+export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git 
a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch 
b/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
deleted file mode 100644
index c905cea..000
--- a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d0a006ad2fcabd1e785787b9a5c84b32edbab780 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida kohei.yosh...@gmail.com
-Date: Tue, 7 Jan 2014 15:43:36 -0500
-Subject: [PATCH] Add a method to set empty to a span of elements.
-

- include/mdds/multi_type_matrix.hpp |  9 +
- include/mdds/multi_type_matrix_def.inl | 10 ++
- 2 files changed, 19 insertions(+)
-
-diff --git a/include/mdds/multi_type_matrix.hpp 
b/include/mdds/multi_type_matrix.hpp
-index a30393f..0574466 100644
 a/include/mdds/multi_type_matrix.hpp
-+++ b/c/d/include/mdds/multi_type_matrix.hpp
-@@ -377,6 +377,15 @@ public:
- void set_empty(size_type row, size_type col);
- 
- /**
-+ * Set specified range of elements empty.
-+ *
-+ * @param row row position of the first element.
-+ * @param col column position of the first element.
-+ * @param length length of the range to set empty.
-+ */
-+void set_empty(size_type row, size_type col, size_type length);
-+
-+/**
-  * Set element referenced by the position object empty.
-  *
-  * @param pos position object that references element.
-diff --git a/include/mdds/multi_type_matrix_def.inl 
b/include/mdds/multi_type_matrix_def.inl
-index 21fe866..36f5448 100644
 a/include/mdds/multi_type_matrix_def.inl
-+++ b/c/d/include/mdds/multi_type_matrix_def.inl
-@@ -240,6 +240,16 @@ void multi_type_matrix_String::set_empty(size_type row, 
size_type col)
- }
- 
- templatetypename _String
-+void multi_type_matrix_String::set_empty(size_type row, size_type col, 
size_type length)
-+{
-+if (length == 0)
-+throw general_error(multi_type_matrix::set_empty: length of zero is 
not permitted.);
-+
-+size_type pos1 = get_pos(row, col);
-+m_store.set_empty(pos1, pos1+length-1);
-+}
-+
-+templatetypename _String
- typename multi_type_matrix_String::position_type
- multi_type_matrix_String::set_empty(const position_type pos)
- {
--- 
-1.8.1.4
-
diff --git a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch 
b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
deleted file mode 100644
index 8529fbf..000
--- a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida kohei.yosh...@gmail.com
-Date: Sat, 22 Jun 2013 21:30:13 -0400
-Subject: [PATCH]

[Libreoffice-commits] core.git: configure.ac download.lst external/python3

2014-01-06 Thread Michael Stahl

 configure.ac|2 
 download.lst|2 
 external/python3/ExternalPackage_python3.mk |   14 +-
 external/python3/UnpackedTarball_python3.mk |   11 -
 external/python3/i100492-freebsd.patch.1|2 
 external/python3/python-3.3.0-15833.patch.1 |   28 
 external/python3/python-3.3.0-aix.patch.1   |  156 
 external/python3/python-3.3.0-elf-rpath.patch.1 |   13 --
 external/python3/python-3.3.0-ffi-clang.patch.1 |   40 --
 external/python3/python-3.3.3-aix.patch.1   |  145 ++
 external/python3/python-3.3.3-elf-rpath.patch.1 |   13 ++
 11 files changed, 170 insertions(+), 256 deletions(-)

New commits:
commit 45c537a1185dfca7e51229dde9e9220e5174bd57
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jan 6 16:05:56 2014 +0100

fdo#73087: python3: upgrade to version 3.3.3

- drop obsolete/upstreamed patches:
  python-3.3.0-ffi-clang.patch.1
  python-3.3.0-15833.patch.1
  one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in

Change-Id: I12f0f78a172067986b63455847015ea2430a084c
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/configure.ac b/configure.ac
index 2047a6b..67efcce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8175,7 +8175,7 @@ internal)
 SYSTEM_PYTHON=NO
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=3
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
 BUILD_TYPE=$BUILD_TYPE PYTHON
 # Embedded Python dies without Home set
 if test $HOME = ; then
diff --git a/download.lst b/download.lst
index 6ab97a7..5cd4914 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export PIXMAN_TARBALL := 
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
 export POPPLER_TARBALL := 
1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
 export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 
32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/external/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
index ac8e856..1b83bd2 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -114,6 +114,13 @@ endif
 # headers are not delivered, but used from unpacked dir Include/
 # (+ toplevel for pyconfig.h)
 
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
+   LO_lib/_sysconfigdata.py \
+))
+endif
+
 # packages not shipped:
 # dbm, sqlite3 - need some database stuff
 # curses - need curses to build the C module
@@ -148,13 +155,6 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
Lib/plat-aix4/IN.py \
 ))
 
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call 
gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
-   Lib/_sysconfigdata.py \
-))
-endif
-
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 62cc55e..200a9e13 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -22,28 +22,21 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-i42553.patch.2 \
-   external/python3/python-3.3.0-aix.patch.1 \
+   external/python3/python-3.3.3-aix.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.3.0-msvc2012.patch.1 \
external/python3/python-3.3.0-msvc-disable.patch.1 \
external/python3/python-3.3.0-msvc-x64.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
external/python3/python-3.3.0-implicit-int.patch.1 \
-   external/python3/python-3.3.0-ffi-clang.patch.1 \
external/python3/python-3.3.0-gcc-4.8.patch.1 \
external/python3/python-3.3.0-pythreadstate.patch.1 \

[Libreoffice-commits] core.git: configure.ac download.lst external/libeot vcl/source

2013-12-01 Thread David Tardon

 configure.ac   |   18 
 download.lst   |4 -
 external/libeot/UnpackedTarball_libeot.mk  |4 -
 external/libeot/libeot-avoid-autotools-run.patch.0 |   44 -
 vcl/source/gdi/embeddedfontshelper.cxx |8 +--
 vcl/source/gdi/pdfwriter_impl.cxx  |2 
 6 files changed, 8 insertions(+), 72 deletions(-)

New commits:
commit 0f4be588622379388650d8fc451829d17d16a7bf
Author: David Tardon dtar...@redhat.com
Date:   Sun Dec 1 09:02:13 2013 +0100

upload libeot-0.01

Change-Id: I877cab5e13ebb52911b2e238a0f4ebb87cda73e9

diff --git a/configure.ac b/configure.ac
index 68a8750..dce1142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7712,28 +7712,12 @@ if test $_os != WINNT -a $_os != Darwin -a 
$enable_eot = yes; then
 AC_DEFINE([ENABLE_EOT])
 AC_MSG_RESULT([yes])
 
-AC_MSG_CHECKING([which libeot to use])
-if test $with_system_libeot = yes; then
-AC_MSG_RESULT([external])
-SYSTEM_LIBEOT=YES
-AC_CHECK_HEADER([libeot.h], [],
-[AC_MSG_ERROR([libeot.h not found. install libeot])], [])
-AC_CHECK_LIB([libeot], [eot2ttf_file], [:],
-[AC_MSG_RESULT([libeot library not found or functional.])], [])
-libo_MINGW_CHECK_DLL([libeot])
-else
-AC_MSG_RESULT([internal])
-SYSTEM_LIBEOT=NO
-BUILD_TYPE=$BUILD_TYPE LIBEOT
-fi
+libo_CHECK_SYSTEM_MODULE([libeot],[LIBEOT],[libeot = 0.01])
 else
 ENABLE_EOT=
 AC_MSG_RESULT([no])
 fi
 AC_SUBST([ENABLE_EOT])
-AC_SUBST([SYSTEM_LIBEOT])
-AC_SUBST([LIBEOT_CFLAGS])
-AC_SUBST([LIBEOT_LIBS])
 
 dnl ===
 dnl Check for system libe-book
diff --git a/download.lst b/download.lst
index ee63b4d..444d6dc 100644
--- a/download.lst
+++ b/download.lst
@@ -22,8 +22,8 @@ HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
 export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
-LIBEOT_MD5SUM := 4c3fdbae53f3c155af94d6df0b6e12b6
-export LIBEOT_TARBALL := libeot.tar.bz2
+LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
+export LIBEOT_TARBALL := libeot-0.01.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
diff --git a/external/libeot/UnpackedTarball_libeot.mk 
b/external/libeot/UnpackedTarball_libeot.mk
index 9b95fd2..cbd1a69a 100644
--- a/external/libeot/UnpackedTarball_libeot.mk
+++ b/external/libeot/UnpackedTarball_libeot.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libeot))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libeot,$(LIBEOT_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libeot,\
-   external/libeot/libeot-avoid-autotools-run.patch.0 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libeot/libeot-avoid-autotools-run.patch.0 
b/external/libeot/libeot-avoid-autotools-run.patch.0
deleted file mode 100644
index 875bda5..000
--- a/external/libeot/libeot-avoid-autotools-run.patch.0
+++ /dev/null
@@ -1,44 +0,0 @@
 Makefile.in.dt 2013-11-12 17:02:57.555418341 +0100
-+++ Makefile.in2013-11-12 17:04:03.100619894 +0100
-@@ -87,7 +87,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
-   $(srcdir)/config.h.in depcomp $(libeot_include_HEADERS) ar-lib \
-   compile config.guess config.sub install-sh missing ltmain.sh
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps =
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-   $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -367,19 +367,6 @@ all: config.h
- .SUFFIXES: .c .lo .o .obj
- am--refresh: Makefile
-   @:
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--  @for dep in $?; do \
--case '$(am__configure_deps)' in \
--  *$$dep*) \
--echo ' cd $(srcdir)  $(AUTOMAKE) --foreign'; \
--$(am__cd) $(srcdir)  $(AUTOMAKE) --foreign \
--   exit 0; \
--exit 1;; \
--esac; \
--  done; \
--  echo ' cd $(top_srcdir)  $(AUTOMAKE) --foreign Makefile'; \
--  $(am__cd) $(top_srcdir)  \
--$(AUTOMAKE) --foreign Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-   @case '$?' in \
-@@ -394,12 +381,6 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
- $(top_builddir)/config.status: $(top_srcdir)/configure 
$(CONFIG_STATUS_DEPENDENCIES)
-   $(SHELL) ./config.status --recheck
- 
--$(top_srcdir)/configure:  $(am__configure_deps)
--  $(am__cd) $(srcdir)  $(AUTOCONF)
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--  $(am__cd)

[Libreoffice-commits] core.git: configure.ac download.lst

2013-11-16 Thread David Tardon

 configure.ac |4 ++--
 download.lst |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c7bedbf124b4c903249ea78ba1f819e1e58d38f7
Author: David Tardon dtar...@redhat.com
Date:   Sat Nov 16 20:32:43 2013 +0100

upload new libe-book

Force it as minimum version for system, as 0.0.1 is not usable
out-of-the-box.

Change-Id: Ic3205cf717b476f4f04777fc57032c0197bfbd84

diff --git a/configure.ac b/configure.ac
index fbac8ef..0de54c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7699,9 +7699,9 @@ AC_SUBST([LIBEOT_CFLAGS])
 AC_SUBST([LIBEOT_LIBS])
 
 dnl ===
-dnl Check for system libebook
+dnl Check for system libe-book
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.0],[-I${WORKDIR}/UnpackedTarball/libebook/inc],[-L${WORKDIR}/UnpackedTarball/libebook/src/lib/.libs
 -le-book-0.0])
+libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.0 = 
0.0.2],[-I${WORKDIR}/UnpackedTarball/libebook/inc],[-L${WORKDIR}/UnpackedTarball/libebook/src/lib/.libs
 -le-book-0.0])
 
 dnl ===
 dnl Check for system libetonyek
diff --git a/download.lst b/download.lst
index f4a2206..757ddc2 100644
--- a/download.lst
+++ b/download.lst
@@ -1,7 +1,7 @@
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 74524e1eecc8ab3ac2e8e8a8bb75d6e4
-export EBOOK_TARBALL := libe-book-0.0.1.tar.bz2
+EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
+export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
 ETONYEK_MD5SUM := 040e0d7ce0cc0eb3a016964699d54a6c
 export ETONYEK_TARBALL := libetonyek-0.0.1.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac download.lst external/icu

2013-11-13 Thread Robert M Campbell

 configure.ac |2 
 download.lst |3 
 external/icu/UnpackedTarball_icu.mk  |8 --
 external/icu/icu4c-aix.patch |   39 +++
 external/icu/icu4c-android.patch |   38 +-
 external/icu/icu4c-buffer-overflow.patch |3 
 external/icu/icu4c-build.patch   |   35 ++---
 external/icu/icu4c-macosx.patch  |3 
 external/icu/icu4c-mkdir.patch   |3 
 external/icu/icu4c-rpath.patch   |1 
 external/icu/icu4c-solarisgcc.patch  |6 -
 external/icu/icu4c-warnings.patch|5 -
 external/icu/icu4c-wchar_t.patch |5 -
 external/icu/icu4c.10129.wintz.patch |   24 --
 external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch |   36 --
 15 files changed, 60 insertions(+), 151 deletions(-)

New commits:
commit 8ab4752820331ab80410877836093630198812d8
Author: Robert M Campbell robert.rcampb...@gmail.com
Date:   Wed Nov 13 17:23:40 2013 +0700

upgrade to ICU 52.1, fdo#70995

Change-Id: I25e4b630c9029749cc459c0b65da287d6f0ba95e
Reviewed-on: https://gerrit.libreoffice.org/
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Eike Rathke er...@redhat.com

diff --git a/configure.ac b/configure.ac
index 6d7dcf9..657e4b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8911,7 +8911,7 @@ SYSTEM_GENBRK=
 SYSTEM_GENCCODE=
 SYSTEM_GENCMN=
 
-ICU_MAJOR=51
+ICU_MAJOR=52
 ICU_MINOR=1
 ICU_RECLASSIFIED_CLOSE_PARENTHESIS=YES
 ICU_RECLASSIFIED_PREPEND_SET_EMPTY=YES
diff --git a/download.lst b/download.lst
index a34b6c2..238407c 100644
--- a/download.lst
+++ b/download.lst
@@ -58,8 +58,7 @@ export GRAPHITE_TARBALL := 
7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
-export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
-export ICU_51_LAYOUT_FIX_TARBALL := 
7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz
+export ICU_TARBALL := 9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := 
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 export JFREEREPORT_FLUTE_TARBALL := 
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 export JFREEREPORT_LIBBASE_TARBALL := 
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
diff --git a/external/icu/UnpackedTarball_icu.mk 
b/external/icu/UnpackedTarball_icu.mk
index 2fdc9ee..77cd38a 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -11,15 +11,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL)))
 
-# *ONLY* for ICU 51(.1)!
-# http://site.icu-project.org/download/51#TOC-Known-Issues
-$(eval $(call gb_UnpackedTarball_set_pre_action,icu,\
-   $(GNUTAR) -x -z -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(ICU_51_LAYOUT_FIX_TARBALL) \
-))
-
 $(eval $(call gb_UnpackedTarball_add_patches,icu,\
-   external/icu/icu4c.10318.CVE-2013-2924_changeset_34076.patch \
-   external/icu/icu4c.10129.wintz.patch \
external/icu/icu4c-build.patch \
external/icu/icu4c-aix.patch \
external/icu/icu4c-wchar_t.patch \
diff --git a/external/icu/icu4c-aix.patch b/external/icu/icu4c-aix.patch
index 48659ca..580a8fc 100644
--- a/external/icu/icu4c-aix.patch
+++ b/external/icu/icu4c-aix.patch
@@ -1,20 +1,6 @@
 misc/icu/source/config/mh-aix-gcc  2009-01-15 01:46:10.0 -0600
-+++ misc/build/icu/source/config/mh-aix-gcc2010-06-24 20:58:16.0 
-0500
-@@ -1,10 +1,7 @@
- ## -*-makefile-*-
--## Copyright (c) 2003-2009 IBM, Ken Foskey, and others. All rights reserved.
--##
--## Aix-specific setup (for gcc)
--##
--## Please note: AIX does NOT have library versioning per se (there is no 
'SONAME' capability). 
--## So, we are using 'windows' style library names, that is, libicuuc20.1.so 
instead of libicuuc.so.20.1
-+## Linux-specific setup
-+## Copyright (c) 1999-2006, International Business Machines Corporation and
-+## others. All Rights Reserved.
- 
- # Certain files don't compile in -ansi mode (e.g. umutex.c, toolutil.c, and 
cdatatst.c)
- CFLAGS += -D_ALL_SOURCE
-@@ -13,84 +10,30 @@
+--- misc/icu/source/config/mh-aix-gcc  2010-06-24 20:58:16.0 -0500
 misc/build/icu/source/config/mh-aix-gcc2013-10-31 20:34:16.607982310 
+0700
+@@ -13,84 +13,29 @@
  GEN_DEPS.c=   $(CC) -E -MM $(DEFS) $(CPPFLAGS)
  GEN_DEPS.cc=  $(CXX) -E -MM $(DEFS)

1 2 >

1 - 100 of 102 matches

Mail list logo