packages: iceape/iceape-agent.patch, iceape/iceape-ldap-with-nss.patch - up...

[baggins]

Author: baggins                      Date: Mon Jun  4 17:08:34 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated from seamonkey package

---- Files affected:
packages/iceape:
   iceape-agent.patch (1.1 -> 1.2) , iceape-ldap-with-nss.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/iceape/iceape-agent.patch
diff -u packages/iceape/iceape-agent.patch:1.1 packages/iceape/iceape-agent.patch:1.2
--- packages/iceape/iceape-agent.patch:1.1	Wed Jun 25 17:39:50 2008
+++ packages/iceape/iceape-agent.patch	Mon Jun  4 19:08:29 2012
@@ -1,5 +1,5 @@
---- mozilla/xpfe/bootstrap/browser-prefs.js.orig	2007-03-21 23:39:25.000000000 +0100
-+++ mozilla/xpfe/bootstrap/browser-prefs.js	2007-03-21 23:39:10.000000000 +0100
+--- mozilla/suite/browser/browser-prefs.js.orig	2007-03-21 23:39:25.000000000 +0100
++++ mozilla/suite/browser/browser-prefs.js	2007-03-21 23:39:10.000000000 +0100
 @@ -61,6 +61,10 @@
  
  #expand pref("general.useragent.extra.__MOZ_APP_NAME__", "__MOZ_APP_DISPLAYNAME__/__MOZ_APP_VERSION__");

================================================================
Index: packages/iceape/iceape-ldap-with-nss.patch
diff -u packages/iceape/iceape-ldap-with-nss.patch:1.1 packages/iceape/iceape-ldap-with-nss.patch:1.2
--- packages/iceape/iceape-ldap-with-nss.patch:1.1	Wed Jun 25 17:39:52 2008
+++ packages/iceape/iceape-ldap-with-nss.patch	Mon Jun  4 19:08:29 2012
@@ -1,36 +1,40 @@
---- seamonkey-1.0/configure.in.orig	2006-01-10 04:11:42.000000000 +0100
-+++ seamonkey-1.0/configure.in	2006-02-01 21:10:12.670658750 +0100
-@@ -7098,7 +7098,7 @@
+--- seamonkey-1.1.10/configure.in.orig	2008-06-16 00:25:32.000000000 +0200
++++ seamonkey-1.1.10/configure.in	2008-07-10 18:30:45.487028766 +0200
+@@ -3746,7 +3746,7 @@
+ fi
+ 
+ if test -n "$MOZ_NATIVE_NSS"; then
+-   NSS_LIBS="$NSS_LIBS -lcrmf"
++   NSS_LIBS="-lcrmf $NSS_LIBS"
+ else
+    NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
+    NSS_DEP_LIBS="\
+@@ -7629,7 +7629,7 @@
          mkdir "directory/c-sdk/ldap"    
      fi
  
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
-+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-nss --with-mozilla"
+-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
++    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-nss --with-mozilla"
      if test -z "$MOZ_DEBUG"; then
          ac_configure_args="$ac_configure_args --disable-debug"
      fi
---- seamonkey-1.0/configure.orig	2006-01-11 06:43:03.000000000 +0100
-+++ seamonkey-1.0/configure	2006-02-01 21:10:17.982990750 +0100
-@@ -20209,7 +20209,7 @@
+--- seamonkey-1.1.10/configure.orig	2008-06-16 00:25:31.000000000 +0200
++++ seamonkey-1.1.10/configure	2008-07-10 18:31:04.379027928 +0200
+@@ -11842,7 +11842,7 @@
+ fi
+ 
+ if test -n "$MOZ_NATIVE_NSS"; then
+-   NSS_LIBS="$NSS_LIBS -lcrmf"
++   NSS_LIBS="-lcrmf $NSS_LIBS"
+ else
+    NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss'
+    NSS_DEP_LIBS="\
+@@ -21195,7 +21195,7 @@
          mkdir "directory/c-sdk/ldap"    
      fi
  
--    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --without-nss --with-mozilla"
-+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --with-dist-prefix=$MOZ_BUILD_ROOT/dist --with-nss --with-mozilla"
+-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --without-nss --with-mozilla"
++    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-dist-prefix=$MOZ_BUILD_ROOT/mozilla/dist --with-nss --with-mozilla"
      if test -z "$MOZ_DEBUG"; then
          ac_configure_args="$ac_configure_args --disable-debug"
      fi
---- mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in.orig	Fri May 17 08:54:00 2002
-+++ mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	Wed Aug 28 11:37:29 2002
-@@ -53,9 +53,8 @@
- LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
- INCLUDES	+= -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
- 		   -I$(DIST)/include \
--		   -I$(DIST)/public/security \
--		   -I$(DIST)/public/nss \
--                   -I$(DIST)/include/nspr
-+		   -I/usr/include/nss \
-+                   -I/usr/include/nspr
- DEFINES		+= $(DEFS)
- 
- PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceape/iceape-agent.patch?r1=1.1&r2=1.2
    http://cvs.pld-linux.org/packages/iceape/iceape-ldap-with-nss.patch?r1=1.1&r2=1.2