[libreoffice] 50/152: update patch set, remove upstreamed ones
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 27 19:16:56 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 571bad2b0bc5311658f10b78aea9b5bab15359b3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Feb 26 13:23:40 2016 +0100
update patch set, remove upstreamed ones
---
changelog | 3 +-
patches/ScValidationDlg.diff | 54 -------------------
patches/build-connectivitytools.diff | 4 +-
patches/debian-debug.diff | 22 +++++---
patches/debian-hardened-buildflags-CPPFLAGS.diff | 63 ++++++++++++----------
patches/debian-opt.diff | 6 +--
patches/disable-npapi-plugin-support.diff | 14 ++++-
patches/fix-internal-hsqldb-build.diff | 2 +-
patches/fix-system-lpsolve-build.diff | 6 +--
patches/gcj-no-bitness-check.diff | 20 +++++--
patches/gcj-safe-jni-h-include.diff | 4 +-
patches/hppa-is-32bit.diff | 14 ++++-
patches/install-fixes.diff | 20 +++++--
patches/integraltrans.diff | 8 +--
patches/jdbc-driver-classpaths.diff | 2 +-
patches/jurt-soffice-location.diff | 4 +-
patches/lo-xlate-lang-update.diff | 12 ++++-
...-readd-updated-Ubuntu-brand-palette-colors.diff | 5 +-
patches/mysqlcppconn-libmysqlclient-SONAME.diff | 46 ++++++++++------
patches/odk-no-dot.diff | 6 +--
patches/reportdesign-mention-package.diff | 4 +-
patches/rsc-no-error-about-unknown-switch.diff | 12 ++++-
patches/series | 1 -
23 files changed, 185 insertions(+), 147 deletions(-)
diff --git a/changelog b/changelog
index 327ca85..560f4d7 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
libreoffice (1:5.1.1~rc2-0ubuntu1) xenial; urgency=medium
* new upstream rc
+ * update patches, remove upstreamed ones
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 26 Feb 2016 11:33:38 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 26 Feb 2016 13:20:54 +0100
libreoffice (1:5.1.0-0ubuntu1) xenial; urgency=medium
diff --git a/patches/ScValidationDlg.diff b/patches/ScValidationDlg.diff
deleted file mode 100644
index 82b88ea..0000000
--- a/patches/ScValidationDlg.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From bf46969b89470e69494ccc02ef6978180c5552da Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman at redhat.com>
-Date: Tue, 19 Jan 2016 10:58:44 +0100
-Subject: [PATCH] Make virtual ~ScValidationDlg non-inline
-
-...otherwise, GCC 6 would aggressively inline ScValidationDlg destruction of the
-VclPtr<ScValidationDlg> in ScValidityRefChildWin::ScValidityRefChildWin
-(sc/source/ui/view/reffact.cxx, in sc library), checking whether the vtable
-points at ~ScValidationDlg (instead of a derived class dtor) to directly inline
-the ~ScValidationDlg code, which requires the ScValidateionDlg vtable (to store
-it in the object's vtable during destruction), which requires the code of inline
-virtual ScValidationDlg::dispose and ScValidationDlg::Close, which in turn need
-the addresses of (non-inline) ScValidationDlg::RemoveRefDlg and
-ScTPValidationValue::RemoveRefDlg, both defined in the scui library and not
-exported from there.
-
-Change-Id: I7eb96f42deb5edd844d91e999aa5511679302c01
----
- sc/source/ui/dbgui/validate.cxx | 5 +++++
- sc/source/ui/inc/validate.hxx | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
-index 459c5d7..db73012 100644
---- a/sc/source/ui/dbgui/validate.cxx
-+++ b/sc/source/ui/dbgui/validate.cxx
-@@ -96,6 +96,11 @@ ScValidationDlg::ScValidationDlg(vcl::Window* pParent, const SfxItemSet* pArgSet
- get(m_pHBox, "refinputbox");
- }
-
-+ScValidationDlg::~ScValidationDlg()
-+{
-+ disposeOnce();
-+}
-+
- void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pDoc )
- {
- if ( rRange.aStart != rRange.aEnd )
-diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
-index d39b99b..1e785b7 100644
---- a/sc/source/ui/inc/validate.hxx
-+++ b/sc/source/ui/inc/validate.hxx
-@@ -182,7 +182,7 @@ class ScValidationDlg
-
- public:
- explicit ScValidationDlg( vcl::Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell * pTabViewSh, SfxBindings *pB = nullptr );
-- virtual ~ScValidationDlg() { disposeOnce(); }
-+ virtual ~ScValidationDlg();
- virtual void dispose() override
- {
- if( m_bOwnRefHdlr )
---
-2.5.0
-
diff --git a/patches/build-connectivitytools.diff b/patches/build-connectivitytools.diff
index 476212d..98d9a6a 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
-@@ -149,7 +149,7 @@ endif
+@@ -129,7 +129,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.
--
-1.9.1
+2.5.0
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 911f602..751f9f3 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -1,8 +1,16 @@
-diff --git a/configure.ac b/configure.in
-index 3257668..afd36de 100755
---- libreoffice-3.5.0/configure.ac
-+++ libreoffice-3.5.0/configure.ac
-@@ -3361,13 +3361,19 @@ dnl Check for enable symbols option
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:20 +0100
+Subject: [PATCH] debian-debug.diff
+
+---
+ configure.ac | 10 ++++++++--
+ solenv/gbuild/platform/com_GCC_defs.mk | 4 ++++
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -3991,13 +3991,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
@@ -25,7 +33,6 @@ index 3257668..afd36de 100755
if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
ENABLE_SYMBOLS="FALSE"
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
-index 9de88a2..9161a4e 100644
--- 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)
@@ -44,3 +51,6 @@ index 9de88a2..9161a4e 100644
ifeq ($(HAVE_GCC_FINLINE_LIMIT),TRUE)
FINLINE_LIMIT0=-finline-limit=0
+--
+2.5.0
+
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index fdbe044..90dbe4b 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -5,14 +5,35 @@ Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS.diff
Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
---
- config_host.mk.in | 1 +
- configure.ac | 5 +++++
- solenv/gbuild/gbuild.mk | 2 ++
- 3 files changed, 8 insertions(+)
+ config_host.mk.in | 2 +-
+ configure.ac | 16 +++++-----------
+ solenv/gbuild/gbuild.mk | 2 ++
+ solenv/gbuild/platform/com_GCC_defs.mk | 6 ------
+ 4 files changed, 8 insertions(+), 18 deletions(-)
---- a/configure.ac-old 2012-03-02 21:48:47.000000000 +0000
-+++ b/configure.ac 2012-03-02 21:51:29.000000000 +0000
-@@ -5751,17 +5751,6 @@ if test "$GCC" = "yes"; then
+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@
+ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
+ export CPUNAME=@CPUNAME@
+ export CDEFAULTOPT=@CDEFAULTOPT@
++export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
+ export CROSS_COMPILING=@CROSS_COMPILING@
+ export CURL=@CURL@
+ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
+@@ -243,7 +244,6 @@ export USING_X11=@USING_X11@
+ export HAMCREST_JAR=@HAMCREST_JAR@
+ export HARDLINKDELIVER=@HARDLINKDELIVER@
+ export HAVE_GCC_AVX=@HAVE_GCC_AVX@
+-export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
+ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
+ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
+ export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -5985,17 +5985,6 @@ if test "$GCC" = "yes"; then
AC_MSG_RESULT([no])
fi
@@ -30,7 +51,7 @@ Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
AC_MSG_CHECKING([whether $CC supports atomic functions])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
int v = 0;
-@@ -10225,6 +10225,11 @@ else
+@@ -10401,6 +10390,11 @@ else
fi
AC_SUBST(ENABLE_VLC)
@@ -42,28 +63,10 @@ Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9
# this is for opengl transitions in impress slideshow
ENABLE_OPENGL=
if test $_os = iOS -o $_os = Android; then
---- a/config_host.mk.in-old 2012-04-06 14:17:55.164239390 +0200
-+++ b/config_host.mk.in 2012-04-06 14:18:55.440239065 +0200
-@@ -70,6 +70,7 @@
- export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
- export CPUNAME=@CPUNAME@
- export CDEFAULTOPT=@CDEFAULTOPT@
-+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
- export CROSS_COMPILING=@CROSS_COMPILING@
- export CURL=@CURL@
- export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
-@@ -240,7 +240,6 @@ export GUIBASE=@GUIBASE@
- export HAMCREST_JAR=@HAMCREST_JAR@
- export HARDLINKDELIVER=@HARDLINKDELIVER@
- export HAVE_GCC_AVX=@HAVE_GCC_AVX@
--export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
- export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
- export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
- export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
+@@ -243,6 +243,8 @@ gb_GLOBALDEFS += \
ENABLE_LTO \
)
@@ -73,10 +76,9 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
# This is used to detect whether LibreOffice is being built (as opposed to building
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
-index 7acd068..b6d9735 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -103,12 +103,6 @@ endif
+@@ -106,12 +106,6 @@ endif
endif
gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
@@ -89,3 +91,6 @@ index 7acd068..b6d9735 100644
gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror)
# This is the default in non-C++11 mode
+--
+2.5.0
+
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 72c80bb..cab449a 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
-@@ -71,6 +71,7 @@ export CPP_LIBRARY=@CPP_LIBRARY@
+@@ -72,6 +72,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
-@@ -12905,6 +12905,9 @@ fi
+@@ -12809,6 +12809,9 @@ fi
AC_SUBST(MPL_SUBSET)
@@ -34,5 +34,5 @@ diff --git a/configure.ac b/configure.ac
dnl Setting up the environment.
dnl ===================================================================
--
-1.9.1
+2.5.0
diff --git a/patches/disable-npapi-plugin-support.diff b/patches/disable-npapi-plugin-support.diff
index b10ed40..5d118dd 100644
--- a/patches/disable-npapi-plugin-support.diff
+++ b/patches/disable-npapi-plugin-support.diff
@@ -1,8 +1,15 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:28 +0100
+Subject: [PATCH] disable-npapi-plugin-support.diff
+
+---
+ configure.ac | 16 ++--------------
+ 1 file changed, 2 insertions(+), 14 deletions(-)
+
diff --git a/configure.ac b/configure.ac
-index 9ee77171..dd2ab7f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -9181,21 +9181,9 @@ else
+@@ -9219,21 +9219,9 @@ else
fi
AC_SUBST(ENABLE_HARFBUZZ)
@@ -26,3 +33,6 @@ index 9ee77171..dd2ab7f 100644
AC_SUBST(ENABLE_NPAPI_FROM_BROWSER)
AC_MSG_CHECKING([whether to use X11])
+--
+2.5.0
+
diff --git a/patches/fix-internal-hsqldb-build.diff b/patches/fix-internal-hsqldb-build.diff
index 10b4e78..f7da3e3 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"
--
-1.9.1
+2.5.0
diff --git a/patches/fix-system-lpsolve-build.diff b/patches/fix-system-lpsolve-build.diff
index cb10695..b8904ef 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
-@@ -2176,7 +2176,7 @@ ifneq ($(ENABLE_LPSOLVE),)
+@@ -2379,7 +2379,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
-@@ -9678,8 +9678,9 @@ if test "$ENABLE_LPSOLVE" = TRUE; then
+@@ -9667,8 +9667,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
--
-1.9.1
+2.5.0
diff --git a/patches/gcj-no-bitness-check.diff b/patches/gcj-no-bitness-check.diff
index c80cf71..7743b75 100644
--- a/patches/gcj-no-bitness-check.diff
+++ b/patches/gcj-no-bitness-check.diff
@@ -1,6 +1,15 @@
---- a/configure.ac-old 2015-02-19 15:32:27.000000000 +0100
-+++ b/configure.ac 2015-02-19 15:38:58.709444812 +0100
-@@ -6670,6 +6670,7 @@ if test "$ENABLE_JAVA" != ""; then
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:27 +0100
+Subject: [PATCH] gcj-no-bitness-check.diff
+
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -6784,6 +6784,7 @@ if test "$ENABLE_JAVA" != ""; then
fi
JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
elif test "$cross_compiling" != "yes"; then
@@ -8,7 +17,7 @@
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
-@@ -6684,6 +6685,7 @@ if test "$ENABLE_JAVA" != ""; then
+@@ -6798,6 +6799,7 @@ if test "$ENABLE_JAVA" != ""; then
fi
;;
esac
@@ -16,3 +25,6 @@
fi
fi
+--
+2.5.0
+
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index c887666..f8160d2 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
-@@ -7303,12 +7303,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
+@@ -7161,12 +7161,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
k*bsd*-gnu*)
JAVAINC="-I$JAVA_HOME/include"
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*)
--
-1.9.1
+2.5.0
diff --git a/patches/hppa-is-32bit.diff b/patches/hppa-is-32bit.diff
index b3ceb17..432e4b0 100644
--- a/patches/hppa-is-32bit.diff
+++ b/patches/hppa-is-32bit.diff
@@ -1,8 +1,15 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:27 +0100
+Subject: [PATCH] hppa-is-32bit.diff
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
diff --git a/configure.ac b/configure.ac
-index 42dc3b4..f5a51c9 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -6671,7 +6671,7 @@ if test "$ENABLE_JAVA" != ""; then
+@@ -6785,7 +6785,7 @@ if test "$ENABLE_JAVA" != ""; then
JAVAINTERPRETER=`win_short_path_for_make "$JAVAINTERPRETER"`
elif test "$cross_compiling" != "yes"; then
case $CPUNAME in
@@ -11,3 +18,6 @@ index 42dc3b4..f5a51c9 100644
if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then
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
+
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 9a25d69..30c3e06 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -1,8 +1,15 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:21 +0100
+Subject: [PATCH] install-fixes.diff
+
+---
+ bin/distro-install-file-lists | 150 +-----------------------------------------
+ 1 file changed, 2 insertions(+), 148 deletions(-)
+
diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
-index eaabf9c..c1b1ec6 100755
---- libreoffice-3.5.0/bin/distro-install-file-lists
-+++ libreoffice-3.5.0/bin/distro-install-file-lists
-@@ -8,6 +8,8 @@
+--- a/bin/distro-install-file-lists
++++ b/bin/distro-install-file-lists
+@@ -5,6 +5,8 @@ if test -z "${SRC_ROOT}"; then
exit 1
fi
@@ -11,7 +18,7 @@ index eaabf9c..c1b1ec6 100755
BUILDDIR=`pwd`
FILELISTSDIR="$BUILDDIR/file-lists"
-@@ -366,154 +366,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
+@@ -366,154 +368,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
@@ -166,3 +173,6 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
+--
+2.5.0
+
diff --git a/patches/integraltrans.diff b/patches/integraltrans.diff
index dc5e5a9..4a1ec3a 100644
--- a/patches/integraltrans.diff
+++ b/patches/integraltrans.diff
@@ -3,13 +3,13 @@ Date: Fri, 23 Oct 2015 00:01:16 +0200
Subject: [PATCH] use different var for inseparatable translations
---
- sysui/CustomTarget_share.mk | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ sysui/CustomTarget_share.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
-@@ -227,7 +227,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \
+@@ -224,7 +224,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \
$(eval $(call gb_CustomTarget_ulfex_rule,\
$(share_WORKDIR)/%.ulf,\
$(share_SRCDIR)/share/%.ulf,\
@@ -19,5 +19,5 @@ diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
# vim: set noet sw=4 ts=4:
--
-2.1.4
+2.5.0
diff --git a/patches/jdbc-driver-classpaths.diff b/patches/jdbc-driver-classpaths.diff
index cacca91..67f0d07 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">
--
-1.9.1
+2.5.0
diff --git a/patches/jurt-soffice-location.diff b/patches/jurt-soffice-location.diff
index e2bd9ef..f498297 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
-@@ -111,6 +111,8 @@ public final class NativeLibraryLoader {
+@@ -122,6 +122,8 @@ public final class NativeLibraryLoader {
}
}
}
@@ -21,5 +21,5 @@ diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/
}
--
-1.9.1
+2.5.0
diff --git a/patches/lo-xlate-lang-update.diff b/patches/lo-xlate-lang-update.diff
index ee988b9..b7597f2 100644
--- a/patches/lo-xlate-lang-update.diff
+++ b/patches/lo-xlate-lang-update.diff
@@ -1,5 +1,12 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:26 +0100
+Subject: [PATCH] lo-xlate-lang-update.diff
+
+---
+ bin/lo-xlate-lang | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang
-index c54f379..1580d64 100755
--- a/bin/lo-xlate-lang
+++ b/bin/lo-xlate-lang
@@ -119,7 +119,7 @@ __DATA__
@@ -20,3 +27,6 @@ index c54f379..1580d64 100755
01:en-US:english_american
03:pt:portuguese
07:ru:russian
+--
+2.5.0
+
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 c04fda8..3f28d9f 100644
--- a/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+++ b/patches/lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
@@ -3,6 +3,7 @@ Date: Fri, 21 Mar 2014 14:32:03 +0100
Subject: [PATCH] lp#753627: readd updated Ubuntu brand palette colors
Change-Id: I4720b415ca8cc27713d548f22a5de2bfe8be3074
+
---
extras/Package_palettes.mk | 1 +
extras/source/palettes/ubuntu.soc | 11 +++++++++++
@@ -12,7 +13,7 @@ Change-Id: I4720b415ca8cc27713d548f22a5de2bfe8be3074
diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
-@@ -29,6 +29,7 @@ $(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/
+@@ -29,6 +29,7 @@ $(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,
styles.sod \
tango.soc \
web.soc \
@@ -37,5 +38,5 @@ new file mode 100644
+ <draw:color draw:name="Canonical Aubergine" draw:color="#772953"/>
+</office:color-table>
--
-1.9.1
+2.5.0
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 038b780..2a30f3f 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -1,8 +1,18 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:23 +0100
+Subject: [PATCH] mysqlcppconn-libmysqlclient-SONAME.diff
+
+---
+ external/mysqlcppconn/Library_mysqlcppconn.mk | 4 ++++
+ external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk | 1 +
+ .../patches/mysql-connector-c++-1.1.0-SONAME.patch | 12 ++++++++++++
+ 3 files changed, 17 insertions(+)
+ create mode 100644 external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch
+
diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
-index 1670de8..c5bab4f 100644
--- a/external/mysqlcppconn/Library_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Library_mysqlcppconn.mk
-@@ -80,4 +80,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
+@@ -84,4 +84,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysqlcppconn,\
UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
))
@@ -11,8 +21,21 @@ index 1670de8..c5bab4f 100644
+))
+
# vim: set noet sw=4 ts=4:
---- a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch 2013-02-08 21:20:25.249889678 +0100
-+++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch 2013-02-26 22:48:27.030275718 +0100
+diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+--- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
++++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
+
+ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
+ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
++ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch \
+ external/mysqlcppconn/patches/warnings.patch.0 \
+ external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
+ ))
+diff --git a/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch
+new file mode 100644
+--- /dev/null
++++ b/external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch
@@ -0,0 +1,12 @@
+diff -urNad mysql-connector-c++-1.0.6~r754~/driver/nativeapi/libmysql_dynamic_proxy.cpp mysql-connector-c++-1.0.6~r754/driver/nativeapi/libmysql_dynamic_proxy.cpp
+--- misc/mysql-connector-c++-1.1.0/driver/nativeapi/libmysql_dynamic_proxy.cpp 2009-08-20 16:42:14.000000000 +0200
@@ -26,15 +49,6 @@ index 1670de8..c5bab4f 100644
+ #endif
+
+ template<typename FunctionType>
-diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
-index 3f86236..f75b60a 100644
---- a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
-+++ b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
-@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
-
- $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
- external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
-+ external/mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch \
- external/mysqlcppconn/patches/warnings.patch.0 \
- external/mysqlcppconn/patches/enable-libmysql-proxy.patch \
- ))
+--
+2.5.0
+
diff --git a/patches/odk-no-dot.diff b/patches/odk-no-dot.diff
index 3d93e76..6dadd4f 100644
--- a/patches/odk-no-dot.diff
+++ b/patches/odk-no-dot.diff
@@ -12,7 +12,7 @@ Change-Id: If5404c0946695beb4c50c0bc3f51627af4e2757a
diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
--- a/odk/docs/cpp/Doxyfile
+++ b/odk/docs/cpp/Doxyfile
-@@ -29,6 +29,8 @@ HTML_OUTPUT = .
+@@ -30,6 +30,8 @@ HTML_TIMESTAMP = NO
GENERATE_LATEX = NO
@@ -24,7 +24,7 @@ diff --git a/odk/docs/cpp/Doxyfile b/odk/docs/cpp/Doxyfile
diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
--- a/odk/docs/idl/Doxyfile
+++ b/odk/docs/idl/Doxyfile
-@@ -17,6 +17,8 @@ GENERATE_HTML = YES
+@@ -18,6 +18,8 @@ HTML_OUTPUT = .
HTML_TIMESTAMP = NO
GENERATE_LATEX = NO
@@ -34,5 +34,5 @@ diff --git a/odk/docs/idl/Doxyfile b/odk/docs/idl/Doxyfile
WARNINGS = YES
WARN_IF_DOC_ERROR = YES
--
-1.9.1
+2.5.0
diff --git a/patches/reportdesign-mention-package.diff b/patches/reportdesign-mention-package.diff
index f07ee58..34359bb 100644
--- a/patches/reportdesign-mention-package.diff
+++ b/patches/reportdesign-mention-package.diff
@@ -11,7 +11,7 @@ Change-Id: I10985231448e24fe18f5d9fb6536c171aaf65c59
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
-@@ -85,7 +85,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
+@@ -82,7 +82,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS
String RID_STR_EXTENSION_NOT_PRESENT
{
// #i96130# use hard coded name
@@ -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: */
--
-1.9.1
+2.5.0
diff --git a/patches/rsc-no-error-about-unknown-switch.diff b/patches/rsc-no-error-about-unknown-switch.diff
index d8b839d..1f76a91 100644
--- a/patches/rsc-no-error-about-unknown-switch.diff
+++ b/patches/rsc-no-error-about-unknown-switch.diff
@@ -1,5 +1,12 @@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Fri, 26 Feb 2016 13:05:28 +0100
+Subject: [PATCH] rsc-no-error-about-unknown-switch.diff
+
+---
+ rsc/source/parser/erscerr.cxx | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
-index c5a9fd7..62aa8ab 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -389,7 +389,7 @@ void RscError::Error( const ERRTYPE& rError, RscTop * pClass,
@@ -21,3 +28,6 @@ index c5a9fd7..62aa8ab 100644
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+--
+2.5.0
+
diff --git a/patches/series b/patches/series
index 850e04c..7767520 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,3 @@ rsc-no-error-about-unknown-switch.diff
disable-npapi-plugin-support.diff
lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
integraltrans.diff
-ScValidationDlg.diff
--
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