diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-26 00:28:44 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-08-26 00:28:44 +0800 |
| commit | b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55 (patch) | |
| tree | b7dc44bbce3a6fd59e9c7c1d7655850957d39229 /x11-toolkits/gtk20 | |
| parent | 00c861dec4645dab6a444afcbd61f4dca7ad958d (diff) | |
| download | marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.tar marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.tar.gz marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.tar.bz2 marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.tar.lz marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.tar.xz marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.tar.zst marcuscom-ports-b56fb2a10a1020e4a11b3bc5c763ab3bd80b4c55.zip | |
Fix screen resolution initialization issues that were causing vte to lockup.
See http://bugzilla.gnome.org/show_bug.cgi?id=314452 for more details.
Obtained from: Above bug
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4626 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits/gtk20')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 3 | ||||
| -rw-r--r-- | x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c | 50 |
2 files changed, 52 insertions, 1 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 5df485deb..003bc771b 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,11 +3,12 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.67 2005/08/24 07:49:27 ahze Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.68 2005/08/24 19:36:46 mezz Exp $ # PORTNAME= gtk PORTVERSION= 2.8.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \ ftp://ftp.gtk.org/pub/gtk/v2.8/ \ diff --git a/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c b/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c new file mode 100644 index 000000000..6e3382f0e --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gdk_gdkscreen.c @@ -0,0 +1,50 @@ +--- gdk/gdkscreen.c.orig Thu Aug 25 12:09:18 2005 ++++ gdk/gdkscreen.c Thu Aug 25 12:25:31 2005 +@@ -53,14 +53,14 @@ gdk_screen_get_type (void) + static const GTypeInfo object_info = + { + sizeof (GdkScreenClass), +- (GBaseInitFunc) gdk_screen_init, ++ (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) gdk_screen_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (GdkScreen), + 0, /* n_preallocs */ +- (GInstanceInitFunc) NULL, ++ (GInstanceInitFunc) gdk_screen_init_instance, + }; + + object_type = g_type_register_static (G_TYPE_OBJECT, +@@ -101,9 +101,10 @@ gdk_screen_class_init (GdkScreenClass *k + } + + static void +-gdk_screen_init (GdkScreen *screen) ++gdk_screen_init_instance (GTypeInstance *instance, ++ gpointer g_class) + { +- screen->resolution = -1; ++ GDK_SCREEN (instance)->resolution = -1.; + } + + static void +@@ -407,7 +408,7 @@ gdk_screen_set_resolution_libgtk_only (G + if (dpi >= 0) + screen->resolution = dpi; + else +- screen->resolution = -1; ++ screen->resolution = -1.; + } + + /** +@@ -423,7 +424,7 @@ gdk_screen_set_resolution_libgtk_only (G + gdouble + gdk_screen_get_resolution_libgtk_only (GdkScreen *screen) + { +- g_return_val_if_fail (GDK_IS_SCREEN (screen), -1); ++ g_return_val_if_fail (GDK_IS_SCREEN (screen), -1.); + + return screen->resolution; + } |