[ooo-build-commit] 2 commits - patches/dev300

Petr Mladek pmladek at kemper.freedesktop.org
Thu Oct 29 07:14:25 PDT 2009


 patches/dev300/apply                        |    8 ++-
 patches/dev300/libxmlsec-system-nss-m1.diff |   40 ++++++++++++++++
 patches/dev300/libxmlsec-system-nss.diff    |   70 ++++++++++++++++------------
 patches/dev300/scp2_extensions.diff         |    2 
 4 files changed, 88 insertions(+), 32 deletions(-)

New commits:
commit d8ebc42a489ffefe1ee978b192f39540a41f3f41
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 29 15:13:29 2009 +0100

    Update gdocs extension version also in scp2_extensions.diff
    
    * patches/dev300/scp2_extensions.diff: update gdocs version

diff --git a/patches/dev300/scp2_extensions.diff b/patches/dev300/scp2_extensions.diff
index 54364c3..fad1e79 100644
--- a/patches/dev300/scp2_extensions.diff
+++ b/patches/dev300/scp2_extensions.diff
@@ -126,7 +126,7 @@
 +    TXT_FILE_BODY;
 +    Styles = (PACKED);
 +    Dir = gid_Brand_Dir_Share_Extension_Install;
-+    Name = "gdocs_1.8.1_modified.oxt";
++    Name = "gdocs_1.8.2_modified.oxt";
 +End
 +
 +#endif
commit 250247a661aea1d474587d5c7c0033f4529a4bbc
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Oct 29 13:42:46 2009 +0100

    Update libxmlsec-system-nss.diff for ooo320-m2
    
    * patches/dev300/apply:
    * patches/dev300/libxmlsec-system-nss-m1.diff:
    * patches/dev300/libxmlsec-system-nss.diff: update for ooo320-m2

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b7d024e..7423ded 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1070,12 +1070,18 @@ scp2-user-config-ooo3.diff, pmladek
 # Push fonts into the ps stream always
 pushfont-psstream.diff, i#84481, michael
 
-[ BrokenSystemNSS ]
+[ BrokenSystemNSS > ooo320-m1 ]
 
 # fix build with system libnss installed apart from mozilla
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
+[ BrokenSystemNSS <= ooo320-m1 ]
+
+# fix build with system libnss installed apart from mozilla
+# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
+libxmlsec-system-nss-m1.diff, i#69368, n#195272, pmladek
+
 [ BuildBits < ooo320-m2 ]
 novell-win32-agfa-monotype-fonts-m1.diff, tml
 
diff --git a/patches/dev300/libxmlsec-system-nss-m1.diff b/patches/dev300/libxmlsec-system-nss-m1.diff
new file mode 100644
index 0000000..feb9234
--- /dev/null
+++ b/patches/dev300/libxmlsec-system-nss-m1.diff
@@ -0,0 +1,40 @@
+--- /dev/null	2008-06-06 22:36:48.000000000 +0200
++++ libxmlsec/xmlsec1-1.2.6-broken-system-nss.patch	2009-10-09 17:23:18.000000000 +0200
+@@ -0,0 +1,17 @@
++--- misc/xmlsec1-1.2.6/configure.in.old	2009-10-09 17:00:31.000000000 +0200
+++++ misc/build/xmlsec1-1.2.6/configure.in	2009-10-09 17:21:21.000000000 +0200
++@@ -535,12 +535,12 @@ if test "z$with_nss" = "zno" -o "z$with_
++     AC_MSG_RESULT(no)
++     NSS_FOUND="without"
++ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
++-    PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
+++    PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
++ 	[NSS_FOUND=yes],
++ 	[NSS_FOUND=no])
++     AC_MSG_RESULT($NSS_FOUND)
++     if test "z$NSS_FOUND" = "zno" ; then 
++-        PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
+++        PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
++ 	    [NSS_FOUND=yes],
++ 	    [NSS_FOUND=no])
++         AC_MSG_RESULT($NSS_FOUND)
+--- libxmlsec/makefile.mk.old	2009-09-25 00:39:01.000000000 +0200
++++ libxmlsec/makefile.mk	2009-10-09 17:24:42.000000000 +0200
+@@ -49,7 +49,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+ XMLSEC1VERSION=1.2.6
+ 
+ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
+-PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch
++PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch xmlsec1-1.2.6-broken-system-nss.patch
+ 
+ 
+ ADDITIONAL_FILES= \
+@@ -141,7 +141,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
+ 
+ .ENDIF
+ CONFIGURE_DIR=
+-CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
++CONFIGURE_ACTION=autoconf && chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+ CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
+ # system-mozilla needs pkgconfig to get the information about nss
+ # FIXME: This also will enable pkg-config usage for libxml2. It *seems*
diff --git a/patches/dev300/libxmlsec-system-nss.diff b/patches/dev300/libxmlsec-system-nss.diff
index feb9234..34be091 100644
--- a/patches/dev300/libxmlsec-system-nss.diff
+++ b/patches/dev300/libxmlsec-system-nss.diff
@@ -1,40 +1,50 @@
---- /dev/null	2008-06-06 22:36:48.000000000 +0200
-+++ libxmlsec/xmlsec1-1.2.6-broken-system-nss.patch	2009-10-09 17:23:18.000000000 +0200
-@@ -0,0 +1,17 @@
-+--- misc/xmlsec1-1.2.6/configure.in.old	2009-10-09 17:00:31.000000000 +0200
-++++ misc/build/xmlsec1-1.2.6/configure.in	2009-10-09 17:21:21.000000000 +0200
-+@@ -535,12 +535,12 @@ if test "z$with_nss" = "zno" -o "z$with_
-+     AC_MSG_RESULT(no)
-+     NSS_FOUND="without"
-+ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
-+-    PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
-++    PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
-+ 	[NSS_FOUND=yes],
-+ 	[NSS_FOUND=no])
-+     AC_MSG_RESULT($NSS_FOUND)
-+     if test "z$NSS_FOUND" = "zno" ; then 
-+-        PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
-++        PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
-+ 	    [NSS_FOUND=yes],
+--- /dev/null	2007-04-20 17:59:41.000000000 +0200
++++ libxmlsec/xmlsec1-1.2.12-broken-system-nss.patch	2009-10-29 13:35:21.000000000 +0100
+@@ -0,0 +1,26 @@
++--- misc/xmlsec1-1.2.12/configure.in.old	2009-10-29 13:33:02.000000000 +0100
+++++ misc/build/xmlsec1-1.2.12/configure.in	2009-10-29 13:33:32.000000000 +0100
++@@ -539,6 +539,11 @@ elif test "z$with_nss" = "z" -a "z$with_
++     dnl We are going to try all options
++     dnl
++     if test "z$NSS_FOUND" = "zno" ; then
+++        PKG_CHECK_MODULES(NSS, nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION,
+++    	    [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
+++	    [NSS_FOUND=no])
+++    fi
+++    if test "z$NSS_FOUND" = "zno" ; then
++         PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR >= $MOZILLA_MIN_VERSION,
++     	    [NSS_FOUND=yes NSPR_PACKAGE=$MOZ_FLAVOUR-nspr NSS_PACKAGE=$MOZ_FLAVOUR-nss],
 + 	    [NSS_FOUND=no])
