commit 6cf904c13fb46f5e13c0c2f6941e1488b499ebf5
Author: Jakub Bogusz <[email protected]>
Date: Sat Sep 15 12:27:17 2012 +0200
- updated to 1.4.1
- updated xx-icon-patch (now it handles only hotkeys; symbol is always
enabled with ibus 1.4.x)
- removed obsolete ibus-1.4 patch
- pl
ibus-hangul-ibus-1.4.patch | 142 ---------------------------------------
ibus-hangul-xx-icon-symbol.patch | 16 ++---
ibus-hangul.spec | 44 ++++++++----
3 files changed, 37 insertions(+), 165 deletions(-)
---
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index fcc8d1d..0b3995f 100644
--- a/ibus-hangul.spec
+++ b/ibus-hangul.spec
@@ -3,25 +3,28 @@
%bcond_with bridge_hotkey # enable the engine hotkeys
#
Summary: The Hangul engine for IBus input platform
+Summary(pl.UTF-8): Silnik Hangul dla platformy wprowadzania znaków IBus
Name: ibus-hangul
-Version: 1.3.1
+Version: 1.4.1
Release: 1
License: GPL v2+
Group: Libraries
+#Source0Download: http://code.google.com/p/ibus/downloads/list
Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5: b71565bba3a1439a47212611b774ecf7
-Patch0: %{name}-ibus-1.4.patch
-Patch1: %{name}-xx-icon-symbol.patch
+# Source0-md5: c9615a9f704a4c29252028407329e1c3
+Patch0: %{name}-xx-icon-symbol.patch
URL: http://code.google.com/p/ibus/
-BuildRequires: gettext-devel
-BuildRequires: ibus
-BuildRequires: ibus-devel >= 1.3.0
-BuildRequires: intltool
-BuildRequires: libhangul-devel >= 0.0.10
+BuildRequires: autoconf >= 2.50
+BuildRequires: automake >= 1:1.10
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: ibus-devel >= 1.4.0
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libhangul-devel >= 0.1.0
BuildRequires: libtool
BuildRequires: pkgconfig
-Requires: ibus >= 1.3.0
-Requires: libhangul >= 0.0.10
+BuildRequires: python >= 1:2.5
+Requires: ibus >= 1.4.0
+Requires: libhangul >= 0.1.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_libdir}/ibus
@@ -30,14 +33,20 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
The Hangul engine for IBus platform. It provides Korean input method
from libhangul.
+%description -l pl.UTF-8
+Silnik Hangul dla platformy wprowadzania znaków IBus. Udostępnia
+metodę wprowadzania znaków koreańskich zaimplementowaną w libhangul.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
+%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
%{?with_bridge_hotkey:--with-hotkeys}
@@ -57,7 +66,16 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
+%attr(755,root,root) %{_bindir}/ibus-setup-hangul
%attr(755,root,root) %{_libexecdir}/ibus-engine-hangul
%attr(755,root,root) %{_libexecdir}/ibus-setup-hangul
+%dir %{_libdir}/ibus-hangul
+%dir %{_libdir}/ibus-hangul/setup
+%attr(755,root,root) %{_libdir}/ibus-hangul/setup/hangul_keyboard_list
%{_datadir}/ibus-hangul
-%{_datadir}/ibus/component/*
+%{_datadir}/ibus/component/hangul.xml
+%{_desktopdir}/ibus-setup-hangul.desktop
+%{_iconsdir}/hicolor/64x64/apps/ibus-hangul.png
+%{_iconsdir}/hicolor/64x64/apps/ibus-setup-hangul.png
+%{_iconsdir}/hicolor/scalable/apps/ibus-hangul.svg
+%{_iconsdir}/hicolor/scalable/apps/ibus-setup-hangul.svg
diff --git a/ibus-hangul-ibus-1.4.patch b/ibus-hangul-ibus-1.4.patch
deleted file mode 100644
index 3005672..0000000
--- a/ibus-hangul-ibus-1.4.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Patch to follow ibus 1.4 config API change.
-Index: ibus-hangul-1.3.1/src/engine.c
-===================================================================
---- ibus-hangul-1.3.1.orig/src/engine.c
-+++ ibus-hangul-1.3.1/src/engine.c
-@@ -111,7 +111,11 @@ static void ibus_hangul_engine_update_lo
- static void ibus_config_value_changed (IBusConfig *config,
- const gchar *section,
- const gchar *name,
-+#if IBUS_CHECK_VERSION(1,3,99)
-+ GVariant *value,
-+#else
- GValue *value,
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
- gpointer
user_data);
-
- static void lookup_table_set_visible (IBusLookupTable *table,
-@@ -136,6 +140,11 @@ static gboolean hanja_key_list_match
- static gboolean hanja_key_list_has_modifier (HanjaKeyList *list,
- guint keyval);
-
-+static gboolean config_get_string (IBusConfig *config,
-+ const gchar *section,
-+ const gchar *name,
-+ gchar **result);
-+
- static IBusEngineClass *parent_class = NULL;
- static HanjaTable *hanja_table = NULL;
- static HanjaTable *symbol_table = NULL;
-@@ -176,7 +185,7 @@ void
- ibus_hangul_init (IBusBus *bus)
- {
- gboolean res;
-- GValue value = { 0, };
-+ gchar *str;
-
- hanja_table = hanja_table_load (NULL);
-
-@@ -187,22 +196,20 @@ ibus_hangul_init (IBusBus *bus)
- g_object_ref_sink (config);
-
- hangul_keyboard = g_string_new_len ("2", 8);
-- res = ibus_config_get_value (config, "engine/Hangul",
-- "HangulKeyboard", &value);
-+ str = NULL;
-+ res = config_get_string (config, "engine/Hangul", "HangulKeyboard", &str);
- if (res) {
-- const gchar* str = g_value_get_string (&value);
- g_string_assign (hangul_keyboard, str);
-- g_value_unset(&value);
-+ g_free (str);
- }
-
- hanja_key_list_init(&hanja_keys);
-
-- res = ibus_config_get_value (config, "engine/Hangul",
-- "HanjaKeys", &value);
-+ str = NULL;
-+ res = config_get_string (config, "engine/Hangul", "HanjaKeys", &str);
- if (res) {
-- const gchar* str = g_value_get_string (&value);
- hanja_key_list_set_from_string(&hanja_keys, str);
-- g_value_unset(&value);
-+ g_free (str);
- } else {
- hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
- hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
-@@ -963,27 +970,71 @@ ibus_hangul_engine_property_activate (IB
- }
- }
-
-+static gboolean
-+config_get_string (IBusConfig *config,
-+ const gchar *section,
-+ const gchar *name,
-+ gchar **result)
-+{
-+#if IBUS_CHECK_VERSION(1,3,99)
-+ GVariant *value = NULL;
-+
-+ g_return_val_if_fail (result != NULL, FALSE);
-+
-+ value = ibus_config_get_value (config, section, name);
-+ if (value) {
-+ *result = g_strdup (g_variant_get_string (value, NULL));
-+ g_variant_unref (value);
-+ return TRUE;
-+ }
-+ return FALSE;
-+#else
-+ GValue value = { 0 };
-+
-+ g_return_val_if_fail (result != NULL, FALSE);
-+
-+ if (ibus_config_get_value (config, section, name, &value)) {
-+ *result = g_strdup (g_value_get_string (&value));
-+ g_value_unset (&value);
-+ return TRUE;
-+ }
-+ return FALSE;
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
-+}
-+
-+#if IBUS_CHECK_VERSION(1,3,99)
-+#define _g_variant_get_string g_variant_get_string
-+#define _g_variant_get_int32 g_variant_get_int32
-+#else
-+#define _g_variant_get_string(value, length) g_value_get_string(value)
-+#define _g_variant_get_int32 g_value_get_int
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
-+
- static void
- ibus_config_value_changed (IBusConfig *config,
- const gchar *section,
- const gchar *name,
-+#if IBUS_CHECK_VERSION(1,3,99)
-+ GVariant *value,
-+#else
- GValue *value,
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
- gpointer user_data)
- {
- IBusHangulEngine *hangul = (IBusHangulEngine *) user_data;
-
- if (strcmp(section, "engine/Hangul") == 0) {
- if (strcmp(name, "HangulKeyboard") == 0) {
-- const gchar *str = g_value_get_string (value);
-+ const gchar *str = _g_variant_get_string (value, NULL);
- g_string_assign (hangul_keyboard, str);
- hangul_ic_select_keyboard (hangul->context, hangul_keyboard->str);
- } else if (strcmp(name, "HanjaKeys") == 0) {
-- const gchar* str = g_value_get_string (value);
-+ const gchar* str = _g_variant_get_string (value, NULL);
- hanja_key_list_set_from_string(&hanja_keys, str);
- }
- } else if (strcmp(section, "panel") == 0) {
- if (strcmp(name, "lookup_table_orientation") == 0) {
-- lookup_table_orientation = g_value_get_int (value);
-+ lookup_table_orientation = _g_variant_get_int32 (value);
- }
- }
- }
diff --git a/ibus-hangul-xx-icon-symbol.patch b/ibus-hangul-xx-icon-symbol.patch
index 0484ce7..5d3391c 100644
--- a/ibus-hangul-xx-icon-symbol.patch
+++ b/ibus-hangul-xx-icon-symbol.patch
@@ -1,15 +1,14 @@
-Patch to embed hotkeys and symbol property in component XML.
+Patch to embed hotkeys property in component XML.
Index: ibus-hangul-1.3.1/configure.ac
===================================================================
--- ibus-hangul-1.3.1.orig/configure.ac
+++ ibus-hangul-1.3.1/configure.ac
-@@ -75,6 +75,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
+@@ -75,6 +75,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.17])
+# hotkeys and symbol properties in component xml
+IBUS_WITH_HOTKEYS([Control+space,Hangul])
-+IBUS_SET_SYMBOL([한])
+
# OUTPUT files
@@ -71,16 +70,13 @@ Index: ibus-hangul-1.3.1/m4/ibus.m4
+ fi
+ AC_SUBST(IBUS_SYMBOL_XML)
+])
-Index: ibus-hangul-1.3.1/src/hangul.xml.in.in
-===================================================================
---- ibus-hangul-1.3.1.orig/src/hangul.xml.in.in
-+++ ibus-hangul-1.3.1/src/hangul.xml.in.in
-@@ -21,6 +21,8 @@
- <longname>Korean</longname>
+--- ibus-hangul-1.4.1/src/hangul.xml.in.in.orig 2012-09-15
11:32:11.785250460 +0200
++++ ibus-hangul-1.4.1/src/hangul.xml.in.in 2012-09-15 11:43:35.728569536
+0200
+@@ -22,6 +22,7 @@
<description>Korean Input Method</description>
<rank>99</rank>
+ <symbol>한</symbol>
+ @IBUS_HOTKEYS_XML@
-+ @IBUS_SYMBOL_XML@
</engine>
</engines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ibus-hangul.git/commitdiff/6cf904c13fb46f5e13c0c2f6941e1488b499ebf5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
