summaryrefslogtreecommitdiff
path: root/www/mozilla-devel/files
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-08-12 16:48:56 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-08-12 16:48:56 +0000
commit2213e9a1d9ccaf87f9cf19a361c8f6e029c9f30b (patch)
tree71eae0caf37a0c62eabe12337597b04cfad23add /www/mozilla-devel/files
parent. Don't override the CFLAGS and CC settings. (diff)
* Add a knob to optionally build XMLTerm [1]
* Add some extra CLI options to the mozilla.sh script [2] * Add a patch to prevent crashes when visiting certain Russian sites [3] * Add a dependency on devel/nspr to avoid problems with Galeon and Epiphany in certain setups [4] PR: 55330 [1] 55412 [2] Submitted by: Alexander Nedotsukov <bland@mail.ru> [1] [2] Sergey Akifyev <asa@gascom.ru> [4] Obtained from: www/mozilla-firebird [3]
Notes
Notes: svn path=/head/; revision=86840
Diffstat (limited to 'www/mozilla-devel/files')
-rw-r--r--www/mozilla-devel/files/mozilla.sh6
-rw-r--r--www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp57
2 files changed, 63 insertions, 0 deletions
diff --git a/www/mozilla-devel/files/mozilla.sh b/www/mozilla-devel/files/mozilla.sh
index bbc7d2568bc6..c839ef1a9ff4 100644
--- a/www/mozilla-devel/files/mozilla.sh
+++ b/www/mozilla-devel/files/mozilla.sh
@@ -7,9 +7,15 @@ LOCATION='new-tab'
cd $MOZILLA_DIR || exit 1
case $1 in
+ -browser)
+ REMOTE_COMMAND="xfeDoCommand (openBrowser)"
+ ;;
-mail)
REMOTE_COMMAND="xfeDoCommand (openInbox)"
;;
+ -compose)
+ REMOTE_COMMAND="xfeDoCommand (composeMessage)"
+ ;;
-*)
exec ./$MOZILLA_EXEC "$@"
;;
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..0b0e08247101
--- /dev/null
+++ b/www/mozilla-devel/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
@@ -0,0 +1,57 @@
+--- gfx/src/gtk/nsFontMetricsXft.cpp.save Thu Aug 7 12:14:49 2003
++++ gfx/src/gtk/nsFontMetricsXft.cpp Thu Aug 7 12:33:45 2003
+@@ -106,6 +106,7 @@
+ FcPattern *mPattern;
+ FcPattern *mFontName;
+ FcCharSet *mCharset;
++ int mNotXft;
+ };
+
+ class nsFontXftInfo;
+@@ -1051,7 +1052,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 (font->HasChar(PRUint32(aChar)))
++ if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
+ return font;
+ }
+
+@@ -1492,7 +1493,7 @@
+ // this character.
+ for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
+ font = (nsFontXft *)mLoadedFonts.ElementAt(j);
+- if (font->HasChar(c)) {
++ if (font->HasChar(c) && font->GetXftFont()) {
+ currFont = font;
+ goto FoundFont; // for speed -- avoid "if" statement
+ }
+@@ -1922,6 +1923,7 @@
+ FcPatternReference(mFontName);
+
+ mXftFont = nsnull;
++ mNotXft = 0;
+
+ // set up our charset
+ mCharset = nsnull;
+@@ -1948,7 +1950,7 @@
+ XftFont *
+ nsFontXft::GetXftFont(void)
+ {
+- if (!mXftFont) {
++ if (!mXftFont && !mNotXft) {
+ FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
+ if (!pat)
+ return nsnull;
+@@ -1967,8 +1969,10 @@
+ FcPatternDel(pat, FC_SPACING);
+
+ mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
+- if (!mXftFont)
++ if (!mXftFont) {
+ FcPatternDestroy(pat);
++ mNotXft = 1;
++ }
+ }
+
+ return mXftFont;