summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-24 13:28:04 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-24 13:28:04 +0800
commit40c4f3ac4589fa1214dd1306268d8aaa4b36280b (patch)
tree19f6ac6aa7165bcb2ed0dc71f5ca206aba6c34cc
parentc35285ec99b91d9c27ed71ae9ea67f28283cc390 (diff)
downloadmarcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.tar
marcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.tar.gz
marcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.tar.bz2
marcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.tar.lz
marcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.tar.xz
marcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.tar.zst
marcuscom-ports-40c4f3ac4589fa1214dd1306268d8aaa4b36280b.zip
Workaround a crash that occurs if a11y support is not enabled. The problem
is triggered by a chicken and egg problem between gtk_init() and the spi bridge. This workaround means that an error dialog will not be seen. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7839 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gdm/Makefile3
-rw-r--r--x11/gdm/files/patch-gui_gdmcommon.c18
2 files changed, 20 insertions, 1 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 8d80150b6..0d9c98126 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.44 2006/10/03 13:36:08 ahze Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.46 2006/10/19 01:23:27 marcus Exp $
#
PORTNAME= gdm
PORTVERSION= 2.17.0
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gdm/files/patch-gui_gdmcommon.c b/x11/gdm/files/patch-gui_gdmcommon.c
new file mode 100644
index 000000000..038d07964
--- /dev/null
+++ b/x11/gdm/files/patch-gui_gdmcommon.c
@@ -0,0 +1,18 @@
+--- gui/gdmcommon.c.orig Tue Oct 24 00:47:40 2006
++++ gui/gdmcommon.c Tue Oct 24 00:51:13 2006
+@@ -626,13 +626,14 @@ filter_watch (GdkXEvent *xevent, GdkEven
+ static void
+ error_dialog (void)
+ {
+- GtkWidget *dialog = gtk_message_dialog_new (NULL,
++/* GtkWidget *dialog = gtk_message_dialog_new (NULL,
+ GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Assistive technology support has been requested for this session, but the accessibility registry was not found. Please ensure that the AT-SPI package is installed. Your session has been started without assistive technology support."));
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
++ */
+ }
+
+