diff --git a/.gitignore b/.gitignore index 0800d96..3551032 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ibus-hangul-1.3.0.20100329.tar.gz /ibus-hangul-1.4.2.tar.gz /ibus-hangul-1.5.0.tar.gz /ibus-hangul-1.5.1.tar.gz +/ibus-hangul-1.5.3.tar.gz diff --git a/ibus-hangul-fixes-reset.patch b/ibus-hangul-fixes-reset.patch deleted file mode 100644 index 12b919e..0000000 --- a/ibus-hangul-fixes-reset.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit b3bbd17e5c557463991a6fb193fcfe299817e542 -Author: Peng Wu -Date: Thu Apr 18 15:05:47 2019 +0800 - - Do not commit text when reset signal is received - - ibus-hangul uses ibus_engine_update_preedit_text_with_mode() to - commit the preedit text by ibus-daemon and now focus-out and - mouse click are handled by ibus-daemon and ibus clients. - - BUG=https://github.com/ibus/ibus/issues/1980 - -Index: ibus-hangul-1.5.1/src/engine.c -=================================================================== ---- ibus-hangul-1.5.1.orig/src/engine.c -+++ ibus-hangul-1.5.1/src/engine.c -@@ -1351,7 +1351,16 @@ ibus_hangul_engine_reset (IBusEngine *en - { - IBusHangulEngine *hangul = (IBusHangulEngine *) engine; - -+#if IBUS_CHECK_VERSION(1, 5, 20) -+ // ibus-hangul uses -+ // ibus_engine_update_preedit_text_with_mode() function which makes -+ // the preedit string committed automatically when the reset is received -+ // So we don't need to commit the preedit here. -+ hangul_ic_reset (hangul->context); -+ ustring_clear (hangul->preedit); -+#endif - ibus_hangul_engine_flush (hangul); -+ - IBUS_ENGINE_CLASS (parent_class)->reset (engine); - } - diff --git a/ibus-hangul.spec b/ibus-hangul.spec index 17926ae..a35c124 100644 --- a/ibus-hangul.spec +++ b/ibus-hangul.spec @@ -6,8 +6,8 @@ %global require_libhangul_version 0.1.0 Name: ibus-hangul -Version: 1.5.1 -Release: 7%{?dist} +Version: 1.5.3 +Release: 1%{?dist} Summary: The Hangul engine for IBus input platform License: GPLv2+ URL: https://github.com/libhangul/ibus-hangul @@ -15,7 +15,6 @@ Source0: https://github.com/libhangul/ibus-hangul/releases/download/%{version # not upstreamed patches Patch1: ibus-hangul-setup-abspath.patch -Patch3: ibus-hangul-fixes-reset.patch BuildRequires: gettext-devel, automake, libtool BuildRequires: intltool @@ -39,7 +38,6 @@ libhangul. %prep %setup -q %patch1 -p1 -b .setup-abspath -%patch3 -p1 -b .reset # autopoint -f # AUTOPOINT='intltoolize --automake --copy' autoreconf -fi @@ -109,6 +107,7 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangu %{_libexecdir}/ibus-engine-hangul %{_libexecdir}/ibus-setup-hangul %{_datadir}/appdata/*.appdata.xml +%{_datadir}/metainfo/*.metainfo.xml %{_datadir}/glib-2.0/schemas/*.gschema.xml %{_datadir}/ibus-hangul %{_datadir}/ibus/component/* @@ -116,6 +115,9 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangu %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Dec 26 2019 Peng Wu - 1.5.3-1 +- Update to 1.5.3 + * Tue Aug 6 2019 Peng Wu - 1.5.1-7 - Change default mode to latin diff --git a/sources b/sources index 4c1977a..a1df731 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-hangul-1.5.1.tar.gz) = 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec +SHA512 (ibus-hangul-1.5.3.tar.gz) = ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4