[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2019-04-12 Thread Christian Lohmaier (via logerrit) 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 87328c90b7e8448c562fdafcc33dad722491ad9e
Author: Christian Lohmaier 
AuthorDate: Fri Apr 12 13:32:41 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Apr 12 13:32:41 2019 +0200

bump product version to 6.1.7.0.0+

Change-Id: I6ac45e5024dead05d6bfe44d4ab2c6ad07f39acd

diff --git a/configure.ac b/configure.ac
index 1f4b41603e93..e83bb7909574 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.6.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.7.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac download.lst external/python3

2019-04-03 Thread Michael Stahl (via logerrit) 
 configure.ac|2 
 download.lst|4 -
 external/python3/UnpackedTarball_python3.mk |1 
 external/python3/python-3.5.7-c99.patch.1   |   62 
 4 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b
Author: Michael Stahl 
AuthorDate: Wed Apr 3 11:03:17 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Apr 4 01:26:49 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 
(cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c)
Reviewed-on: https://gerrit.libreoffice.org/70194
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index f895e3ba1177..1f4b41603e93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8289,7 +8289,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 d1c494eddecf..4149c8fea800 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 := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.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 := 
8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73
 export QXP_TARBALL := libqxp-0.0.1.tar.xz
 export RAPTOR_SHA256SUM := 
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index ec1bdabe4fdd..66a82955e440 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \

external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
 \
+   external/python3/python-3.5.7-c99.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.7-c99.patch.1 
b/external/python3/python-3.5.7-c99.patch.1
new file mode 100644
index ..558166d9953f
--- /dev/null
+++ b/external/python3/python-3.5.7-c99.patch.1
@@ -0,0 +1,62 @@
+remove C99 which isn't suppored by all compilers yet
+
+--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200
 python3/Modules/_pickle.c  2019-04-03 16:35:18.579005171 +0200
+@@ -674,9 +674,12 @@
+ PyErr_NoMemory();
+ return NULL;
+ }
+-for (size_t i = 0; i < self->mt_allocated; i++) {
++{
++size_t i;
++for (i = 0; i < self->mt_allocated; i++) {
+ Py_XINCREF(self->mt_table[i].me_key);
+ }
++}
+ memcpy(new->mt_table, self->mt_table,
+sizeof(PyMemoEntry) * self->mt_allocated);
+ 
+@@ -4204,7 +4207,9 @@
+ return NULL;
+ 
+ memo = self->pickler->memo;
+-for (size_t i = 0; i < memo->mt_allocated; ++i) {
++{
++size_t i;
++for (i = 0; i < memo->mt_allocated; ++i) {
+ PyMemoEntry entry = memo->mt_table[i];
+ if (entry.me_key != NULL) {
+ int status;
+@@ -4225,6 +4230,7 @@
+ goto error;
+ }
+ }
++}
+ return new_memo;
+ 
+   error:
+@@ -6791,10 +6797,13 @@
+ if (new_memo == NULL)
+ return -1;
+ 
+-for (size_t i = 0; i < new_memo_size; i++) {
++{
++size_t i;
++for (i = 0; i < new_memo_size; i++) {
+ Py_XINCREF(unpickler->memo[i]);
+ new_memo[i] = unpickler->memo[i];
+ }
++}
+ }
+ else if (PyDict_Check(obj)) {
+ Py_ssize_t i = 0;
+@@ -6839,7 +6848,8 @@
+ 
+   error:
+ if (new_memo_size) {
+-for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) {
++size_t i;
++for (i = new_memo_size - 1; i != SIZE_MAX; i--) {
+ Py_XDECREF(new_memo[i]);

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2019-01-31 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 86ca46e30ba9d9f070400a1bd860b3978b537758
Author: Michael Stahl 
AuthorDate: Thu Jan 31 15:41:33 2019 +0100
Commit: Michael Weghorn 
CommitDate: Thu Jan 31 22:47:26 2019 +0100

Revert "configure: require autoconf 2.68"

This reverts commit 8bc2018c83aeef691313502a83e42e8a0cc8adf4.

No longer needed for libnumbertext.

Change-Id: I093cffacc26c71b1a687d7e0a1d228561097ded0
Reviewed-on: https://gerrit.libreoffice.org/67220
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/configure.ac b/configure.ac
index a208887fb3c0..f895e3ba1177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl in order to create a configure script.
 
 AC_INIT([LibreOffice],[6.1.6.0.0+],[],[],[http://documentfoundation.org/])
 
-AC_PREREQ([2.68])
+AC_PREREQ([2.59])
 
 if test -n "$BUILD_TYPE"; then
 AC_MSG_ERROR([You have sourced config_host.mk in this shell.  This may 
lead to trouble, please run in a fresh (login) shell.])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2019-01-30 Thread Libreoffice Gerrit user 
 configure.ac |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit ca1ad45e82f8822c048d8161c85e191e4c923961
Author: Stephan Bergmann 
AuthorDate: Wed Jan 30 12:05:45 2019 +0100
Commit: Michael Stahl 
CommitDate: Wed Jan 30 16:26:13 2019 +0100

Avoid CFLAGS being set by accident

When no CFLAGS are passed into autogen.sh,
f104b3cafee63b47a735cfdce0f05dab2eedbb91 "tdf#72987 run firebird test for 
little
endian only for now" (introducing AC_C_BIGENDIAN before AC_PROG_CC) caused
CFLAGS in config_host.mk to accidentally be set to -g -O2 (instead of being 
left
undefined).

Change-Id: I639ce74b468e7fb25a6bda97346c7f97d6b829aa
Reviewed-on: https://gerrit.libreoffice.org/67125
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fcb08e31ee0635fe61338246a57e926c11890ac7)
Reviewed-on: https://gerrit.libreoffice.org/67135
Reviewed-by: Michael Stahl 

diff --git a/configure.ac b/configure.ac
index 3e0fc099692f..a208887fb3c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -812,13 +812,6 @@ haiku*)
 ;;
 esac
 
-if test "$_os" != "WINNT"; then
-AC_C_BIGENDIAN([ENDIANNESS=big], [ENDIANNESS=little])
-else
-ENDIANNESS=little
-fi
-AC_SUBST(ENDIANNESS)
-
 if test "$_os" = "Android" ; then
 # Verify that the NDK and SDK options are proper
 if test -z "$with_android_ndk"; then
@@ -934,7 +927,7 @@ my_original_CXXFLAGS=$CXXFLAGS
 my_original_CPPFLAGS=$CPPFLAGS
 
 dnl The following checks for gcc, cc and then cl (if it weren't guarded for 
win32)
-dnl Needs to precede the AC_SEARCH_LIBS call below, which apparently calls
+dnl Needs to precede the AC_C_BIGENDIAN and AC_SEARCH_LIBS calls below, which 
apparently call
 dnl AC_PROG_CC internally.
 if test "$_os" != "WINNT"; then
 # AC_PROG_CC sets CFLAGS to -g -O2 if not set, avoid that
@@ -943,6 +936,13 @@ if test "$_os" != "WINNT"; then
 CFLAGS=$save_CFLAGS
 fi
 
+if test "$_os" != "WINNT"; then
+AC_C_BIGENDIAN([ENDIANNESS=big], [ENDIANNESS=little])
+else
+ENDIANNESS=little
+fi
+AC_SUBST(ENDIANNESS)
+
 if test $_os != "WINNT"; then
 save_LIBS="$LIBS"
 AC_SEARCH_LIBS([dlsym], [dl],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2019-01-29 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8bc2018c83aeef691313502a83e42e8a0cc8adf4
Author: Michael Stahl 
AuthorDate: Mon Jan 28 11:39:10 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Tue Jan 29 18:01:20 2019 +0100

configure: require autoconf 2.68

LO's own configure doesn't need it, but the
ExternalProject_libnumbertext requires this version; since it's
available in RHEL6 as "autoconf268", just keep it simple and require it
in the top-level configure.

Change-Id: I43a6ef10089363c344f06134d75f54685ed7026b
Reviewed-on: https://gerrit.libreoffice.org/67002
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 182f5a0f34fa45d2f74ba22eda41d4e39dca93e5)
Reviewed-on: https://gerrit.libreoffice.org/67057
Reviewed-by: Thorsten Behrens 

diff --git a/configure.ac b/configure.ac
index 3a3c7ddca9b6..3e0fc099692f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl in order to create a configure script.
 
 AC_INIT([LibreOffice],[6.1.6.0.0+],[],[],[http://documentfoundation.org/])
 
-AC_PREREQ([2.59])
+AC_PREREQ([2.68])
 
 if test -n "$BUILD_TYPE"; then
 AC_MSG_ERROR([You have sourced config_host.mk in this shell.  This may 
lead to trouble, please run in a fresh (login) shell.])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac download.lst

2019-01-18 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 download.lst |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6808e1e5e2361220988dfa81cb35d03fb6e15855
Author: Caolán McNamara 
AuthorDate: Thu Jan 17 10:50:42 2019 +
Commit: Michael Stahl 
CommitDate: Fri Jan 18 10:16:04 2019 +0100

upgrade to python 3.5.6

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

diff --git a/configure.ac b/configure.ac
index 4c55cd4933c0..3a3c7ddca9b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8289,7 +8289,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 3b526c2befba..4d0aac521f15 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 := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.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 := 
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: Branch 'libreoffice-6-1' - configure.ac

2019-01-16 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a3962d99ba6467f6043c431230e9a1df4bfc0e4b
Author: Christian Lohmaier 
AuthorDate: Wed Jan 16 21:45:54 2019 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Jan 16 21:45:54 2019 +0100

bump product version to 6.1.6.0.0+

Change-Id: I7428b3f6cf16cb32813420b7fb39c1e41c13761e

diff --git a/configure.ac b/configure.ac
index 4c213dc3fd47..4c55cd4933c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.6.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-11-28 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2a5d84d0e4ce1ce85459398a6eca63b49c93dd1
Author: Christian Lohmaier 
AuthorDate: Wed Nov 28 23:00:50 2018 +0100
Commit: Christian Lohmaier 
CommitDate: Wed Nov 28 23:00:50 2018 +0100

bump product version to 6.1.5.0.0+

Change-Id: Ic5e5b929c353a1a438268ba01b40b70fc85a9bd7

diff --git a/configure.ac b/configure.ac
index f1c76828a4df..4c213dc3fd47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.4.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.5.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-11-21 Thread Libreoffice Gerrit user 
 configure.ac |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b73450caef299d38350f446d914f45b7c23a25b7
Author: Stephan Bergmann 
AuthorDate: Wed Nov 7 10:43:14 2018 +0100
Commit: Caolán McNamara 
CommitDate: Wed Nov 21 22:26:29 2018 +0100

tdf#121131: Default COMPILER_PLUGINS_CXX to g++ -std=c++11

ab8bf5533f8de9bb1aa9dc83e650e4eccf0fcac3 "Avoid error message from configure
about clang's header for compiler plugins" caused problems after
cd472d1d8489f30797f47d3f6dafede28c1feb90 "Compile as C++2a, where 
available",
when the compiler used to build LO (CXX) supports -std=gnu++2a but the 
compiler
used to build loplugin (COMPILER_PLUGINS_CXX) does not.  So solve that 
problem
instead by just adding -std=c++11 to the default for COMPILER_PLUGINS_CXX.

Change-Id: I95e86bc28f2a0dfb2b7bdce6b15955b870428b8c
Reviewed-on: https://gerrit.libreoffice.org/62997
Reviewed-by: Jan-Marek Glogowski 
Reviewed-by: Luboš Luňák 
Tested-by: Jenkins
(cherry picked from commit 4613e105f98af6e3b65ce87432b1a2db45e71ae2)
Reviewed-on: https://gerrit.libreoffice.org/63714

diff --git a/configure.ac b/configure.ac
index a158e7f80bcf..f1c76828a4df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6601,9 +6601,9 @@ if test "$COM_IS_CLANG" = "TRUE"; then
 save_CPPFLAGS=$CPPFLAGS
 save_CXX=$CXX
 # compiler plugins must be built with "native" compiler that was used 
to build Clang itself:
-: "${COMPILER_PLUGINS_CXX=g++}"
+: "${COMPILER_PLUGINS_CXX=g++ -std=c++11}"
 CXX=$COMPILER_PLUGINS_CXX
-CPPFLAGS="$CPPFLAGS $CXXFLAGS_CXX11 -I$CLANGDIR/include 
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
+CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -D__STDC_CONSTANT_MACROS 
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
 AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
 [COMPILER_PLUGINS=TRUE],
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-11-21 Thread Libreoffice Gerrit user 
 configure.ac |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 8c27cd8913035dc781295452946bf600a2848512
Author: Tor Lillqvist 
AuthorDate: Tue Nov 20 09:56:51 2018 +0200
Commit: Miklos Vajna 
CommitDate: Wed Nov 21 11:00:29 2018 +0100

Accept also macOS SDK 10.14

Change-Id: I3ff9381e547d40f9155d5324f9178939f9d7dac6
Reviewed-on: https://gerrit.libreoffice.org/63626
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist 

diff --git a/configure.ac b/configure.ac
index dd0fd29c0753..a158e7f80bcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2702,7 +2702,7 @@ if test $_os = Darwin -o $_os = iOS; then
 # higher than or equal to the minimum required should be found.
 
 AC_MSG_CHECKING([what Mac OS X SDK to use])
-for _macosx_sdk in $with_macosx_sdk 10.13 10.12; do
+for _macosx_sdk in $with_macosx_sdk 10.14 10.13 10.12; do
 MACOSX_SDK_PATH=`xcrun --sdk macosx${_macosx_sdk} --show-sdk-path 2> 
/dev/null`
 if test -d "$MACOSX_SDK_PATH"; then
 with_macosx_sdk="${_macosx_sdk}"
@@ -2746,6 +2746,9 @@ if test $_os = Darwin -o $_os = iOS; then
 10.13)
 MACOSX_SDK_VERSION=101300
 ;;
+10.14)
+MACOSX_SDK_VERSION=101400
+;;
 *)
 AC_MSG_ERROR([with-macosx-sdk $with_macosx_sdk is not a supported 
value, supported values are 10.9--13])
 ;;
@@ -2782,6 +2785,9 @@ if test $_os = Darwin -o $_os = iOS; then
 10.13)
 MAC_OS_X_VERSION_MIN_REQUIRED="101300"
 ;;
+10.14)
+MAC_OS_X_VERSION_MIN_REQUIRED="101400"
+;;
 *)
 AC_MSG_ERROR([with-macosx-version-min-required 
$with_macosx_version_min_required is not a supported value, supported values 
are 10.9--13])
 ;;
@@ -2823,6 +2829,9 @@ if test $_os = Darwin -o $_os = iOS; then
 10.13)
 MAC_OS_X_VERSION_MAX_ALLOWED="101300"
 ;;
