[csw-devel] SF.net SVN: gar:[7399] csw/mgar/pkg/firefox/trunk
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Mon Nov 23 23:54:13 CET 2009
Revision: 7399
http://gar.svn.sourceforge.net/gar/?rev=7399&view=rev
Author: wbonnet
Date: 2009-11-23 22:54:13 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
Upgrade to 3.0.15
Modified Paths:
--------------
csw/mgar/pkg/firefox/trunk/Makefile
csw/mgar/pkg/firefox/trunk/checksums
csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff
Modified: csw/mgar/pkg/firefox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/firefox/trunk/Makefile 2009-11-23 22:31:19 UTC (rev 7398)
+++ csw/mgar/pkg/firefox/trunk/Makefile 2009-11-23 22:54:13 UTC (rev 7399)
@@ -1,5 +1,5 @@
GARNAME = firefox
-GARVERSION = 3.0.14
+GARVERSION = 3.0.15
CATEGORIES = x11
DISTNAME = $(GARNAME)
@@ -20,6 +20,8 @@
CATALOGNAME_CSWfirefox = $(GARNAME)
SPKG_DESC_CSWfirefox = $(DESCRIPTION)
+PREREQUISITE_PKGS = CSWgtk2devel CSWlibdbusdev CSWdbusglibdev CSWsqlite3devel CSWkbproto CSWrenderproto
+
REQUIRED_PKGS_CSWfirefox = CSWdbusglib
REQUIRED_PKGS_CSWfirefox += CSWfconfig
REQUIRED_PKGS_CSWfirefox += CSWftype2
@@ -84,9 +86,9 @@
WORK_INSTALL = $(WORKROOTDIR)/install-$(firstword $(MODULATIONS))
post-extract:
- @mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD)
- @cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc
- @$(MAKECOOKIE)
+ mv $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))/mozilla $(WORK_BUILD)
+ cp $(FILEDIR)/stdbool.h $(WORK_BUILD)/memory/jemalloc
+ $(MAKECOOKIE)
pre-configure-modulated:
@cp $(FILEDIR)/.mozconfig $(WORK_BUILD)/.mozconfig
@@ -95,8 +97,8 @@
@grep openwin $(WORKSRC)/config/autoconf.mk && gpatch -d$(WORKSRC) --forward -p1 -F2 < download/autoconf.mk.diff || true
pre-install-modulated:
- @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < download/firefox.diff
- @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < download/firefox.dist.bin.diff
+ @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/browser/app/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.diff
+ @grep "LD_LIBRARY_PATH=.LD_LIBRARY_PATH:/usr/lib/lwp" $(WORKSRC)/dist/bin/firefox || gpatch -d$(WORKSRC) --forward -p1 -F2 < $(FILEDIR)/firefox.dist.bin.diff
( if [ ! -d $(WORK_INSTALL)/opt/csw/bin ] ; then mkdir -p $(WORK_INSTALL)/opt/csw/bin ; fi )
( cd $(WORK_INSTALL)/opt/csw/bin ; rm -f firefox ; ln -sf ../mozilla/firefox/bin/firefox . )
( mkdir -p $(WORK_INSTALL)/opt/csw/share/pixmaps )
Modified: csw/mgar/pkg/firefox/trunk/checksums
===================================================================
--- csw/mgar/pkg/firefox/trunk/checksums 2009-11-23 22:31:19 UTC (rev 7398)
+++ csw/mgar/pkg/firefox/trunk/checksums 2009-11-23 22:54:13 UTC (rev 7399)
@@ -1,23 +1,23 @@
-f9c7fb69080051172bd7357370731ba3 download/CSWfirefox.postinstall
-6ede39c29b3672fb1fc1d8fe397a7863 download/CSWfirefox.postremove
-9eaa0433fd8d1d7a3b39442b4b4c3e14 download/SunOS5.mk.diff
-03e4d0e627dd508ea895c99c5e7ed184 download/autoconf.mk.diff
-45bba282258a321e5e4f73a742bcc31b download/autoconf.mk.in.diff
-c869762735a41bb30f417e510ccb7f31 download/configure.diff
-a71a4afaabc4d067f30d8fb184fea520 download/file_id.cc.diff
-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
+18e15c50f07ee3252a5ecec68026bfa9 CSWfirefox.postinstall
+e458069bc47dfab03251da4042e99614 CSWfirefox.postremove
+9eaa0433fd8d1d7a3b39442b4b4c3e14 SunOS5.mk.diff
+03e4d0e627dd508ea895c99c5e7ed184 autoconf.mk.diff
+45bba282258a321e5e4f73a742bcc31b autoconf.mk.in.diff
+c869762735a41bb30f417e510ccb7f31 configure.diff
+a71a4afaabc4d067f30d8fb184fea520 file_id.cc.diff
+e28e30d74c1488c8a8e2ff8cd2c37439 firefox-3.0.15-source.tar.bz2
+125a5da522c7b0cc834ba6d97694d162 firefox.diff
+162d4cf2d198196e94f6878d60dc7a26 firefox.dist.bin.diff
+a19792f0b67f28c9227d19d069369369 jemalloc.c.diff
+b2f4390ca62446743829cf7e23fcbc6c legacydb.config.mk.diff
+8b401ae856d5be4b9761444b66acdcd8 legacydb.manifest.mm.diff
+18b0cdc902caa4172b7f2d473239c9a9 md5.h.diff
+1a3d61e09378d28d9bc9f3df45a224bc nsExceptionHandler.cpp.diff
+ca4162516d8c09deaa9f0b6f3b3ecffb nsMathUtils.h.diff
+d8f7ec0df9f63317ff2d8578d9dbe3ff nsNativeApSuportUnix.cpp.diff
+f562a935a0fb2c5ad38f95af114d0a49 nsPluginsDirUnix.cpp.diff
+32a26e077d300d4f3ae135a778e43525 nsWildCard.cpp.diff
+d0d942fa0c012abcb2a45b1d0fc99051 packager.mk.diff
+25efd55ebf8715e66a28f2b07b25f38a softoken.config.mk.diff
+187c192196a8c721ac7ae93466614c95 softoken.manifest.mm.diff
+29e0ca858fe3aef24d5be1300dc39735 solaris_lwp.h.diff
Modified: csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff
===================================================================
--- csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-11-23 22:31:19 UTC (rev 7398)
+++ csw/mgar/pkg/firefox/trunk/files/nsWildCard.cpp.diff 2009-11-23 22:54:13 UTC (rev 7399)
@@ -1,6 +1,6 @@
--- 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 @@
++++ firefox/xpfe/components/filepicker/src/nsWildCard.cpp 2009-09-12 16:06:48.580505412 +0200
+@@ -57,40 +57,35 @@
typedef int static_assert_character_code_arrangement['a' > 'A' ? 1 : -1];
@@ -40,20 +40,36 @@
/* ----------------------------- _valid_subexp ---------------------------- */
-template<class T>
-+template<typename T>
static int
- _valid_subexp(const T *expr, T stop1, T stop2)
+-_valid_subexp(const T *expr, T stop1, T stop2)
++_valid_subexp(const PRUnichar *expr, PRUnichar stop1, PRUnichar stop2)
{
-@@ -162,7 +158,7 @@
+ register int x;
+ int nsc = 0; /* Number of special characters */
+@@ -132,7 +127,7 @@
+ return INVALID_SXP;
+ np = -1;
+ do {
+- int t = ::_valid_subexp(&expr[++x], T(')'), T('|'));
++ int t = ::_valid_subexp(&expr[++x], PRUnichar(')'), PRUnichar('|'));
+ if(t == 0 || t == INVALID_SXP)
+ return INVALID_SXP;
+ x+=t;
+@@ -162,11 +157,10 @@
}
-template<class T>
-+template<typename T>
int
- NS_WildCardValid_(const T *expr)
+-NS_WildCardValid_(const T *expr)
++NS_WildCardValid_(const PRUnichar *expr)
{
-@@ -183,9 +179,8 @@
+- int x = ::_valid_subexp(expr, T('\0'), T('\0'));
++ int x = ::_valid_subexp(expr, PRUnichar('\0'), PRUnichar('\0'));
+ return (x < 0 ? x : VALID_SXP);
+ }
+
+@@ -183,9 +177,8 @@
#define NOMATCH 1
#define ABORTED -1
@@ -64,7 +80,7 @@
/**
* Count characters until we reach a NUL character or either of the
-@@ -196,9 +191,8 @@
+@@ -196,9 +189,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.
*/
@@ -75,7 +91,7 @@
{
register int sx; /* source index */
register char cc;
-@@ -219,7 +213,7 @@
+@@ -219,7 +211,7 @@
}
if (dest && sx) {
/* Copy all but the closing delimiter. */
@@ -84,7 +100,7 @@
dest[sx] = 0;
}
return cc ? sx : ABORTED; /* index of closing delimiter */
-@@ -233,36 +227,35 @@
+@@ -233,36 +225,35 @@
* matches the input string. Repeat this until some alternative matches,
* or we have an abort.
*/
@@ -127,7 +143,7 @@
ret = ::_shexp_match(str, e2, case_insensitive, level + 1);
if (ret != NOMATCH || !expr[sx] || expr[sx] == ')')
break;
-@@ -284,9 +277,8 @@
+@@ -284,9 +275,8 @@
return map[lower(val)];
}
@@ -138,7 +154,7 @@
unsigned int level)
{
register int x; /* input string index */
-@@ -326,7 +318,7 @@
+@@ -326,7 +316,7 @@
else
return NOMATCH;
case '[': {
@@ -147,7 +163,7 @@
int i;
neg = ((expr[++y] == '^') && (expr[y+1] != ']'));
if (neg)
-@@ -342,9 +334,9 @@
+@@ -342,9 +332,9 @@
}
if (alphanumeric(end) && expr[i] == ']') {
/* This is a range form: a-b */
@@ -159,7 +175,7 @@
end = start;
start = tmp;
}
-@@ -405,21 +397,20 @@
+@@ -405,22 +395,21 @@
}
@@ -177,7 +193,9 @@
return _shexp_match(str, xp, case_insensitive, 0);
- expr = (T *) NS_Alloc((nsCharTraits<T>::length(xp) + 1) * sizeof(T));
+- memcpy(expr, xp, (nsCharTraits<T>::length(xp) + 1) * sizeof(T));
+ expr = (PRUnichar *) NS_Alloc((nsCharTraits<PRUnichar>::length(xp) + 1) * sizeof(PRUnichar));
++ memcpy(expr, xp, (nsCharTraits<PRUnichar>::length(xp) + 1) * sizeof(PRUnichar));
if(!expr)
return NOMATCH;
@@ -186,7 +204,7 @@
if (x != ABORTED && expr[x] == '~') {
expr[x++] = '\0';
ret = ::_shexp_match(str, &expr[x], case_insensitive, 0);
-@@ -436,9 +427,8 @@
+@@ -437,9 +426,8 @@
return ret;
}
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