[libreoffice] 01/02: git update; add libqxp conditionals; update patches
Rene Engelhard
rene at moszumanska.debian.org
Wed Aug 30 19:43:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit 97ecedaf1a0c6fd02a15b34702a553ec1b7305c0
Author: Rene Engelhard <rene at debian.org>
Date: Mon Aug 28 12:30:43 2017 +0200
git update; add libqxp conditionals; update patches
---
changelog | 2 +-
control | 1 +
patches/disable-flaky-tests.diff | 12 ++++++++----
patches/no-openssl.diff | 40 ----------------------------------------
rules | 6 +++++-
5 files changed, 15 insertions(+), 46 deletions(-)
diff --git a/changelog b/changelog
index 749ceb6..d12f5db 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170815-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170828-1) UNRELEASED; urgency=medium
[ Rene Engelhard ]
* New upstream snapshot
diff --git a/control b/control
index def93cc..e682445 100644
--- a/control
+++ b/control
@@ -120,6 +120,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
+ libqxp-dev,
librdf0-dev (>= 1.0.16-2),
librevenge-dev,
libsane-dev,
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index 70cdb31..f4dabfc 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -113,9 +113,9 @@ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexpor
index 54eed4d..78019bd 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
-@@ -1103,28 +1103,28 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
- assertXPath(pXmlDoc, "//w:ind", "start", "1418");
- }
+@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
+
+
-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-{
@@ -131,6 +131,7 @@ index 54eed4d..78019bd 100644
-#ifndef MACOSX /* Retina-related rounding rountrip error
- * hard to smooth out due to the use of string compare
- * instead of number */
+-#if !defined(_WIN32)
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
@@ -138,6 +139,7 @@ index 54eed4d..78019bd 100644
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-#endif
+-#endif
-}
+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
+//{
@@ -153,6 +155,7 @@ index 54eed4d..78019bd 100644
+//#ifndef MACOSX /* Retina-related rounding rountrip error
+// * hard to smooth out due to the use of string compare
+// * instead of number */
++//#if !defined(_WIN32)
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
@@ -160,10 +163,11 @@ index 54eed4d..78019bd 100644
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
+//#endif
++//#endif
+//}
- #endif
+ CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
index 1c3925f..a16f001 100644
--- a/svx/qa/unoapi/svx.sce
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index 21b3472..d58d6fa 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -209,46 +209,6 @@ index 37f3c8f..2167dd2 100644
serf \
zlib \
))
-diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
-index 65b3cfc..8217bc1 100644
---- a/xmlsecurity/Library_xsec_xmlsec.mk
-+++ b/xmlsecurity/Library_xsec_xmlsec.mk
-@@ -126,13 +126,6 @@
- -DXMLSEC_CRYPTO_NSS \
- ))
-
--ifeq ($(OS),ANDROID)
--$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
-- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/openssl/.libs/libxmlsec1-openssl.a \
-- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
--))
--else
--
- ifeq ($(SYSTEM_XMLSEC),)
- $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
- $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \
-@@ -140,8 +133,6 @@
- ))
- endif
-
--endif
--
- $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
- plc4 \
- ))
-diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk
-index 9259f01..a85653f 100644
---- a/external/libxmlsec/ExternalProject_xmlsec.mk
-+++ b/external/libxmlsec/ExternalProject_xmlsec.mk
-@@ -13,8 +13,6 @@ $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
-
- $(eval $(call gb_ExternalProject_use_external,xmlsec,nss3))
-
--$(eval $(call gb_ExternalProject_use_external,xmlsec,openssl))
--
- $(eval $(call gb_ExternalProject_register_targets,xmlsec,\
- build \
- ))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0fc7d25..fe5a208 100644
--- a/RepositoryExternal.mk
diff --git a/rules b/rules
index 7c87346..820654b 100755
--- a/rules
+++ b/rules
@@ -189,6 +189,7 @@ SYSTEM_STUFF += libabw
SYSTEM_STUFF += libpagemaker
SYSTEM_STUFF += libzmf
SYSTEM_STUFF += libstaroffice
+SYSTEM_STUFF += libqxp
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
CAIRO_FONTS_PATCH=y
@@ -680,7 +681,7 @@ endif
# Debian Stretch
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
BUGS=mailto:debian-backports at lists.debian.org
- SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit mdds xmlsec,$(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit mdds xmlsec libqxp,$(SYSTEM_STUFF))
ifeq "$(RUN_MAKE_CHECK)" "y"
SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
endif
@@ -1222,6 +1223,9 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
BUILD_DEPS += , libstaroffice-dev
BUILD_DEPS += , libstaroffice-dev (>= 0.0.3) <!nocheck>
endif
+ ifneq (,$(filter libqxp, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libqxp-dev
+ endif
ifneq (,$(filter libebook, $(SYSTEM_STUFF)))
BUILD_DEPS += , libe-book-dev
BUILD_DEPS += , libe-book-dev (>= 0.1.2) <!nocheck>
--
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