Mon Nov 19 23:16:41 2012 UTC ()
Don't use nested functions. Bump revision.


(joerg)
diff -r1.21 -r1.22 pkgsrc/inputmethod/ibus-handwrite/Makefile
diff -r1.6 -r1.7 pkgsrc/inputmethod/ibus-handwrite/distinfo
diff -r0 -r1.1 pkgsrc/inputmethod/ibus-handwrite/patches/patch-src_UI__gtk.c
cvs diff -r1.21 -r1.22 pkgsrc/inputmethod/ibus-handwrite/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-handwrite/Makefile 2012/10/16 17:47:21 1.21
+++ pkgsrc/inputmethod/ibus-handwrite/Makefile 2012/11/19 23:16:40 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2012/10/16 17:47:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.22 2012/11/19 23:16:40 joerg Exp $
2# 2#
3 3
4DISTNAME= ibus-handwrite-2.1.4 4DISTNAME= ibus-handwrite-2.1.4
5PKGREVISION= 10 5PKGREVISION= 11
6CATEGORIES= inputmethod 6CATEGORIES= inputmethod
7MASTER_SITES= http://ibus-handwrite.googlecode.com/files/ 7MASTER_SITES= http://ibus-handwrite.googlecode.com/files/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
11HOMEPAGE= http://code.google.com/p/ibus-handwrite/ 11HOMEPAGE= http://code.google.com/p/ibus-handwrite/
12COMMENT= Handwrite recognizer for ibus 12COMMENT= Handwrite recognizer for ibus
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
15DEPENDS+= zinnia-tomoe-[0-9]*:../../inputmethod/zinnia-tomoe 15DEPENDS+= zinnia-tomoe-[0-9]*:../../inputmethod/zinnia-tomoe
16 16
17FIND_PREFIX:= ZINNIA_TOMOE_DIR=zinnia-tomoe 17FIND_PREFIX:= ZINNIA_TOMOE_DIR=zinnia-tomoe
18.include "../../mk/find-prefix.mk" 18.include "../../mk/find-prefix.mk"
cvs diff -r1.6 -r1.7 pkgsrc/inputmethod/ibus-handwrite/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus-handwrite/distinfo 2011/12/16 10:51:18 1.6
+++ pkgsrc/inputmethod/ibus-handwrite/distinfo 2012/11/19 23:16:40 1.7
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.6 2011/12/16 10:51:18 obache Exp $ 1$NetBSD: distinfo,v 1.7 2012/11/19 23:16:40 joerg Exp $
2 2
3SHA1 (ibus-handwrite-2.1.4.tar.bz2) = 2798728c628dfa60a7c1c45c8a59882962c91b1e 3SHA1 (ibus-handwrite-2.1.4.tar.bz2) = 2798728c628dfa60a7c1c45c8a59882962c91b1e
4RMD160 (ibus-handwrite-2.1.4.tar.bz2) = 35e7288d5efcd98a01138d075b0455874730a4ea 4RMD160 (ibus-handwrite-2.1.4.tar.bz2) = 35e7288d5efcd98a01138d075b0455874730a4ea
5Size (ibus-handwrite-2.1.4.tar.bz2) = 237980 bytes 5Size (ibus-handwrite-2.1.4.tar.bz2) = 237980 bytes
6SHA1 (patch-configure) = 66d3e86c3ac5de1bbd466bfca1fc1d709b2d1da6 6SHA1 (patch-configure) = 66d3e86c3ac5de1bbd466bfca1fc1d709b2d1da6
7SHA1 (patch-configure.ac) = 0730abb2210c60b2feb1e9a3055568f4fbb11e2a 7SHA1 (patch-configure.ac) = 0730abb2210c60b2feb1e9a3055568f4fbb11e2a
 8SHA1 (patch-src_UI__gtk.c) = 1225bb4effdf4bf7e0de57ebfc9edc65134f9a61
File Added: pkgsrc/inputmethod/ibus-handwrite/patches/patch-src_UI__gtk.c
$NetBSD: patch-src_UI__gtk.c,v 1.1 2012/11/19 23:16:41 joerg Exp $

--- src/UI_gtk.c.orig	2012-11-19 16:23:52.000000000 +0000
+++ src/UI_gtk.c
@@ -173,6 +173,11 @@ static void glwidget_realize(GtkWidget *
 	}
 }
 
+static void clicked(GtkButton *button, IBusHandwriteEngine *engine)
+{
+	ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
+}
+
 static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine)
 {
 	int i;
@@ -195,11 +200,6 @@ static void regen_loopuptable(GtkWidget 
 
 		gtk_widget_show(bt);
 
-		void clicked(GtkButton *button, IBusHandwriteEngine *engine)
-		{
-			ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order")));
-		}
-
 		g_object_set_data(G_OBJECT(bt),"order",GINT_TO_POINTER(i));
 		g_signal_connect(bt,"clicked",G_CALLBACK(clicked),engine);