[libreoffice] 02/02: update patches
Rene Engelhard
rene at moszumanska.debian.org
Thu Jun 8 20:46:20 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.
commit adee95ba9b5bf04e1fa4d52a35dccf414d1af64c
Author: Rene Engelhard <rene at debian.org>
Date: Thu Jun 8 05:38:16 2017 +0000
update patches
---
changelog | 2 +-
patches/cppunit-optional.diff | 2 +-
patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 61d8d86..e92ec16 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.5.0~alpha0~git20170606-1) UNRELEASED; urgency=medium
+libreoffice (1:5.5.0~alpha0~git20170608-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/cppunit-optional.diff b/patches/cppunit-optional.diff
index 7a3eb6d..c806a54 100644
--- a/patches/cppunit-optional.diff
+++ b/patches/cppunit-optional.diff
@@ -36,9 +36,9 @@ index 880895e3c00f..a3dab3e00979 100644
export COINMP_LIBS=@COINMP_LIBS@
export ENABLE_COLLADA=@ENABLE_COLLADA@
+export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
- export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
export ENABLE_CUPS=@ENABLE_CUPS@
export ENABLE_CURL=@ENABLE_CURL@
+ export ENABLE_FUZZERS=@ENABLE_FUZZERS@
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index fe9523a7a6e2..719edf8c6252 100644
--- a/sal/Module_sal.mk
diff --git a/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff b/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
index 292c1f0..ac3e87b 100644
--- a/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
+++ b/patches/disable-sc_subsequent_filters_test-with-internal-cppunit.diff
@@ -14,13 +14,13 @@ index ef82147d781b..f737236d40c3 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -53,12 +53,17 @@ endif
- $(eval $(call gb_Module_add_slowcheck_targets,sc, \
CppunitTest_sc_condformats \
CppunitTest_sc_new_cond_format_api \
- CppunitTest_sc_subsequent_filters_test \
CppunitTest_sc_subsequent_export_test \
CppunitTest_sc_html_export_test \
CppunitTest_sc_copypaste \
+ CppunitTest_sc_dataproviders_test \
))
+ifeq ($(SYSTEM_CPPUNIT),TRUE)
--
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