[libreoffice] 01/01: Revert "install LOs fc_local.conf to instdir before make check and remove ww8export-HAVE_MORE_FONTS.diff again"

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 598896e46a2428531464e52f0ba32e1fbab7b372
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Oct 10 21:29:50 2017 +0200

    Revert "install LOs fc_local.conf to instdir before make check and remove ww8export-HAVE_MORE_FONTS.diff again"
    
    This reverts commit 3eb126869552cdfcd29439e9b605dc75d3ee28f6.
---
 changelog                              |  7 +++++++
 patches/series                         |  1 +
 patches/ww8export-HAVE_MORE_FONTS.diff | 22 ++++++++++++++++++++++
 rules                                  |  6 ------
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index b84e7d1..ea0b74a 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.4.2-3) unstable; urgency=medium
+
+  * debian/patches/ww8export-HAVE_MORE_FONTS.diff, debian/rules: revert
+    change of -2. Actually doesn't work. (Did in a testbuild, but...)
+
+ -- Rene Engelhard <rene at debian.org>  Tue, 10 Oct 2017 21:28:41 +0200
+
 libreoffice (1:5.4.2-2) unstable; urgency=medium
 
   * debian/patches/ww8export-HAVE_MORE_FONTS.diff: remove again ...
diff --git a/patches/series b/patches/series
index 58bc856..a78cdf4 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
 stop-shipping-mimelnk-desktop-files.diff
 icu-no-icu-config.diff
+ww8export-HAVE_MORE_FONTS.diff
diff --git a/patches/ww8export-HAVE_MORE_FONTS.diff b/patches/ww8export-HAVE_MORE_FONTS.diff
new file mode 100644
index 0000000..882d876
--- /dev/null
+++ b/patches/ww8export-HAVE_MORE_FONTS.diff
@@ -0,0 +1,22 @@
+--- a/sw/qa/extras/ww8export/ww8export.cxx	2017-05-09 19:53:51.214105419 +0200
++++ b/sw/qa/extras/ww8export/ww8export.cxx	2017-10-08 11:36:36.035930560 +0200
+@@ -1274,14 +1274,17 @@
+ }
+ 
+ #if !defined(MACOSX)
+-#if !TEST_FONTS_MISSING
++// A build with fonts works...
++// The intereresting thing is that this file apparently uses the Liberation
++// fonts which _are_ in Build-Depends, so it should work...
++/*#if !TEST_FONTS_MISSING
+ DECLARE_WW8EXPORT_TEST(testTableKeep, "tdf91083.odt")
+ {
+     //emulate table "keep with next" -do not split table
+     CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), parseDump("/root/page[3]/body/tab[1]/row[2]/cell[1]/txt[1]") );
+     CPPUNIT_ASSERT_EQUAL( OUString("Row 1"), parseDump("/root/page[6]/body/tab[1]/row[2]/cell[1]/txt[1]") );
+ }
+-#endif
++#endif*/
+ #endif
+ 
+ DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins, "tdf76349_textboxMargins.doc")
diff --git a/rules b/rules
index 9519e82..932e9c3 100755
--- a/rules
+++ b/rules
@@ -2038,12 +2038,6 @@ endif
 	export gb_SUPPRESS_TESTS=true; \
 		$(MAKE) check
 
-	# install font config.
-	# some tests (e.g. ww8exports testTableKeep) somewhow need this...
-	# Shouldn't this be done by by fonts-liberation* itself?
-	cp external/more_fonts/fonts/fc_local.conf \
-		instdir/share/fonts/truetype
-
         # and now run them
 	$(IGNORE_MAKE_CHECK_FAILURES)t=`mktemp -q -d`; \
 	cd $(SOURCE_TREE) && \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git