Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inputmethod/scim/DESCR Normal file
View File

@@ -0,0 +1,6 @@
Currently the SCIM project has a wide range of input methods (some may need
other libraries), covering more than 30 languages, including
(Simplified/Traditional) Chinese, Japanese, Korean and many European languages.
What's more, Composing/Dead key support is one of the built-in features.
In addition, several projects have been established to design IMEngines for
SCIM and others supply their own SCIM plugins.

55
inputmethod/scim/Makefile Normal file
View File

@@ -0,0 +1,55 @@
# $NetBSD: Makefile,v 1.28 2013/06/06 12:53:47 wiz Exp $
#
DISTNAME= scim-1.4.14
PKGREVISION= 12
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
MAINTAINER= obache@NetBSD.org
HOMEPAGE= http://www.scim-im.org/
COMMENT= Smart Common Input Method
LICENSE= gnu-lgpl-v2.1
SUPERSEDES+= scim-bridge-[0-9]*
PKG_SYSCONFSUBDIR= scim
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= msgfmt pkg-config
USE_TOOLS+= gmake # make scim-setup.desktop
USE_TOOLS+= perl intltool
PKGCONFIG_OVERRIDE= scim-gtkutils.pc.in
PKGCONFIG_OVERRIDE+= scim-x11utils.pc.in
PKGCONFIG_OVERRIDE+= scim.pc.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
.include "options.mk"
EGDIR= ${PREFIX}/share/examples/scim
CONF_FILES= ${EGDIR}/config ${PKG_SYSCONFDIR}/config
CONF_FILES+= ${EGDIR}/global ${PKG_SYSCONFDIR}/global
INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples
# for DLOPEN_REQUIRE_PTHREADS
PTHREAD_AUTO_VARS= yes
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
CONFIGURE_ENV+= ac_cv_func_gethostbyname_r=no
LDFLAGS.SunOS+= -lsocket -lnsl
.endif
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXt= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

124
inputmethod/scim/PLIST Normal file
View File

