[ooo-build-commit] .: 2 commits - libxmlsec/makefile.mk libxmlsec/xmlsec1-configure.patch libxmlsec/xmlsec1-nspr.patch

[Caolán McNamara]

 libxmlsec/makefile.mk             |    3 +--
 libxmlsec/xmlsec1-configure.patch |   18 ++++++++++++++++++
 libxmlsec/xmlsec1-nspr.patch      |   11 -----------
 3 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit c8c748b3e7bffcff2d4555f336667d6876d3d3d2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 20:30:56 2010 +0100

    fix up conflict, merge into configure patch

diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 67dd8a5..b7dff3e 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -65,8 +65,7 @@ PATCH_FILES=\
    xmlsec1-nssmangleciphers.patch \
    xmlsec1-noverify.patch \
    xmlsec1-mingw32.patch \
-   xmlsec1-mingw-keymgr-mscrypto.patch \
-   xmlsec1-nspr.patch
+   xmlsec1-mingw-keymgr-mscrypto.patch
 
 
 ADDITIONAL_FILES= \
diff --git a/libxmlsec/xmlsec1-nspr.patch b/libxmlsec/xmlsec1-nspr.patch
deleted file mode 100644
index 09f7b2f..0000000
--- a/libxmlsec/xmlsec1-nspr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/xmlsec1-1.2.14/configure	2010-09-29 22:51:25.000000000 +0200
-+++ misc/build/xmlsec1-1.2.14/configure	2010-09-29 22:50:42.000000000 +0200
-@@ -13325,7 +13325,7 @@
- 
-     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
-        OLD_CPPFLAGS=$CPPFLAGS
--       CPPFLAGS="$NSS_CFLAGS"
-+       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
commit d492ea7fd94dbe08b91dad1497e0ab306021a063
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 5 15:21:54 2010 +0100

    #i113076# missing includes in configure test

diff --git a/libxmlsec/xmlsec1-configure.patch b/libxmlsec/xmlsec1-configure.patch
index 943ac98..f2f5f4e 100644
--- a/libxmlsec/xmlsec1-configure.patch
+++ b/libxmlsec/xmlsec1-configure.patch
@@ -590,6 +590,15 @@
          	    		if test "z$dir" = "z/usr/lib" ; then
          	    NSS_LIBS="$NSS_LIBS_LIST"
                  else
+@@ -13166,7 +13284,7 @@
+ 
+     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
+        OLD_CPPFLAGS=$CPPFLAGS
+-       CPPFLAGS="$NSS_CFLAGS"
++       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
 @@ -15036,7 +15154,7 @@
  # values after options handling.
  ac_log="
@@ -734,6 +743,15 @@
          	dnl do not add -L/usr/lib because compiler does it anyway
      		if test "z$dir" = "z/usr/lib" ; then
          	    NSS_LIBS="$NSS_LIBS_LIST"
+@@ -738,7 +761,7 @@
+ 
+     if test "z$NSS_INCLUDES_FOUND" = "zyes" -a "z$NSS_LIBS_FOUND" = "zyes" ; then
+        OLD_CPPFLAGS=$CPPFLAGS
+-       CPPFLAGS="$NSS_CFLAGS"
++       CPPFLAGS="$NSS_CFLAGS $NSPR_CFLAGS"
+        AC_EGREP_CPP(yes,[
+           #include <nss.h>
+           #if NSS_VMAJOR >= 3 && NSS_VMINOR >= 2
 --- misc/xmlsec1-1.2.14/win32/Makefile.msvc	2009-06-25 22:53:18.000000000 +0200
 +++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc	2009-10-01 10:28:50.997747312 +0200
 @@ -376,7 +376,7 @@