+10.14)
+MAC_OS_X_VERSION_MAX_ALLOWED="101400"
+;;
 *)
 AC_MSG_ERROR([with-macosx-version-max-allowed 
$with_macosx_version_max_allowed is not a supported value, supported values are 
10.9--13])
 ;;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac instsetoo_native/CustomTarget_setup.mk instsetoo_native/util

2018-10-22 Thread Libreoffice Gerrit user 
 configure.ac|2 +-
 instsetoo_native/CustomTarget_setup.mk  |2 +-
 instsetoo_native/util/openoffice.lst.in |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 77536b29b9241930256917fde7e5fc9513be9a7c
Author: heiko tietze 
AuthorDate: Thu Oct 18 12:12:26 2018 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Oct 22 13:38:18 2018 +0200

tdf#120176 - Text appears as white on first launch

Splash screen text should be black now

Change-Id: I963ffc89c48fdc1de148586cd6f0fb4bf35d44bd
Reviewed-on: https://gerrit.libreoffice.org/61924
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 920bf3979cd7421110b65621635aefc072e8a779)
Reviewed-on: https://gerrit.libreoffice.org/62176
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/configure.ac b/configure.ac
index 38a39a35ebbb..df9441656bfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2119,7 +2119,7 @@ AC_ARG_WITH(branding,
   bar from left,top. Comma separated decimal values.
   PROGRESSFRAMECOLOR="20,136,3" Set color of progress
   bar frame. Comma separated RGB decimal values.
-  PROGRESSTEXTCOLOR="255,255,255" Set color of progress
+  PROGRESSTEXTCOLOR="0,0,0" Set color of progress
   bar text. Comma separated RGB decimal values.
   PROGRESSTEXTBASELINE="287" Set vertical position of
   progress bar text from top. Decimal value.
diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index ebeb00dcd019..ec31d718a6a0 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -129,7 +129,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'ProgressPositionHigh=46,212' \
&& echo 'ProgressSizeHigh=617,12' \
&& echo 'ProgressTextBaseline=145' \
-   && echo 'ProgressTextColor=255,255,255' \
+   && echo 'ProgressTextColor=0,0,0' \
&& echo 'SecureUserConfig=true' \
&& echo 'SecureUserConfigCompress=true' \
&& echo 'SecureUserConfigExtensions=true' \
diff --git a/instsetoo_native/util/openoffice.lst.in 
b/instsetoo_native/util/openoffice.lst.in
index afc8631cfd3a..8394418d5fe6 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -22,7 +22,7 @@ Globals
 PROGRESSPOSITIONHIGH 46,212
 PROGRESSFRAMECOLOR 102,102,102
 PROGRESSTEXTBASELINE 145
-PROGRESSTEXTCOLOR 255,255,255
+PROGRESSTEXTCOLOR 0,0,0
 NATIVEPROGRESS false
 REGISTRYLAYERNAME Layers
 SERVICEPACK 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-10-10 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f7ad9cd3baeb2360164fd0d82a325c311e5a42f
Author: Christian Lohmaier 
AuthorDate: Wed Oct 10 22:13:26 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Wed Oct 10 22:13:26 2018 +0200

bump product version to 6.1.4.0.0+

Change-Id: I23ee7d9db3428a833be6fc1862c7b5e23a25bf3f

diff --git a/configure.ac b/configure.ac
index 387302ba1269..4176ef077b0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.3.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.4.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-09-20 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d76e518ffa714756d8dc70810103bc2189d2ee28
Author: Christian Lohmaier 
AuthorDate: Thu Sep 20 11:43:36 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Sep 20 11:43:36 2018 +0200

bump product version to 6.1.3.0.0+

Change-Id: I858c7a1aff8c36e05442b7b9b7b12b74a8495185

diff --git a/configure.ac b/configure.ac
index 735ebf2e360a..387302ba1269 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.2.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.3.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-08-24 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f675adc55e9dee1185b57d8e51df7ad3c9364753
Author: Christian Lohmaier 
AuthorDate: Fri Aug 24 18:24:09 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Fri Aug 24 18:24:09 2018 +0200

bump product version to 6.1.2.0.0+

Change-Id: I2f100d07a49be70a5a3e1be0b0a693713f0f5ce9

diff --git a/configure.ac b/configure.ac
index 64d6eaa54cfc..8de3b8bf4365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.2.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-07-19 Thread Libreoffice Gerrit user 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e6eb1644f84dd1fd48bbbf5418acdcc750f723bc
Author: Christian Lohmaier 
AuthorDate: Thu Jul 19 22:11:32 2018 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 19 22:11:32 2018 +0200

bump product version to 6.1.1.0.0+

Change-Id: I7c8f85f0321741da21e01e1f02911c95ccf8559d

diff --git a/configure.ac b/configure.ac
index 258370e9ec32..64d6eaa54cfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.1.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-07-04 Thread Christian Lohmaier 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 07c5fdacc8e760809f0f6bfca37a7ce66d3b3d03
Author: Christian Lohmaier 
Date:   Wed Jul 4 23:45:41 2018 +0200

bump product version to 6.1.0.1.0+

Change-Id: Ida1c538e15bc0254f383a8471fc9bdfc5e1f83a4

diff --git a/configure.ac b/configure.ac
index cbbda6a4aa15..258370e9ec32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.0.0.beta2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.0.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-07-03 Thread Rene Engelhard 
 configure.ac |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 768e1465afb3e78eb00b65afef1a681bada68127
Author: Rene Engelhard 
Date:   Tue Jul 3 18:17:27 2018 +0200

we still need a Archive::Zip test in configure.ac

since system-hsqldb uses it for checking the hsqldb version. This partly
reverts 4e3dc8c141c2efd037c1f214b5edff071812b6a8

Change-Id: I60d333d5807404355dd8c8fc2763e76d3a7fa350
Reviewed-on: https://gerrit.libreoffice.org/56888
Reviewed-by: Rene Engelhard 
Tested-by: Rene Engelhard 
(cherry picked from commit d503b5d50b22fe376d74aadbe518bc616299a019)
Reviewed-on: https://gerrit.libreoffice.org/56894

diff --git a/configure.ac b/configure.ac
index e5fb9f6f9d0a..cbbda6a4aa15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5022,6 +5022,9 @@ if test "$_os" = "WINNT"; then
 done
 fi
 fi
+if test "$with_system_hsqldb" = "yes"; then
+   perl_use_string="$perl_use_string ; use Archive::Zip"
+fi
 if $PERL -e "$perl_use_string">/dev/null 2>&1; then
 AC_MSG_RESULT([all modules found])
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - 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 67a56897ec1e4f2bab2c3291b8dd225710d2ae29
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 
(cherry picked from commit 744feb55a11263ae0947ab59db76b949b5863acf)
Reviewed-on: https://gerrit.libreoffice.org/56672

diff --git a/configure.ac b/configure.ac
index b267ec3666c2..e5fb9f6f9d0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8265,7 +8265,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 750cbcd8123f..2af348b1ab7e 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: Branch 'libreoffice-6-1' - configure.ac

2018-06-14 Thread Xisco Fauli 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9956e32fab5ccd44d48cb26bb5d2d3ffd0f81446
Author: Xisco Fauli 
Date:   Thu Jun 14 19:13:39 2018 +0200

bump product version to 6.1.0.0.beta2+

Change-Id: I4f285f9d69844b6bd01212f45ccb8a766e46f0b3

diff --git a/configure.ac b/configure.ac
index 34f13e2e5f45..b267ec3666c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.0.0.beta1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.0.0.beta2+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac vcl/qa vcl/source

2018-06-07 Thread heiko tietze 
 configure.ac  |2 -
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |   13 ++--
 vcl/source/app/IconThemeSelector.cxx  |   28 ++
 3 files changed, 32 insertions(+), 11 deletions(-)

New commits:
commit 1e3ae648ca32806bd6dcdd6e161630ec111bc6d3
Author: heiko tietze 
Date:   Fri May 25 11:45:29 2018 +0200

tdf#116916 - Icon themes missing on LibreOffice Vanilla from macOS appstore

Update of blacklist for $WITH_THEMES
Fallback to Tango for ancient/unknown DE, Colibre only on Windows
MPL vs. non-MPL on macOS

Change-Id: Ibeefbaefae5a8e62e973bcb8cddd53845f96b67d
Reviewed-on: https://gerrit.libreoffice.org/55295
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 
Reviewed-on: https://gerrit.libreoffice.org/54794
Reviewed-on: https://gerrit.libreoffice.org/55396

diff --git a/configure.ac b/configure.ac
index a3b9107477b5..34f13e2e5f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12520,7 +12520,7 @@ if test "$enable_mpl_subset" = "yes"; then
 fi
 for theme in $WITH_THEMES; do
 case $theme in
-breeze|default|sifr)
+breeze|breeze_dark|sifr|sifr_dark|elementary|karasa_jaga) #blacklist 
of icon themes under GPL or LGPL
 AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': 
