Import of pkgsrc-2015Q1

inputmethod/ibus-array/Makefile

@@ -1,28 +1,34 @@
-# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:11 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2015/03/15 18:46:56 hiramatsu Exp $
 
-DISTNAME=	ibus-array-0.0.2
-PKGREVISION=	7
+DISTNAME=	ibus-array-0.1.0
 CATEGORIES=	inputmethod chinese
-MASTER_SITES=	http://ibus-array.googlecode.com/files/
+MASTER_SITES=	http://ibus-array.googlecode.com/svn/tarballs/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	obache@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/ibus-array/
 COMMENT=	Array 30 Input Method for iBus
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-ibus-python-[0-9]*:../../inputmethod/ibus-python
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=	gmake pkg-config automake autoconf autopoint msgfmt msgmerge
+
+WRKSRC=		${WRKDIR}
+
+pre-configure:
+	${RUN}cd ${WRKSRC};${PKGSRC_SETENV} ${CONFIGURE_ENV} ./autogen.sh
 
 SUBST_CLASSES+=		epython
 SUBST_STAGE.epython=	pre-configure
 SUBST_FILES.epython=	setup/ibus-setup-array.in
 SUBST_SED.epython=	-e 's;exec python;exec ${PYTHONBIN};g'
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 # py-gtk2 via py-ibus-python
-
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

inputmethod/ibus-array/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/07 01:53:41 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/01/20 11:24:33 obache Exp $
 libexec/ibus-engine-array
 libexec/ibus-setup-array
 share/ibus-array/icons/ibus-array.png
@@ -10,3 +10,4 @@ share/ibus-array/setup/main.pyc
 share/ibus-array/setup/main.pyo
 share/ibus-array/tables/array.db
 share/ibus/component/array.xml
+share/locale/zh_TW/LC_MESSAGES/ibus-array.mo

inputmethod/ibus-array/distinfo

@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/11/19 23:15:52 joerg Exp $
+$NetBSD: distinfo,v 1.6 2015/01/29 11:45:25 obache Exp $
 
-SHA1 (ibus-array-0.0.2.tar.gz) = 1b2c65b0a5d45f858014d892ec9036918ce85a54
-RMD160 (ibus-array-0.0.2.tar.gz) = 40dbed9c00cc83855af05350da244f668fddb751
-Size (ibus-array-0.0.2.tar.gz) = 2759103 bytes
-SHA1 (patch-src_engine.c) = fcd75da6cb349a7dd2f2caa8dae4b9ebb23668c7
+SHA1 (ibus-array-0.1.0.tgz) = f4f6f5ccb0c2d54ef80b5e694fc508f99bf1f381
+RMD160 (ibus-array-0.1.0.tgz) = 2526bd21f704bbd4bf8d563a6e89870a047562b9
+Size (ibus-array-0.1.0.tgz) = 3838716 bytes
+SHA1 (patch-src_engine.c) = aa7978ae11c8e1410980585ff6f7a76200df6f99

inputmethod/ibus-array/patches/patch-src_engine.c

@@ -1,103 +1,25 @@
-$NetBSD: patch-src_engine.c,v 1.2 2012/11/19 23:15:53 joerg Exp $
+$NetBSD: patch-src_engine.c,v 1.5 2015/01/29 11:45:25 obache Exp $
 
-* for ibus-1.4
+* Fixes return type mismatch:
+  https://code.google.com/p/ibus-array/issues/detail?id=11
 
---- src/engine.c.orig	2009-10-18 17:06:12.000000000 +0000
+--- src/engine.c.orig	2015-01-24 16:30:52.000000000 +0000
 +++ src/engine.c
-@@ -79,7 +79,7 @@ static void ibus_array_engine_show_speci
- static void ibus_config_value_changed (IBusConfig *config, 
-                                         const gchar *section, 
-                                         const gchar *name, 
--                                        GValue *value, 
-+                                        GVariant *value, 
-                                         gpointer user_data);
+@@ -67,7 +67,7 @@ static gboolean ibus_array_engine_commit
  
