Update ibus-handwrite to 2.1.1. bug fix.diff -r1.3 -r1.4 pkgsrc/inputmethod/ibus-handwrite/Makefile
(obache)
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | # $NetBSD: Makefile,v 1.3 2010/11/15 22:57:32 abs Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2010/11/23 01:10:36 obache Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= ibus-handwrite-2.1.0 | 4 | DISTNAME= ibus-handwrite-2.1.1 | |
5 | PKGREVISION= 3 | |||
6 | CATEGORIES= inputmethod | 5 | CATEGORIES= inputmethod | |
7 | MASTER_SITES= http://ibus-handwrite.googlecode.com/files/ | 6 | MASTER_SITES= http://ibus-handwrite.googlecode.com/files/ | |
8 | EXTRACT_SUFX= .tar.bz2 | |||
9 | 7 | |||
10 | MAINTAINER= obache@NetBSD.org | 8 | MAINTAINER= obache@NetBSD.org | |
11 | HOMEPAGE= http://code.google.com/p/ibus-handwrite/ | 9 | HOMEPAGE= http://code.google.com/p/ibus-handwrite/ | |
12 | COMMENT= Handwrite recognizer for ibus | 10 | COMMENT= Handwrite recognizer for ibus | |
13 | LICENSE= gnu-gpl-v3 | 11 | LICENSE= gnu-gpl-v3 | |
14 | 12 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 14 | |||
17 | DEPENDS+= zinnia-tomoe-[0-9]*:../../inputmethod/zinnia-tomoe | 15 | DEPENDS+= zinnia-tomoe-[0-9]*:../../inputmethod/zinnia-tomoe | |
18 | 16 | |||
19 | FIND_PREFIX:= ZINNIA_TOMOE_DIR=zinnia-tomoe | 17 | FIND_PREFIX:= ZINNIA_TOMOE_DIR=zinnia-tomoe | |
20 | .include "../../mk/find-prefix.mk" | 18 | .include "../../mk/find-prefix.mk" | |
21 | 19 | |||
22 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
23 | USE_PKGLOCALEDIR= yes | 21 | USE_PKGLOCALEDIR= yes | |
24 | USE_TOOLS+= gmake pkg-config | 22 | USE_TOOLS+= gmake pkg-config | |
25 | 23 | |||
26 | CONFIGURE_ARGS+= --enable-zinnia | 24 | CONFIGURE_ARGS+= --enable-zinnia | |
27 | CONFIGURE_ARGS+= --with-zinnia-tomoe=${ZINNIA_TOMOE_DIR}/lib/zinnia/model/tomoe | 25 | CONFIGURE_ARGS+= --with-zinnia-tomoe=${ZINNIA_TOMOE_DIR}/lib/zinnia/model/tomoe | |
28 | 26 | |||
27 | .include "../../devel/gettext-lib/buildlink3.mk" | |||
28 | .include "../../graphics/gtkglext/buildlink3.mk" | |||
29 | .include "../../inputmethod/ibus/buildlink3.mk" | 29 | .include "../../inputmethod/ibus/buildlink3.mk" | |
30 | .include "../../inputmethod/zinnia/buildlink3.mk" | 30 | .include "../../inputmethod/zinnia/buildlink3.mk" | |
31 | .include "../../x11/gtk2/buildlink3.mk" | 31 | .include "../../x11/gtk2/buildlink3.mk" | |
32 | .include "../../mk/bsd.pkg.mk" | 32 | .include "../../mk/bsd.pkg.mk" |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1.1.1 2010/08/07 02:25:03 obache Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2010/11/23 01:10:36 obache Exp $ | |
2 | libexec/ibus-engine-handwrite | 2 | libexec/ibus-engine-handwrite | |
3 | share/ibus-handwrite/data/table.txt | 3 | share/ibus-handwrite/data/table.txt | |
4 | share/ibus-handwrite/icons/ibus-handwrite.svg | 4 | share/ibus-handwrite/icons/ibus-handwrite.svg | |
5 | share/ibus-handwrite/icons/switch.svg | 5 | share/ibus-handwrite/icons/switch.svg | |
6 | share/ibus/component/handwrite-jp.xml | 6 | share/ibus/component/handwrite-jp.xml | |
7 | share/ibus/component/handwrite-zh.xml | 7 | share/ibus/component/handwrite-zh.xml | |
8 | share/locale/ja/LC_MESSAGES/ibus-handwrite.mo | |||
8 | share/locale/zh_CN/LC_MESSAGES/ibus-handwrite.mo | 9 | share/locale/zh_CN/LC_MESSAGES/ibus-handwrite.mo |
@@ -1,8 +1,8 @@ | @@ -1,8 +1,8 @@ | |||
1 | $NetBSD: distinfo,v 1.1.1.1 2010/08/07 02:25:03 obache Exp $ | 1 | $NetBSD: distinfo,v 1.2 2010/11/23 01:10:36 obache Exp $ | |
2 | 2 | |||
3 | SHA1 (ibus-handwrite-2.1.0.tar.bz2) = 173e94f6dd5cdc6f89172b29b887bb15987859a3 | 3 | SHA1 (ibus-handwrite-2.1.1.tar.gz) = c12db8513f9cf4b0445d7c6fcb80871cafbb79a7 | |
4 | RMD160 (ibus-handwrite-2.1.0.tar.bz2) = 9c20c7c5c13bba8564969f2bd5a40f322796392d | 4 | RMD160 (ibus-handwrite-2.1.1.tar.gz) = 20fe65f689acebe0bc93e9e82bd3e16d888cf7db | |
5 | Size (ibus-handwrite-2.1.0.tar.bz2) = 235326 bytes | 5 | Size (ibus-handwrite-2.1.1.tar.gz) = 292768 bytes | |
6 | SHA1 (patch-aa) = 4688dd3ed6f3e6fa3c9a06070cca5c329cbd82e4 | 6 | SHA1 (patch-aa) = c3df000bc9f4f84bf4f3be2d472a467f995086f6 | |
7 | SHA1 (patch-ab) = 1b6bc1555fb6a2df5f98354d807080ce43f3bad5 | 7 | SHA1 (patch-ab) = d9cd7f5b046337179779f0bca66459fb3f81262d | |
8 | SHA1 (patch-ac) = 5c6b951e0f581ee066b0784df6bef7ab37ff2940 | 8 | SHA1 (patch-ac) = 5c6b951e0f581ee066b0784df6bef7ab37ff2940 |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-aa,v 1.1.1.1 2010/08/07 02:25:03 obache Exp $ | 1 | $NetBSD: patch-aa,v 1.2 2010/11/23 01:10:36 obache Exp $ | |
2 | 2 | |||
3 | --- src/handrecog_lucykila.c.orig 2010-04-22 10:53:37.000000000 +0000 | 3 | --- src/handrecog_lucykila.c.orig 2010-11-22 12:41:39.000000000 +0000 | |
4 | +++ src/handrecog_lucykila.c | 4 | +++ src/handrecog_lucykila.c | |
5 | @@ -17,6 +17,12 @@ | 5 | @@ -18,6 +18,12 @@ | |
6 | #include "engine.h" | |||
7 | #include "handrecog.h" | 6 | #include "handrecog.h" | |
7 | #include "global_var.h" | |||
8 | 8 | |||
9 | +#ifndef MAP_ANONYMOUS | 9 | +#ifndef MAP_ANONYMOUS | |
10 | +#ifdef MAP_ANON | 10 | +#ifdef MAP_ANON | |
11 | +#define MAP_ANONYMOUS MAP_ANON | 11 | +#define MAP_ANONYMOUS MAP_ANON | |
12 | +#endif | 12 | +#endif | |
13 | +#endif | 13 | +#endif | |
14 | + | 14 | + | |
15 | typedef struct _MATCHED MATCHED; | 15 | typedef struct _MATCHED MATCHED; | |
16 | typedef struct _IbusHandwriteRecogLucyKila IbusHandwriteRecogLucyKila; | 16 | typedef struct _IbusHandwriteRecogLucyKila IbusHandwriteRecogLucyKila; | |
17 | typedef struct _IbusHandwriteRecogLucyKilaClass IbusHandwriteRecogLucyKilaClass; | 17 | typedef struct _IbusHandwriteRecogLucyKilaClass IbusHandwriteRecogLucyKilaClass; |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | $NetBSD: patch-ab,v 1.1.1.1 2010/08/07 02:25:03 obache Exp $ | 1 | $NetBSD: patch-ab,v 1.2 2010/11/23 01:10:36 obache Exp $ | |
2 | 2 | |||
3 | --- src/main.c.orig 2010-04-23 07:13:02.000000000 +0000 | 3 | --- src/main.c.orig 2010-11-22 12:57:26.000000000 +0000 | |
4 | +++ src/main.c | 4 | +++ src/main.c | |
5 | @@ -1,7 +1,9 @@ | 5 | @@ -1,7 +1,9 @@ | |
6 | /* vim:set et sts=4: */ | 6 | /* vim:set et sts=4: */ | |
7 | #include <config.h> | 7 | #include <config.h> | |
8 | #include <unistd.h> | 8 | #include <unistd.h> | |
9 | +#ifdef __linux__ | 9 | +#ifdef __linux__ | |
10 | #include <execinfo.h> | 10 | #include <execinfo.h> | |
11 | +#endif | 11 | +#endif | |
12 | #include <stdio.h> | 12 | #include <stdio.h> | |
13 | #include <stdlib.h> | 13 | #include <stdlib.h> | |
14 | #include <ibus.h> | 14 | #include <ibus.h> |