rpms/ibus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update and fix typo in autostart scripts

Browse Source
This commit is contained in:
Takao Fujiwara 2022-01-18 17:32:16 +09:00
parent fd5bd5cf1a
commit 62afb96838
2 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
ibus-HEAD.patch
View File

@ -1139,3 +1139,81 @@ index 9aeafbf9..7e844838 100644
--
2.33.1
From f5757ada54edaa7d2e3ea948d340cdf48064e30c Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Thu, 6 Jan 2022 11:20:26 +0900
Subject: [PATCH] ibusenginesimple: Fix to send char position at
update_preedit_text
ibus_engine_update_preedit_text() should send the character position
instead of the byte position.
BUG=https://github.com/ibus/ibus/issues/2368
---
src/ibusenginesimple.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ibusenginesimple.c b/src/ibusenginesimple.c
index 83b04ebc..a80e41a5 100644
--- a/src/ibusenginesimple.c
+++ b/src/ibusenginesimple.c
@@ -2,7 +2,7 @@
/* vim:set et sts=4: */
/* ibus - The Input Bus
* Copyright (C) 2014 Peng Huang <shawn.p.huang@gmail.com>
- * Copyright (C) 2015-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
+ * Copyright (C) 2015-2022 Takao Fujiwara <takao.fujiwara1@gmail.com>
* Copyright (C) 2014-2017 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
@@ -386,7 +386,7 @@ ibus_engine_simple_update_preedit_text (IBusEngineSimple *simple)
} else if (s->len >= G_MAXINT) {
g_warning ("%s is too long compose length: %lu", s->str, s->len);
} else {
- int len = (int)s->len;
+ guint len = (guint)g_utf8_strlen (s->str, -1);
IBusText *text = ibus_text_new_from_string (s->str);
ibus_text_append_attribute (text,
IBUS_ATTR_TYPE_UNDERLINE, IBUS_ATTR_UNDERLINE_SINGLE, 0, len);
--
2.33.1
From 3abcb19619750e242e1641c1c443fb460f055289 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 18 Jan 2022 17:03:53 +0900
Subject: [PATCH] src/tests: Update ibus-desktop-testing-autostart
---
src/tests/ibus-desktop-testing-autostart | 2+
src/tests/ibus-desktop-testing.desktop.in | 2 +-
2 file changed, 3 insertion(+), 1 deletion(-)
diff --git a/src/tests/ibus-desktop-testing-autostart b/src/tests/ibus-desktop-testing-autostart
index da22b64e..1e1eb180 100755
--- a/src/tests/ibus-desktop-testing-autostart
+++ b/src/tests/ibus-desktop-testing-autostart
@@ -29,6 +29,8 @@ pwd
pstree -asp $$
gsettings list-recursively org.gnome.shell
rpm -q gnome-shell-extension-no-overview gnome-shell gnome-session
+ps -ef | grep ibus | grep -v grep
+ibus address
'
if [ $# -gt 0 ] ; then
diff --git a/src/tests/ibus-desktop-testing.desktop.in b/src/tests/ibus-desktop-testing.desktop.in
index fa0c9b40..1b815345 100644
--- a/src/tests/ibus-desktop-testing.desktop.in
+++ b/src/tests/ibus-desktop-testing.desktop.in
@@ -2,7 +2,7 @@
Name=IBus Desktop Testing Runner
GenericName=Input Method Desktop Testing Runner
Comment=Test plugin for IBus Desktop Testing
-Exec=@ibexecdir@/ibus-desktop-testing-autostart /var/tmp/ibus-ci-autostart.log
+Exec=@libexecdir@/ibus-desktop-testing-autostart /var/tmp/ibus-ci-autostart.log
Terminal=false
Type=Application
Encoding=UTF-8
--
2.33.1

5
ibus.spec
View File

@ -39,7 +39,7 @@
Name: ibus
Version: 1.5.25
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Intelligent Input Bus for Linux OS
License: LGPLv2+
URL: https://github.com/ibus/%name/wiki
@ -517,6 +517,9 @@ dconf update || :
%{_datadir}/installed-tests/ibus
%changelog
* Tue Jan 18 2022 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-7
- Update and fix typo in autostart scripts
* Fri Dec 03 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-6
- Check mtime of entity compose file instead of one of symlink file
- Disable emoji shortcut key with no-emoji hint