mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Update to 0.6.1. This is mainly a bug fix release according to the release

Browse Source 
notes at http://www.mozilla.org/projects/firebird/release-notes.html,
but it went from being based on Mozilla 1.4b to 1.5a.

Note, the master site may be temporary.  The source tarball at
${MASTER_SITE_MOZILLA} was missing some key bits that prevented compilation.
This commit is contained in:
Joe Marcus Clarke 2003-07-29 19:22:12 +00:00
parent 1d88562c21
commit 84361df012
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=85874
60 changed files with 34250 additions and 34470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/firefox-devel/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox-devel/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox-devel/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox-devel/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox-esr/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox-esr/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox-esr/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox-esr/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox-esr/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox-esr/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox10/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox10/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox10/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox10/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox10/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox10/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox15/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox15/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox15/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox15/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox15/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox15/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox3-devel/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox3-devel/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox3-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox3-devel/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox3-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox3-devel/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox35/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox35/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox35/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox35/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox35/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox35/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/firefox36/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/firefox36/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/firefox36/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/firefox36/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/firefox36/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/flock/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/flock/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/flock/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/flock/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/flock/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/flock/pkg-plist
View File

File diff suppressed because it is too large Load Diff

10
www/mozilla-firebird/Makefile
View File

@ -6,11 +6,14 @@
#
PORTNAME= firebird
PORTVERSION= 0.6
PORTVERSION= 0.6.1
CATEGORIES= www
MASTER_SITES= http://komodo.mozilla.org/pub/firebird/releases/${PORTVERSION}/
#MASTER_SITES= ${MASTER_SITE_MOZILLA}
#MASTER_SITE_SUBDIR= firebird/releases/${PORTVERSION}
MASTER_SITES= http://pryan.org/firebird/pryan/
PKGNAMEPREFIX= mozilla-
DISTNAME= MozillaFirebird-${PORTVERSION}-source
#DISTNAME= MozillaFirebird-source-${PORTVERSION}
DISTNAME= MozillaFirebird-${PORTVERSION}-source-pryan
MAINTAINER= gnome@FreeBSD.org
COMMENT= Mozilla Firebird is the next generation browser from the mozilla.org project
@ -31,6 +34,7 @@ USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
HAS_CONFIGURE= yes
ALL_TARGET= default
.if defined(WITH_GTK2)
USE_GNOME= gtk20 libidl

2
www/mozilla-firebird/distinfo
View File

@ -1 +1 @@
MD5 (MozillaFirebird-0.6-source.tar.bz2) = de52dd03f8628724f14f517cd6346755
MD5 (MozillaFirebird-0.6.1-source-pryan.tar.bz2) = 4a29b474067fa7c436b05e944892b840

57
www/mozilla-firebird/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
View File

@ -1,57 +0,0 @@
--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Mon May 12 06:03:28 2003
+++ gfx/src/gtk/nsFontMetricsXft.cpp Sat May 31 11:32:14 2003
@@ -90,6 +90,7 @@
FcPattern *mPattern;
FcPattern *mFontName;
FcCharSet *mCharset;
+ int mNotXft;
};
struct MozXftLangGroup {
@@ -772,7 +773,7 @@
// font in our loaded list that supports the character
for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
- if (FcCharSetHasChar(font->mCharset, aChar))
+ if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
return font;
}
@@ -1194,7 +1195,7 @@
for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
nsFontXft *font;
font = (nsFontXft *)mLoadedFonts.ElementAt(j);
- if (FcCharSetHasChar(font->mCharset, c)) {
+ if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
foundFont = font;
break;
}
@@ -1503,6 +1504,7 @@
FcPatternReference(mFontName);
mXftFont = nsnull;
+ mNotXft = 0;
// set up our charset
mCharset = nsnull;
@@ -1529,7 +1531,7 @@
XftFont *
nsFontXft::GetXftFont(void)
{
- if (!mXftFont) {
+ if (!mXftFont && !mNotXft) {
FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
if (!pat)
return nsnull;
@@ -1548,8 +1550,10 @@
FcPatternDel(pat, FC_SPACING);
mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
- if (!mXftFont)
+ if (!mXftFont) {
FcPatternDestroy(pat);
+ mNotXft = 1;
+ }
}
return mXftFont;

29
www/mozilla-firebird/files/patch-jsfun.c
View File

@ -1,29 +0,0 @@
--- js/src/jsfun.c.orig Fri May 30 20:55:38 2003
+++ js/src/jsfun.c Fri May 30 20:54:24 2003
@@ -1081,7 +1081,7 @@
JSString *atomstr;
char *propname;
JSScopeProperty *sprop;
- jsid userid;
+ uint32 userid;
JSAtom *atom;
uintN i, n, dupflag;
uint32 type;
@@ -1157,7 +1157,7 @@
userid = INT_TO_JSVAL(sprop->shortid);
propname = ATOM_BYTES((JSAtom *)sprop->id);
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
if (mark)
JS_ARENA_RELEASE(&cx->tempPool, mark);
@@ -1173,7 +1173,7 @@
uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT;
if (!JS_XDRUint32(xdr, &type) ||
- !JS_XDRUint32(xdr, (uint32 *)&userid) ||
+ !JS_XDRUint32(xdr, &userid) ||
!JS_XDRCString(xdr, &propname)) {
return JS_FALSE;
}

45
www/mozilla-firebird/files/patch-nsprpub-pr-src-pthreads-ptio.c
View File

@ -1,22 +1,29 @@
Index: nsprpub/pr/src/pthreads/ptio.c
diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
--- nsprpub/pr/src/pthreads/ptio.c.orig Fri Apr 12 03:14:39 2002
+++ nsprpub/pr/src/pthreads/ptio.c Tue Jul 30 18:52:11 2002
@@ -3414,6 +3414,17 @@
--- nsprpub/pr/src/pthreads/ptio.c.orig Tue Jul 8 23:37:46 2003
+++ nsprpub/pr/src/pthreads/ptio.c Wed Jul 23 00:53:15 2003
@@ -3370,7 +3370,7 @@
PR_EXTERN(PRStatus) _pr_push_ipv6toipv4_layer(PRFileDesc *fd);
#if defined(_PR_INET6_PROBE)
PR_EXTERN(PRBool) _pr_ipv6_is_present;
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
static PRBool _pr_ipv6_v6only_on_by_default;
#endif
PR_IMPLEMENT(PRBool) _pr_test_ipv6_socket()
@@ -3385,7 +3385,7 @@
*/
osfd = socket(AF_INET6, SOCK_STREAM, 0);
if (osfd != -1) {
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
/* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option
* is turned on by default, contrary to what RFC 3493, Section
* 5.3 says. So we have to turn it off. Find out whether we
@@ -3452,7 +3452,7 @@
if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
else
{
+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
+ defined(__FreeBSD__) && defined(IPV6_V6ONLY)
+ if (domain == PR_AF_INET6) {
+ int opt = 0;
+ if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
+ &opt, sizeof(opt))) {
+ close(osfd);
+ return NULL;
+ }
+ }
+#endif
fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
if (fd == NULL) close(osfd);
}
-#ifdef DARWIN
+#if defined(DARWIN) || defined(FREEBSD)
if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default)
{
int on = 0;

6729
www/mozilla-firebird/pkg-plist
View File

File diff suppressed because it is too large Load Diff