$theme present, use --with-theme=tango]) ;;
 *) : ;;
 esac
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 3b6c53d3278f..06cfe9466f63 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -19,6 +19,7 @@
 
 class IconThemeSelectorTest : public CppUnit::TestFixture
 {
+#ifndef _WIN32 //default theme on Windows is Colibre independently from any 
desktop environment
 void
 BreezeIsReturnedForKde5Desktop();
 
@@ -51,10 +52,13 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 
 static std::vector
 GetFakeInstalledThemes();
+#endif
 
 // Adds code needed to register the test suite
+
 CPPUNIT_TEST_SUITE(IconThemeSelectorTest);
 
+#ifndef _WIN32
 CPPUNIT_TEST(BreezeIsReturnedForKde5Desktop);
 CPPUNIT_TEST(ElementaryIsReturnedForGnomeDesktop);
 CPPUNIT_TEST(ThemeIsOverriddenByPreferredTheme);
@@ -65,23 +69,26 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 CPPUNIT_TEST(FallbackThemeIsReturnedForEmptyInput);
 CPPUNIT_TEST(DifferentPreferredThemesAreInequal);
 CPPUNIT_TEST(DifferentHighContrastModesAreInequal);
+#endif
 
 // End of test suite definition
 
 CPPUNIT_TEST_SUITE_END();
 };
 
