From 5b376d7df9b03e51f5e5f7b1396df8bda96f6602 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Tue, 30 Nov 2010 20:15:49 +0000
Subject: fix build with newer gtk2 (needs more cleanup, but looks OK for now)

---
 x11/gtk2+extra/distinfo         |  3 ++-
 x11/gtk2+extra/patches/patch-ag | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 x11/gtk2+extra/patches/patch-ag

(limited to 'x11/gtk2+extra')

diff --git a/x11/gtk2+extra/distinfo b/x11/gtk2+extra/distinfo
index 6f498f832b5..73e6e81dc7f 100644
--- a/x11/gtk2+extra/distinfo
+++ b/x11/gtk2+extra/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2010/09/25 08:38:51 obache Exp $
+$NetBSD: distinfo,v 1.7 2010/11/30 20:15:49 drochner Exp $
 
 SHA1 (gtk+extra-2.1.2.tar.gz) = 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07
 RMD160 (gtk+extra-2.1.2.tar.gz) = e14bfc2a055fdef0d037b494018ca25047cc3c9e
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = d061999e1f2261fa7fe92ef29ecfa889f141e6b0
 SHA1 (patch-ad) = e2c45a044ef08c4e01df8f24ef174dc7d62a95f6
 SHA1 (patch-ae) = a27172a43e2796dff796916773e3f57ed6be30ed
 SHA1 (patch-af) = 4d83e4859aa4377cae55cdccc4b3a2c774d32a9a
+SHA1 (patch-ag) = c4c50b3f73177de6d9f31190f013cd05fed41518
diff --git a/x11/gtk2+extra/patches/patch-ag b/x11/gtk2+extra/patches/patch-ag
new file mode 100644
index 00000000000..3d2c89ef950
--- /dev/null
+++ b/x11/gtk2+extra/patches/patch-ag
@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.3 2010/11/30 20:15:49 drochner Exp $
+
+--- gtkextra/gtkitementry.c.orig	2010-03-13 05:49:00.000000000 +0000
++++ gtkextra/gtkitementry.c
+@@ -131,7 +131,9 @@ static void         gtk_entry_draw_curso
+ static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
+                                                         gboolean        include_preedit);
+ static void         gtk_entry_queue_draw               (GtkEntry       *entry);
++#if 0
+ static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
++#endif
+ static void         gtk_entry_recompute                (GtkEntry       *entry);
+ static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
+ 							CursorType      type,
+@@ -1754,6 +1756,7 @@ gtk_entry_queue_draw (GtkEntry *entry)
+     gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);
+ }
+ 
++#if 0
+ static void
+ gtk_entry_reset_im_context (GtkEntry *entry)
+ {
+@@ -1763,6 +1766,7 @@ gtk_entry_reset_im_context (GtkEntry *en
+       gtk_im_context_reset (entry->im_context);
+     }
+ }
++#endif
+ 
+ static void
+ gtk_entry_get_cursor_locations (GtkEntry   *entry,
-- 
cgit v1.2.3