don't use xft if no xft fonts is available

stops moz from crashing
This commit is contained in:
wilfried 2004-01-19 14:36:48 +00:00
parent d9d291e583
commit 7cbef7cca1
6 changed files with 27 additions and 15 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2004/01/18 11:47:42 wilfried Exp $
# $OpenBSD: Makefile,v 1.2 2004/01/19 14:36:49 wilfried Exp $
ONLY_FOR_ARCHS= alpha i386 sparc sparc64
@ -79,7 +79,7 @@ post-extract:
pre-configure:
@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g' \
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/mail/app/mozilla.in
do-install:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-mail_app_mozilla_in,v 1.1.1.1 2004/01/18 11:47:42 wilfried Exp $
$OpenBSD: patch-mail_app_mozilla_in,v 1.2 2004/01/19 14:36:49 wilfried Exp $
--- mail/app/mozilla.in.orig 2003-04-05 22:52:38.000000000 +0200
+++ mail/app/mozilla.in 2003-12-12 13:02:18.000000000 +0100
+++ mail/app/mozilla.in 2004-01-19 15:33:25.000000000 +0100
@@ -33,6 +33,7 @@
#set -x
@ -9,11 +9,15 @@ $OpenBSD: patch-mail_app_mozilla_in,v 1.1.1.1 2004/01/18 11:47:42 wilfried Exp $
MRE_HOME=%MREDIR%
# honor MOZILLA_FIVE_HOME if it's there
@@ -111,7 +112,7 @@ do
@@ -111,7 +112,11 @@ do
esac
done
-export MRE_HOME
+if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]
+then export GDK_USE_XFT=0
+fi
+
+export MOZ_PLUGIN_PATH MRE_HOME
eval "set -- $moreargs"
if [ $debugging = 1 ]

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.27 2004/01/18 11:49:41 wilfried Exp $
# $OpenBSD: Makefile,v 1.28 2004/01/19 14:36:48 wilfried Exp $
ONLY_FOR_ARCHS= alpha i386 sparc sparc64
@ -73,7 +73,7 @@ post-extract:
pre-configure:
@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g' \
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/browser/app/mozilla.in
do-install:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-browser_app_mozilla_in,v 1.6 2004/01/18 11:51:10 wilfried Exp $
$OpenBSD: patch-browser_app_mozilla_in,v 1.7 2004/01/19 14:36:48 wilfried Exp $
--- browser/app/mozilla.in.orig 2003-07-26 09:51:05.000000000 +0200
+++ browser/app/mozilla.in 2003-12-12 12:41:31.000000000 +0100
+++ browser/app/mozilla.in 2004-01-19 15:19:46.000000000 +0100
@@ -33,6 +33,7 @@
#set -x
@ -9,11 +9,15 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.6 2004/01/18 11:51:10 wilfried Exp $
MRE_HOME=%MREDIR%
# Use run-mozilla.sh in the current dir if it exists
@@ -106,7 +107,7 @@ do
@@ -106,7 +107,11 @@ do
esac
done
-export MRE_HOME
+if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]
+then export GDK_USE_XFT=0
+fi
+
+export MOZ_PLUGIN_PATH MRE_HOME
eval "set -- $moreargs"
if [ $debugging = 1 ]

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.63 2004/01/18 10:48:38 wilfried Exp $
# $OpenBSD: Makefile,v 1.64 2004/01/19 14:36:48 wilfried Exp $
ONLY_FOR_ARCHS= alpha i386 sparc sparc64
@ -79,7 +79,7 @@ post-extract:
pre-configure:
@cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF}
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g' \
@perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \
${WRKSRC}/xpfe/bootstrap/mozilla.in
do-install:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-xpfe_bootstrap_mozilla_in,v 1.4 2004/01/18 10:49:33 wilfried Exp $
$OpenBSD: patch-xpfe_bootstrap_mozilla_in,v 1.5 2004/01/19 14:36:48 wilfried Exp $
--- xpfe/bootstrap/mozilla.in.orig 2002-08-07 13:46:15.000000000 +0200
+++ xpfe/bootstrap/mozilla.in 2003-12-12 15:43:30.000000000 +0100
+++ xpfe/bootstrap/mozilla.in 2004-01-19 15:29:17.000000000 +0100
@@ -33,6 +33,7 @@
#set -x
@ -9,11 +9,15 @@ $OpenBSD: patch-xpfe_bootstrap_mozilla_in,v 1.4 2004/01/18 10:49:33 wilfried Exp
MRE_HOME=%MREDIR%
# honor MOZILLA_FIVE_HOME if it's there
@@ -111,7 +112,7 @@ do
@@ -111,7 +112,11 @@ do
esac
done
-export MRE_HOME
+if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]
+then export GDK_USE_XFT=0
+fi
+
+export MOZ_PLUGIN_PATH MRE_HOME
eval "set -- $moreargs"
if [ $debugging = 1 ]