summaryrefslogtreecommitdiff
path: root/www/mozilla-devel/files
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-14 19:49:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-14 19:49:37 +0000
commit9f60ac7db7d52fb4e20b70a3e6ada9757656468d (patch)
tree3dc8531528f82ac4646df697d88b1297614192fc /www/mozilla-devel/files
parentDo 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/files')
-rw-r--r--www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp55
1 files changed, 55 insertions, 0 deletions
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;