@@ -0,0 +1,124 @@
@comment $NetBSD: PLIST,v 1.2 2012/08/19 08:09:08 obache Exp $
bin/scim
bin/scim-config-agent
bin/scim-im-agent
bin/scim-setup
include/scim-1.0/gtk/scimkeyselection.h
include/scim-1.0/gtk/scimstringview.h
include/scim-1.0/gtk/scimtrayicon.h
include/scim-1.0/scim.h
include/scim-1.0/scim_attribute.h
include/scim-1.0/scim_backend.h
include/scim-1.0/scim_bind.h
include/scim-1.0/scim_compose_key.h
include/scim-1.0/scim_config_base.h
include/scim-1.0/scim_config_module.h
include/scim-1.0/scim_config_path.h
include/scim-1.0/scim_connection.h
include/scim-1.0/scim_debug.h
include/scim-1.0/scim_event.h
include/scim-1.0/scim_exception.h
include/scim-1.0/scim_filter.h
include/scim-1.0/scim_filter_manager.h
include/scim-1.0/scim_filter_module.h
include/scim-1.0/scim_frontend.h
include/scim-1.0/scim_frontend_module.h
include/scim-1.0/scim_global_config.h
include/scim-1.0/scim_helper.h
include/scim-1.0/scim_helper_manager.h
include/scim-1.0/scim_helper_module.h
include/scim-1.0/scim_hotkey.h
include/scim-1.0/scim_iconv.h
include/scim-1.0/scim_imengine.h
include/scim-1.0/scim_imengine_module.h
include/scim-1.0/scim_lookup_table.h
include/scim-1.0/scim_module.h
include/scim-1.0/scim_object.h
include/scim-1.0/scim_panel_agent.h
include/scim-1.0/scim_panel_client.h
include/scim-1.0/scim_panel_common.h
include/scim-1.0/scim_pointer.h
include/scim-1.0/scim_property.h
include/scim-1.0/scim_signals.h
include/scim-1.0/scim_slot.h
include/scim-1.0/scim_socket.h
include/scim-1.0/scim_trans_commands.h
include/scim-1.0/scim_transaction.h
include/scim-1.0/scim_types.h
include/scim-1.0/scim_utility.h
include/scim-1.0/x11/scim_x11_utils.h
${PLIST.gtk2}lib/gtk-2.0/2.10.0/immodules/im-scim.la
${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-scim.la
lib/libscim-1.0.la
lib/libscim-gtkutils-1.0.la
lib/libscim-x11utils-1.0.la
lib/pkgconfig/scim-gtkutils.pc
lib/pkgconfig/scim-x11utils.pc
lib/pkgconfig/scim.pc
lib/scim-1.0/1.4.0/Config/simple.la
lib/scim-1.0/1.4.0/Config/socket.la
lib/scim-1.0/1.4.0/Filter/sctc.la
lib/scim-1.0/1.4.0/FrontEnd/socket.la
lib/scim-1.0/1.4.0/FrontEnd/x11.la
lib/scim-1.0/1.4.0/Helper/setup.la
lib/scim-1.0/1.4.0/IMEngine/rawcode.la
lib/scim-1.0/1.4.0/IMEngine/socket.la
lib/scim-1.0/1.4.0/SetupUI/aaa-frontend-setup.la
lib/scim-1.0/1.4.0/SetupUI/aaa-imengine-setup.la
lib/scim-1.0/1.4.0/SetupUI/panel-gtk-setup.la
lib/scim-1.0/scim-helper-launcher
lib/scim-1.0/scim-helper-manager
lib/scim-1.0/scim-launcher
lib/scim-1.0/scim-panel-gtk
${PLIST.qt}qt4/plugins/inputmethods/im-scim.la
share/applications/scim-setup.desktop
share/control-center-2.0/capplets/scim-setup.desktop
share/examples/scim/config
share/examples/scim/global
share/locale/as/LC_MESSAGES/scim.mo
share/locale/bn_IN/LC_MESSAGES/scim.mo
share/locale/ca/LC_MESSAGES/scim.mo
share/locale/cs/LC_MESSAGES/scim.mo
share/locale/de/LC_MESSAGES/scim.mo
share/locale/es/LC_MESSAGES/scim.mo
share/locale/fi/LC_MESSAGES/scim.mo
share/locale/fr/LC_MESSAGES/scim.mo
share/locale/gu/LC_MESSAGES/scim.mo
share/locale/hi/LC_MESSAGES/scim.mo
share/locale/it/LC_MESSAGES/scim.mo
share/locale/ja/LC_MESSAGES/scim.mo
share/locale/kn/LC_MESSAGES/scim.mo
share/locale/ko/LC_MESSAGES/scim.mo
share/locale/ml/LC_MESSAGES/scim.mo
share/locale/mr/LC_MESSAGES/scim.mo
share/locale/nl/LC_MESSAGES/scim.mo
share/locale/pa/LC_MESSAGES/scim.mo
share/locale/pt_BR/LC_MESSAGES/scim.mo
share/locale/ru/LC_MESSAGES/scim.mo
share/locale/sk/LC_MESSAGES/scim.mo
share/locale/sv/LC_MESSAGES/scim.mo
share/locale/ta/LC_MESSAGES/scim.mo
share/locale/te/LC_MESSAGES/scim.mo
share/locale/vi/LC_MESSAGES/scim.mo
share/locale/zh_CN/LC_MESSAGES/scim.mo
share/locale/zh_TW/LC_MESSAGES/scim.mo
share/pixmaps/scim-setup.png
share/scim/icons/down.png
share/scim/icons/full-letter.png
share/scim/icons/full-punct.png
share/scim/icons/half-letter.png
share/scim/icons/half-punct.png
share/scim/icons/help.png
share/scim/icons/keyboard.png
share/scim/icons/left.png
share/scim/icons/menu.png
share/scim/icons/pin-down.png
share/scim/icons/pin-up.png
share/scim/icons/rawcode.png
share/scim/icons/right.png
share/scim/icons/sctc-sc-to-tc.png
share/scim/icons/sctc-tc-to-sc.png
share/scim/icons/sctc.png
share/scim/icons/setup.png
share/scim/icons/trademark.png
share/scim/icons/up.png

27
inputmethod/scim/buildlink3.mk Normal file
View File

@@ -0,0 +1,27 @@
# $NetBSD: buildlink3.mk,v 1.20 2013/06/06 12:53:47 wiz Exp $
BUILDLINK_TREE+= scim
.if !defined(SCIM_BUILDLINK3_MK)
SCIM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.scim+= scim>=1.4.7
BUILDLINK_ABI_DEPENDS.scim+= scim>=1.4.14nb12
BUILDLINK_PKGSRCDIR.scim?= ../../inputmethod/scim
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.if defined(USE_SCIM_GTKUTILS) && !empty(USE_SCIM_GTKUTILS:M[Yy][Ee][Ss])
pkgbase := scim
.include "../../mk/pkg-build-options.mk"
. if !empty(PKG_BUILD_OPTIONS.scim:Mgtk3)
.include "../../x11/gtk3/buildlink3.mk"
. else
.include "../../x11/gtk2/buildlink3.mk"
. endif
.endif
.endif # SCIM_BUILDLINK3_MK
BUILDLINK_TREE+= -scim

24
inputmethod/scim/distinfo Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: distinfo,v 1.8 2012/09/26 08:17:00 jperkin Exp $
SHA1 (scim-1.4.14.tar.gz) = 73391be371dd7ef9f9af8b3a211e2bedec0cf71b
RMD160 (scim-1.4.14.tar.gz) = 50643a8a8084c32612d415bfb0fe8b7f91c22459
Size (scim-1.4.14.tar.gz) = 1519287 bytes
SHA1 (patch-ab) = c5220c83ec8125f75b1e5d7b41f4438ec73becbf
SHA1 (patch-ac) = c8c4a54b1b6ffd82211616c3b99de1239b29c652
SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6
SHA1 (patch-ae) = 61909935f6226d2126392d0990f81243dc2bb933
SHA1 (patch-af) = 010d4f31d684b8163672d2521ebff74230591d66
SHA1 (patch-ag) = 2f97e1d9c9a96096524903c43ba4f7626956450d
SHA1 (patch-ah) = abb315ac44a36e99d8c456b1cb3af9290a29be12
SHA1 (patch-bb) = 69e001995a8caa65b885e438123a7efb0ad9995b
SHA1 (patch-bc) = 2b802e83a8aab3e3165418d540f91238c8941c2b
SHA1 (patch-bd) = 15982bf8a9aee6f6ccd94f186bff20b70b1a93cf
SHA1 (patch-be) = 85a98134d77038d20544241410ec8130df2ea94c
SHA1 (patch-extras_immodules_agent_scim-bridge-agent-application.cpp) = b8dc14330f29e706439e9ca91217892355f86ee4
SHA1 (patch-extras_immodules_agent_scim-bridge-agent.cpp) = f1a9bd1b185a02ba2e84d6040565662b95a25397
SHA1 (patch-extras_immodules_client-common_scim-bridge-client-output.c) = 51c8635a3084112fd4362862690c4cc5bfffbe01
SHA1 (patch-extras_immodules_client-common_scim-bridge-client.c) = ee441af01f39d65f8ed3f305407add2ac9fc0a32
SHA1 (patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c) = 19c8f4ec70bb1c21c7318819367729579641866e
SHA1 (patch-extras_immodules_common_scim-bridge-messenger.h) = 1a9defe26a124317c410bef12b2a7f023ea284b4
SHA1 (patch-extras_immodules_common_scim-bridge-output.h) = 65d32eb28ef92d8580352e333fa2e95243f5d987
SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51

55
inputmethod/scim/options.mk Normal file
View File

@@ -0,0 +1,55 @@
# $NetBSD: options.mk,v 1.1 2012/08/19 08:09:08 obache Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.scim
PKG_OPTIONS_REQUIRED_GROUPS= gtk
PKG_OPTIONS_GROUP.gtk= gtk gtk3
PKG_SUPPORTED_OPTIONS= qt
PKG_SUGGESTED_OPTIONS= gtk
PLIST_VARS+= gtk2 gtk3 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.gtk2= yes
.else
CONFIGURE_ARGS+= --enable-gtk2-immodule=no
.endif
.if !empty(PKG_OPTIONS:Mgtk3)
GTK3_IMMODULES= yes
.include "../../x11/gtk3/modules.mk"
CONFIGURE_ARGS+= --enable-gtk3-immodule
PLIST.gtk3= yes
.else
CONFIGURE_ARGS+= --enable-gtk3-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
CONFIGURE_ARGS+= --with-qt4-im-module-dir=${QTDIR}/plugins/inputmethods
PLIST.qt= yes
.else
CONFIGURE_ARGS+= --disable-qt4-immodule
.endif
.if !empty(PKG_OPTIONS:Mgtk3)
CONFIGURE_ARGS+= --with-gtk-version=3
.include "../../x11/gtk3/buildlink3.mk"
.else
CONFIGURE_ARGS+= --with-gtk-version=2
.include "../../x11/gtk2/buildlink3.mk"
.endif

171
inputmethod/scim/patches/patch-ab Normal file
View File

@@ -0,0 +1,171 @@
$NetBSD: patch-ab,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- src/scim_chartraits.cpp.orig 2008-11-02 06:42:37.000000000 +0000
+++ src/scim_chartraits.cpp
@@ -26,4 +26,5 @@
*/
+#if 0
#include <string>
#include "scim_types.h"
@@ -41,27 +42,33 @@ namespace std
template<>
-void
-char_traits<ucs4_t>::assign(char_type& __c1, const char_type& __c2)
+struct char_traits<ucs4_t>
+{
+
+typedef ucs4_t char_type;
+typedef ucs4_t int_type;
+typedef streampos pos_type;
+typedef streamoff off_type;
+typedef mbstate_t state_type;
+
+static void
+assign(char_type& __c1, const char_type& __c2)
{
__c1 = __c2;
}
-template<>
-bool
-char_traits<ucs4_t>::eq(const char_type& __c1, const char_type& __c2)
+static bool
+eq(const char_type& __c1, const char_type& __c2)
{
return __c1 == __c2;
}
-template<>
-bool
-char_traits<ucs4_t>::lt(const char_type& __c1, const char_type& __c2)
+static bool
+lt(const char_type& __c1, const char_type& __c2)
{
return __c1 < __c2;
}
-template<>
-char_traits<ucs4_t>::char_type*
-char_traits<ucs4_t>::assign(char_type* __s, size_t __n, char_type __a)
+static char_type*
+assign(char_type* __s, size_t __n, char_type __a)
{
char_type* dest = __s;
@@ -71,7 +78,6 @@ char_traits<ucs4_t>::assign(char_type* _
}
-template<>
-char_traits<ucs4_t>::char_type*
-char_traits<ucs4_t>::copy(char_type* __s1, const char_type* __s2, size_t __n)
+static char_type*
+copy(char_type* __s1, const char_type* __s2, size_t __n)
{
char_type* dest = __s1;
@@ -82,13 +88,12 @@ char_traits<ucs4_t>::copy(char_type* __s
}
-template<>
-char_traits<ucs4_t>::char_type*
-char_traits<ucs4_t>::move(char_type* __s1, const char_type* __s2, size_t __n)
+static char_type*
+move(char_type* __s1, const char_type* __s2, size_t __n)
{
- if (__s1 + __n > __s2) {
+ if (__s1 > __s2) {
char_type* dest = __s1 + __n - 1;
- const char_type* from = __s2;
+ const char_type* from = __s2 + __n - 1;
while (__n-- > 0)
- *(dest--) = *(from++);
+ *(dest--) = *(from--);
return __s1;
} else {
@@ -97,7 +102,6 @@ char_traits<ucs4_t>::move(char_type* __s
}
-template<>
-size_t
-char_traits<ucs4_t>::length(const char_type* __s)
+static size_t
+length(const char_type* __s)
{
size_t __result = 0;
@@ -107,7 +111,6 @@ char_traits<ucs4_t>::length(const char_t
}
-template<>
-int
-char_traits<ucs4_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
+static int
+compare(const char_type* __s1, const char_type* __s2, size_t __n)
{
while ( (*__s1 == *__s2++) && __n-- > 0 )
@@ -118,7 +121,6 @@ char_traits<ucs4_t>::compare(const char_
}
-template<>
-const char_traits<ucs4_t>::char_type*
-char_traits<ucs4_t>::find(const char_type* __s, size_t __n, const char_type& __a)
+static const char_type*
+find(const char_type* __s, size_t __n, const char_type& __a)
{
while (__n-- > 0) {
@@ -130,40 +132,38 @@ char_traits<ucs4_t>::find(const char_typ
}
-template<>
-char_traits<ucs4_t>::char_type
-char_traits<ucs4_t>::to_char_type (const int_type& __c)
+static char_type
+to_char_type(const int_type& __c)
{
return static_cast<char_type>(__c);
}
-template<>
-char_traits<ucs4_t>::int_type
-char_traits<ucs4_t>::to_int_type (const char_type& __c)
+static int_type
+to_int_type(const char_type& __c)
{
return static_cast<int_type>(__c);
}
-template<>
-bool
-char_traits<ucs4_t>::eq_int_type(const int_type& __c1, const int_type& __c2)
+static bool
+eq_int_type(const int_type& __c1, const int_type& __c2)
{
return __c1 == __c2;
}
-template<>
-char_traits<ucs4_t>::int_type
-char_traits<ucs4_t>::eof ()
+static int_type
+eof()
{
- return static_cast<int_type>(EOF);
+ return static_cast<int_type>(-1);
}
-template<>
-char_traits<ucs4_t>::int_type
-char_traits<ucs4_t>::not_eof (const int_type& __c)
+static int_type
+not_eof(const int_type& __c)
{
- return (__c == eof()) ? 0 : __c;
+ return eq_int_type(__c, eof()) ? static_cast<int_type>(0) : __c;
}
-}
+}; //struct char_traits<ucs4_t>
+
+} //namespace std
+#endif
#endif

13
inputmethod/scim/patches/patch-ac Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ac,v 1.3 2012/04/20 12:13:48 obache Exp $
--- extras/panel/scim_panel_gtk.cpp.orig 2012-04-10 09:15:30.000000000 +0000
+++ extras/panel/scim_panel_gtk.cpp
@@ -490,7 +490,7 @@ static GdkColor _active_text;
#endif
static ConfigModule *_config_module = 0;
-static ConfigPointer _config;
+static ConfigPointer _config = ConfigPointer(0);
static guint _check_exit_timeout = 0;

13
inputmethod/scim/patches/patch-ad Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ad,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- modules/FrontEnd/scim_socket_frontend.cpp.orig 2008-11-02 06:42:11.000000000 +0000
+++ modules/FrontEnd/scim_socket_frontend.cpp
@@ -51,7 +51,7 @@
using namespace scim;
-static Pointer <SocketFrontEnd> _scim_frontend (0);
+static Pointer <SocketFrontEnd> _scim_frontend = Pointer<SocketFrontEnd>(0);
static int _argc;
static char **_argv;

13
inputmethod/scim/patches/patch-ae Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ae,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- modules/FrontEnd/scim_x11_frontend.cpp.orig 2008-11-02 06:42:11.000000000 +0000
+++ modules/FrontEnd/scim_x11_frontend.cpp
@@ -71,7 +71,7 @@
using namespace scim;
//Local static data
-static Pointer <X11FrontEnd> _scim_frontend (0);
+static Pointer <X11FrontEnd> _scim_frontend = Pointer<X11FrontEnd>(0);
//Module Interface
extern "C" {

13
inputmethod/scim/patches/patch-af Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-af,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- modules/IMEngine/scim_rawcode_imengine.cpp.orig 2008-11-02 06:42:21.000000000 +0000
+++ modules/IMEngine/scim_rawcode_imengine.cpp
@@ -48,7 +48,7 @@
using namespace scim;
-static Pointer <RawCodeFactory> __rawcode_factory;
+static Pointer <RawCodeFactory> __rawcode_factory = Pointer<RawCodeFactory>(0);
static String __rawcode_locales;

13
inputmethod/scim/patches/patch-ag Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- src/scim_config_base.cpp.orig 2008-11-02 06:42:34.000000000 +0000
+++ src/scim_config_base.cpp
@@ -30,7 +30,7 @@
namespace scim {
-ConfigPointer _scim_default_config (0);
+ConfigPointer _scim_default_config = ConfigPointer(0);
ConfigModule _scim_default_config_module;
static ConfigPointer

156
inputmethod/scim/patches/patch-ah Normal file
View File

@@ -0,0 +1,156 @@
$NetBSD: patch-ah,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- src/scim_types.h.in.orig 2008-11-02 06:42:37.000000000 +0000
+++ src/scim_types.h.in
@@ -31,13 +31,7 @@
#define __SCIM_TYPES_H
@INCLUDE_STDINT@
-
-#ifdef __FreeBSD__
-# include <osreldate.h>
-# if __FreeBSD_version > 500035
-# define __STDC_ISO_10646__
-# endif
-#endif
+#include <string>
namespace scim {
@@ -51,6 +45,136 @@ typedef @UINT64@ uint64;
typedef uint32 ucs4_t;
#endif
+} // namespace scim
+
+#ifndef __STDC_ISO_10646__
+#include <cstring>
+
+namespace std
+{
+
+template<>
+struct char_traits<scim::ucs4_t>
+{
+
+typedef scim::ucs4_t char_type;
+typedef scim::ucs4_t int_type;
+typedef streampos pos_type;
+typedef streamoff off_type;
+typedef mbstate_t state_type;
+
+static void
+assign(char_type& __c1, const char_type& __c2)
+{
+ __c1 = __c2;
+}
+
+static bool
+eq(const char_type& __c1, const char_type& __c2)
+{
+ return __c1 == __c2;
+}
+
+static bool
+lt(const char_type& __c1, const char_type& __c2)
+{
+ return __c1 < __c2;
+}
+
+static char_type*
+assign(char_type* __s, size_t __n, char_type __a)
+{
+ while (__n-- > 0)
+ assign(__s[__n], __a);
+ return __s;
+}
+
+static char_type*
+copy(char_type* __s1, const char_type* __s2, size_t __n)
+{
+ return static_cast<char_type *>
+ (memcpy(__s1, __s2, __n * sizeof(char_type)));
+}
+
+static char_type*
+move(char_type* __s1, const char_type* __s2, size_t __n)
+{
+ return static_cast<char_type *>
+ (memmove(__s1, __s2, __n * sizeof(char_type)));
+}
+
+static size_t
+length(const char_type* __s)
+{
+ const char_type *__p;
+
+ __p = __s;
+ while (eq(*__p, static_cast<int_type>(0)))
+ ++__p;
+ return static_cast<size_t>(__p - __s);
+}
+
+static int
+compare(const char_type* __s1, const char_type* __s2, size_t __n)
+{
+ size_t __i;
+
+ for (__i = 0; __i < __n; ++__i)
+ if (!eq(__s1[__i], __s2[__i]))
+ return lt(__s1[__i], __s2[__i]) ? -1 : 1;
+ return 0;
+}
+
+static const char_type*
+find(const char_type* __s, size_t __n, const char_type& __a)
+{
+ while (__n-- > 0) {
+ if (eq(*__s, __a))
+ return __s;
+ ++__s;
+ }
+ return 0;
+}
+
+static bool
+eq_int_type(const int_type& __c1, const int_type& __c2)
+{
+ return __c1 == __c2;
+}
+
+static char_type
+to_char_type(const int_type& __c)
+{
+ return static_cast<char_type>(__c);
+}
+
+static int_type
+to_int_type(const char_type& __c)
+{
+ return static_cast<int_type>(__c);
+}
+
+static int_type
+eof()
+{
+ return static_cast<int_type>(-1);
+}
+
+static int_type
+not_eof(const int_type& __c)
+{
+ return eq_int_type(__c, eof())
+ ? static_cast<int_type>(0) : __c;
+}
+
+}; // struct char_traits<scim::ucs4_t>
+
+} // namespace std
+
+#endif //!__STDC_ISO_10646__
+
+namespace scim {
+
typedef std::basic_string<char> String;
typedef std::basic_string<ucs4_t> WideString;

54
inputmethod/scim/patches/patch-bb Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-bb,v 1.3 2012/04/20 12:13:48 obache Exp $
--- extras/gtk_immodule/gtkimcontextscim.cpp.orig 2012-04-10 10:30:58.000000000 +0000
+++ extras/gtk_immodule/gtkimcontextscim.cpp
@@ -282,11 +282,11 @@ static int
static FrontEndHotkeyMatcher _frontend_hotkey_matcher;
static IMEngineHotkeyMatcher _imengine_hotkey_matcher;
-static IMEngineInstancePointer _default_instance;
+static IMEngineInstancePointer _default_instance = IMEngineInstancePointer(0);
static ConfigModule *_config_module = 0;
-static ConfigPointer _config;
-static BackEndPointer _backend;
+static ConfigPointer _config = ConfigPointer(0);
+static BackEndPointer _backend = BackEndPointer(0);
static GtkIMContextSCIM *_focused_ic = 0;
static GtkWidget *_focused_widget = 0;
@@ -304,8 +304,8 @@ static bool
static int _instance_count = 0;
static int _context_count = 0;
-static IMEngineFactoryPointer _fallback_factory;
-static IMEngineInstancePointer _fallback_instance;
+static IMEngineFactoryPointer _fallback_factory = IMEngineFactoryPointer(0);
+static IMEngineInstancePointer _fallback_instance = IMEngineInstancePointer(0);
static PanelClient _panel_client;
@@ -318,6 +318,7 @@ static bool
static bool _shared_input_method = false;
static bool _use_key_snooper = false;
+#if 0
// A hack to shutdown the immodule cleanly even if im_module_exit () is not called when exiting.
class FinalizeHandler
{
@@ -334,6 +335,7 @@ public:
};
static FinalizeHandler _finalize_handler;
+#endif
/* Function Implementations */
@@ -446,6 +448,7 @@ gtk_im_context_scim_register_type (GType
sizeof (GtkIMContextSCIM),
0,
(GInstanceInitFunc) gtk_im_context_scim_init,
+ 0
};
SCIM_DEBUG_FRONTEND(1) << "gtk_im_context_scim_register_type...\n";

20
inputmethod/scim/patches/patch-bc Normal file
View File

@@ -0,0 +1,20 @@
$NetBSD: patch-bc,v 1.4 2012/08/19 08:09:08 obache Exp $
--- utils/scimkeyselection.cpp.orig 2012-06-11 15:50:28.000000000 +0000
+++ utils/scimkeyselection.cpp
@@ -79,6 +79,7 @@ scim_key_selection_register_type (GTypeM
sizeof (ScimKeySelection),
0,
(GInstanceInitFunc) scim_key_selection_init,
+ 0
};
if (!key_selection_type) {
@@ -641,6 +642,7 @@ scim_key_selection_dialog_register_type
sizeof (ScimKeySelectionDialog),
0,
(GInstanceInitFunc) scim_key_selection_dialog_init,
+ 0
};
if (!key_selection_dialog_type) {

12
inputmethod/scim/patches/patch-bd Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-bd,v 1.2 2012/04/20 12:13:48 obache Exp $
--- utils/scimstringview.c.orig 2012-04-10 10:30:58.000000000 +0000
+++ utils/scimstringview.c
@@ -153,6 +153,7 @@ scim_string_view_register_type (GTypeMod
sizeof (ScimStringView),
0,
(GInstanceInitFunc) scim_string_view_init,
+ 0
};
if (!string_view_type)

14
inputmethod/scim/patches/patch-be Normal file
View File

@@ -0,0 +1,14 @@
$NetBSD: patch-be,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
--- utils/scimtrayicon.c.orig 2008-11-02 06:42:49.000000000 +0000
+++ utils/scimtrayicon.c
@@ -72,7 +72,8 @@ scim_tray_icon_get_type (void)
NULL, /* class_data */
sizeof (ScimTrayIcon),
0, /* n_preallocs */
- (GInstanceInitFunc) scim_tray_icon_init
+ (GInstanceInitFunc) scim_tray_icon_init,
+ 0
};
our_type = g_type_register_static (GTK_TYPE_PLUG, "ScimTrayIcon", &our_info, 0);
}

37
inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent-application.cpp Normal file
View File

@@ -0,0 +1,37 @@
$NetBSD: patch-extras_immodules_agent_scim-bridge-agent-application.cpp,v 1.1 2012/08/19 08:09:08 obache Exp $
--- extras/immodules/agent/scim-bridge-agent-application.cpp.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/agent/scim-bridge-agent-application.cpp
@@ -61,12 +61,12 @@ int main (int argc, char *argv[])
{0, 0, NULL, 0}
};
- char short_options[] = "vhqdls:b:";
+ char short_options[] = "vhql:sn:";
unsigned int tmp_uint;
int option = 0;
- while (option != EOF) {
+ while (option != -1) {
option = getopt_long (argc, argv, short_options, long_options, NULL);
switch (option) {
case 'v':
@@ -90,14 +90,14 @@ int main (int argc, char *argv[])
standalone_enabled = true;
break;
case 'h':
- cout << "Usage: scim-bridge-agent [options]" << endl;
+ cout << "Usage: scim-im-agent [options]" << endl;
cout << " Options" << endl << endl;
cout << " -h, --help\tGive this help list" << endl;
cout << " -v, --verbose\tVerbosely print out the debug message into standard output.This option equals to '--debuglevel=6'" << endl;
cout << " -q, --quiet\tMake it print no debug message at all.This option equals to '--debuglevel=0" << endl;
cout << " -l, --debuglevel\tSet how verbosely should it print debug output.'--debuglevel=0' equals to '--queit', and '--debuglevel=9' equals to '--verbose'" << endl;
- cout << " -s, --standalone\tGiven this, scim-brige-agent won't daemonize itself." << endl;
- cout << " -n, --noexit\tGiven this, scim-brige-agent won't exit when there is no client." << endl;
+ cout << " -s, --standalone\tGiven this, scim-im-agent won't daemonize itself." << endl;
+ cout << " -n, --noexit\tGiven this, scim-im-agent won't exit when there is no client." << endl;
exit (0);
break;
case ':':

12
inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent.cpp Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-extras_immodules_agent_scim-bridge-agent.cpp,v 1.1 2012/08/19 08:09:08 obache Exp $
--- extras/immodules/agent/scim-bridge-agent.cpp.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/agent/scim-bridge-agent.cpp
@@ -198,6 +198,7 @@ ScimBridgeAgent *ScimBridgeAgent::alloc
ScimBridgeAgentImpl::ScimBridgeAgentImpl ():
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)
{
}

12
inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client-output.c Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-extras_immodules_client-common_scim-bridge-client-output.c,v 1.1 2012/08/19 08:09:08 obache Exp $
--- extras/immodules/client-common/scim-bridge-client-output.c.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/client-common/scim-bridge-client-output.c
@@ -20,6 +20,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include "scim-bridge-debug.h"
#include "scim-bridge-output.h"

25
inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client.c Normal file
View File

@@ -0,0 +1,25 @@
$NetBSD: patch-extras_immodules_client-common_scim-bridge-client.c,v 1.1 2012/08/19 08:09:08 obache Exp $
--- extras/immodules/client-common/scim-bridge-client.c.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/client-common/scim-bridge-client.c
@@ -38,6 +38,11 @@
#include "scim-bridge-path.h"
#include "scim-bridge-string.h"
+#ifndef SUN_LEN
+#define SUN_LEN(su) \
+ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+#endif
+
/* Private data type */
typedef struct _IMContextListElement
{
@@ -1080,7 +1085,7 @@ retval_t scim_bridge_client_open_messeng
socket_addr.sun_family = AF_UNIX;
strcpy (socket_addr.sun_path, scim_bridge_path_get_socket ());
- if (connect (socket_fd, (struct sockaddr*)&socket_addr, sizeof (socket_addr.sun_family) + strlen (socket_addr.sun_path))) {
+ if (connect (socket_fd, (struct sockaddr*)&socket_addr, SUN_LEN(&socket_addr))) {
if (i == 5 && launch_agent ()) {
scim_bridge_perrorln ("Cannot launch the agent");
return RETVAL_FAILED;

12
inputmethod/scim/patches/patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c,v 1.1 2012/08/19 08:09:08 obache Exp $
--- extras/immodules/client-gtk/scim-bridge-client-imcontext-gtk.c.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/client-gtk/scim-bridge-client-imcontext-gtk.c
@@ -684,6 +684,7 @@ void scim_bridge_client_imcontext_regist
#else
(GtkObjectInitFunc) scim_bridge_client_imcontext_initialize,
#endif
+ 0
};
class_type = g_type_module_register_type (type_module, GTK_TYPE_IM_CONTEXT, "ScimBridgeClientIMContext", &klass_info, 0);

13
inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-extras_immodules_common_scim-bridge-messenger.h,v 1.1 2012/08/19 08:09:08 obache Exp $
--- extras/immodules/common/scim-bridge-messenger.h.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/common/scim-bridge-messenger.h
@@ -33,6 +33,8 @@
*/
typedef struct _ScimBridgeMessenger ScimBridgeMessenger;
+struct timeval;
+
#ifdef __cplusplus
extern "C"
{

22
inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-output.h Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-extras_immodules_common_scim-bridge-output.h,v 1.1 2012/09/26 08:17:00 jperkin Exp $
* alloca.h is required for alloca(3C) on Solaris.
* Not all systems provide MSG_NOSIGNAL.
--- extras/immodules/common/scim-bridge-output.h.orig 2012-06-13 15:22:28.000000000 +0000
+++ extras/immodules/common/scim-bridge-output.h 2012-09-26 07:56:02.073082321 +0000
@@ -28,6 +28,14 @@
#include "scim-bridge.h"
#include "scim-bridge-debug.h"
+#ifdef __sun
+#include <alloca.h>
+#endif
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
#ifdef __cplusplus
extern "C"
{

27
inputmethod/scim/patches/patch-src_scim__helper__manager__server.cpp Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-src_scim__helper__manager__server.cpp,v 1.1 2011/11/13 07:52:02 obache Exp $
* Variable Length Arrays with non-POD types are a GCC extension.
--- src/scim_helper_manager_server.cpp.orig 2008-10-19 04:48:33.000000000 +0000
+++ src/scim_helper_manager_server.cpp
@@ -95,10 +95,10 @@ void load_helper_modules (void)
// so I added a workaround: have an array of modules and unload them all together in the end only.
// TODO Need to figure out what's going on with this issue.
- HelperModule module[mod_list.size ()];
-
if (mod_list.size ()) {
+ HelperModule *module = new HelperModule[mod_list.size ()];
+
for (size_t i = 0; i < mod_list.size (); ++i) {
SCIM_DEBUG_MAIN (2) << " Load module: " << mod_list [i] << "\n";
@@ -120,6 +120,7 @@ void load_helper_modules (void)
for (size_t i = 0; i < mod_list.size (); ++i) {
module[i].unload ();
}
+ delete[] module;
}
}