- static IBusEngineClass *parent_class = NULL;
-@@ -120,7 +120,7 @@ void 
- ibus_array_init (IBusBus *bus) 
- {
-     gboolean res;
--    GValue value = { 0, };
-+    GVariant *value = NULL;
+ static void ibus_array_engine_space_press(IBusArrayEngine *arrayeng);
  
-     array_context = array_create_context();
+-static gboolean ibus_array_engine_update_symbol_lookup_table (IBusArrayEngine *arrayeng);
++static void ibus_array_engine_update_symbol_lookup_table (IBusArrayEngine *arrayeng);
  
-@@ -129,20 +129,22 @@ ibus_array_init (IBusBus *bus) 
-     is_special_notify = FALSE;
-     is_special_only = FALSE;
+ static void ibus_array_engine_update_auxiliary_text (IBusArrayEngine *arrayeng, gchar* aux_string);
  
--    res = ibus_config_get_value (config, "engine/Array", 
--                                "SpecialNotify", &value);
-+    res = ((value = ibus_config_get_value (config, "engine/Array", 
-+                                "SpecialNotify")) != NULL);
-     if (res) {
--        const gchar* str = g_value_get_string(&value);
-+        const gchar* str = g_variant_get_string(value, NULL);
-         if (g_strcmp0(str, "1") == 0)
-             is_special_notify = TRUE;
-+        g_variant_unref(value);
-     }
- 
--    res = ibus_config_get_value (config, "engine/Array", 
--                                "SpecialOnly", &value);
-+    res = ((value = ibus_config_get_value (config, "engine/Array", 
-+                                "SpecialOnly")) != NULL);
-     if (res) {
--        const gchar* str = g_value_get_string(&value);
-+        const gchar* str = g_variant_get_string(value, NULL);
-         if (g_strcmp0(str, "1") == 0)
-             is_special_only = TRUE;
-+        g_variant_unref(value);
-     }
+@@ -313,7 +313,7 @@ static void ibus_array_engine_update_pre
+     g_string_free(array_preedit, TRUE);
  }
  
-@@ -349,7 +351,7 @@ ibus_array_engine_update_symbol_lookup_t
- 
-     if (arrayeng->preedit->len == 0) {
-         ibus_engine_hide_lookup_table ((IBusEngine *) arrayeng);
--        return;
-+        return FALSE;
-     }
- 
-     ibus_lookup_table_clear (arrayeng->table);
-@@ -360,12 +362,12 @@ ibus_array_engine_update_symbol_lookup_t
-     
-     if (candidates == NULL) {
-         ibus_engine_hide_lookup_table ((IBusEngine *) arrayeng);
--        return;
-+        return FALSE;
-     }
-     else if (candidates->len == 0) {
-         array_release_candidates(candidates);
-         ibus_engine_hide_lookup_table ((IBusEngine *) arrayeng);
--        return;
-+        return FALSE;
-     }
- 
-     for (i = 0; i < candidates->len; i++) {
-@@ -754,14 +756,14 @@ static void ibus_array_engine_property_a
- static void ibus_config_value_changed (IBusConfig *config, 
-                                         const gchar *section, 
-                                         const gchar *name, 
--                                        GValue *value, 
-+                                        GVariant *value, 
-                                         gpointer user_data)
+-static gboolean ibus_array_engine_update_symbol_lookup_table (IBusArrayEngine *arrayeng) 
++static void ibus_array_engine_update_symbol_lookup_table (IBusArrayEngine *arrayeng) 
  {
-     IBusArrayEngine *arrayeng = (IBusArrayEngine*)user_data;
- 
-     if (g_strcmp0(section, "engine/Array") == 0) {
-         if (g_strcmp0(name, "SpecialNotify") == 0) {
--            const gchar* str = g_value_get_string(value);
-+            const gchar* str = g_variant_get_string(value, NULL);
-             if (g_strcmp0(str, "1") == 0) {
-                 is_special_notify = TRUE;
-             }
-@@ -770,7 +772,7 @@ static void ibus_config_value_changed (I
-             }
-         }
-         else if (g_strcmp0(name, "SpecialOnly") == 0) {
--            const gchar* str = g_value_get_string(value);
-+            const gchar* str = g_variant_get_string(value, NULL);
-             if (g_strcmp0(str, "1") == 0) {
-                 is_special_only = TRUE;
-             }
+     gint i;
+     gboolean retval;