diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-14 19:49:37 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-04-14 19:49:37 +0000 |
commit | 9f60ac7db7d52fb4e20b70a3e6ada9757656468d (patch) | |
tree | 3dc8531528f82ac4646df697d88b1297614192fc /www/mozilla-devel | |
parent | Do not enable -O2 optimization by default. Instead, allow the user (diff) |
* Sync recent CONFIGURE_ARGS and optimization changes with www/mozilla
* Add patch to prevent crashing with non-Xft fonts
* Depend on libIDL instead of ORBit2
Obtained from: www/mozilla
Notes
Notes:
svn path=/head/; revision=78978
Diffstat (limited to 'www/mozilla-devel')
-rw-r--r-- | www/mozilla-devel/Makefile | 18 | ||||
-rw-r--r-- | www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp | 55 |
2 files changed, 68 insertions, 5 deletions
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile index e801dafc5525..100141bf4843 100644 --- a/www/mozilla-devel/Makefile +++ b/www/mozilla-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME?= mozilla PORTVERSION= 1.4a +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ @@ -31,7 +32,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} MOZILLA?= mozilla-devel .if defined(WITH_GTK2) -USE_GNOME= gtk20 orbit2 +USE_GNOME= gtk20 libidl .else USE_GNOME= gtk12 orbit .endif @@ -72,6 +73,11 @@ CONFIGURE_ARGS= \ --disable-cpp-rtti \ --enable-crypto \ --disable-debug \ + --disable-debug \ + --disable-gtktest \ + --disable-freetypetest \ + --disable-installer \ + --disable-glibtest \ --enable-double-buffer \ --enable-mathml \ --disable-md \ @@ -149,12 +155,14 @@ ALL_TARGET= default CONFIGURE_ARGS+= --enable-reorder .endif -.if !defined(WITHOUT_OPTIMIZE) && ${ARCH} != "alpha" -CFLAGS+= -O2 +.if defined(WITH_OPTIMIZED_CFLAGS) && ${ARCH} != "alpha" +CFLAGS+= -O2 +CONFIGURE_ARGS+= --enable-optimize=-O2 .endif .if ${ARCH} == "alpha" -CFLAGS+= -O0 +CFLAGS+= -O0 +CONFIGURE_ARGS+= --disable-optimize BROKEN= "core dumps on alpha during post-build" .endif @@ -172,7 +180,7 @@ pre-everything:: @${ECHO_MSG} " WITHOUT_LDAP=yes Disables LDAP support within the Mailnews module" @${ECHO_MSG} " WITHOUT_CHATZILLA=yes Disable the Chatzilla IRC module" @${ECHO_MSG} " WITH_JAVASCRIPT_DEBUGGER=yes Enable the DTD and JavaScript debuggers" - @${ECHO_MSG} " WITHOUT_OPTIMIZE=yes Disable -O2 optimization" + @${ECHO_MSG} " WITH_OPTIMIZED_CFLAGS=yes Enable -O2 optimization" @${ECHO_MSG} "" .if defined(WITH_CALENDAR) @${ECHO_MSG} "Calendar is still beta software." diff --git a/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp new file mode 100644 index 000000000000..0071f169c0e2 --- /dev/null +++ b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp @@ -0,0 +1,55 @@ +--- gfx/src/gtk/nsFontMetricsXft.cpp.orig Tue Mar 25 16:13:01 2003 ++++ gfx/src/gtk/nsFontMetricsXft.cpp Mon Apr 14 10:21:18 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,14 +1531,16 @@ + XftFont * + nsFontXft::GetXftFont(void) + { +- if (!mXftFont) { ++ if (!mXftFont && !mNotXft) { + FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName); + if (!pat) + return nsnull; + + mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat); +- if (!mXftFont) ++ if (!mXftFont) { + FcPatternDestroy(pat); ++ mNotXft = 1; ++ } + } + + return mXftFont; |