diff options
author | obache <obache@pkgsrc.org> | 2010-09-07 07:08:00 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2010-09-07 07:08:00 +0000 |
commit | 75f769e3d96a3364404b4102cc91122bd0e8cb75 (patch) | |
tree | c0b17b26d1f201d4fa70c922a7c1f381e8f062cc /inputmethod | |
parent | 2363a2dae9d051c431a3cbeebd7b729c5ab5f13b (diff) | |
download | pkgsrc-75f769e3d96a3364404b4102cc91122bd0e8cb75.tar.gz |
Update input-pad to 0.1.2
* Added some acronyms.
* Fixed the default selection in GtkTreeView.
* Don't load kbdui/foo.so in addition to kbdui/foo.la.
* Added debian build.
* Fixed #1 input-pad.pc doesn't include gtk+-2.0
Diffstat (limited to 'inputmethod')
-rw-r--r-- | inputmethod/input-pad/Makefile.common | 4 | ||||
-rw-r--r-- | inputmethod/input-pad/distinfo | 9 | ||||
-rw-r--r-- | inputmethod/input-pad/patches/patch-aa | 74 |
3 files changed, 6 insertions, 81 deletions
diff --git a/inputmethod/input-pad/Makefile.common b/inputmethod/input-pad/Makefile.common index ec5ca7bf885..0f16104d991 100644 --- a/inputmethod/input-pad/Makefile.common +++ b/inputmethod/input-pad/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.1.1.1 2010/08/31 08:25:20 obache Exp $ +# $NetBSD: Makefile.common,v 1.2 2010/09/07 07:08:00 obache Exp $ # # used by inputmethod/input-pad/Makefile # used by inputmethod/py-input-pad/Makefile -DISTNAME= input-pad-0.1.1 +DISTNAME= input-pad-0.1.2 CATEGORIES= inputmethod MASTER_SITES= http://input-pad.googlecode.com/files/ diff --git a/inputmethod/input-pad/distinfo b/inputmethod/input-pad/distinfo index c1325e4a655..39329c8facc 100644 --- a/inputmethod/input-pad/distinfo +++ b/inputmethod/input-pad/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/08/31 08:25:20 obache Exp $ +$NetBSD: distinfo,v 1.2 2010/09/07 07:08:00 obache Exp $ -SHA1 (input-pad-0.1.1.tar.gz) = 98a612d16be9df83369be29b4f678fea19fa7ffe -RMD160 (input-pad-0.1.1.tar.gz) = 9a2f64da4261eb5f94279f2ca57f594032a59036 -Size (input-pad-0.1.1.tar.gz) = 475626 bytes -SHA1 (patch-aa) = 82a379c927631d8861bec677636ec0e348293be9 +SHA1 (input-pad-0.1.2.tar.gz) = 99e4a22f4a6faefb156077d387a614c24088e827 +RMD160 (input-pad-0.1.2.tar.gz) = afa43fb4b5539dd580bde76b53886166b3b26485 +Size (input-pad-0.1.2.tar.gz) = 478155 bytes diff --git a/inputmethod/input-pad/patches/patch-aa b/inputmethod/input-pad/patches/patch-aa deleted file mode 100644 index 39c10840bea..00000000000 --- a/inputmethod/input-pad/patches/patch-aa +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2010/08/31 08:25:20 obache Exp $ - -Don't load kbdui/foo.so in addition to kbdui/foo.la. -http://github.com/fujiwarat/input-pad/commit/ed250b079e0a64a4780b821a37f285e5c35f866e - ---- input-pad/window-gtk.c.orig 2010-07-08 10:07:08.000000000 +0000 -+++ input-pad/window-gtk.c -@@ -3508,6 +3508,27 @@ input_pad_gtk_window_xtest_gdk_setup (In - - #endif /* MODULE_XTEST_GDK_BASE */ - -+static gboolean -+check_module_filename (const gchar *filename) -+{ -+ if (!g_str_has_prefix (filename, "lib") || -+ !g_str_has_prefix (filename + 3, MODULE_NAME_PREFIX)) { -+ g_warning ("File prefix is not input-pad library: %s", filename); -+ return FALSE; -+ } -+#ifdef G_MODULE_SUFFIX -+ /* G_MODULE_SUFFIX is defined in glibconfig.h */ -+ g_assert (G_MODULE_SUFFIX != NULL); -+ if (!g_str_has_suffix (filename, "." G_MODULE_SUFFIX)) { -+ /* filename is ignored due to no suffix G_MODULE_SUFFIX. */ -+ return FALSE; -+ } -+#else -+ g_debug ("Recommend to have G_MODULE_SUFFIX to avoid '.la' file.\n"); -+#endif -+ return TRUE; -+} -+ - static GModule * - kbdui_module_open (const gchar *filepath) - { -@@ -3774,9 +3795,7 @@ input_pad_gtk_window_parse_kbdui_modules - } - - while ((filename = g_dir_read_name (dir)) != NULL) { -- if (!g_str_has_prefix (filename, "lib") || -- !g_str_has_prefix (filename + 3, MODULE_NAME_PREFIX)) { -- g_warning ("File prefix is not input-pad library: %s", filename); -+ if (!check_module_filename (filename)) { - continue; - } - filepath = g_build_filename (dirname, filename, NULL); -@@ -4295,9 +4314,7 @@ input_pad_gtk_window_get_kbdui_name_list - const gchar *subname = NULL; - gchar *name = NULL; - -- if (!g_str_has_prefix (filename, "lib") || -- !g_str_has_prefix (filename + 3, MODULE_NAME_PREFIX)) { -- g_warning ("File prefix is not input-pad library: %s", filename); -+ if (!check_module_filename (filename)) { - continue; - } - filepath = g_build_filename (dirname, filename, NULL); -@@ -4315,11 +4332,11 @@ input_pad_gtk_window_get_kbdui_name_list - g_warning ("Filename is invalid %s", filename); - continue; - } -- if (g_str_has_suffix (subname, ".so")) { -- name = g_strndup (subname, strlen (subname) - 3); -- } else { -- name = g_strdup (subname); -- } -+#ifdef G_MODULE_SUFFIX -+ name = g_strndup (subname, strlen (subname) - strlen (G_MODULE_SUFFIX) - 1); -+#else -+ name = g_strdup (subname); -+#endif - if (name == NULL || *name == '\0') { - g_warning ("Filename is invalid %s", filename); - g_free (name); |