+#ifndef _WIN32
+
 /*static*/ std::vector
 IconThemeSelectorTest::GetFakeInstalledThemes()
 {
 std::vector r;
 vcl::IconThemeInfo a;
-a.mThemeId = "colibre";
-r.push_back(a);
 a.mThemeId = "breeze";
 r.push_back(a);
 a.mThemeId = "elementary";
 r.push_back(a);
+a.mThemeId = "colibre";
+r.push_back(a);
 a.mThemeId = "sifr";
 r.push_back(a);
 return r;
@@ -190,6 +197,8 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as 
inequal", false, equal);
 }
 
+#endif
+
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeSelectorTest);
 
diff --git a/vcl/source/app/IconThemeSelector.cxx 
b/vcl/source/app/IconThemeSelector.cxx
index 20b64f4da6ac..c9da2d6895c3 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -11,12 +11,13 @@
 
 #include 
 #include 
+#include 
 
 #include 
 
 namespace vcl {
 
-/*static*/ const OUStringLiteral 
IconThemeSelector::FALLBACK_ICON_THEME_ID("colibre");
+/*static*/ const OUStringLiteral 
IconThemeSelector::FALLBACK_ICON_THEME_ID("tango");
 
 namespace {
 
@@ -51,20 +52,31 @@ IconThemeSelector::IconThemeSelector()
 IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& 
desktopEnvironment)
 {
 OUString r;
+#ifdef _WIN32
+r = "colibre";
+(void)desktopEnvironment;
+#else
 if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") ||
- desktopEnvironment.equalsIgnoreAsciiCase("kde5") ||
- desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {
+ desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) {
 r = "breeze";
-}
-else
+} else
+if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) {
+#if MPL_HAVE_SUBSET
+r = "tango";
+#else
+r = "breeze";
+#endif
+} else
 if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") ||
  desktopEnvironment.equalsIgnoreAsciiCase("mate") ||
  desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
 r = "elementary";
