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

Import of pkgsrc-2015Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
inputmethod/scim/Makefile
View File

@@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.34 2014/02/12 23:18:05 tron Exp $
# $NetBSD: Makefile,v 1.39 2015/03/15 16:56:49 hiramatsu Exp $
#
DISTNAME= scim-1.4.14
PKGREVISION= 17
DISTNAME= scim-1.4.15
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
MAINTAINER= obache@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.scim-im.org/
COMMENT= Smart Common Input Method
LICENSE= gnu-lgpl-v2.1
@@ -21,6 +20,9 @@ USE_LIBTOOL= yes
USE_TOOLS+= msgfmt pkg-config
USE_TOOLS+= gmake # make scim-setup.desktop
USE_TOOLS+= perl intltool
USE_TOOLS+= autopoint autoconf automake
BUILD_DEPENDS+= gettext>=0.19.4:../../devel/gettext
PKGCONFIG_OVERRIDE= scim-gtkutils.pc.in
PKGCONFIG_OVERRIDE+= scim-x11utils.pc.in
@@ -49,6 +51,12 @@ LDFLAGS.SunOS+= -lsocket -lnsl
CONFIGURE_ENV+= ac_cv_func_gethostbyname_r=no
.endif
# unused test script
CHECK_PORTABILITY_SKIP+= extras/immodules/tests/test-exec.sh.in
pre-configure:
${RUN}cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${SH} bootstrap
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"

4
inputmethod/scim/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.22 2013/10/10 14:41:50 ryoon Exp $
# $NetBSD: buildlink3.mk,v 1.23 2014/05/05 00:48:03 ryoon Exp $
BUILDLINK_TREE+= scim
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= scim
SCIM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.scim+= scim>=1.4.7
BUILDLINK_ABI_DEPENDS.scim+= scim>=1.4.14nb16
BUILDLINK_ABI_DEPENDS.scim+= scim>=1.4.14nb18
BUILDLINK_PKGSRCDIR.scim?= ../../inputmethod/scim
.include "../../devel/gettext-lib/buildlink3.mk"

21
inputmethod/scim/distinfo
View File

@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.8 2012/09/26 08:17:00 jperkin Exp $
$NetBSD: distinfo,v 1.9 2014/11/09 02:46:30 obache 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 (scim-1.4.15.tar.gz) = 771d81b5c81164840f7d45c39165c2990cc809bd
RMD160 (scim-1.4.15.tar.gz) = 07d4337ee0c33ba88ee94fd2dc76e71d1529c2df
Size (scim-1.4.15.tar.gz) = 1374463 bytes
SHA1 (patch-ab) = 1e10dfb2405849daceda2b3e15835f6a84d8990a
SHA1 (patch-ac) = c8c4a54b1b6ffd82211616c3b99de1239b29c652
SHA1 (patch-ad) = 2812ded533f29bd69bad180c33c81fd49e6213e6
SHA1 (patch-ae) = 61909935f6226d2126392d0990f81243dc2bb933
@@ -11,14 +11,5 @@ 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_agent_scim-bridge-agent-application.cpp) = 183b9d036a791d2004eac9655406f7501de2fb0d
SHA1 (patch-extras_immodules_common_scim-bridge-output.h) = 65d32eb28ef92d8580352e333fa2e95243f5d987
SHA1 (patch-src_scim__helper__manager__server.cpp) = 3a1130f37c7c93389e2ae7db65af7438bac5de51

165
inputmethod/scim/patches/patch-ab
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
$NetBSD: patch-ab,v 1.2 2014/11/09 02:46:30 obache Exp $
--- src/scim_chartraits.cpp.orig 2008-11-02 06:42:37.000000000 +0000
--- src/scim_chartraits.cpp.orig 2012-09-22 13:26:08.000000000 +0000
+++ src/scim_chartraits.cpp
@@ -26,4 +26,5 @@
*/
@@ -8,164 +8,9 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $
+#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;
@@ -163,4 +164,5 @@ struct char_traits<ucs4_t>
}
-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
+#endif
/*

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

@@ -1,20 +0,0 @@
$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
View File

@@ -1,12 +0,0 @@
$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
View File

@@ -1,14 +0,0 @@
$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);
}

20
inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent-application.cpp
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-extras_immodules_agent_scim-bridge-agent-application.cpp,v 1.1 2012/08/19 08:09:08 obache Exp $
$NetBSD: patch-extras_immodules_agent_scim-bridge-agent-application.cpp,v 1.2 2014/11/09 02:46:30 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
@@ -17,21 +17,3 @@ $NetBSD: patch-extras_immodules_agent_scim-bridge-agent-application.cpp,v 1.1 20
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
View File

@@ -1,12 +0,0 @@
$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
View File

@@ -1,12 +0,0 @@
$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
View File

@@ -1,25 +0,0 @@
$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
View File

@@ -1,12 +0,0 @@
$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
View File

@@ -1,13 +0,0 @@
$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"
{

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

@@ -1,27 +0,0 @@
$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;
}
}