[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-6.1] 7 commits: git update; update no-check-if-root.diff
Rene Engelhard
rene at debian.org
Sat Jan 20 13:31:01 UTC 2018
Rene Engelhard pushed to branch debian-experimental-6.1 at Debian LibreOffice Maintainers / libreoffice / libreoffice
Commits:
8f9bafbb by Rene Engelhard at 2018-01-10T20:47:47+01:00
git update; update no-check-if-root.diff
- - - - -
44d794c9 by Rene Engelhard at 2018-01-10T21:58:15+01:00
also add the new linespacing test to disable-tests-somehow-needing-more-fonts.diff
Reverts upstreams f4a97dff08468027c1d9972815aad5d85d02ce79
- - - - -
8ebf88ce by Rene Engelhard at 2018-01-11T23:06:36+01:00
6.0 rc2
- - - - -
c25cd3d4 by Rene Engelhard at 2018-01-12T08:05:43+01:00
release libreoffice 1:6.0.0~rc2-1
- - - - -
db60fab4 by Rene Engelhard at 2018-01-17T18:38:35+01:00
readd a new apparmor-fixes.diff, backporting 35ad7482af49ab80d348b619b6d420ee170d3e5d from master
- - - - -
eee0097a by Rene Engelhard at 2018-01-18T23:36:57+01:00
add more apparmor fixes/updates (closes: #887593)
- - - - -
5577038f by Rene Engelhard at 2018-01-20T14:30:26+01:00
Merge remote-tracking branch 'origin/debian-experimental-6.0' into debian-experimental-6.1
- - - - -
4 changed files:
- changelog
- control
- patches/apparmor-complain.diff
- patches/disable-tests-somehow-needing-more-fonts.diff
Changes:
=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -17,9 +17,18 @@ libreoffice (1:6.1.0~alpha1~git20180118-1) UNRELEASED; urgency=medium
-- Rene Engelhard <rene at debian.org> Tue, 07 Nov 2017 20:59:01 +0100
-libreoffice (1:6.0.0~rc2~git20180108-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~rc2-2) UNRELEASED; urgency=medium
- * New upstream snapshot
+ * 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
+
+libreoffice (1:6.0.0~rc2-1) experimental; urgency=medium
+
+ * New upstream release candidate
* debian/patches/poppler-0.62.diff: backport from master to fix build with
poppler 0.62
@@ -27,7 +36,7 @@ libreoffice (1:6.0.0~rc2~git20180108-1) UNRELEASED; urgency=medium
* debian/rules:
- rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
- -- Rene Engelhard <rene at debian.org> Mon, 08 Jan 2018 22:44:59 +0100
+ -- Rene Engelhard <rene at debian.org> Thu, 11 Jan 2018 23:05:44 +0100
libreoffice (1:6.0.0~rc1-1) experimental; urgency=medium
=====================================
control
=====================================
--- a/control
+++ b/control
@@ -201,7 +201,7 @@ Build-Conflicts: amd-libopencl1,
Standards-Version: 4.0.1
Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-6.1
Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice
-Bugs: mailto:debian-openoffice at lists.debian.org
+Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
=====================================
patches/apparmor-complain.diff
=====================================
--- a/patches/apparmor-complain.diff
+++ b/patches/apparmor-complain.diff
@@ -9,8 +9,8 @@ index fef54b7ee384..9dde31a63615 100644
-profile libreoffice-oopslash INSTDIR-program/oosplash {
+profile libreoffice-oopslash INSTDIR-program/oosplash flags=(complain) {
#include <abstractions/base>
+ #include <abstractions/X>
- /etc/libreoffice/ r,
diff --git a/sysui/desktop/apparmor/program.soffice.bin b/sysui/desktop/apparmor/program.soffice.bin
index b4baeab8f5ee..7861c9eac9bd 100644
--- a/sysui/desktop/apparmor/program.soffice.bin
=====================================
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
@@ -101,3 +101,135 @@ index 0398e15e6ebe..cbfc0955842a 100644
void SwUiWriterTest::testTdf113877()
{
+
+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
++++ b/editeng/qa/unit/core-test.cxx
+@@ -21,7 +21,6 @@
+ #include <editeng/editeng.hxx>
+ #include <editeng/eeitem.hxx>
+ #include <editeng/editids.hrc>
+-#include <editeng/lspcitem.hxx>
+ #include <editeng/svxacorr.hxx>
+ #include <editeng/unofield.hxx>
+ #include <editeng/wghtitem.hxx>
+@@ -31,8 +30,6 @@
+ #include <editeng/flditem.hxx>
+ #include <editeng/udlnitem.hxx>
+ #include <svl/srchitem.hxx>
+-#include <editeng/fontitem.hxx>
+-#include <editeng/fhgtitem.hxx>
+
+ #include <com/sun/star/text/textfield/Type.hpp>
+
+@@ -51,9 +48,6 @@ public:
+ virtual void setUp() override;
+ virtual void tearDown() override;
+
+- /// Test text portions position when percentage line spacing is set
+- void testLineSpacing();
+-
+ 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()
+ test::BootstrapFixture::tearDown();
+ }
+
+-void Test::testLineSpacing()
+-{
+- // Create EditEngine's instance
+- EditEngine aEditEngine(mpItemPool);
+-
+- if(aEditEngine.GetRefDevice()->GetDPIY() != 96
+- || aEditEngine.GetRefDevice()->GetDPIScaleFactor() != 1.0)
+- return;
+-
+- // Get EditDoc for current EditEngine's instance
+- EditDoc &rDoc = aEditEngine.GetEditDoc();
+-
+- // Initially no text should be there
+- CPPUNIT_ASSERT_EQUAL(sal_uLong(0), rDoc.GetTextLen());
+- CPPUNIT_ASSERT_EQUAL(OUString(), rDoc.GetParaAsString(sal_Int32(0)));
+-
+- // Set initial text
+- OUString aText = "This is multi-line paragraph";
+-
+- sal_Int32 aTextLen = aText.getLength();
+- aEditEngine.SetText(aText);
+-
+- // Assert changes - text insertion
+- CPPUNIT_ASSERT_EQUAL(sal_uLong(aTextLen), rDoc.GetTextLen());
+- CPPUNIT_ASSERT_EQUAL(aText, rDoc.GetParaAsString(sal_Int32(0)));
+-
+- // Get ItemSet for line spacing - 60%
+- std::unique_ptr<SfxItemSet> pSet(new SfxItemSet(aEditEngine.GetEmptyItemSet()));
+- SvxLineSpacingItem aLineSpacing(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
+- aLineSpacing.SetPropLineSpace(60);
+- pSet->Put(aLineSpacing);
+-
+- // Set font
+- SvxFontItem aFont(EE_CHAR_FONTINFO);
+- aFont.SetFamilyName("Liberation Sans");
+- pSet->Put(aFont);
+- SvxFontHeightItem aFontSize(240, 100, EE_CHAR_FONTHEIGHT);
+- pSet->Put(aFontSize);
+-
+- CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(3), pSet->Count());
+-
+- // Select all paragraphs and set spacing
+- ESelection aSelection(0, 0, 0, aTextLen);
+- aEditEngine.QuickSetAttribs(*pSet, aSelection);
+-
+- // Force multiple lines
+- aEditEngine.SetPaperSize(Size(1000, 6000));
+- 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());
+-
+- // 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));
+-
+- // Prepare second case - 150%
+- std::unique_ptr<SfxItemSet> pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet()));
+- SvxLineSpacingItem aLineSpacing2(LINE_SPACE_DEFAULT_HEIGHT, EE_PARA_SBL);
+- aLineSpacing2.SetPropLineSpace(150);
+- pSet2->Put(aLineSpacing2);
+- pSet2->Put(aFont);
+- pSet2->Put(aFontSize);
+-
+- CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(3), pSet2->Count());
+-
+- // Select all paragraphs and set spacing
+- aEditEngine.QuickSetAttribs(*pSet2, aSelection);
+-
+- // 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());
+-
+- // 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));
+-}
+-
+ void Test::testConstruction()
+ {
+ EditEngine aEngine(mpItemPool);
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/7b25dc98e10ac09397b60305954c2f352e34b8df...5577038fc939d4fced33a16c6f8f84d008cc3855
---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/7b25dc98e10ac09397b60305954c2f352e34b8df...5577038fc939d4fced33a16c6f8f84d008cc3855
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/20180120/d106f6bb/attachment-0001.html>
More information about the Pkg-openoffice-commits
mailing list