+} else
+{
+r = FALLBACK_ICON_THEME_ID;
 }
-else {
-r = FALLBACK_ICON_THEME_ID; //effective also on Windows
-}
+#endif
+
 return r;
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac vcl/qa vcl/source

2018-06-06 Thread Heiko Tietze 
 configure.ac  |2 -
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |   25 ++---
 vcl/source/app/IconThemeSelector.cxx  |   30 +++---
 3 files changed, 18 insertions(+), 39 deletions(-)

New commits:
commit 5b20226bb0e431afa4505373aaa0af2d28479528
Author: Heiko Tietze 
Date:   Wed Jun 6 12:44:55 2018 +0200

Revert "tdf#116916 - Icon themes missing on LibreOffice Vanilla from macOS 
appstore"

This reverts commit 0550189c28cd759c41b8a048a3f667ae12560c5e.

Change-Id: Id02b5bef9e82ed474a718d57ea3e2159855283b6
Reviewed-on: https://gerrit.libreoffice.org/55369
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/configure.ac b/configure.ac
index 34f13e2e5f45..a3b9107477b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12520,7 +12520,7 @@ if test "$enable_mpl_subset" = "yes"; then
 fi
 for theme in $WITH_THEMES; do
 case $theme in
-breeze|breeze_dark|sifr|sifr_dark|elementary|karasa_jaga) #blacklist 
of icon themes under GPL or LGPL
+breeze|default|sifr)
 AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': 
