[Libreoffice-commits] core.git: external/xmlsec

[Libreoffice Gerrit user]

 external/xmlsec/UnpackedTarball_xmlsec.mk |    2 +
 external/xmlsec/xmlsec1-configure.patch.1 |   16 -----------
 external/xmlsec/xmlsec1-macos.patch.1     |   41 ++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 16 deletions(-)

New commits:
commit d2fda98aae606b4e133582952b5a7699a0733746
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Wed Aug 15 21:55:54 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Thu Aug 16 09:02:27 2018 +0200

    xmlsec: replace macOS configure patch with backport
    
    Change-Id: I5d3b16e09e585607a4261f8435d032d0d2ae4bd9
    Reviewed-on: https://gerrit.libreoffice.org/59146
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 0d33b12584dd..9e861cc394b6 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -13,6 +13,8 @@ xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
 # Backport of <https://github.com/lsh123/xmlsec/pull/192>.
 xmlsec_patches += mscng-fixes.patch.1
+# Backport of <https://github.com/lsh123/xmlsec/pull/197>.
+xmlsec_patches += xmlsec1-macos.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/xmlsec/xmlsec1-configure.patch.1 b/external/xmlsec/xmlsec1-configure.patch.1
index 60d2eb0ccab3..cd009af1cce0 100644
--- a/external/xmlsec/xmlsec1-configure.patch.1
+++ b/external/xmlsec/xmlsec1-configure.patch.1
@@ -93,19 +93,3 @@ index 0689f11b..e7cd5c38 100644
 -- 
 2.16.3
 
-diff --git a/configure.ac b/configure.ac
-index 951b3ebe..b66bdc10 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,7 +165,10 @@ dnl ==========================================================================
- dnl Hack for autoconf version mismatch
- dnl ==========================================================================
- if test "z$shrext" = "z" ; then
--    shrext=$shrext_cmds
-+    AC_MSG_CHECKING(for shared library suffix)
-+    module=no
-+    eval shrext=$shrext_cmds
-+    AC_MSG_RESULT($shrext)
- fi
- 
- dnl ==========================================================================
diff --git a/external/xmlsec/xmlsec1-macos.patch.1 b/external/xmlsec/xmlsec1-macos.patch.1
new file mode 100644
index 000000000000..1740fef65f5f
--- /dev/null
+++ b/external/xmlsec/xmlsec1-macos.patch.1
@@ -0,0 +1,41 @@
+From 9626654fa60825b5dc09a35bdfba6cb53d45e618 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos at vmiklos.hu>
+Date: Mon, 25 Jun 2018 19:49:54 +0200
+Subject: [PATCH] configure: macOS improvement (#197)
+
+* configure: fix shared library suffix on macOS
+
+See <https://lists.gnu.org/archive/html/libtool/2010-04/msg00020.html>,
+shrext_cmds is a command to be evaluated. Linux uses .so for both
+loadable and shared libraries (in terms of libtool), so the problem is
+not visible there, but on macOS this caused configure to literally look
+for
+
+libnspr4`test .$module = .yes && echo .so || echo .dylib`
+
+for the nss backend, while nss provides libnspr4.dylib.
+---
+ configure.ac  |  5 ++++-
+ src/xmldsig.c | 10 +++++-----
+ src/xmlenc.c  |  4 ++--
+ 3 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2eb3f444..2adc625d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -175,7 +175,10 @@ dnl ==========================================================================
+ dnl Hack for autoconf version mismatch
+ dnl ==========================================================================
+ if test "z$shrext" = "z" ; then
+-    shrext=$shrext_cmds
++    AC_MSG_CHECKING(for shared library suffix)
++    module=no
++    eval shrext=$shrext_cmds
++    AC_MSG_RESULT($shrext)
+ fi
+ 
+ dnl ==========================================================================
+-- 
+2.16.4
+