-+         AC_MSG_RESULT($NSS_FOUND)
---- libxmlsec/makefile.mk.old	2009-09-25 00:39:01.000000000 +0200
-+++ libxmlsec/makefile.mk	2009-10-09 17:24:42.000000000 +0200
-@@ -49,7 +49,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
- XMLSEC1VERSION=1.2.6
- 
- TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
--PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch
-+PATCH_FILES=$(TARFILE_NAME).patch xmlsec1-1.2.6-mingwport24.patch xmlsec1-1.2.6-broken-system-nss.patch
++@@ -553,11 +558,6 @@ elif test "z$with_nss" = "z" -a "z$with_
++     	    [NSS_FOUND=yes NSPR_PACKAGE=xulrunner-nspr NSS_PACKAGE=xulrunner-nss],
++ 	    [NSS_FOUND=no])
++     fi
++-    if test "z$NSS_FOUND" = "zno" ; then
++-        PKG_CHECK_MODULES(NSS, nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION,
++-    	    [NSS_FOUND=yes NSPR_PACKAGE=nspr NSS_PACKAGE=nss],
++-	    [NSS_FOUND=no])
++-    fi
++ fi
++ 
++ if test "z$NSS_FOUND" = "zno" ; then 
+--- libxmlsec/makefile.mk.old	2009-10-15 14:52:41.000000000 +0200
++++ libxmlsec/makefile.mk	2009-10-28 22:09:40.000000000 +0100
+@@ -65,7 +65,8 @@ PATCH_FILES=\
+    xmlsec1-nssdisablecallbacks.patch \
+    xmlsec1-noverify.patch \
+    xmlsec1-mingw32.patch \
+-   xmlsec1-mingw-keymgr-mscrypto.patch
++   xmlsec1-mingw-keymgr-mscrypto.patch \
++   xmlsec1-1.2.12-broken-system-nss.patch
  
  
  ADDITIONAL_FILES= \
-@@ -141,7 +141,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
+@@ -153,7 +154,7 @@ LDFLAGS:=$(xmlsec_LDFLAGS)
  
  .ENDIF
  CONFIGURE_DIR=
--CONFIGURE_ACTION=chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
-+CONFIGURE_ACTION=autoconf && chmod 777 libxml2-config && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
+-CONFIGURE_ACTION=.$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
++CONFIGURE_ACTION=autoconf && .$/configure ADDCFLAGS="$(xmlsec_CFLAGS)" CPPFLAGS="$(xmlsec_CPPFLAGS)"
  CONFIGURE_FLAGS=--with-pic --disable-shared --with-libxslt=no --with-openssl=no --with-gnutls=no LIBXML2LIB="$(LIBXML2LIB)"
  # system-mozilla needs pkgconfig to get the information about nss
  # FIXME: This also will enable pkg-config usage for libxml2. It *seems*


More information about the ooo-build-commit mailing list