diff options
| author | hans <hans@pkgsrc.org> | 2012-02-16 20:26:18 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-02-16 20:26:18 +0000 |
| commit | 7413d8afc66ee3e1d0e41d00a28b71143db66a05 (patch) | |
| tree | 4fdfe191a5649f9a8909b667b957575c0c25d187 /x11 | |
| parent | 24db286fcad8ce913022d45a686e388c6975957c (diff) | |
| download | pkgsrc-7413d8afc66ee3e1d0e41d00a28b71143db66a05.tar.gz | |
Fix breakage with newer gtk.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wxGTK24/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK24/patches/patch-src_gtk_menu.cpp | 22 | ||||
| -rw-r--r-- | x11/wxGTK24/patches/patch-src_gtk_settings.cpp | 15 |
3 files changed, 40 insertions, 1 deletions
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo index 7ee7e3b2a8f..ddcc17a9c4c 100644 --- a/x11/wxGTK24/distinfo +++ b/x11/wxGTK24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2011/01/24 09:38:13 wiz Exp $ +$NetBSD: distinfo,v 1.15 2012/02/16 20:26:18 hans Exp $ SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e @@ -20,3 +20,5 @@ SHA1 (patch-an) = a9d276244cac87fa00a3c3338179e68084b72b1d SHA1 (patch-ao) = 3ee66e4bdef6ede5e715fc951f48887e90d0d13a SHA1 (patch-ap) = b1217506bfffe9ed7a282c960a99921c61d76dbd SHA1 (patch-aq) = 72cc09c94ca6911859f3b40f01e13f0f95d07141 +SHA1 (patch-src_gtk_menu.cpp) = ca3ec1f3f797430a1d16ebc391ba88fb4534121e +SHA1 (patch-src_gtk_settings.cpp) = 05d472af6916e41b5fabebcb29f818222cab0406 diff --git a/x11/wxGTK24/patches/patch-src_gtk_menu.cpp b/x11/wxGTK24/patches/patch-src_gtk_menu.cpp new file mode 100644 index 00000000000..ca003b5827a --- /dev/null +++ b/x11/wxGTK24/patches/patch-src_gtk_menu.cpp @@ -0,0 +1,22 @@ +$NetBSD: patch-src_gtk_menu.cpp,v 1.1 2012/02/16 20:26:18 hans Exp $ + +--- src/gtk/menu.cpp.orig 2003-09-21 13:31:57.000000000 +0200 ++++ src/gtk/menu.cpp 2012-01-15 17:43:10.375045952 +0100 +@@ -30,13 +30,13 @@ + #ifdef __WXGTK20__ + #include <glib-object.h> + +- #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o)) +- #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o)) ++ #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g)) ++ #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g)) + #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m) + +- #define ACCEL_OBJECT GObject ++ #define ACCEL_OBJECT GtkWindow + #define ACCEL_OBJECTS(a) (a)->acceleratables +- #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj) ++ #define ACCEL_OBJ_CAST(obj) GTK_WINDOW(obj) + #else // GTK+ 1.x + #define ACCEL_OBJECT GtkObject + #define ACCEL_OBJECTS(a) (a)->attach_objects diff --git a/x11/wxGTK24/patches/patch-src_gtk_settings.cpp b/x11/wxGTK24/patches/patch-src_gtk_settings.cpp new file mode 100644 index 00000000000..65a1ecaeb7f --- /dev/null +++ b/x11/wxGTK24/patches/patch-src_gtk_settings.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_gtk_settings.cpp,v 1.1 2012/02/16 20:26:18 hans Exp $ + +--- src/gtk/settings.cpp 2012-01-15 17:42:01.818106898 +0100 ++++ src/gtk/settings.cpp.orig 2003-09-21 13:31:57.000000000 +0200 +@@ -340,8 +340,8 @@ wxFont wxSystemSettingsNative::GetFont( + } + else + { +- const gchar *font_name = +- _gtk_rc_context_get_default_font_name(gtk_settings_get_default()); ++ gchar *font_name; ++ g_object_get(gtk_settings_get_default(), "gtk-font-name", &font_name, NULL); + g_systemFont = new wxFont(wxString::FromAscii(font_name)); + } + gtk_widget_destroy( widget ); |