From ead318acf99eb47a886c3964f84c116ccbe377f2 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Fri, 13 Aug 2021 19:57:35 +0200 Subject: [PATCH] Update to 1.4.7 - Assign symbols to all the new inscript2 engines (and add some other missing symbols) (Resolves: https://github.com/ibus/ibus-m17n/issues/34) - Allow to use kbd engines (#32) (Resolves: https://github.com/ibus/ibus-m17n/issues/32) - ibus-m17n-xkb-options.patch from Fedora included upstream - ibus-m17n-enable-ar-kbd.patch from Fedora included upstream - adapt CI test to new input method names --- .gitignore | 1 + ibus-m17n-enable-ar-kbd.patch | 16 ------- ibus-m17n-xkb-options.patch | 79 ----------------------------------- ibus-m17n.spec | 24 ++++++----- sources | 2 +- tests/smoke/runtest.sh | 11 ++--- 6 files changed, 21 insertions(+), 112 deletions(-) delete mode 100644 ibus-m17n-enable-ar-kbd.patch delete mode 100644 ibus-m17n-xkb-options.patch diff --git a/.gitignore b/.gitignore index 516038e..5d7f708 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ ibus-m17n-1.3.0.tar.gz /ibus-m17n-1.4.4.tar.gz /ibus-m17n-1.4.5.tar.gz /ibus-m17n-1.4.6.tar.gz +/ibus-m17n-1.4.7.tar.gz diff --git a/ibus-m17n-enable-ar-kbd.patch b/ibus-m17n-enable-ar-kbd.patch deleted file mode 100644 index 37f1e9e..0000000 --- a/ibus-m17n-enable-ar-kbd.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ibus-m17n-1.3.4/src/default.xml.old 2016-12-20 11:07:26.242523223 +0530 -+++ ibus-m17n-1.3.4/src/default.xml 2016-12-20 11:11:42.392527990 +0530 -@@ -18,6 +18,13 @@ - m17n:*:kbd - -1 - -+ -+ -+ m17n:ar:kbd -+ 1 -+ -+ - - - m17n:zh:py diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch deleted file mode 100644 index 5e39e44..0000000 --- a/ibus-m17n-xkb-options.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: ibus-m17n-1.3.4/src/default.xml -=================================================================== ---- ibus-m17n-1.3.4.orig/src/default.xml -+++ ibus-m17n-1.3.4/src/default.xml -@@ -184,6 +184,15 @@ - m17n:si:samanala - 0 - -+ -+ -+ m17n:*:inscript* -+ default[lv3:ralt_switch] -+ -+ -+ m17n:si:* -+ default[lv3:ralt_switch] -+ - - - m17n:zh:cangjie -Index: ibus-m17n-1.3.4/src/m17nutil.c -=================================================================== ---- ibus-m17n-1.3.4.orig/src/m17nutil.c -+++ ibus-m17n-1.3.4/src/m17nutil.c -@@ -17,7 +17,8 @@ typedef enum { - ENGINE_CONFIG_RANK_MASK = 1 << 0, - ENGINE_CONFIG_SYMBOL_MASK = 1 << 1, - ENGINE_CONFIG_LONGNAME_MASK = 1 << 2, -- ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 3 -+ ENGINE_CONFIG_LAYOUT_MASK = 1 << 3, -+ ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK = 1 << 4 - } EngineConfigMask; - - struct _EngineConfigNode { -@@ -137,7 +138,7 @@ ibus_m17n_engine_new (MSymbol lang, - "language", msymbol_name (lang), - "license", "GPL", - "icon", engine_icon ? engine_icon : "", -- "layout", "default", -+ "layout", config->layout ? config->layout : "default", - "rank", config->rank, - "symbol", config->symbol ? config->symbol : "", - "setup", engine_setup, -@@ -272,6 +273,8 @@ ibus_m17n_get_engine_config (const gchar - config->symbol = cnode->config.symbol; - if (cnode->mask & ENGINE_CONFIG_LONGNAME_MASK) - config->longname = cnode->config.longname; -+ if (cnode->mask & ENGINE_CONFIG_LAYOUT_MASK) -+ config->layout = cnode->config.layout; - if (cnode->mask & ENGINE_CONFIG_PREEDIT_HIGHLIGHT_MASK) - config->preedit_highlight = cnode->config.preedit_highlight; - } -@@ -314,6 +317,12 @@ ibus_m17n_engine_config_parse_xml_node ( - cnode->mask |= ENGINE_CONFIG_LONGNAME_MASK; - continue; - } -+ if (g_strcmp0 (sub_node->name , "layout") == 0) { -+ g_free (cnode->config.layout); -+ cnode->config.layout = g_strdup (sub_node->text); -+ cnode->mask |= ENGINE_CONFIG_LAYOUT_MASK; -+ continue; -+ } - if (g_strcmp0 (sub_node->name , "preedit-highlight") == 0) { - if (g_ascii_strcasecmp ("TRUE", sub_node->text) == 0) - cnode->config.preedit_highlight = TRUE; -Index: ibus-m17n-1.3.4/src/m17nutil.h -=================================================================== ---- ibus-m17n-1.3.4.orig/src/m17nutil.h -+++ ibus-m17n-1.3.4/src/m17nutil.h -@@ -20,6 +20,9 @@ struct _IBusM17NEngineConfig { - /* overridding longname shown on panel */ - gchar *longname; - -+ /* keyboard layout */ -+ gchar *layout; -+ - /* whether to highlight preedit */ - gboolean preedit_highlight; - }; diff --git a/ibus-m17n.spec b/ibus-m17n.spec index a906f30..c610462 100644 --- a/ibus-m17n.spec +++ b/ibus-m17n.spec @@ -1,8 +1,8 @@ %global require_ibus_version 1.4.0 Name: ibus-m17n -Version: 1.4.6 -Release: 2%{?dist} +Version: 1.4.7 +Release: 1%{?dist} Summary: The M17N engine for IBus platform License: GPLv2+ URL: https://github.com/ibus/ibus-m17n @@ -11,13 +11,8 @@ Source0: https://github.com/ibus/%{name}/archive/%{version}/%{name}-%{version # Upstreamed patches: # Fedora specific patches: -# Enable lv3:ralt_switch option for some Indic engines in default.xml. -Patch100: ibus-m17n-xkb-options.patch # Don't make the status button clickable (maybe obsolete). -Patch101: ibus-m17n-hide-title-status.patch -# Use ar-kbd as default keymap for Arabic -# https://bugzilla.redhat.com/show_bug.cgi?id=1076945 -Patch103: ibus-m17n-enable-ar-kbd.patch +Patch100: ibus-m17n-hide-title-status.patch BuildRequires: gettext-devel >= 0.19 BuildRequires: libtool @@ -40,9 +35,7 @@ the input table maps from m17n-db. %prep %setup -q -%patch100 -p1 -b .xkb-options -%patch101 -p1 -b .hide-title-status -%patch103 -p1 -b .enable-ar-kbd +%patch100 -p1 -b .hide-title-status %build @@ -72,6 +65,15 @@ make check %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.m17n.gschema.xml %changelog +* Fri Aug 13 2021 Mike FABIAN - 1.4.7-1 +- Update to 1.4.7 +- Assign symbols to all the new inscript2 engines (and add some other missing symbols) + (Resolves: https://github.com/ibus/ibus-m17n/issues/34) +- Allow to use kbd engines (#32) + (Resolves: https://github.com/ibus/ibus-m17n/issues/32) +- ibus-m17n-xkb-options.patch from Fedora included upstream +- ibus-m17n-enable-ar-kbd.patch from Fedora included upstream + * Thu Jul 22 2021 Fedora Release Engineering - 1.4.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c9ba943..65ef658 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-m17n-1.4.6.tar.gz) = d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57 +SHA512 (ibus-m17n-1.4.7.tar.gz) = b011d4ee63a538a51f67012932d872fc2d527c6f3e5dd1642b7e70d3a32164532bc2ab69fb794eb985617b2698074af9079dac7991b5a2a30828595b129cce40 diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh index aa22874..ddf7ba6 100755 --- a/tests/smoke/runtest.sh +++ b/tests/smoke/runtest.sh @@ -39,10 +39,10 @@ rlJournalStart bo:ewts \ bo:tcrc \ bo:wylie \ - brx:inscript2 \ + brx:inscript2-deva \ cr:western \ da:post \ - doi:inscript2 \ + doi:inscript2-deva \ dv:phonetic \ eo:h-fundamente \ eo:h-sistemo \ @@ -76,8 +76,9 @@ rlJournalStart kn:kgp \ kn:optitransv2 \ kn:typewriter \ - kok:inscript2 \ + kok:inscript2-deva \ ks:inscript \ + ks:inscript2-deva \ ks:kbd \ lo:lrt \ mai:inscript \ @@ -97,7 +98,7 @@ rlJournalStart mr:phonetic \ mr:remington \ mr:typewriter \ - ne:inscript2 \ + ne:inscript2-deva \ ne:rom \ ne:rom-translit \ ne:trad \ @@ -125,7 +126,7 @@ rlJournalStart sat:inscript2-deva \ sat:inscript2-olck \ sd:inscript \ - sd:inscript2 \ + sd:inscript2-deva \ si:phonetic-dynamic \ si:samanala \ si:sayura \