Tue Nov 30 20:15:50 2010 UTC ()
fix build with newer gtk2 (needs more cleanup, but looks OK for now)


(drochner)
diff -r1.6 -r1.7 pkgsrc/x11/gtk2+extra/distinfo
diff -r0 -r1.3 pkgsrc/x11/gtk2+extra/patches/patch-ag
cvs diff -r1.6 -r1.7 pkgsrc/x11/gtk2+extra/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk2+extra/distinfo 2010/09/25 08:38:51 1.6
+++ pkgsrc/x11/gtk2+extra/distinfo 2010/11/30 20:15:49 1.7
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.6 2010/09/25 08:38:51 obache Exp $ 1$NetBSD: distinfo,v 1.7 2010/11/30 20:15:49 drochner Exp $
2 2
3SHA1 (gtk+extra-2.1.2.tar.gz) = 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07 3SHA1 (gtk+extra-2.1.2.tar.gz) = 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07
4RMD160 (gtk+extra-2.1.2.tar.gz) = e14bfc2a055fdef0d037b494018ca25047cc3c9e 4RMD160 (gtk+extra-2.1.2.tar.gz) = e14bfc2a055fdef0d037b494018ca25047cc3c9e
5Size (gtk+extra-2.1.2.tar.gz) = 1274946 bytes 5Size (gtk+extra-2.1.2.tar.gz) = 1274946 bytes
6SHA1 (patch-aa) = d061999e1f2261fa7fe92ef29ecfa889f141e6b0 6SHA1 (patch-aa) = d061999e1f2261fa7fe92ef29ecfa889f141e6b0
7SHA1 (patch-ad) = e2c45a044ef08c4e01df8f24ef174dc7d62a95f6 7SHA1 (patch-ad) = e2c45a044ef08c4e01df8f24ef174dc7d62a95f6
8SHA1 (patch-ae) = a27172a43e2796dff796916773e3f57ed6be30ed 8SHA1 (patch-ae) = a27172a43e2796dff796916773e3f57ed6be30ed
9SHA1 (patch-af) = 4d83e4859aa4377cae55cdccc4b3a2c774d32a9a 9SHA1 (patch-af) = 4d83e4859aa4377cae55cdccc4b3a2c774d32a9a
 10SHA1 (patch-ag) = c4c50b3f73177de6d9f31190f013cd05fed41518
File Added: pkgsrc/x11/gtk2+extra/patches/patch-ag
$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,