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

@@ -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

ibus-m17n-enable-ar-kbd.patch

@@ -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 @@
- 		<name>m17n:*:kbd</name>
- 		<rank>-1</rank>
- 	</engine>
-+        <!-- Arabic kbd engine should be selected by default:
-+             https://bugzilla.redhat.com/show_bug.cgi?id=1076945 -->
-+        <engine>
-+                <name>m17n:ar:kbd</name>
-+                <rank>1</rank>
-+        </engine>
-+
- 	<!-- zh:py is superseded by ibus-pinyin etc -->
- 	<engine>
- 		<name>m17n:zh:py</name>

ibus-m17n-xkb-options.patch

@@ -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 @@
- 		<name>m17n:si:samanala</name>
- 		<rank>0</rank>
- 	</engine>
-+	<!-- Some Indic engines expect AltGr is automatically mapped -->
-+	<engine>
-+		<name>m17n:*:inscript*</name>
-+		<layout>default[lv3:ralt_switch]</layout>
-+	</engine>
-+	<engine>
-+		<name>m17n:si:*</name>
-+		<layout>default[lv3:ralt_switch]</layout>
-+	</engine>
- 	<!-- Some CJK engines use preedit. -->
- 	<engine>
- 		<name>m17n:zh:cangjie</name>
-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;
- };

ibus-m17n.spec

@@ -1,8 +1,8 @@
 %global require_ibus_version 1.4.0
 
 Name:       ibus-m17n
-Version:    1.4.6
+Version:    1.4.7
-Release:    2%{?dist}
+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
+Patch100:     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
 
 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
+%patch100 -p1 -b .hide-title-status
-%patch101 -p1 -b .hide-title-status
-%patch103 -p1 -b .enable-ar-kbd
 
 
 %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 <mfabian@redhat.com> - 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 <releng@fedoraproject.org> - 1.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ibus-m17n-1.4.6.tar.gz) = d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57
+SHA512 (ibus-m17n-1.4.7.tar.gz) = b011d4ee63a538a51f67012932d872fc2d527c6f3e5dd1642b7e70d3a32164532bc2ab69fb794eb985617b2698074af9079dac7991b5a2a30828595b129cce40

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 \