From 1528b1f7e808b977d16e31fa323a9e51f16130f6 Mon Sep 17 00:00:00 2001 From: obache Date: Tue, 24 Nov 2009 11:49:44 +0000 Subject: Import scim-bridge-0.4.16 as inputmethod/scim-bridge. Scim-bridge is wrapper library for SCIM, written in C. It is firstly written to solve problems occured by the ABI transition of GNU libstdc++ between 3.* branch and 4.* branch. That's not the problem in the most of cases because you usually used the same compiler for SCIM and GUI apps. --- inputmethod/scim-bridge/DESCR | 4 ++++ inputmethod/scim-bridge/Makefile | 29 ++++++++++++++++++++++++++ inputmethod/scim-bridge/PLIST | 4 ++++ inputmethod/scim-bridge/distinfo | 9 ++++++++ inputmethod/scim-bridge/options.mk | 35 ++++++++++++++++++++++++++++++++ inputmethod/scim-bridge/patches/patch-aa | 13 ++++++++++++ inputmethod/scim-bridge/patches/patch-ab | 12 +++++++++++ inputmethod/scim-bridge/patches/patch-ac | 12 +++++++++++ inputmethod/scim-bridge/patches/patch-ad | 13 ++++++++++++ 9 files changed, 131 insertions(+) create mode 100644 inputmethod/scim-bridge/DESCR create mode 100644 inputmethod/scim-bridge/Makefile create mode 100644 inputmethod/scim-bridge/PLIST create mode 100644 inputmethod/scim-bridge/distinfo create mode 100644 inputmethod/scim-bridge/options.mk create mode 100644 inputmethod/scim-bridge/patches/patch-aa create mode 100644 inputmethod/scim-bridge/patches/patch-ab create mode 100644 inputmethod/scim-bridge/patches/patch-ac create mode 100644 inputmethod/scim-bridge/patches/patch-ad (limited to 'inputmethod') diff --git a/inputmethod/scim-bridge/DESCR b/inputmethod/scim-bridge/DESCR new file mode 100644 index 00000000000..35e62e3a566 --- /dev/null +++ b/inputmethod/scim-bridge/DESCR @@ -0,0 +1,4 @@ +Scim-bridge is wrapper library for SCIM, written in C. It is firstly written to +solve problems occured by the ABI transition of GNU libstdc++ between 3.* branch +and 4.* branch. That's not the problem in the most of cases because you usually +used the same compiler for SCIM and GUI apps. diff --git a/inputmethod/scim-bridge/Makefile b/inputmethod/scim-bridge/Makefile new file mode 100644 index 00000000000..fc80ed6d56b --- /dev/null +++ b/inputmethod/scim-bridge/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ +# + +DISTNAME= scim-bridge-0.4.16 +CATEGORIES= inputmethod +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/} + +MAINTAINER= obache@NetBSD.org +HOMEPAGE= http://www.scim-im.org/projects/scim_bridge +COMMENT= C wrapper library for SCIM +LICENSE= gnu-gpl-v2 OR gnu-lgpl-v2.1 + +PKG_DESTDIR_SUPPORT= user-destdir + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_LANGUAGES= c c++ +USE_TOOLS+= pkg-config + +CONFIGURE_ARGS+= --enable-agent +CONFIGURE_ARGS+= --disable-documents +CONFIGURE_ARGS+= --disable-tests + +.include "options.mk" + +CHECK_PORTABILITY_SKIP= tests/* + +.include "../../inputmethod/scim/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/inputmethod/scim-bridge/PLIST b/inputmethod/scim-bridge/PLIST new file mode 100644 index 00000000000..7e637a8d67d --- /dev/null +++ b/inputmethod/scim-bridge/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ +bin/scim-bridge +${PLIST.gtk}lib/gtk-2.0/immodules/im-scim-bridge.la +${PLIST.qt}qt4/plugins/inputmethods/im-scim-bridge.la diff --git a/inputmethod/scim-bridge/distinfo b/inputmethod/scim-bridge/distinfo new file mode 100644 index 00000000000..f358d60fc7e --- /dev/null +++ b/inputmethod/scim-bridge/distinfo @@ -0,0 +1,9 @@ +$NetBSD: distinfo,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ + +SHA1 (scim-bridge-0.4.16.tar.gz) = 6a7a714592dbecc9a1f44794f37319bafe2bdfae +RMD160 (scim-bridge-0.4.16.tar.gz) = 37aed056fb880358b013f104f08b2e58c3de4188 +Size (scim-bridge-0.4.16.tar.gz) = 508870 bytes +SHA1 (patch-aa) = e4d0803a8d572e2efb79128c307d25bd867007ac +SHA1 (patch-ab) = 7c103b3da298e8ed72e84c239a3fc4617a647ce5 +SHA1 (patch-ac) = e7dd5f64e3fcd9cdc03199d041fefb09fce9ff8f +SHA1 (patch-ad) = cc87a5c24af8c066482d164b2805602ed90e2acb diff --git a/inputmethod/scim-bridge/options.mk b/inputmethod/scim-bridge/options.mk new file mode 100644 index 00000000000..a53fbf5cb52 --- /dev/null +++ b/inputmethod/scim-bridge/options.mk @@ -0,0 +1,35 @@ +# $NetBSD: options.mk,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ +# + +PKG_OPTIONS_VAR= PKG_OPTIONS.scim-bridge +PKG_SUPPORTED_OPTIONS= gtk qt +PKG_SUGGESTED_OPTIONS= gtk + +PLIST_VARS+= gtk qt + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgtk) +GTK2_IMMODULES= yes +.include "../../x11/gtk2/modules.mk" +CONFIGURE_ARGS+= --enable-gtk2-immodule +PLIST.gtk= yes +.else +CONFIGURE_ARGS+= --enable-gtk2-immodule=no +.endif + +#.if !empty(PKG_OPTIONS:Mqt3) +#.include "../../x11/qt3-libs/buildlink3.mk" +#CONFIGURE_ARGS+= --enable-qt3-immodule +#PLIST.qt= yes +#.else +#CONFIGURE_ARGS+= --disable-qt3-immodule +#.endif + +.if !empty(PKG_OPTIONS:Mqt) +.include "../../x11/qt4-libs/buildlink3.mk" +CONFIGURE_ARGS+= --enable-qt4-immodule +PLIST.qt= yes +.else +CONFIGURE_ARGS+= --disable-qt4-immodule +.endif diff --git a/inputmethod/scim-bridge/patches/patch-aa b/inputmethod/scim-bridge/patches/patch-aa new file mode 100644 index 00000000000..3e17c619d24 --- /dev/null +++ b/inputmethod/scim-bridge/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ + +--- agent/scim-bridge-agent.cpp.orig 2009-01-18 02:58:59.000000000 +0000 ++++ agent/scim-bridge-agent.cpp +@@ -192,7 +192,7 @@ ScimBridgeAgent *ScimBridgeAgent::alloc + + + ScimBridgeAgentImpl::ScimBridgeAgentImpl (): +-running (true), noexit_enabled (false), standalone_enabled (false), client_app_count (0), ++running (true), noexit_enabled (false), standalone_enabled (false), client_app_count (0), scim_config_module(0), + accept_listener (NULL), interruption_listener (NULL), panel_listener (NULL), signal_listener (NULL), display (NULL) + { + } diff --git a/inputmethod/scim-bridge/patches/patch-ab b/inputmethod/scim-bridge/patches/patch-ab new file mode 100644 index 00000000000..2d8eaab38e3 --- /dev/null +++ b/inputmethod/scim-bridge/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ + +--- client-common/scim-bridge-client-output.c.orig 2008-11-02 06:44:34.000000000 +0000 ++++ client-common/scim-bridge-client-output.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + + #include "scim-bridge-debug.h" + #include "scim-bridge-output.h" diff --git a/inputmethod/scim-bridge/patches/patch-ac b/inputmethod/scim-bridge/patches/patch-ac new file mode 100644 index 00000000000..0cd65ea1e4b --- /dev/null +++ b/inputmethod/scim-bridge/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ + +--- client-gtk/scim-bridge-client-imcontext-gtk.c.orig 2008-11-02 06:44:23.000000000 +0000 ++++ client-gtk/scim-bridge-client-imcontext-gtk.c +@@ -674,6 +674,7 @@ void scim_bridge_client_imcontext_regist + 0, + /* object initizlier */ + (GtkObjectInitFunc) scim_bridge_client_imcontext_initialize, ++ 0 + }; + + if (!class_type) class_type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "ScimBridgeClientIMContext", &klass_info, 0); diff --git a/inputmethod/scim-bridge/patches/patch-ad b/inputmethod/scim-bridge/patches/patch-ad new file mode 100644 index 00000000000..0c655cb3e76 --- /dev/null +++ b/inputmethod/scim-bridge/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1.1.1 2009/11/24 11:49:44 obache Exp $ + +--- common/scim-bridge-messenger.h.orig 2008-11-02 06:44:32.000000000 +0000 ++++ common/scim-bridge-messenger.h +@@ -33,6 +33,8 @@ + */ + typedef struct _ScimBridgeMessenger ScimBridgeMessenger; + ++struct timeval; ++ + #ifdef __cplusplus + extern "C" + { -- cgit v1.2.3