$theme present, use --with-theme=tango]) ;;
 *) : ;;
 esac
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 45359af06535..3b6c53d3278f 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -19,12 +19,11 @@
 
 class IconThemeSelectorTest : public CppUnit::TestFixture
 {
-#ifndef _WIN32 //default theme on Windows is Colibre independently from any 
desktop environment
 void
 BreezeIsReturnedForKde5Desktop();
 
 void
-TangoIsReturnedForGnomeDesktop();
+ElementaryIsReturnedForGnomeDesktop();
 
 void
 ThemeIsOverriddenByPreferredTheme();
@@ -52,15 +51,12 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 
 static std::vector
 GetFakeInstalledThemes();
-#endif
 
 // Adds code needed to register the test suite
-
 CPPUNIT_TEST_SUITE(IconThemeSelectorTest);
 
-#ifndef _WIN32
 CPPUNIT_TEST(BreezeIsReturnedForKde5Desktop);
-CPPUNIT_TEST(TangoIsReturnedForGnomeDesktop);
+CPPUNIT_TEST(ElementaryIsReturnedForGnomeDesktop);
 CPPUNIT_TEST(ThemeIsOverriddenByPreferredTheme);
 CPPUNIT_TEST(ThemeIsOverriddenByHighContrastMode);
 CPPUNIT_TEST(NotInstalledThemeDoesNotOverride);
@@ -69,25 +65,22 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 CPPUNIT_TEST(FallbackThemeIsReturnedForEmptyInput);
 CPPUNIT_TEST(DifferentPreferredThemesAreInequal);
 CPPUNIT_TEST(DifferentHighContrastModesAreInequal);
-#endif
 
 // End of test suite definition
 
 CPPUNIT_TEST_SUITE_END();
 };
 
