[libreoffice] 01/03: there's system-xmlsec now

[Rene Engelhard]

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 6e2579982649fce1a077e7e575146d6b967682ae
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 22 16:35:04 2017 +0200

    there's system-xmlsec now
---
 changelog               |  5 ++++-
 patches/no-openssl.diff | 11 ++++++++---
 rules                   |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index ec92cb6..f8eed92 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,10 @@
-libreoffice (1:6.0.0~alpha0~git20170615-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170622-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
+  * debian/rules: add conditional for system-xmlsec. yay. not enabled yet given
+    it needs >= 1.2.24 which is not yet in Debian.
+
  -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 
 libreoffice (1:5.4.0~rc1~git20170616-1) UNRELEASED; urgency=medium
diff --git a/patches/no-openssl.diff b/patches/no-openssl.diff
index 938f252..21b3472 100644
--- a/patches/no-openssl.diff
+++ b/patches/no-openssl.diff
@@ -213,7 +213,7 @@ diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlse
 index 65b3cfc..8217bc1 100644
 --- a/xmlsecurity/Library_xsec_xmlsec.mk
 +++ b/xmlsecurity/Library_xsec_xmlsec.mk
-@@ -105,17 +105,10 @@ $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
+@@ -126,13 +126,6 @@
  	-DXMLSEC_CRYPTO_NSS \
  ))
  
@@ -223,14 +223,19 @@ index 65b3cfc..8217bc1 100644
 -	$(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 \
- 	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
+@@ -140,8 +133,6 @@
  ))
--endif
+ 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
diff --git a/rules b/rules
index 896bc62..ed48c4b 100755
--- a/rules
+++ b/rules
@@ -195,6 +195,7 @@ KDELIBS_MINVER= (>= 4:4.3.4)
 ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
 BUILD_DBGSYM_PACKAGES=y
 endif
+#SYSTEM_STUFF += xmlsec
 
 # this changes the packages' built/contents of packages (-subsequentcheckbase)
 # This is not exactly allowed in policy but it doesn't have real practical difference,
@@ -689,7 +690,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,$(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit mdds xmlsec,$(SYSTEM_STUFF))
   STRETCH_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -849,6 +850,9 @@ ifneq (,$(filter libxml, $(SYSTEM_STUFF)))
 else
        CONFIGURE_FLAGS += --without-system-libxml
 endif
+ifneq (,$(filter xmlsec, $(SYSTEM_STUFF)))
+       BUILD_DEPS += , libxmlsec1-dev (>= 1.2.24)
+endif
 ifneq (,$(filter expat, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libexpat1-dev
 endif

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