[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.1] more patch fixes...

Rene Engelhard rene at debian.org
Mon Jan 22 20:48:09 UTC 2018 

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


Commits:
97564737 by Rene Engelhard at 2018-01-22T21:40:37+01:00
more patch fixes...

- - - - -


4 changed files:

- + patches/apparmor-fixes.diff
- patches/disable-flaky-tests.diff
- patches/disable-tests-somehow-needing-more-fonts.diff
- patches/series


Changes:

=====================================
patches/apparmor-fixes.diff
=====================================
--- /dev/null
+++ b/patches/apparmor-fixes.diff
@@ -0,0 +1,24 @@
+diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
+index a365f6297781..d3df2163d1f6 100644
+--- a/sysui/desktop/apparmor/program.soffice.bin
++++ b/sysui/desktop/apparmor/program.soffice.bin
+@@ -63,7 +63,7 @@
+ #include <tunables/global>
+
+ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+-  #include <abstractions/private-files-strict>
++  #include <abstractions/private-files>
+
+   #include <abstractions/audio>
+   #include <abstractions/bash>
+@@ -174,7 +174,9 @@ profile libreoffice-soffice INSTDIR-program/soffice.bin {
+   /usr/share/*-fonts/conf.avail/*.conf  r,
+   /usr/share/fonts-config/conf.avail/*.conf r,
+ 
+-  owner @{HOME}/.mozilla/firefox/** r,
++  owner @{HOME}/.mozilla/firefox/profiles.ini r,
++  owner @{HOME}/.mozilla/firefox/*/secmod.db r,
++  owner @{HOME}/.mozilla/firefox/*/cert8.db r,
+   # there is abstractions/gnupg but that's just for gpg1...
+   profile gpg {
+     #include <abstractions/base>


=====================================
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
@@ -72,8 +72,8 @@ index 0398e15e6ebe..cbfc0955842a 100644
 -    void testTdf114306();
 +//    void testTdf114306();
      void testTdf113481();
- 
-     CPPUNIT_TEST_SUITE(SwUiWriterTest);
+     void testTdf115013();
+     void testTdf114536();
 @@ -464,7 +464,7 @@ public:
      CPPUNIT_TEST(testTdf99689TableOfTables);
      CPPUNIT_TEST(testTdf113790);
@@ -81,8 +81,8 @@ index 0398e15e6ebe..cbfc0955842a 100644
 -    CPPUNIT_TEST(testTdf114306);
 +//    CPPUNIT_TEST(testTdf114306);
      CPPUNIT_TEST(testTdf113481);
-     CPPUNIT_TEST_SUITE_END();
- 
+     CPPUNIT_TEST(testTdf115013);
+     CPPUNIT_TEST(testTdf114536);
 @@ -5242,7 +5242,7 @@ void SwUiWriterTest::testTdf112025()
      CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xStyle, "IsLandscape"));
  }
@@ -98,10 +98,9 @@ index 0398e15e6ebe..cbfc0955842a 100644
      assertXPath(pXmlDoc, "/root/page[2]/body/tab[1]/row[1]/cell[1]/txt", 1);
 -}
 +}*/
- 
- void SwUiWriterTest::testTdf113877()
- {
 
+ // During insert of the document with list inside into the main document inside the list
+ // we should merge both lists into one, when they have the same list properties
 diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
 index c65b1c2f391e..8becb860cc0b 100644
 --- a/editeng/qa/unit/core-test.cxx
@@ -133,15 +132,7 @@ index c65b1c2f391e..8becb860cc0b 100644
      void testConstruction();
  
      /// Test UNO service class that implements text field items.
-@@ -98,7 +92,6 @@ public:
-     DECL_STATIC_LINK( Test, CalcFieldValueHdl, EditFieldInfo*, void );
- 
-     CPPUNIT_TEST_SUITE(Test);
--    CPPUNIT_TEST(testLineSpacing);
-     CPPUNIT_TEST(testConstruction);
-     CPPUNIT_TEST(testUnoTextFields);
-     CPPUNIT_TEST(testAutocorrect);
-@@ -137,91 +130,6 @@ void Test::tearDown()
+@@ -140,91 +140,6 @@ void Test::tearDown()
      test::BootstrapFixture::tearDown();
  }
  
@@ -192,19 +183,19 @@ index c65b1c2f391e..8becb860cc0b 100644
 -
 -    // Force multiple lines
 -    aEditEngine.SetPaperSize(Size(1000, 6000));
--    CPPUNIT_ASSERT_EQUAL((sal_Int32)4, aEditEngine.GetLineCount(0));
+-    CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aEditEngine.GetLineCount(0));
 -
 -    // Assert changes
 -    ParaPortion* pParaPortion = aEditEngine.GetParaPortions()[0];
 -    ContentNode* const pNode = pParaPortion->GetNode();
 -    const SvxLineSpacingItem& rLSItem = pNode->GetContentAttribs().GetItem(EE_PARA_SBL);
 -    CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem.GetInterLineSpaceRule());
--    CPPUNIT_ASSERT_EQUAL((sal_uInt16)60, rLSItem.GetPropLineSpace());
+-    CPPUNIT_ASSERT_EQUAL(sal_uInt16(60), rLSItem.GetPropLineSpace());
 -
 -    // Check the first line
 -    ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0);
--    CPPUNIT_ASSERT_EQUAL((sal_uInt16)122, aInfo.nFirstLineMaxAscent);
--    CPPUNIT_ASSERT_EQUAL((sal_uInt16)153, (sal_uInt16)aEditEngine.GetLineHeight(0));
+-    CPPUNIT_ASSERT_EQUAL(sal_uInt16(122), aInfo.nFirstLineMaxAscent);
+-    CPPUNIT_ASSERT_EQUAL(sal_uInt16(153), static_cast<sal_uInt16>(aEditEngine.GetLineHeight(0)));
 -
 -    // Prepare second case - 150%
 -    std::unique_ptr<SfxItemSet> pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet()));
@@ -222,12 +213,12 @@ index c65b1c2f391e..8becb860cc0b 100644
 -    // Assert changes
 -    const SvxLineSpacingItem& rLSItem2 = pNode->GetContentAttribs().GetItem(EE_PARA_SBL);
 -    CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem2.GetInterLineSpaceRule());
--    CPPUNIT_ASSERT_EQUAL((sal_uInt16)150, rLSItem2.GetPropLineSpace());
+-    CPPUNIT_ASSERT_EQUAL(sal_uInt16(150), rLSItem2.GetPropLineSpace());
 -
 -    // Check the first line
 -    ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0);
--    CPPUNIT_ASSERT_EQUAL((sal_uInt16)269, aInfo2.nFirstLineMaxAscent);
--    CPPUNIT_ASSERT_EQUAL((sal_uInt16)382, (sal_uInt16)aEditEngine.GetLineHeight(0));
+-    CPPUNIT_ASSERT_EQUAL(sal_uInt16(269), aInfo2.nFirstLineMaxAscent);
+-    CPPUNIT_ASSERT_EQUAL(sal_uInt16(382), static_cast<sal_uInt16>(aEditEngine.GetLineHeight(0)));
 -}
 -
  void Test::testConstruction()


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -31,5 +31,6 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 disable-tests-somehow-needing-more-fonts.diff
 tdf108963-test.diff
+apparmor-fixes.diff
 apparmor-complain.diff
 gtk3_kde5.diff



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/975647378c6d34eae6e88a6943dd6a21b40687a6

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/commit/975647378c6d34eae6e88a6943dd6a21b40687a6
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/20180122/f8230e2c/attachment-0001.html>

More information about the Pkg-openoffice-commits mailing list