-#ifndef _WIN32
-
 /*static*/ std::vector
 IconThemeSelectorTest::GetFakeInstalledThemes()
 {
 std::vector r;
 vcl::IconThemeInfo a;
-a.mThemeId = "breeze";
+a.mThemeId = "colibre";
 r.push_back(a);
-a.mThemeId = "tango";
+a.mThemeId = "breeze";
 r.push_back(a);
-a.mThemeId = "colibre";
+a.mThemeId = "elementary";
 r.push_back(a);
 a.mThemeId = "sifr";
 r.push_back(a);
@@ -104,12 +97,12 @@ IconThemeSelectorTest::BreezeIsReturnedForKde5Desktop()
 }
 
 void
-IconThemeSelectorTest::TangoIsReturnedForGnomeDesktop()
+IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop()
 {
 std::vector themes = GetFakeInstalledThemes();
 vcl::IconThemeSelector s;
 OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
-CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is returned for gnome 
desktop", OUString("tango"), r);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome 
desktop", OUString("elementary"), r);
 }
 
 void
@@ -120,7 +113,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
 s.SetPreferredIconTheme(preferred, false);
 std::vector themes = GetFakeInstalledThemes();
 OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, 
"gnome");
-CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by breeze", 
preferred, selected);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", 
preferred, selected);
 }
 
 void
@@ -197,8 +190,6 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as 
inequal", false, equal);
 }
 
-#endif
-
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeSelectorTest);
 
diff --git a/vcl/source/app/IconThemeSelector.cxx 
b/vcl/source/app/IconThemeSelector.cxx
index 175fead1cc09..20b64f4da6ac 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -11,13 +11,12 @@
 
 #include 
 #include 
-#include 
 
 #include 
 
 namespace vcl {
 
-/*static*/ const OUStringLiteral

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac vcl/qa vcl/source

2018-06-04 Thread heiko tietze 
 configure.ac  |2 -
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |   25 ++---
 vcl/source/app/IconThemeSelector.cxx  |   30 ++
 3 files changed, 39 insertions(+), 18 deletions(-)

New commits:
commit 0550189c28cd759c41b8a048a3f667ae12560c5e
Author: heiko tietze 
Date:   Fri May 25 11:45:29 2018 +0200

tdf#116916 - Icon themes missing on LibreOffice Vanilla from macOS appstore

Update of blacklist for $WITH_THEMES
Fallback to Tango for ancient/unknown DE, Colibre only on Windows
MPL vs. non-MPL on macOS
tdf#117615 reverting elementary on gnome

Change-Id: Ibea9e9429a79911d632b54fa4aa9649003830aa3
Reviewed-on: https://gerrit.libreoffice.org/55295
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/configure.ac b/configure.ac
index a3b9107477b5..34f13e2e5f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12520,7 +12520,7 @@ if test "$enable_mpl_subset" = "yes"; then
 fi
 for theme in $WITH_THEMES; do
 case $theme in
-breeze|default|sifr)
+breeze|breeze_dark|sifr|sifr_dark|elementary|karasa_jaga) #blacklist 
of icon themes under GPL or LGPL
 AC_MSG_ERROR([need to disable icon themes from '$WITH_THEMES': 
$theme present, use --with-theme=tango]) ;;
 *) : ;;
 esac
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx 
b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 3b6c53d3278f..45359af06535 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -19,11 +19,12 @@
 
 class IconThemeSelectorTest : public CppUnit::TestFixture
 {
+#ifndef _WIN32 //default theme on Windows is Colibre independently from any 
desktop environment
 void
 BreezeIsReturnedForKde5Desktop();
 
 void
-ElementaryIsReturnedForGnomeDesktop();
+TangoIsReturnedForGnomeDesktop();
 
 void
 ThemeIsOverriddenByPreferredTheme();
@@ -51,12 +52,15 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 
 static std::vector
 GetFakeInstalledThemes();
+#endif
 
 // Adds code needed to register the test suite
+
 CPPUNIT_TEST_SUITE(IconThemeSelectorTest);
 
+#ifndef _WIN32
 CPPUNIT_TEST(BreezeIsReturnedForKde5Desktop);
-CPPUNIT_TEST(ElementaryIsReturnedForGnomeDesktop);
+CPPUNIT_TEST(TangoIsReturnedForGnomeDesktop);
 CPPUNIT_TEST(ThemeIsOverriddenByPreferredTheme);
 CPPUNIT_TEST(ThemeIsOverriddenByHighContrastMode);
 CPPUNIT_TEST(NotInstalledThemeDoesNotOverride);
@@ -65,22 +69,25 @@ class IconThemeSelectorTest : public CppUnit::TestFixture
 CPPUNIT_TEST(FallbackThemeIsReturnedForEmptyInput);
 CPPUNIT_TEST(DifferentPreferredThemesAreInequal);
 CPPUNIT_TEST(DifferentHighContrastModesAreInequal);
+#endif
 
 // End of test suite definition
 
 CPPUNIT_TEST_SUITE_END();
 };
 
