[libreoffice] 02/02: git update; update patches

Rene Engelhard rene at moszumanska.debian.org
Sun Sep 24 08:35:44 UTC 2017 

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 82809884b55c152b7d48cca1dece2f5dbcd48ad0
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Sep 24 10:35:12 2017 +0200

    git update; update patches
---
 changelog                                       |  2 +-
 patches/cppunit-optional.diff                   | 17 ------------
 patches/debian-debug.diff                       | 17 ++++--------
 patches/mysqlcppconn-libmysqlclient-SONAME.diff | 36 ++++++++++++-------------
 4 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/changelog b/changelog
index b3baea5..ead0445 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170911-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170924-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
diff --git a/patches/cppunit-optional.diff b/patches/cppunit-optional.diff
index c806a54..5540d95 100644
--- a/patches/cppunit-optional.diff
+++ b/patches/cppunit-optional.diff
@@ -161,23 +161,6 @@ index a47ca5d4b694..e243e06309f5 100644
  
  ifneq ($(ENABLE_JAVA),)
  $(eval $(call gb_Module_add_targets,unotest,\
-diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
-index 0b862086f5a9..4bbfacf564f8 100644
---- a/writerperfect/Module_writerperfect.mk
-+++ b/writerperfect/Module_writerperfect.mk
-@@ -43,7 +43,12 @@ $(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
- 	CppunitTest_writerperfect_import \
- 	CppunitTest_writerperfect_impress \
- 	CppunitTest_writerperfect_writer \
-+))
-+
-+ifeq ($(ENABLE_CPPUNIT),TRUE)
-+$(eval $(call gb_Module_add_slowcheck_targets,writerperfect,\
- 	Library_wpftqahelper \
- ))
-+endif
- 
- # vim: set noet sw=4 ts=4:
 diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
 index a1b84e175b30..08e4aad24c11 100644
 --- a/testtools/Module_testtools.mk
diff --git a/patches/debian-debug.diff b/patches/debian-debug.diff
index 5f0ba47..e012b07 100644
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@ -2,22 +2,15 @@ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com
 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)
- gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
- 
+@@ -170,6 +170,8 @@ gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
+ ifeq ($(OS),ANDROID)
+ gb_DEBUGINFO_FLAGS=-glldb
  # Clang does not know -ggdb2 or some other options
-+ifeq ($(ENABLE_SYMBOLS),SMALL)
++else ifeq ($(ENABLE_SYMBOLS),SMALL)
 +gb_DEBUGINFO_FLAGS=-g1
-+else
- ifeq ($(HAVE_GCC_GGDB2),TRUE)
+ else ifeq ($(HAVE_GCC_GGDB2),TRUE)
  gb_DEBUGINFO_FLAGS=-ggdb2
  else
- gb_DEBUGINFO_FLAGS=-g2
- endif
-+endif
- 
- ifeq ($(HAVE_GCC_FINLINE_LIMIT),TRUE)
- FINLINE_LIMIT0=-finline-limit=0
 diff --git a/configure.ac b/configure.ac
 index a91de78..1c03b1d 100644
 --- a/configure.ac
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 3091bda..581764f 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -1,18 +1,18 @@
-diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk
+diff --git a/external/mysql-connector-cpp/Library_mysql-connector-cpp.mk b/external/mysql-connector-cpp/Library_mysql-connector-cpp.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,\
- 	UnpackedTarball/mysqlcppconn/driver/nativeapi/mysql_native_statement_wrapper \
+--- a/external/mysql-connector-cpp/Library_mysqlcppconn.mk
++++ b/external/mysql-connector-cpp/Library_mysqlcppconn.mk
+@@ -80,4 +80,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,mysql-connector-cpp,\
+ 	UnpackedTarball/mysql-connector-cpp/driver/nativeapi/mysql_native_statement_wrapper \
  ))
  
-+$(eval $(call gb_Library_add_cflags,mysqlcppconn,\
++$(eval $(call gb_Library_add_cflags,mysql-connector-cpp,\
 +       -DLIBMYSQLCLIENT_SONAME=\"$(shell readlink -f `mysql_config --variable=pkglibdir`/libmysqlclient_r.so | sed -e s/mysqlclient/mysqlclient_r/ | sed -e "s,`mysql_config --variable=pkglibdir`/\(libmysqlclient_r.so.[0-9][0-9]\).*,\\1,")\" \
 +))
 +
  # 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
+--- a/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch	2013-02-08 21:20:25.249889678 +0100
++++ b/external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch	2013-02-26 22:48:27.030275718 +0100
 @@ -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 +26,15 @@ index 1670de8..c5bab4f 100644
 + #endif
 + 
 + template<typename FunctionType>
-diff --git a/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+diff --git a/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk
 index 82a368460747..03d0a8b05057 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_
+--- a/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk
++++ b/external/mysql-connector-cpp/UnpackedTarball_mysql-connector-cpp.mk
+@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysql-connector-cpp,driver/nativeapi/b
  
- $(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 \
- 	external/mysqlcppconn/patches/dynexcspec.patch.0 \
+ $(eval $(call gb_UnpackedTarball_add_patches,mysql-connector-cpp,\
+ 	external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0.patch \
++	external/mysql-connector-cpp/patches/mysql-connector-c++-1.1.0-SONAME.patch \
+ 	external/mysql-connector-cpp/patches/warnings.patch.0 \
+ 	external/mysql-connector-cpp/patches/enable-libmysql-proxy.patch \
+ 	external/mysql-connector-cpp/patches/dynexcspec.patch.0 \

-- 
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