[packages/ibus-m17n] - updated to 1.4.34

[qboosh]

commit 2894591906f9e6e4f4610cf4b54703368c493b35
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Nov 11 19:59:59 2024 +0100

    - updated to 1.4.34

 ibus-m17n-xkb-options.patch | 79 ---------------------------------------------
 ibus-m17n.spec              |  8 ++---
 2 files changed, 4 insertions(+), 83 deletions(-)
---
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index 062145d..9de80e1 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -1,14 +1,13 @@
 Summary:	The M17N engine for IBus platform
 Summary(pl.UTF-8):	Silnik M17N dla platformy IBus
 Name:		ibus-m17n
-Version:	1.4.2
+Version:	1.4.34
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 #Source0Download: https://github.com/ibus/ibus-m17n/releases
 Source0:	https://github.com/ibus/ibus-m17n/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2042a1da9675041a853d6eba7517b212
-Patch0:		%{name}-xkb-options.patch
+# Source0-md5:	0f1c453ce850049261292f0837b20f8f
 URL:		https://github.com/ibus/ibus-m17n
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.10
@@ -39,7 +38,6 @@ z m17n-db.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -80,3 +78,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ibus/component/m17n.xml
 %{_datadir}/metainfo/m17n.appdata.xml
 %{_desktopdir}/ibus-setup-m17n.desktop
+%{_iconsdir}/hicolor/*x*/apps/ibus-m17n.png
+%{_iconsdir}/hicolor/scalable/apps/ibus-m17n.svg
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 @@
- 		<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;
- };
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ibus-m17n.git/commitdiff/2894591906f9e6e4f4610cf4b54703368c493b35