[libreoffice] 91/152: Add style class to LibreOffice toolbars in gtk3
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 27 19:17:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.
commit c45b331d57cacea7f1b25231334ed8ba476fc5f6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Aug 8 16:50:39 2016 +0200
Add style class to LibreOffice toolbars in gtk3
---
changelog | 6 +
patches/build-connectivitytools.diff | 4 +-
patches/debian-debug.diff | 6 +-
patches/debian-hardened-buildflags-CPPFLAGS.diff | 13 +-
patches/debian-opt.diff | 6 +-
patches/disable-flaky-tests.diff | 127 +++++++-----------
patches/fix-internal-hsqldb-build.diff | 2 +-
patches/fix-system-lpsolve-build.diff | 6 +-
patches/gcj-no-bitness-check.diff | 6 +-
patches/gcj-safe-jni-h-include.diff | 4 +-
patches/gtk3-toolbar-styleclass.diff | 23 ++++
patches/hppa-is-32bit.diff | 4 +-
patches/install-fixes.diff | 4 +-
patches/integraltrans.diff | 2 +-
patches/javadoc-optional.diff | 142 +++++++++++----------
patches/jdbc-driver-classpaths.diff | 2 +-
patches/jurt-soffice-location.diff | 4 +-
patches/lo-xlate-lang-update.diff | 2 +-
...-readd-updated-Ubuntu-brand-palette-colors.diff | 2 +-
patches/make-package-modules-not-suck.diff | 128 ++++++++++---------
patches/mysqlc-boost-fallthrough.diff | 21 ++-
patches/mysqlcppconn-libmysqlclient-SONAME.diff | 2 +-
patches/odk-no-dot.diff | 2 +-
patches/reportdesign-mention-package.diff | 2 +-
patches/rsc-no-error-about-unknown-switch.diff | 2 +-
patches/series | 1 +
patches/split-evoab.diff | 74 ++++++-----
27 files changed, 320 insertions(+), 277 deletions(-)
diff --git a/changelog b/changelog
index 865f69c..7e7690d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:5.2.0~rc4-0ubuntu1~yakkety2) yakkety; urgency=medium
+
+ * Add style class to LibreOffice toolbars in gtk3 with gtk3-toolbar-styleclass.diff
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Mon, 08 Aug 2016 16:49:27 +0200
+
libreoffice (1:5.2.0~rc4-0ubuntu1~yakkety1) yakkety; urgency=medium
* new upstream rc
diff --git a/patches/build-connectivitytools.diff b/patches/build-connectivitytools.diff
index 98d9a6a..573758d 100644
--- a/patches/build-connectivitytools.diff
+++ b/patches/build-connectivitytools.diff
@@ -11,7 +11,7 @@ Change-Id: Iadcab228214cc124785df3d18f3f4c039f77e5df
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
-@@ -129,7 +129,7 @@ endif
+@@ -119,7 +119,7 @@ endif
endif
ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
@@ -21,5 +21,5 @@ diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectiv
))
# FIXME: Does not work. Convert to JUnit.
--
-2.5.0
+2.7.4
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 751f9f3..b7e9fea 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -10,7 +10,7 @@ Subject: [PATCH] debian-debug.diff
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -3991,13 +3991,19 @@ dnl Check for enable symbols option
+@@ -3970,13 +3970,19 @@ dnl Check for enable symbols option
dnl ===================================================================
AC_MSG_CHECKING([whether to include symbols while preserve optimization])
if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
@@ -35,7 +35,7 @@ diff --git a/configure.ac b/configure.ac
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -153,11 +153,15 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
+@@ -179,11 +179,15 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
# Clang does not know -ggdb2 or some other options
@@ -52,5 +52,5 @@ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com
ifeq ($(HAVE_GCC_FINLINE_LIMIT),TRUE)
FINLINE_LIMIT0=-finline-limit=0
--
-2.5.0
+2.7.4
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index ecc0ba1..2239a6e 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -14,7 +14,7 @@ Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
diff --git a/config_host.mk.in b/config_host.mk.in
--- a/config_host.mk.in
+++ b/config_host.mk.in
-@@ -73,6 +73,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
+@@ -76,6 +76,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPUNAME=@CPUNAME@
export CDEFAULTOPT=@CDEFAULTOPT@
@@ -22,7 +22,7 @@ diff --git a/config_host.mk.in b/config_host.mk.in
export CROSS_COMPILING=@CROSS_COMPILING@
export CURL=@CURL@
export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
-@@ -243,7 +244,6 @@ export USING_X11=@USING_X11@
+@@ -245,7 +246,6 @@ export USING_X11=@USING_X11@
export HAMCREST_JAR=@HAMCREST_JAR@
export HARDLINKDELIVER=@HARDLINKDELIVER@
export HAVE_GCC_AVX=@HAVE_GCC_AVX@
@@ -33,7 +33,7 @@ diff --git a/config_host.mk.in b/config_host.mk.in
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -5985,17 +5985,6 @@ if test "$GCC" = "yes"; then
+@@ -5987,17 +5987,6 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_RESULT([no])
fi
@@ -51,7 +51,7 @@ diff --git a/configure.ac b/configure.ac
AC_MSG_CHECKING([whether $CC supports atomic functions])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
int v = 0;
-@@ -10401,6 +10390,11 @@ else
+@@ -10384,6 +10373,11 @@ else
fi
AC_SUBST(ENABLE_VLC)
@@ -78,7 +78,7 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -106,12 +106,6 @@ endif
+@@ -124,12 +124,6 @@ endif
endif
gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
@@ -91,3 +91,6 @@ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com
ifeq ($(ENABLE_PCH),TRUE)
ifneq ($(COM_IS_CLANG),TRUE)
gb_CFLAGS_COMMON += -fpch-preprocess -Winvalid-pch
+--
+2.7.4
+
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index cab449a..8f8674f 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -12,7 +12,7 @@ Change-Id: I1a1e700bec24fc6de77fb9578cc9ddbcf0fa6ca2
diff --git a/config_host.mk.in b/config_host.mk.in
--- a/config_host.mk.in
+++ b/config_host.mk.in
-@@ -72,6 +72,7 @@ export COM_IS_CLANG=@COM_IS_CLANG@
+@@ -75,6 +75,7 @@ export COM_IS_CLANG=@COM_IS_CLANG@
export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPUNAME=@CPUNAME@
@@ -23,7 +23,7 @@ diff --git a/config_host.mk.in b/config_host.mk.in
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -12809,6 +12809,9 @@ fi
+@@ -12772,6 +12772,9 @@ fi
AC_SUBST(MPL_SUBSET)
@@ -34,5 +34,5 @@ diff --git a/configure.ac b/configure.ac
dnl Setting up the environment.
dnl ===================================================================
--
-2.5.0
+2.7.4
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index 9b330cc..b24b0de 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -1,31 +1,32 @@
-14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some
- system dependent way) e.g. on the Win at 6 tinderbox it always
- crashes
-14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of
- the time
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Mon, 8 Aug 2016 16:42:20 +0200
+Subject: [PATCH] disable-flaky-tests.diff
-diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
-index 25db0b6..14e507c 100644
---- a/toolkit/Module_toolkit.mk
-+++ b/toolkit/Module_toolkit.mk
-@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
- ifneq ($(OOO_JUNIT_JAR),)
- $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
- JunitTest_toolkit_complex \
-- JunitTest_toolkit_unoapi_1 \
-- JunitTest_toolkit_unoapi_2 \
-- JunitTest_toolkit_unoapi_3 \
-- JunitTest_toolkit_unoapi_4 \
+---
+ libreofficekit/Module_libreofficekit.mk | 6 ++---
+ sc/qa/unoapi/sc_1.sce | 7 -----
+ sc/qa/unoapi/sc_2.sce | 5 ----
+ sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 44 +++++++++++++++----------------
+ toolkit/Module_toolkit.mk | 8 +++---
+ 5 files changed, 29 insertions(+), 41 deletions(-)
+
+diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
+--- a/libreofficekit/Module_libreofficekit.mk
++++ b/libreofficekit/Module_libreofficekit.mk
+@@ -15,9 +15,9 @@ $(eval $(call gb_Module_add_check_targets,libreofficekit, \
+ CppunitTest_libreofficekit_checkapi \
))
- endif
-+# JunitTest_toolkit_unoapi_1 \
-+# JunitTest_toolkit_unoapi_2 \
-+# JunitTest_toolkit_unoapi_3 \
-+# JunitTest_toolkit_unoapi_4 \
- # vim: set noet sw=4 ts=4:
+-$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
+- CppunitTest_libreofficekit_tiledrendering \
+-))
++#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
++# CppunitTest_libreofficekit_tiledrendering \
++#))
+
+ ifneq ($(ENABLE_GTK3),)
+ $(eval $(call gb_Module_add_targets,libreofficekit,\
diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
-index fa1684c..cc8e1a5 100644
--- a/sc/qa/unoapi/sc_1.sce
+++ b/sc/qa/unoapi/sc_1.sce
@@ -24,10 +24,3 @@
@@ -40,7 +41,6 @@ index fa1684c..cc8e1a5 100644
-# i91045 -o sc.ScAccessibleDocumentPagePreview
--o sc.ScAccessiblePageHeader
diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
-index dbfc3e1..d235c5d 100644
--- a/sc/qa/unoapi/sc_2.sce
+++ b/sc/qa/unoapi/sc_2.sce
@@ -15,11 +15,6 @@
@@ -55,62 +55,7 @@ index dbfc3e1..d235c5d 100644
# FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
# -o sc.ScAnnotationObj
# -o sc.ScAnnotationShapeObj
-
-20:42 <@vmiklos> _rene_: yes?
-20:43 < _rene_> vmiklos: see the ml. works, but that of course is not a fix for the test :)
-20:43 < _rene_> s/works/lloconv works/
-20:43 < _rene_> vmiklos: and as a test failure is fatal (at least on i386/amd64)..
-20:44 < loircbot> LibreOffice (core) vmiklos * (3 files in 3 dirs): tdf#83300 DOCX import: 'TOC Heading' should not be 'keep with next' by default
-20:44 <@vmiklos> _rene_: thanks for testing. yes, but then my idea that perhaps the part to fix is the testcase, not the real code may be true at the end :)
-20:45 < _rene_> yeah, or how the test is run (deinit?)
-20:45 < _rene_> because it does say OK...
-20:45 < _rene_> and then SIGSEGVs ;)
-20:46 < loircbot> LibreOffice (core) [feature/glyphy] tml * external/glyphy/glyphy-windows.patch.1: Update the GLyphy patch for Windows
-20:48 <@vmiklos> _rene_: aah, actually it may be a real bug then -- IIRC lloconv has some dirty _exit() hack..
-[...]
-11:21 < _rene_> vmiklos: I think I'll revert to non-libmerged to get that test
- fixed for beta1. I don't like having all tests disabled. can
- live with it for a alpha, but...
-11:22 < _rene_> but merged-nonmerged-merged ping-pong is also not ideal ;)
-11:22 < bubli> tml__: No way I do :P
-11:22 < _rene_> especially as I would differentiate from official TDF builds
- with not-libmerged..
-[...]
-11:48 <@vmiklos> _rene_: right, either revert to non-merged or patch/sed out
- that single test for now.
-
-diff --git a/libreofficekit/Module_libreofficekit.mk b/libreofficekit/Module_libreofficekit.mk
-index 0b2fd4a..ae40d59 100644
---- a/libreofficekit/Module_libreofficekit.mk
-+++ b/libreofficekit/Module_libreofficekit.mk
-@@ -11,9 +11,9 @@ $(eval $(call gb_Module_Module,libreofficekit))
- CppunitTest_libreofficekit_checkapi \
- ))
-
--$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-- CppunitTest_libreofficekit_tiledrendering \
--))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,libreofficekit,\
-+# CppunitTest_libreofficekit_tiledrendering \
-+#))
-
- ifneq ($(ENABLE_GTK3),)
- $(eval $(call gb_Module_add_targets,libreofficekit,\
-
-12:18 < _rene_> chris_wot: ping?
-12:18 < chris_wot> heya
-12:18 < chris_wot> you pinged?
-12:19 < _rene_> chris_wot: any news on
- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
-12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
-12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not
- gotten any further on that one
-12:22 < chris_wot> I honestly think that for this one just disable the test for
- now
-12:22 < chris_wot> I'll ping the ML
-
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-index 54eed4d..78019bd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -1103,28 +1103,28 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
@@ -164,3 +109,25 @@ index 54eed4d..78019bd 100644
#endif
+diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
+--- a/toolkit/Module_toolkit.mk
++++ b/toolkit/Module_toolkit.mk
+@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+ ifneq ($(OOO_JUNIT_JAR),)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+ JunitTest_toolkit_complex \
+- JunitTest_toolkit_unoapi_1 \
+- JunitTest_toolkit_unoapi_2 \
+- JunitTest_toolkit_unoapi_3 \
+- JunitTest_toolkit_unoapi_4 \
+ ))
+ endif
++# JunitTest_toolkit_unoapi_1 \
++# JunitTest_toolkit_unoapi_2 \
++# JunitTest_toolkit_unoapi_3 \
++# JunitTest_toolkit_unoapi_4 \
+
+ # vim: set noet sw=4 ts=4:
+--
+2.7.4
+
diff --git a/patches/fix-internal-hsqldb-build.diff b/patches/fix-internal-hsqldb-build.diff
index f7da3e3..78e84c3 100644
--- a/patches/fix-internal-hsqldb-build.diff
+++ b/patches/fix-internal-hsqldb-build.diff
@@ -56,5 +56,5 @@ new file mode 100644
+ version="false"
+ use="true"
--
-2.5.0
+2.7.4
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index b8904ef..6eff680 100644
--- a/patches/fix-system-lpsolve-build.diff
+++ b/patches/fix-system-lpsolve-build.diff
@@ -12,7 +12,7 @@ Change-Id: Ibe23717730dfb8365b738e366d083ffae9cfbe5a
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
-@@ -2379,7 +2379,7 @@ ifneq ($(ENABLE_LPSOLVE),)
+@@ -2315,7 +2315,7 @@ ifneq ($(ENABLE_LPSOLVE),)
ifneq ($(SYSTEM_LPSOLVE),)
define gb_LinkTarget__use_lpsolve
@@ -24,7 +24,7 @@ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -9667,8 +9667,9 @@ if test "$ENABLE_LPSOLVE" = TRUE; then
+@@ -9670,8 +9670,9 @@ if test "$ENABLE_LPSOLVE" = TRUE; then
# some systems need this. Like Ubuntu....
AC_CHECK_LIB(m, floor)
AC_CHECK_LIB(dl, dlopen)
@@ -36,5 +36,5 @@ diff --git a/configure.ac b/configure.ac
libo_MINGW_CHECK_DLL([lpsolve55])
else
--
-2.5.0
+2.7.4
diff --git a/patches/gcj-no-bitness-check.diff b/patches/gcj-no-bitness-check.diff
index 7743b75..1af1358 100644
--- a/patches/gcj-no-bitness-check.diff
+++ b/patches/gcj-no-bitness-check.diff
@@ -9,7 +9,7 @@ Subject: [PATCH] gcj-no-bitness-check.diff
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -6784,6 +6784,7 @@ if test "$ENABLE_JAVA" != ""; then
+@@ -6867,6 +6867,7 @@ if test "$ENABLE_JAVA" != ""; then
fi
JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
elif test "$cross_compiling" != "yes"; then
@@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac
case $CPUNAME in
AARCH64|AXP|X86_64|IA64|POWERPC64|S390X|SPARC64|GODSON64)
if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
-@@ -6798,6 +6799,7 @@ if test "$ENABLE_JAVA" != ""; then
+@@ -6881,6 +6882,7 @@ if test "$ENABLE_JAVA" != ""; then
fi
;;
esac
@@ -26,5 +26,5 @@ diff --git a/configure.ac b/configure.ac
fi
--
-2.5.0
+2.7.4
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index d7e2e29..fa7a157 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -11,7 +11,7 @@ Change-Id: Iccce595463659ce0979694b8e27865b8dd68fec1
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -7212,12 +7240,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
+@@ -7251,12 +7251,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
JAVAINC="-I$JAVA_HOME/include"
JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
@@ -31,5 +31,5 @@ diff --git a/configure.ac b/configure.ac
mingw*)
--
-2.5.0
+2.7.4
diff --git a/patches/gtk3-toolbar-styleclass.diff b/patches/gtk3-toolbar-styleclass.diff
new file mode 100644
index 0000000..fd7fd2b
--- /dev/null
+++ b/patches/gtk3-toolbar-styleclass.diff
@@ -0,0 +1,23 @@
+From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
+Date: Mon, 8 Aug 2016 16:47:02 +0200
+Subject: [PATCH] Add style class to LibreOffice toolbars in gtk3
+
+---
+ vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
++++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+@@ -1289,6 +1289,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
+ }
+ break;
+ case CTRL_TOOLBAR:
++ static const gchar* sToolbarStyle = "libreoffice-toolbar";
++ styleClass = sToolbarStyle;
+ switch(nPart)
+ {
+ case PART_DRAW_BACKGROUND_HORZ:
+--
+2.7.4
+
diff --git a/patches/hppa-is-32bit.diff b/patches/hppa-is-32bit.diff
index 432e4b0..431c2fd 100644
--- a/patches/hppa-is-32bit.diff
+++ b/patches/hppa-is-32bit.diff
@@ -9,7 +9,7 @@ Subject: [PATCH] hppa-is-32bit.diff
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
-@@ -6785,7 +6785,7 @@ if test "$ENABLE_JAVA" != ""; then
+@@ -6868,7 +6868,7 @@ if test "$ENABLE_JAVA" != ""; then
JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
elif test "$cross_compiling" != "yes"; then
case $CPUNAME in
@@ -19,5 +19,5 @@ diff --git a/configure.ac b/configure.ac
AC_MSG_WARN([You are building 64-bit binaries but the JDK $JAVAINTERPRETER is 32-bit])
AC_MSG_ERROR([You should pass the --with-jdk-home option pointing to a 64-bit JDK])
--
-2.5.0
+2.7.4
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 30c3e06..f6ba094 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -18,7 +18,7 @@ diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
-@@ -366,154 +368,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+@@ -365,154 +367,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
remove_duplicity_from_flists common_list.txt lang_bg_list.txt $INSTALLDIR/presets/config/styles.sod
# the British fixes can be removed after the issue #54113 is fixed
remove_duplicity_from_flists common_list.txt lang_en-GB_list.txt $INSTALLDIR/presets/config/standard.sog
@@ -174,5 +174,5 @@ diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
# mark the config files
--
-2.5.0
+2.7.4
diff --git a/patches/integraltrans.diff b/patches/integraltrans.diff
index 4a1ec3a..d279d4c 100644
--- a/patches/integraltrans.diff
+++ b/patches/integraltrans.diff
@@ -19,5 +19,5 @@ diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
# vim: set noet sw=4 ts=4:
--
-2.5.0
+2.7.4
diff --git a/patches/javadoc-optional.diff b/patches/javadoc-optional.diff
index 6bdc495..da81beb 100644
--- a/patches/javadoc-optional.diff
+++ b/patches/javadoc-optional.diff
@@ -1,34 +1,24 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Mon, 8 Aug 2016 16:42:21 +0200
+Subject: [PATCH] javadoc-optional.diff
+
Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.
-diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
-index 32bdfc1..a174932 100644
---- a/odk/Module_odk.mk
-+++ b/odk/Module_odk.mk
-@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
- $(eval $(call gb_Module_add_targets,odk,\
- $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
- CustomTarget_classes \
-- CustomTarget_javadoc \
-- GeneratedPackage_odk_javadoc \
- GeneratedPackage_uno_loader_classes \
- $(if $(filter WNT,$(OS)),Library_unowinreg) \
- Package_unowinreg \
-+ $(if $(JAVADOC),\
-+ CustomTarget_javadoc \
-+ GeneratedPackage_odk_javadoc \
-+ ) \
- ))
- endif
-
-Gemeinsame Unterverzeichnisse: odk-old/pack und odk/pack.
-Gemeinsame Unterverzeichnisse: odk-old/qa und odk/qa.
-Gemeinsame Unterverzeichnisse: odk-old/settings und odk/settings.
-Gemeinsame Unterverzeichnisse: odk-old/source und odk/source.
-Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
---- a/configure.ac-old 2013-05-27 18:32:42.187305241 +0200
-+++ b/configure.ac 2013-05-27 18:44:29.131286710 +0200
-@@ -2057,6 +2057,18 @@ AC_ARG_WITH(doxygen,
+
+---
+ configure.ac | 62 ++++++++++++++++++++++++++++++---------------
+ odk/CustomTarget_check.mk | 2 +-
+ odk/Module_odk.mk | 6 +++--
+ odk/util/check.pl | 2 +-
+ scp2/InstallModule_sdkoo.mk | 6 +++++
+ scp2/source/sdkoo/sdkoo.scp | 2 ++
+ 6 files changed, 56 insertions(+), 24 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -2063,6 +2063,18 @@ AC_ARG_WITH(doxygen,
documentation. Not relevant in the --disable-odk case.]),
,with_doxygen=yes)
@@ -47,7 +37,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
AC_ARG_WITH(visual-studio,
AS_HELP_STRING([--with-visual-studio=<2013/2015>],
[Specify which Visual Studio version to use in case several are
-@@ -6290,34 +6302,44 @@
+@@ -7024,34 +7036,44 @@ AC_SUBST(JAVACISGCJ)
dnl ===================================================================
dnl Checks for javadoc
dnl ===================================================================
@@ -112,41 +102,7 @@ Gemeinsame Unterverzeichnisse: odk-old/util und odk/util.
if test "$ENABLE_JAVA" != ""; then
# check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr
if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then
---- a/scp2/source/sdkoo/sdkoo.scp-old 2013-05-27 21:26:53.967031270 +0200
-+++ b/scp2/source/sdkoo/sdkoo.scp 2013-05-27 21:27:01.895031062 +0200
-@@ -177,6 +177,7 @@
- End
-
- #if defined(ENABLE_JAVA)
-+#if defined(JAVADOC)
- File gid_File_Package_odk_javadoc
- TXT_FILE_BODY;
- Dir = FILELIST_SDK_DIR;
-@@ -184,6 +185,7 @@
- Styles = (FILELIST,USE_INTERNAL_RIGHTS);
- End
- #endif
-+#endif
-
- File gid_File_Package_odk_lib
- TXT_FILE_BODY;
---- a/scp2/InstallModule_sdkoo.mk-old 2013-09-23 22:46:56.034054736 +0200
-+++ b/scp2/InstallModule_sdkoo.mk 2013-09-23 22:46:47.914054950 +0200
-@@ -15,6 +15,12 @@
- ))
- endif
-
-+ifneq ($(JAVADOC),)
-+$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
-+ -DJAVADOC \
-+))
-+endif
-+
- $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
- scp2/source/sdkoo/sdkoo \
- ))
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
-index a9b542d..707829a 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
@@ -158,11 +114,29 @@ index a9b542d..707829a 100644
$(call gb_Package_get_target,odk_lib) \
$(call gb_Package_get_target,odk_settings) \
$(call gb_Package_get_target,odk_settings_generated) \
+diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
+--- a/odk/Module_odk.mk
++++ b/odk/Module_odk.mk
+@@ -43,11 +43,13 @@ ifneq ($(ENABLE_JAVA),)
+ $(eval $(call gb_Module_add_targets,odk,\
+ $(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
+ CustomTarget_classes \
+- CustomTarget_javadoc \
+- GeneratedPackage_odk_javadoc \
+ GeneratedPackage_uno_loader_classes \
+ $(if $(filter WNT,$(OS)),Library_unowinreg) \
+ Package_unowinreg \
++ $(if $(JAVADOC),\
++ CustomTarget_javadoc \
++ GeneratedPackage_odk_javadoc \
++ ) \
+ ))
+ endif
+
diff --git a/odk/util/check.pl b/odk/util/check.pl
-index 899b42c..2c7a780 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
-@@ -188,7 +188,7 @@ if (-d "$SdkDir") {
+@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
# improvement required
my $solar_java = $ENV{"ENABLE_JAVA"};
my $JDK = $ENV{"JDK"};
@@ -171,3 +145,41 @@ index 899b42c..2c7a780 100644
print "check java docu: ";
if (check_dir("docs/java/ref")) {
if (!check_file("docs/java/ref/index.html")) {
+diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
+--- a/scp2/InstallModule_sdkoo.mk
++++ b/scp2/InstallModule_sdkoo.mk
+@@ -17,6 +17,12 @@ $(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
+ ))
+ endif
+
++ifneq ($(JAVADOC),)
++$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
++ -DJAVADOC \
++))
++endif
++
+ $(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
+ scp2/source/sdkoo/sdkoo \
+ ))
+diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
+--- a/scp2/source/sdkoo/sdkoo.scp
++++ b/scp2/source/sdkoo/sdkoo.scp
+@@ -126,6 +126,7 @@ File gid_File_Package_odk_html
+ End
+
+ #if defined(ENABLE_JAVA)
++#if defined(JAVADOC)
+ File gid_File_Package_odk_javadoc
+ TXT_FILE_BODY;
+ Dir = FILELIST_SDK_DIR;
+@@ -133,6 +134,7 @@ File gid_File_Package_odk_javadoc
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+ End
+ #endif
++#endif
+
+ File gid_File_Package_odk_lib
+ TXT_FILE_BODY;
+--
+2.7.4
+
diff --git a/patches/jdbc-driver-classpaths.diff b/patches/jdbc-driver-classpaths.diff
index 67f0d07..b8ca686 100644
--- a/patches/jdbc-driver-classpaths.diff
+++ b/patches/jdbc-driver-classpaths.diff
@@ -38,5 +38,5 @@ diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/offi
<node oor:name="EvolutionLocal" oor:op="replace" install:module="evoab2">
<prop oor:name="Location" oor:type="xs:string">
--
-2.5.0
+2.7.4
diff --git a/patches/jurt-soffice-location.diff b/patches/jurt-soffice-location.diff
index f498297..eb836dd 100644
--- a/patches/jurt-soffice-location.diff
+++ b/patches/jurt-soffice-location.diff
@@ -11,7 +11,7 @@ Change-Id: Ic275cefd481b004ad31ff539384a27ba06102ad9
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
-@@ -122,6 +122,8 @@ public final class NativeLibraryLoader {
+@@ -123,6 +123,8 @@ public final class NativeLibraryLoader {
}
}
}
@@ -21,5 +21,5 @@ diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/
}
--
-2.5.0
+2.7.4
diff --git a/patches/lo-xlate-lang-update.diff b/patches/lo-xlate-lang-update.diff
index b7597f2..3e112e0 100644
--- a/patches/lo-xlate-lang-update.diff
+++ b/patches/lo-xlate-lang-update.diff
@@ -28,5 +28,5 @@ diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
03:pt:portuguese
07:ru:russian
--
-2.5.0
+2.7.4
diff --git a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
index b876acb..2d48de3 100644
--- a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+++ b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
@@ -207,5 +207,5 @@ new file mode 100644
+
+</office:color-table>
--
-2.5.0
+2.7.4
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 6ed7cf0..7eee2fb 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -1,54 +1,18 @@
-diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
-index a7c02be..d48edf2 100644
---- a/scp2/InstallModule_draw.mk
-+++ b/scp2/InstallModule_draw.mk
-@@ -10,6 +10,7 @@
- $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
-
- $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
-+ draw \
- draw_brand \
- ))
-
-diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
-index 8737579..0913c61 100644
---- a/scp2/source/draw/module_draw.scp
-+++ b/scp2/source/draw/module_draw.scp
-@@ -18,6 +18,7 @@
-
- #include "macros.inc"
-
-+#include "AutoInstall/draw"
- #include "AutoInstall/draw_brand"
-
- Module gid_Module_Prg_Draw
-@@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin
- Sortkey = "100";
- Default = YES;
- Styles = (HIDDEN_ROOT);
-- Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
-+ Files = (auto_draw_ALL
-+ gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
- gid_File_Share_Registry_Draw_Xcd,
- gid_File_Tmp_Userinstall_Draw_Inf);
- End
-diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
-index 7d2a347..a15ac52 100644
---- a/scp2/AutoInstall.mk
-+++ b/scp2/AutoInstall.mk
-@@ -18,6 +18,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
- $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
-+$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
- $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
- $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
- $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Mon, 8 Aug 2016 16:42:19 +0200
+Subject: [PATCH] make-package-modules-not-suck.diff
+
+---
+ Repository.mk | 45 +++++++++++++++++++++++-----------------
+ scp2/AutoInstall.mk | 1 +
+ scp2/InstallModule_draw.mk | 1 +
+ scp2/source/draw/module_draw.scp | 4 +++-
+ 4 files changed, 31 insertions(+), 20 deletions(-)
+
diff --git a/Repository.mk b/Repository.mk
-index 61173d3..38cc001 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -194,13 +194,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
+@@ -199,13 +199,28 @@ $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,base, \
abp \
@@ -78,7 +42,7 @@ index 61173d3..38cc001 100644
date \
pricing \
sc \
-@@ -212,6 +227,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
+@@ -217,6 +232,13 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
))
@@ -92,7 +56,7 @@ index 61173d3..38cc001 100644
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
svgfilter \
flash \
-@@ -236,6 +258,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
+@@ -241,6 +263,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,impress, \
PresenterScreen \
PresentationMinimizer \
wpftimpress \
@@ -100,7 +64,7 @@ index 61173d3..38cc001 100644
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
-@@ -296,11 +319,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -301,11 +324,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
ctl \
cui \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -113,7 +77,7 @@ index 61173d3..38cc001 100644
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(USING_X11),desktop_detector) \
-@@ -313,10 +333,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -318,10 +338,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
evtatt \
expwrap \
$(call gb_Helper_optional,DBCONNECTIVITY, \
@@ -124,7 +88,7 @@ index 61173d3..38cc001 100644
fps_office \
for \
forui \
-@@ -335,7 +353,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -340,7 +358,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
gie \
hyphen \
icg \
@@ -132,7 +96,7 @@ index 61173d3..38cc001 100644
ldapbe2 \
localebe1 \
log \
-@@ -348,8 +365,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -353,8 +370,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
msfilter \
$(call gb_Helper_optional,SCRIPTING,msforms) \
mtfrenderer \
@@ -141,7 +105,7 @@ index 61173d3..38cc001 100644
odfflatxml \
offacc \
oox \
-@@ -363,13 +378,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -368,13 +383,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
sb \
$(call gb_Helper_optional,DBCONNECTIVITY,sdbt) \
scn \
@@ -155,7 +119,7 @@ index 61173d3..38cc001 100644
sot \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
-@@ -380,7 +390,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+@@ -385,7 +395,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
svt \
svx \
svxcore \
@@ -163,7 +127,7 @@ index 61173d3..38cc001 100644
syssh \
$(if $(ENABLE_TDEAB),tdeab1) \
$(if $(ENABLE_TDEAB),tdeabdrv1) \
-@@ -464,6 +473,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
+@@ -469,6 +478,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,writer, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
msword \
@@ -171,7 +135,7 @@ index 61173d3..38cc001 100644
swd \
swui \
t602filter \
-@@ -542,14 +552,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -546,14 +556,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
cached1 \
collator_data \
comphelper \
@@ -186,7 +150,7 @@ index 61173d3..38cc001 100644
i18nlangtag \
i18nutil \
index_data \
-@@ -566,7 +574,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+@@ -570,7 +578,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
package2 \
$(if $(USING_X11),recentfile) \
$(call gb_Helper_optional,SCRIPTING,scriptframe) \
@@ -194,3 +158,49 @@ index 61173d3..38cc001 100644
sofficeapp \
srtrs1 \
$(if $(filter $(OS),WNT),sysdtrans) \
+diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
+--- a/scp2/AutoInstall.mk
++++ b/scp2/AutoInstall.mk
+@@ -18,6 +18,7 @@ $(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
+ $(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
+ $(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
+ $(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
++$(eval $(call gb_AutoInstall_add_module,draw,LIBO_LIB_FILE))
+ $(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
+ $(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
+ $(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
+diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
+--- a/scp2/InstallModule_draw.mk
++++ b/scp2/InstallModule_draw.mk
+@@ -10,6 +10,7 @@
+ $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
+
+ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,\
++ draw \
+ draw_brand \
+ ))
+
+diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
+--- a/scp2/source/draw/module_draw.scp
++++ b/scp2/source/draw/module_draw.scp
+@@ -18,6 +18,7 @@
+
+ #include "macros.inc"
+
++#include "AutoInstall/draw"
+ #include "AutoInstall/draw_brand"
+
+ Module gid_Module_Prg_Draw
+@@ -34,7 +35,8 @@ Module gid_Module_Prg_Draw_Bin
+ Sortkey = "100";
+ Default = YES;
+ Styles = (HIDDEN_ROOT);
+- Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
++ Files = (auto_draw_ALL
++ gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
+ gid_File_Share_Registry_Draw_Xcd,
+ gid_File_Tmp_Userinstall_Draw_Inf);
+ End
+--
+2.7.4
+
diff --git a/patches/mysqlc-boost-fallthrough.diff b/patches/mysqlc-boost-fallthrough.diff
index 74807de..baa52af 100644
--- a/patches/mysqlc-boost-fallthrough.diff
+++ b/patches/mysqlc-boost-fallthrough.diff
@@ -1,7 +1,15 @@
-diff -ru a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
---- a/mysqlc/source/mysqlc_preparedstatement.cxx 2016-05-26 18:55:21.000000000 +0200
-+++ b/mysqlc/source/mysqlc_preparedstatement.cxx 2016-06-04 15:49:03.320192122 +0200
-@@ -564,7 +564,7 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Mon, 8 Aug 2016 16:42:28 +0200
+Subject: [PATCH] mysqlc-boost-fallthrough.diff
+
+---
+ mysqlc/source/mysqlc_preparedstatement.cxx | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx
+--- a/mysqlc/source/mysqlc_preparedstatement.cxx
++++ b/mysqlc/source/mysqlc_preparedstatement.cxx
+@@ -564,7 +564,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
setDouble( _parameterIndex, nValue );
break;
}
@@ -10,7 +18,7 @@ diff -ru a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_pre
}
case DataType::CHAR:
-@@ -591,7 +591,7 @@
+@@ -591,7 +591,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo(sal_Int32 _parameterIndex, c
setFloat(_parameterIndex,nValue);
break;
}
@@ -19,3 +27,6 @@ diff -ru a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_pre
}
case DataType::DOUBLE:
+--
+2.7.4
+
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 2a30f3f..bc75c06 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -50,5 +50,5 @@ new file mode 100644
+
+ template<typename FunctionType>
--
-2.5.0
+2.7.4
diff --git a/patches/odk-no-dot.diff b/patches/odk-no-dot.diff
index 6dadd4f..c453169 100644
--- a/patches/odk-no-dot.diff
+++ b/patches/odk-no-dot.diff
@@ -34,5 +34,5 @@ diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
WARNINGS = YES
WARN_IF_DOC_ERROR = YES
--
-2.5.0
+2.7.4
diff --git a/patches/reportdesign-mention-package.diff b/patches/reportdesign-mention-package.diff
index 34359bb..f570b3a 100644
--- a/patches/reportdesign-mention-package.diff
+++ b/patches/reportdesign-mention-package.diff
@@ -21,5 +21,5 @@ diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/db
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
-2.5.0
+2.7.4
diff --git a/patches/rsc-no-error-about-unknown-switch.diff b/patches/rsc-no-error-about-unknown-switch.diff
index 1f76a91..1dae82b 100644
--- a/patches/rsc-no-error-about-unknown-switch.diff
+++ b/patches/rsc-no-error-about-unknown-switch.diff
@@ -29,5 +29,5 @@ diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
-2.5.0
+2.7.4
diff --git a/patches/series b/patches/series
index 5e50d26..e4a01ca 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ rsc-no-error-about-unknown-switch.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
integraltrans.diff
mysqlc-boost-fallthrough.diff
+gtk3-toolbar-styleclass.diff
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 5d5a9c4..67645e5 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -1,8 +1,44 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Mon, 8 Aug 2016 16:42:03 +0200
+Subject: [PATCH] split-evoab.diff
+
+---
+ postprocess/CustomTarget_registry.mk | 5 +++--
+ scp2/InstallModule_gnome.mk | 1 +
+ scp2/source/gnome/file_gnome.scp | 10 ++++++++++
+ scp2/source/gnome/module_gnome.scp | 3 +++
+ 4 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
+--- a/postprocess/CustomTarget_registry.mk
++++ b/postprocess/CustomTarget_registry.mk
+@@ -329,8 +329,9 @@ ifneq ($(WITH_WEBDAV),)
+ postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
+ endif
+ ifeq ($(ENABLE_EVOAB2),TRUE)
+-postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
+-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
++postprocess_XCDS += evoab.xcd
++postprocess_FILES_evoab += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
++postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
+ postprocess_DRIVERS += evoab
+ endif
+ ifeq ($(ENABLE_JAVA),TRUE)
+diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
+--- a/scp2/InstallModule_gnome.mk
++++ b/scp2/InstallModule_gnome.mk
+@@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
+ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+
+ $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
++ ENABLE_EVOAB2 \
+ ENABLE_GTK \
+ ))
+
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
-index c7a13c8..a3f59a6 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
-@@ -25,3 +25,13 @@ File gid_File_Share_Registry_Gnome_Xcd
+@@ -26,3 +26,13 @@ File gid_File_Share_Registry_Gnome_Xcd
Name = "gnome.xcd";
End
#endif
@@ -17,10 +53,9 @@ index c7a13c8..a3f59a6 100644
+#endif
+
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
-index 08d9efe..492e274 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
-@@ -30,6 +30,9 @@ Module gid_Module_Optional_Gnome
+@@ -31,6 +31,9 @@ Module gid_Module_Optional_Gnome
#if ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
#endif
@@ -30,31 +65,6 @@ index 08d9efe..492e274 100644
gid_File_Bin_Gnome_Open_Url
);
End
-diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
-index 510b444..3ff190f 100644
---- a/postprocess/CustomTarget_registry.mk
-+++ b/postprocess/CustomTarget_registry.mk
-@@ -331,8 +331,9 @@ ifneq ($(WITH_WEBDAV),)
- postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/ucb/Configuration-webdav.xcu
- endif
- ifeq ($(ENABLE_EVOAB2),TRUE)
--postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
--postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
-+postprocess_XCDS += evoab.xcd
-+postprocess_FILES_evoab += $(call gb_XcuModuleTarget_get_target,connectivity/registry/evoab2)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
-+postprocess_FILES_evoab += $(postprocess_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
- postprocess_DRIVERS += evoab
- endif
- ifeq ($(ENABLE_JAVA),TRUE)
-diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
-index 686f6c1..d633c90 100644
---- a/scp2/InstallModule_gnome.mk
-+++ b/scp2/InstallModule_gnome.mk
-@@ -14,6 +14,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
-
- $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
-+ ENABLE_EVOAB2 \
- ENABLE_GTK \
- ))
-
- $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\
+--
+2.7.4
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list