packages: seamonkey/seamonkey-agent.patch, seamonkey/seamonkey-ldap-with-ns...
baggins
baggins at pld-linux.org
Tue Dec 7 14:05:40 CET 2010
Author: baggins Date: Tue Dec 7 13:05:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated patches to 2.0.10
- removed outdated patches
---- Files affected:
packages/seamonkey:
seamonkey-agent.patch (1.2 -> 1.3) , seamonkey-ldap-with-nss.patch (1.2 -> 1.3) , seamonkey-pld-homepage.patch (1.4 -> 1.5) , seamonkey.spec (1.101 -> 1.102)
---- Diffs:
================================================================
Index: packages/seamonkey/seamonkey-agent.patch
diff -u packages/seamonkey/seamonkey-agent.patch:1.2 packages/seamonkey/seamonkey-agent.patch:1.3
--- packages/seamonkey/seamonkey-agent.patch:1.2 Tue Jun 12 09:05:22 2007
+++ packages/seamonkey/seamonkey-agent.patch Tue Dec 7 14:05:33 2010
@@ -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/seamonkey/seamonkey-ldap-with-nss.patch
diff -u packages/seamonkey/seamonkey-ldap-with-nss.patch:1.2 packages/seamonkey/seamonkey-ldap-with-nss.patch:1.3
--- packages/seamonkey/seamonkey-ldap-with-nss.patch:1.2 Thu Jul 10 23:59:58 2008
+++ packages/seamonkey/seamonkey-ldap-with-nss.patch Tue Dec 7 14:05:33 2010
@@ -7,14 +7,14 @@
- NSS_LIBS="$NSS_LIBS -lcrmf"
+ NSS_LIBS="-lcrmf $NSS_LIBS"
else
- NSS_CFLAGS='-I$(DIST)/public/nss'
- NSS_DEP_LIBS='\\\
+ 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
@@ -27,28 +27,14 @@
- NSS_LIBS="$NSS_LIBS -lcrmf"
+ NSS_LIBS="-lcrmf $NSS_LIBS"
else
- NSS_CFLAGS='-I$(DIST)/public/nss'
- NSS_DEP_LIBS='\\\
+ 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
================================================================
Index: packages/seamonkey/seamonkey-pld-homepage.patch
diff -u packages/seamonkey/seamonkey-pld-homepage.patch:1.4 packages/seamonkey/seamonkey-pld-homepage.patch:1.5
--- packages/seamonkey/seamonkey-pld-homepage.patch:1.4 Fri Feb 8 16:12:39 2008
+++ packages/seamonkey/seamonkey-pld-homepage.patch Tue Dec 7 14:05:33 2010
@@ -1,5 +1,5 @@
---- seamonkey-1.0/xpfe/browser/resources/locale/en-US/region.properties.orig 2005-12-05 13:43:59.000000000 +0100
-+++ seamonkey-1.0/xpfe/browser/resources/locale/en-US/region.properties 2006-02-01 21:09:15.479084500 +0100
+--- seamonkey-1.0/mozilla/browser/locales/en-US/region.properties.orig 2005-12-05 13:43:59.000000000 +0100
++++ seamonkey-1.0/mozilla/browser/locales/en-US/region.properties 2006-02-01 21:09:15.479084500 +0100
@@ -1,5 +1,5 @@
# navigator.properties
-homePageDefault=http://www.mozilla.org/
================================================================
Index: packages/seamonkey/seamonkey.spec
diff -u packages/seamonkey/seamonkey.spec:1.101 packages/seamonkey/seamonkey.spec:1.102
--- packages/seamonkey/seamonkey.spec:1.101 Tue Dec 7 13:00:48 2010
+++ packages/seamonkey/seamonkey.spec Tue Dec 7 14:05:33 2010
@@ -30,9 +30,7 @@
Source6: %{name}-venkman.desktop
Patch0: %{name}-pld-homepage.patch
Patch1: %{name}-ldap-with-nss.patch
-Patch2: %{name}-kill_slim_hidden_def.patch
Patch3: %{name}-lib_path.patch
-Patch4: %{name}-fonts.patch
Patch5: %{name}-ti-agent.patch
Patch6: %{name}-agent.patch
Patch7: %{name}-glueload-fix.patch
@@ -209,17 +207,15 @@
%setup -qc
cd comm-*
tar -C mailnews/extensions -zxf %{SOURCE1}
-%patch0 -p1
+#%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch3 -p1
%if "%{pld_release}" == "ti"
%patch5 -p1
%else
%patch6 -p1
%endif
-%patch7 -p2
+%patch7 -p1
%build
cd mozilla
@@ -772,6 +768,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.102 2010/12/07 13:05:33 baggins
+- updated patches to 2.0.10
+- removed outdated patches
+
Revision 1.101 2010/12/07 12:00:48 baggins
- fetch 2.0.10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/seamonkey/seamonkey-agent.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/seamonkey/seamonkey-ldap-with-nss.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/seamonkey/seamonkey-pld-homepage.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/seamonkey/seamonkey.spec?r1=1.101&r2=1.102&f=u
More information about the pld-cvs-commit
mailing list