pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/inputmethod/scim Update scim to 1.4.15.
details: https://anonhg.NetBSD.org/pkgsrc/rev/6e2fc29834ae
branches: trunk
changeset: 641465:6e2fc29834ae
user: obache <obache%pkgsrc.org@localhost>
date: Sun Nov 09 02:46:30 2014 +0000
description:
Update scim to 1.4.15.
* Disable key snooping by default.
* Handle special keys correctly.
* Send reedit-changed event when composing reedit string.
diffstat:
inputmethod/scim/Makefile | 12 +-
inputmethod/scim/distinfo | 21 +-
inputmethod/scim/patches/patch-ab | 167 +---------
inputmethod/scim/patches/patch-bc | 20 -
inputmethod/scim/patches/patch-bd | 12 -
inputmethod/scim/patches/patch-be | 14 -
inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent-application.cpp | 20 +-
inputmethod/scim/patches/patch-extras_immodules_agent_scim-bridge-agent.cpp | 12 -
inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client-output.c | 12 -
inputmethod/scim/patches/patch-extras_immodules_client-common_scim-bridge-client.c | 25 -
inputmethod/scim/patches/patch-extras_immodules_client-gtk_scim-bridge-client-imcontext-gtk.c | 12 -
inputmethod/scim/patches/patch-extras_immodules_common_scim-bridge-messenger.h | 13 -
inputmethod/scim/patches/patch-src_scim__helper__manager__server.cpp | 27 -
13 files changed, 22 insertions(+), 345 deletions(-)
diffs (truncated from 464 to 300 lines):
diff -r e21d8cb38b2d -r 6e2fc29834ae inputmethod/scim/Makefile
--- a/inputmethod/scim/Makefile Sun Nov 09 02:26:27 2014 +0000
+++ b/inputmethod/scim/Makefile Sun Nov 09 02:46:30 2014 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2014/05/29 23:36:42 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2014/11/09 02:46:30 obache Exp $
#
-DISTNAME= scim-1.4.14
-PKGREVISION= 19
+DISTNAME= scim-1.4.15
CATEGORIES= inputmethod
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scim/}
@@ -21,6 +20,7 @@
USE_TOOLS+= msgfmt pkg-config
USE_TOOLS+= gmake # make scim-setup.desktop
USE_TOOLS+= perl intltool
+USE_TOOLS+= autopoint autoconf automake
PKGCONFIG_OVERRIDE= scim-gtkutils.pc.in
PKGCONFIG_OVERRIDE+= scim-x11utils.pc.in
@@ -49,6 +49,12 @@
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"
diff -r e21d8cb38b2d -r 6e2fc29834ae inputmethod/scim/distinfo
--- a/inputmethod/scim/distinfo Sun Nov 09 02:26:27 2014 +0000
+++ b/inputmethod/scim/distinfo Sun Nov 09 02:46:30 2014 +0000
@@ -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-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
diff -r e21d8cb38b2d -r 6e2fc29834ae inputmethod/scim/patches/patch-ab
--- a/inputmethod/scim/patches/patch-ab Sun Nov 09 02:26:27 2014 +0000
+++ b/inputmethod/scim/patches/patch-ab Sun Nov 09 02:46:30 2014 +0000
@@ -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 @@
+#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;
+@@ -163,4 +164,5 @@ struct char_traits<ucs4_t>
}
-
--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
- }
+ #endif
++#endif
--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
-
+ /*
diff -r e21d8cb38b2d -r 6e2fc29834ae inputmethod/scim/patches/patch-bc
--- a/inputmethod/scim/patches/patch-bc Sun Nov 09 02:26:27 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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) {
diff -r e21d8cb38b2d -r 6e2fc29834ae inputmethod/scim/patches/patch-bd
--- a/inputmethod/scim/patches/patch-bd Sun Nov 09 02:26:27 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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)
diff -r e21d8cb38b2d -r 6e2fc29834ae inputmethod/scim/patches/patch-be
--- a/inputmethod/scim/patches/patch-be Sun Nov 09 02:26:27 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 */
Home |
Main Index |
Thread Index |
Old Index