summaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-03-17 13:00:09 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-03-17 13:00:09 +0800
commit14a433e67dbc957596cc2b6323a737c5f904fc5a (patch)
tree77c120158b3acd73f1fa0bcd48b1741479f0c13e /www
parentf570e2ba43259b76583daafc5e16f6f024e878d0 (diff)
downloadmarcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.tar
marcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.tar.gz
marcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.tar.bz2
marcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.tar.lz
marcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.tar.xz
marcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.tar.zst
marcuscom-ports-14a433e67dbc957596cc2b6323a737c5f904fc5a.zip
If locale is set to C, and the spell check plug-in is enabled, ephy will
crash. Try to prevent this by trying to load the English dictionary if no other dictionaries could be found. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10760 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
-rw-r--r--www/epiphany/Makefile3
-rw-r--r--www/epiphany/files/patch-lib_ephy-spell-check.c20
2 files changed, 22 insertions, 1 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 49f5262df..9cdfa1e25 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/epiphany/Makefile,v 1.166 2008/03/02 02:27:52 marcus Exp $
+# $MCom: ports/www/epiphany/Makefile,v 1.167 2008/03/10 20:52:02 mezz Exp $
#
PORTNAME= epiphany
PORTVERSION= 2.22.0
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/www/epiphany/files/patch-lib_ephy-spell-check.c b/www/epiphany/files/patch-lib_ephy-spell-check.c
new file mode 100644
index 000000000..bd68a07d9
--- /dev/null
+++ b/www/epiphany/files/patch-lib_ephy-spell-check.c
@@ -0,0 +1,20 @@
+--- lib/ephy-spell-check.c.orig 2008-03-17 00:41:47.000000000 -0400
++++ lib/ephy-spell-check.c 2008-03-17 00:47:22.000000000 -0400
+@@ -69,8 +69,15 @@ ephy_spell_check_init (EphySpellCheck *s
+ priv->dict = enchant_broker_request_dict (priv->broker, *locale);
+ if (priv->dict != NULL) break;
+ }
+- if (priv->dict == NULL)
+- g_warning (enchant_broker_get_error (priv->broker));
++ if (priv->dict == NULL) {
++ g_warning ("No dictionary found for current locale; trying 'en'");
++ priv->dict = enchant_broker_request_dict (priv->broker, "en");
++
++ if (priv->dict == NULL) {
++ g_warning (enchant_broker_get_error (priv->broker));
++ g_warning ("No dictionary found; expect a crash until LANG is properly set");
++ }
++ }
+ }
+
+ static void