[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.0] 6.0.0 rc3; update patches

[Rene Engelhard]

Rene Engelhard pushed to branch debian-experimental-6.0 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
34660300 by Rene Engelhard at 2018-01-24T20:42:04+00:00
6.0.0 rc3; update patches

- - - - -


3 changed files:

- changelog
- patches/disable-flaky-tests.diff
- patches/disable-tests-somehow-needing-more-fonts.diff


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,11 +1,13 @@
-libreoffice (1:6.0.0~rc2-2) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc3-1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate
 
   * debian/patches/apparmor-fixes.diff: add patch from master with syntax
     fixes. Also include X abstractions and allow .mozilla/firefox/** reading
   * debian/patches/apparmor-updates.diff: more gpg stuff: gpg(sm), .gnupg/*
   (both together closes: #887593)
 
- -- Rene Engelhard <rene at debian.org>  Thu, 11 Jan 2018 23:05:44 +0100
+ -- Rene Engelhard <rene at debian.org>  Wed, 24 Jan 2018 20:40:49 +0000
 
 libreoffice (1:6.0.0~rc2-1) experimental; urgency=medium
 


=====================================
patches/disable-flaky-tests.diff
=====================================
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -209,6 +209,6 @@ index 4d65beeb90c4..f3d71501c41a 100644
  
 -}
 +}*/
- // tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
- 
- CPPUNIT_PLUGIN_IMPLEMENT();
+
+ DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
+ {


=====================================
patches/disable-tests-somehow-needing-more-fonts.diff
=====================================
--- a/patches/disable-tests-somehow-needing-more-fonts.diff
+++ b/patches/disable-tests-somehow-needing-more-fonts.diff
@@ -71,18 +71,18 @@ index 0398e15e6ebe..cbfc0955842a 100644
      void testTdf113790();
 -    void testTdf114306();
 +//    void testTdf114306();
+     void testTdf114536();
  
      CPPUNIT_TEST_SUITE(SwUiWriterTest);
-     CPPUNIT_TEST(testReplaceForward);
-@@ -456,7 +456,7 @@ public:
+@@ -457,7 +457,7 @@ public:
      CPPUNIT_TEST(testTdf99689TableOfFigures);
      CPPUNIT_TEST(testTdf99689TableOfTables);
      CPPUNIT_TEST(testTdf113790);
 -    CPPUNIT_TEST(testTdf114306);
 +//    CPPUNIT_TEST(testTdf114306);
+     CPPUNIT_TEST(testTdf114536);
      CPPUNIT_TEST_SUITE_END();
  
- private:
 @@ -5242,7 +5242,7 @@ void SwUiWriterTest::testTdf112025()
      CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
  }



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/34660300d5f244d6b9ab3b1d382864abd09f91ed

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/34660300d5f244d6b9ab3b1d382864abd09f91ed
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180124/49505334/attachment-0001.html>