Compare commits

..

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/ibus-m17n-1.4.29.tar.gz
SOURCES/ibus-m17n-1.4.4.tar.gz

@ -1 +1 @@
432234f40c567e8e29f7da66d14c02ed7bcf0590 SOURCES/ibus-m17n-1.4.29.tar.gz
781d983de1fdd9e40eaee7e465ef9dfc6836a13a SOURCES/ibus-m17n-1.4.4.tar.gz

@ -0,0 +1,16 @@
--- 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>

@ -0,0 +1,43 @@
From 02022c17212357afb5cec727edd8f095aa40d98d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 29 Sep 2011 10:17:28 +0900
Subject: [PATCH 2/4] Hide status from the panel if status == title.
---
src/engine.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Index: ibus-m17n-1.3.4/src/engine.c
===================================================================
--- ibus-m17n-1.4.0.orig/src/engine.c 2018-10-23 15:32:43.000000000 +0200
+++ ibus-m17n-1.4.0/src/engine.c 2018-10-24 08:35:49.463479480 +0200
@@ -41,6 +41,7 @@
gint lookup_table_orientation;
gboolean use_us_layout;
+ gchar *title;
MInputMethod *im;
};
@@ -236,6 +237,10 @@
"org.freedesktop.ibus.engine.m17n",
g_strdup_printf ("/org/freedesktop/ibus/engine/m17n/%s/%s/",
lang, name));
+ MPlist *l = minput_get_title_icon (msymbol (lang), msymbol (name));
+ if (l && mplist_key (l) == Mtext) {
+ klass->title = ibus_m17n_mtext_to_utf8 (mplist_value (l));
+ }
g_free (lang);
g_free (name);
@@ -961,8 +966,9 @@
else if (command == Minput_status_draw) {
gchar *status;
status = ibus_m17n_mtext_to_utf8 (m17n->context->status);
+ IBusM17NEngineClass *klass = (IBusM17NEngineClass *) G_OBJECT_GET_CLASS (m17n);
- if (status && strlen (status)) {
+ if (status && strlen (status) && g_strcmp0 (status, klass->title)) {
IBusText *text;
text = ibus_text_new_from_string (status);
ibus_property_set_label (m17n->status_prop, text);

@ -0,0 +1,79 @@
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;
};

@ -1,31 +1,34 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.1)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 4;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
%global require_ibus_version 1.4.0
Name: ibus-m17n
Version: 1.4.29
Release: %autorelease
Version: 1.4.4
Release: 3%{?dist}
Summary: The M17N engine for IBus platform
License: GPL-2.0-or-later
License: GPLv2+
URL: https://github.com/ibus/ibus-m17n
Source0: https://github.com/ibus/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
# 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
BuildRequires: gettext-devel >= 0.19
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: gnome-common
BuildRequires: m17n-lib-devel
BuildRequires: gtk3-devel
BuildRequires: ibus-devel >= %{require_ibus_version}
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: make
BuildRequires: make
Requires: ibus >= %{require_ibus_version}
Requires: m17n-lib
@ -37,6 +40,11 @@ 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
%build
%configure --disable-static --with-gtk=3.0
# make -C po update-gmo
@ -57,15 +65,6 @@ make check
%license COPYING
%{_datadir}/metainfo/m17n.appdata.xml
%{_datadir}/ibus-m17n
%{_datadir}/icons/hicolor/16x16/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/22x22/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/24x24/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/32x32/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/48x48/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/64x64/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/128x128/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/256x256/apps/ibus-m17n.png
%{_datadir}/icons/hicolor/scalable/apps/ibus-m17n.svg
%{_libexecdir}/ibus-engine-m17n
%{_libexecdir}/ibus-setup-m17n
%{_datadir}/ibus/component/*
@ -73,170 +72,12 @@ make check
%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.m17n.gschema.xml
%changelog
## START: Generated by rpmautospec
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.4.29-4
- Bump release for June 2024 mass rebuild
* Tue Jun 11 2024 Mike FABIAN <mfabian@redhat.com> - 1.4.29-3
- Fix CI tests
* Tue Jun 04 2024 Twinkle Pardeshi <tpardesh@tpardesh-thinkpadp1gen4i.pnq.csb> - 1.4.29-2
- Resolves:RHELMISC-3924 - adding gating configuration
* Fri Apr 26 2024 Mike FABIAN <mfabian@redhat.com> - 1.4.29-1
- Update to 1.4.29
- Translation update from Weblate (Malayalam (ml), new, 100%%, Swedish (sv)
100%%)
* Thu Feb 15 2024 Mike FABIAN <mfabian@redhat.com> - 1.4.28-1
- Update to 1.4.28
- Translation update from Weblate (Russian (ru), new, 100%%)
- Build against gtk3 by default (Resolves:
https://github.com/ibus/ibus-m17n/issues/73)
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Dec 02 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.27-1
- Update to 1.4.27
- Prefer commit to "return FALSE;" for space, and other keys
where the msymbol name is exactly one character, add a
sleep for Return. This is to avoid ordering problems in
mutter.
(Resolves: https://github.com/ibus/ibus-m17n/issues/72)
* Fri Nov 10 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.24-1
- Update to 1.4.24
- Make IBusEngineSimple read ~/.XCompose
(Resolves: https://github.com/ibus/ibus-m17n/issues/70)
- Do not hide empty preedit text before committing text.
(Resolves: https://github.com/ibus/ibus-m17n/pull/64).
Together with ibus >= 1.5.29 this solves the preedit flicker problem perfectly.
- Use “<developer><name>…</name></developer>” in m17n.appdata.xml instead of “<developer_name>…</developer_name>”
Because </developer_name> is deprecated and it makes the build fail on Fedora rawhide.
* Fri Oct 27 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.23-1
- Update to 1.4.23
- Do not translate the Multi_key when using the option “☑️ Use US keyboard layout”
- Fix option “☑️ Use US keyboard layout”
(Resolves: https://github.com/ibus/ibus-m17n/issues/66)
- Translation update from Weblate: new language Hindi, hi 100%
* Mon Aug 21 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.22-1
- Update to 1.4.22
- Translation update from Weblate (Lithuanian, lt 100%)
* Mon Aug 07 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.21-1
- Update to 1.4.21
- Translation update from Weblate (Swedish, sv 100%)
* Sun Jul 30 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.20-1
- Update to 1.4.20
- Reduce preedit flicker (Resolves: https://github.com/ibus/ibus/issues/2536)
- Remove `xml:lang="en"` from the screenshot in appdata.xml
See: https://github.com/ximion/appstream/issues/494
There must be one image in the default locale, and there can be some
translated ones, but having only translated images is not okay.
- Use ibus_text_new_from_string (string) instead of
ibus_text_new_from_static_string (string) in ibus_m17n_engine_commit_string()
- Add missing g_free (buf) in ibus_m17n_mtext_to_utf8()
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Feb 19 2023 Mike FABIAN <mfabian@redhat.com> - 1.4.19-1
- Update to 1.4.19
- Translation update from Weblate (Sinhala, si 100%)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Dec 07 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.18-1
- Update to 1.4.18
- Add new icon
* Sat Nov 26 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.17-2
- Migrate license tag to SPDX
* Sat Sep 17 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.17-1
- Update to 1.4.17
- Fix problem that sa-IAST input method cannot be activated and make settings of sa-IAST work
(Resolves: https://github.com/ibus/ibus-m17n/issues/52)
- Let IBusM17nEngine inherit from IBusEngineSimple to enable compose support
(Resolves: https://github.com/ibus/ibus-m17n/pull/51)
* Thu Sep 08 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.13-1
- Update to 1.4.13
- Translation update from Weblate (ar updated 100%, ka added 100%)
* Sat Sep 03 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.11-1
- Update to 1.4.11
- Added translation using Weblate (Arabic, 100%)
- Add 256x256 icon to m17n.appdata.xml
* Wed Aug 03 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.10-1
- Update to 1.4.10
- Add language to longname in --xml output to make engines which have exactly
the same icon distinguishable in the engine switcher
- Make the icon of the current engine appear at the left of floating panel of ibus.
And also show the full engine name as a tooltip on that icon
Before only a generic gear wheel ⚙️ was shown, the same for
all engines, so one could not distinguish which engine was
selected in the floating panel.
- Show also the engine name in the title of the setup tool window.
I.e. instead of just “Preferences” show something like
“Preferences m17n:t:latn-post”.
- Better icon and a screenshot which can be shown in gnome-software
- Improvements in m17n.appdata.xml
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Jan 18 2022 Mike FABIAN <mfabian@redhat.com> - 1.4.9-1
- Update to 1.4.9
- Free lang and name after engine_name is built
(Resolves: https://github.com/ibus/ibus-m17n/issues/39)
- Just return from ibus_m17n_engine_callback with nullable m17n
- Accept virtual engine names for CI
- Hide status from the panel if status == title (by Daiki Ueno)
* Tue Oct 19 2021 Mike FABIAN <mfabian@redhat.com> - 1.4.8-1
- Update to 1.4.8
- Remove gnome-common requirement and re-write autogen.sh (by Parag Nemade)
(Resolves: https://github.com/ibus/ibus-m17n/pull/37)
- Translation update from Weblate for Sinhala
* Tue Oct 19 2021 Parag Nemade <pnemade AT redhat DOT com> - 1.4.7-2
- Remove BR: gnome-common and pkgconfig as it is not needed for released tarball
* 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
* Thu Jul 15 2021 Mike FABIAN <mfabian@redhat.com> - 1.4.6-1
- Update to 1.4.6
- Make inscript2 engines rank higher than inscript engines
- Resolves: rhbz#1982546
* Fri Mar 12 2021 Mike FABIAN <mfabian@redhat.com> - 1.4.5-1
- Update to 1.4.5
- Use ibus_engine_update_preedit_with_mode() *always* with IBUS_ENGINE_PREEDIT_COMMIT mode
- Translation update from Weblate, bn new and 100% complete, pt_BR now 100% complete
- Remove redundant target for desktop.in file
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.4-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.4.4-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jan 28 2021 Mike FABIAN <mfabian@redhat.com> - 1.4.4-1
- Update to 1.4.4
@ -633,5 +474,3 @@ make check
* Thu Aug 07 2008 Peng Huang <shawn.p.huang@gmail.com> - 0.1.0.20080810-1
- The first version.
## END: Generated by rpmautospec

Loading…
Cancel
Save