+#ifndef _WIN32
+
 /*static*/ std::vector
 IconThemeSelectorTest::GetFakeInstalledThemes()
 {
 std::vector r;
 vcl::IconThemeInfo a;
-a.mThemeId = "colibre";
-r.push_back(a);
 a.mThemeId = "breeze";
 r.push_back(a);
-a.mThemeId = "elementary";
+a.mThemeId = "tango";
+r.push_back(a);
+a.mThemeId = "colibre";
 r.push_back(a);
 a.mThemeId = "sifr";
 r.push_back(a);
@@ -97,12 +104,12 @@ IconThemeSelectorTest::BreezeIsReturnedForKde5Desktop()
 }
 
 void
-IconThemeSelectorTest::ElementaryIsReturnedForGnomeDesktop()
+IconThemeSelectorTest::TangoIsReturnedForGnomeDesktop()
 {
 std::vector themes = GetFakeInstalledThemes();
 vcl::IconThemeSelector s;
 OUString r = s.SelectIconThemeForDesktopEnvironment(themes, "gnome");
-CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is returned for gnome 
desktop", OUString("elementary"), r);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is returned for gnome 
desktop", OUString("tango"), r);
 }
 
 void
@@ -113,7 +120,7 @@ IconThemeSelectorTest::ThemeIsOverriddenByPreferredTheme()
 s.SetPreferredIconTheme(preferred, false);
 std::vector themes = GetFakeInstalledThemes();
 OUString selected = s.SelectIconThemeForDesktopEnvironment(themes, 
"gnome");
-CPPUNIT_ASSERT_EQUAL_MESSAGE("'elementary' theme is overridden by breeze", 
preferred, selected);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("'tango' theme is overridden by breeze", 
preferred, selected);
 }
 
 void
@@ -190,6 +197,8 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal()
 CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as 
inequal", false, equal);
 }
 
+#endif
+
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeSelectorTest);
 
diff --git a/vcl/source/app/IconThemeSelector.cxx 
b/vcl/source/app/IconThemeSelector.cxx
index 20b64f4da6ac..175fead1cc09 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -11,12 +11,13 @@
 
 #include 
 #include 
+#include 
 
 #include

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-06-01 Thread Stephan Bergmann 
 configure.ac |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fc988abb4110112be48e80320ddce69961b9a83a
Author: Stephan Bergmann 
Date:   Thu May 31 14:14:48 2018 +0200

--enable-gio also for --disable-gtk --enable-gtk3

...as is used by the Flatpak build.  Other settings only checked in that 
block
controlled by ENABLE_GTK, and thus potentially erronously left empty for
--disable-gtk --enable-gtk3 builds, are GTHREAD- and GTK_PRINT-related 
settings.
GTHREAD_LIBS is explicitly used in vcl/Library_vclplug_gtk3.mk even, but it
being empty apparently has no negative effects, so leave it at that for now.
On the GTK_PRINT-related settings, Caolan commented on IRC:  
"ENABLE_GTK_PRINT
is probably best removed entirely I guess, it didn't work out and they're
redoing the dialog in upstream gtk again I'm told."

Change-Id: I7e026c0ac9b23e7ace2c2e92390bdcc3be7d39a3
Reviewed-on: https://gerrit.libreoffice.org/55127
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 
(cherry picked from commit b5dd045bf533a2ba4d1c98debe5a2acba4c8b486)
Reviewed-on: https://gerrit.libreoffice.org/55162

diff --git a/configure.ac b/configure.ac
index 8bf75c8c4d3b..a3b9107477b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10129,7 +10129,9 @@ if test  "$test_gtk" = "yes"; then
 GTK_PRINT_CFLAGS=$(printf '%s' "$GTK_PRINT_CFLAGS" | sed -e 
"s/-I/${ISYSTEM?}/g")
 FilterLibs "${GTK_PRINT_LIBS}"
 GTK_PRINT_LIBS="${filteredlibs}"
+fi
 
+if test "$ENABLE_GTK" = "TRUE" || test "$ENABLE_GTK3" = "TRUE"; then
 AC_MSG_CHECKING([whether to enable GIO support])
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = 
"yes"; then
 dnl Need at least 2.26 for the dbus support.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - configure.ac

2018-05-24 Thread Christian Lohmaier 
 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fde8bf6bd16b5f3c6ab84e5139523a12ae8af0d1
Author: Christian Lohmaier 
Date:   Thu May 24 19:00:49 2018 +0200

bump product version to 6.1.0.0.beta1+

Change-Id: Iaac16262c7d5d4b14d605af26e9c3bdd016b059e

diff --git a/configure.ac b/configure.ac
index c42e17bec20f..8bf75c8c4d3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.1.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.1.0.0.beta1+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits