[csw-devel] SF.net SVN: gar:[6281] csw/mgar/pkg/firefox/trunk
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Sat Sep 12 17:04:59 CEST 2009
Revision: 6281
http://gar.svn.sourceforge.net/gar/?rev=6281&view=rev
Author: wbonnet
Date: 2009-09-12 15:04:59 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
Upgrade to 3.0.14
Modified Paths:
--------------
csw/mgar/pkg/firefox/trunk/Makefile
csw/mgar/pkg/firefox/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff
csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff
csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff
csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff
csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff
Modified: csw/mgar/pkg/firefox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/firefox/trunk/Makefile 2009-09-12 01:26:57 UTC (rev 6280)
+++ csw/mgar/pkg/firefox/trunk/Makefile 2009-09-12 15:04:59 UTC (rev 6281)
@@ -34,6 +34,7 @@
REQUIRED_PKGS_CSWfirefox += CSWlibx11
REQUIRED_PKGS_CSWfirefox += CSWlibxrender
REQUIRED_PKGS_CSWfirefox += CSWpango
+REQUIRED_PKGS_CSWfirefox += CSWzlib
REQUIRED_PKGS_CSWfirefox += CSWsqlite3rt
# Defines the list of patches to be applied to the sources
@@ -49,6 +50,11 @@
PATCHFILES += nsNativeApSuportUnix.cpp.diff
PATCHFILES += nsExceptionHandler.cpp.diff
PATCHFILES += SunOS5.mk.diff
+PATCHFILES += nsWildCard.cpp.diff
+PATCHFILES += softoken.manifest.mm.diff
+PATCHFILES += softoken.config.mk.diff
+PATCHFILES += legacydb.manifest.mm.diff
+PATCHFILES += legacydb.config.mk.diff
# pkg-config options
EXTRA_PKG_CONFIG_PATH += /opt/csw/X11/lib/pkgconfig
Modified: csw/mgar/pkg/firefox/trunk/checksums
===================================================================
--- csw/mgar/pkg/firefox/trunk/checksums 2009-09-12 01:26:57 UTC (rev 6280)
+++ csw/mgar/pkg/firefox/trunk/checksums 2009-09-12 15:04:59 UTC (rev 6281)
@@ -5,14 +5,19 @@
45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff
c869762735a41bb30f417e510ccb7f31 download/configure.diff
a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff
-040d01a1e22a1ec1b28188479df06007 download/firefox-3.0.13-source.tar.bz2
+5a075644b1f8d5dbb23525803b6c81dd download/firefox-3.0.14-source.tar.bz2
125a5da522c7b0cc834ba6d97694d162 download/firefox.diff
162d4cf2d198196e94f6878d60dc7a26 download/firefox.dist.bin.diff
a19792f0b67f28c9227d19d069369369 download/jemalloc.c.diff
+b2f4390ca62446743829cf7e23fcbc6c download/legacydb.config.mk.diff
+8b401ae856d5be4b9761444b66acdcd8 download/legacydb.manifest.mm.diff
18b0cdc902caa4172b7f2d473239c9a9 download/md5.h.diff
1a3d61e09378d28d9bc9f3df45a224bc download/nsExceptionHandler.cpp.diff
ca4162516d8c09deaa9f0b6f3b3ecffb download/nsMathUtils.h.diff
d8f7ec0df9f63317ff2d8578d9dbe3ff download/nsNativeApSuportUnix.cpp.diff
f562a935a0fb2c5ad38f95af114d0a49 download/nsPluginsDirUnix.cpp.diff
+28b8272f0d0f49cf650c5acb212c3d4b download/nsWildCard.cpp.diff
d0d942fa0c012abcb2a45b1d0fc99051 download/packager.mk.diff
+25efd55ebf8715e66a28f2b07b25f38a download/softoken.config.mk.diff
+187c192196a8c721ac7ae93466614c95 download/softoken.manifest.mm.diff
29e0ca858fe3aef24d5be1300dc39735 download/solaris_lwp.h.diff
Added: csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/legacydb.config.mk.diff 2009-09-12 15:04:59 UTC (rev 6281)
@@ -0,0 +1,13 @@
+--- firefox.orig/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:48:35.872144730 +0200
++++ firefox/security/nss/lib/softoken/legacydb/config.mk 2009-09-12 16:49:37.894263860 +0200
+@@ -83,6 +83,10 @@
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
++ -L/opt/csw/lib \
++ -R/opt/csw/lib \
++ -L/opt/csw/X11/lib \
++ -R/opt/csw/X11/lib \
+ -L$(DIST)/lib \
+ -lnssutil3 \
+ -L$(NSPR_LIB_DIR) \
Added: csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/legacydb.manifest.mm.diff 2009-09-12 15:04:59 UTC (rev 6281)
@@ -0,0 +1,10 @@
+--- firefox.orig/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:48:43.152291326 +0200
++++ firefox/security/nss/lib/softoken/legacydb/manifest.mn 2009-09-12 16:49:12.293669070 +0200
+@@ -48,6 +48,7 @@
+
+ ifdef MOZILLA_CLIENT
+ INCLUDES += -I$(DIST)/include/sqlite3
++INCLUDES += -I/opt/csw/include
+ endif
+
+ CSRCS = \
Added: csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-09-12 15:04:59 UTC (rev 6281)
@@ -0,0 +1,199 @@
+--- firefox.orig/xpfe/components/filepicker/src/nsWildCard.cpp 2009-09-12 11:39:56.098357687 +0200
++++ firefox/xpfe/components/filepicker/src]nsWildCard.cpp 2009-09-12 16:06:48.580505412 +0200
+@@ -57,38 +57,34 @@
+
+ typedef int static_assert_character_code_arrangement['a' > 'A' ? 1 : -1];
+
+-template<class T>
+ static int
+-alpha(T c)
++alpha(PRUnichar c)
+ {
+ return ('a' <= c && c <= 'z') ||
+ ('A' <= c && c <= 'Z');
+ }
+
+-template<class T>
+ static int
+-alphanumeric(T c)
++alphanumeric(PRUnichar c)
+ {
+ return ('0' <= c && c <= '9') || alpha(c);
+ }
+
+-template<class T>
+ static int
+-lower(T c)
++lower(PRUnichar c)
+ {
+ return ('A' <= c && c <= 'Z') ? c + ('a' - 'A') : c;
+ }
+
+-template<class T>
+ static int
+-upper(T c)
++upper(PRUnichar c)
+ {
+ return ('a' <= c && c <= 'z') ? c - ('a' - 'A') : c;
+ }
+
+ /* ----------------------------- _valid_subexp ---------------------------- */
+
+-template<class T>
++template<typename T>
+ static int
+ _valid_subexp(const T *expr, T stop1, T stop2)
+ {
+@@ -162,7 +158,7 @@
+ }
+
+
+-template<class T>
++template<typename T>
+ int
+ NS_WildCardValid_(const T *expr)
+ {
+@@ -183,9 +179,8 @@
+ #define NOMATCH 1
+ #define ABORTED -1
+
+-template<class T>
+ static int
+-_shexp_match(const T *str, const T *expr, PRBool case_insensitive, unsigned int level);
++_shexp_match(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive, unsigned int level);
+
+ /**
+ * Count characters until we reach a NUL character or either of the
+@@ -196,9 +191,8 @@
+ * Return index in input string of first stop found, or ABORTED if not found.
+ * If "dest" is non-NULL, copy counted characters to it and NUL terminate.
+ */
+-template<class T>
+ static int
+-_scan_and_copy(const T *expr, T stop1, T stop2, T *dest)
++_scan_and_copy(const PRUnichar *expr, PRUnichar stop1, PRUnichar stop2, PRUnichar *dest)
+ {
+ register int sx; /* source index */
+ register char cc;
+@@ -219,7 +213,7 @@
+ }
+ if (dest && sx) {
+ /* Copy all but the closing delimiter. */
+- memcpy(dest, expr, sx * sizeof(T));
++ memcpy(dest, expr, sx * sizeof(PRUnichar));
+ dest[sx] = 0;
+ }
+ return cc ? sx : ABORTED; /* index of closing delimiter */
+@@ -233,36 +227,35 @@
+ * matches the input string. Repeat this until some alternative matches,
+ * or we have an abort.
+ */
+-template<class T>
+ static int
+-_handle_union(const T *str, const T *expr, PRBool case_insensitive,
++_handle_union(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive,
+ unsigned int level)
+ {
+ register int sx; /* source index */
+ int cp; /* source index of closing parenthesis */
+ int count;
+ int ret = NOMATCH;
+- T *e2;
++ PRUnichar *e2;
+
+ /* Find the closing parenthesis that ends this union in the expression */
+- cp = ::_scan_and_copy(expr, T(')'), T('\0'), static_cast<T*>(NULL));
++ cp = ::_scan_and_copy(expr, PRUnichar(')'), PRUnichar('\0'), static_cast<PRUnichar*>(NULL));
+ if (cp == ABORTED || cp < 4) /* must be at least "(a|b" before ')' */
+ return ABORTED;
+ ++cp; /* now index of char after closing parenthesis */
+- e2 = (T *) NS_Alloc((1 + nsCharTraits<T>::length(expr)) * sizeof(T));
++ e2 = (PRUnichar *) NS_Alloc((1 + nsCharTraits<PRUnichar>::length(expr)) * sizeof(PRUnichar));
+ if (!e2)
+ return ABORTED;
+ for (sx = 1; ; ++sx) {
+ /* Here, expr[sx] is one character past the preceeding '(' or '|'. */
+ /* Copy everything up to the next delimiter to e2 */
+- count = ::_scan_and_copy(expr + sx, T(')'), T('|'), e2);
++ count = ::_scan_and_copy(expr + sx, PRUnichar(')'), PRUnichar('|'), e2);
+ if (count == ABORTED || !count) {
+ ret = ABORTED;
+ break;
+ }
+ sx += count;
+ /* Append everything after closing parenthesis to e2. This is safe. */
+- nsCharTraits<T>::copy(e2 + count, expr + cp, nsCharTraits<T>::length(expr + cp) + 1);
++ nsCharTraits<PRUnichar>::copy(e2 + count, expr + cp, nsCharTraits<PRUnichar>::length(expr + cp) + 1);
+ ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
+ if (ret != NOMATCH || !expr[sx] || expr[sx] == ')')
+ break;
+@@ -284,9 +277,8 @@
+ return map[lower(val)];
+ }
+
+-template<class T>
+ static int
+-_shexp_match(const T *str, const T *expr, PRBool case_insensitive,
++_shexp_match(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive,
+ unsigned int level)
+ {
+ register int x; /* input string index */
+@@ -326,7 +318,7 @@
+ else
+ return NOMATCH;
+ case '[': {
+- T start, end = 0;
++ PRUnichar start, end = 0;
+ int i;
+ neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
+ if (neg)
+@@ -342,9 +334,9 @@
+ }
+ if (alphanumeric(end) && expr[i] == ']') {
+ /* This is a range form: a-b */
+- T val = str[x];
++ PRUnichar val = str[x];
+ if (end < start) { /* swap them */
+- T tmp = end;
++ PRUnichar tmp = end;
+ end = start;
+ start = tmp;
+ }
+@@ -405,21 +397,20 @@
+ }
+
+
+-template<class T>
+ static int
+-ns_WildCardMatch(const T *str, const T *xp, PRBool case_insensitive)
++ns_WildCardMatch(const PRUnichar *str, const PRUnichar *xp, PRBool case_insensitive)
+ {
+- T *expr = NULL;
++ PRUnichar *expr = NULL;
+ int x, ret = MATCH;
+
+- if (!nsCharTraits<T>::find(xp, nsCharTraits<T>::length(xp), T('~')))
++ if (!nsCharTraits<PRUnichar>::find(xp, nsCharTraits<PRUnichar>::length(xp), PRUnichar('~')))
+ return _shexp_match(str, xp, case_insensitive, 0);
+
+- expr = (T *) NS_Alloc((nsCharTraits<T>::length(xp) + 1) * sizeof(T));
++ expr = (PRUnichar *) NS_Alloc((nsCharTraits<PRUnichar>::length(xp) + 1) * sizeof(PRUnichar));
+ if(!expr)
+ return NOMATCH;
+
+- x = ::_scan_and_copy(expr, T('~'), T('\0'), static_cast<T*>(NULL));
++ x = ::_scan_and_copy(expr, PRUnichar('~'), PRUnichar('\0'), static_cast<PRUnichar*>(NULL));
+ if (x != ABORTED && expr[x] == '~') {
+ expr[x++] = '\0';
+ ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
+@@ -436,9 +427,8 @@
+ return ret;
+ }
+
+-template<class T>
+ NS_COM int
+-NS_WildCardMatch_(const T *str, const T *expr, PRBool case_insensitive)
++NS_WildCardMatch_(const PRUnichar *str, const PRUnichar *expr, PRBool case_insensitive)
+ {
+ int is_valid = NS_WildCardValid(expr);
+ switch(is_valid) {
Added: csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/softoken.config.mk.diff 2009-09-12 15:04:59 UTC (rev 6281)
@@ -0,0 +1,13 @@
+--- firefox.orig/security/nss/lib/softoken/config.mk 2009-09-12 16:29:40.981589923 +0200
++++ firefox/security/nss/lib/softoken/config.mk 2009-09-12 16:40:15.362584742 +0200
+@@ -84,6 +84,10 @@
+ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
+ # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
+ EXTRA_SHARED_LIBS += \
++ -L/opt/csw/lib \
++ -R/opt/csw/lib \
++ -L/opt/csw/X11/lib \
++ -R/opt/csw/X11/lib \
+ -L$(DIST)/lib \
+ -lnssutil3 \
+ -lsqlite3 \
Added: csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff (rev 0)
+++ csw/mgar/pkg/firefox/trunk/files/softoken.manifest.mm.diff 2009-09-12 15:04:59 UTC (rev 6281)
@@ -0,0 +1,10 @@
+--- firefox.orig/security/nss/lib/softoken/manifest.mm 2009-09-12 16:29:35.109858462 +0200
++++ firefox/security/nss/lib/softoken/manifest.mn 2009-09-12 16:39:33.257884547 +0200
+@@ -49,6 +49,7 @@
+
+ ifdef MOZILLA_CLIENT
+ INCLUDES += -I$(DIST)/include/sqlite3
++INCLUDES += -I/opt/csw/include
+ endif
+
+ EXPORTS = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list