[libreoffice] 03/03: make patches/system-xmlsec.diff apply on 5.4

Rene Engelhard rene at moszumanska.debian.org
Thu Jun 22 17:38:37 UTC 2017


This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 4d6a52e22e4df14df0fe86ccc77d3cf7dcffee10
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jun 22 19:31:53 2017 +0200

    make patches/system-xmlsec.diff apply on 5.4
---
 patches/system-xmlsec.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/system-xmlsec.diff b/patches/system-xmlsec.diff
index 9247ca0..b11455f 100644
--- a/patches/system-xmlsec.diff
+++ b/patches/system-xmlsec.diff
@@ -171,9 +171,9 @@ index 1b133d4..611240f 100644
 --- a/Repository.mk
 +++ b/Repository.mk
 @@ -917,7 +917,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ 	wizards_basicsrvtools \
+ 	wizards_basicsrvtutorials \
  	wizards_basicusr \
- 	wizards_properties \
- 	wizards_wizardshare \
 -	xmlsec \
  	$(if $(ENABLE_HEADLESS),, \
  		chart2_opengl_shader \
@@ -285,9 +285,9 @@ index d35bc84..41f6d81 100644
  	boost_headers \
  	libxml2 \
 +	xmlsec \
+ 	nss3 \
  ))
  ifneq ($(filter-out WNT MACOSX ANDROID IOS,$(OS)),)
- $(eval $(call gb_Library_use_externals,xsec_xmlsec,\
 @@ -128,12 +132,16 @@ $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
  	$(call gb_UnpackedTarball_get_dir,xmlsec)/src/.libs/libxmlsec1.a \
  ))

-- 
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