Accepting request 965127 from M17N
- Update version to 1.5.26 * Enhance compose keys * Enhance Emoji features * Implement clear preedit for GTK4 * Calculate keycode from keysym in GTK3 forward-key-event * Fix to send char position at update_preedit_text * Deprecate gettext.bind_textdomain_codeset() since Python 3.8 * Fix ibus_key_event_from_string for gobject-introspection * Fix a key event loop with forwarding keys * Delete gnome-autogen dependency * Change XKB layout string color in panel * Add IBUS_INPUT_HINT_PRIVATE for browser private mode * mkdir socket dirs instead of socket paths * Add org.freedesktop.IBus.session.generic.service * Check XDG_SESSION_DESKTOP for Plasma desktop * Update simple.xml with xkeyboard-config 2.35.1 * Update ibusunicodegen.h with unicode-ucd 14.0.0 * Enhance CI * Fix typos * Fix wrong cursor location in gtk3 apps * Update URLS * invalidate cache based on symlink mtime too * Fix unref problems with floating references * Update man page for Emoji shortcut key * Add systemd unit file * Fix forward key keycode for GTK4 - Drop ibus-fix-wrong-cursor-location.patch, merged by upstream OBS-URL: https://build.opensuse.org/request/show/965127 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ibus?expand=0&rev=113
This commit is contained in:
commit
6c74e34a99
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dea4f663c485267cc3313e40a0bc89b977c397e19644f8ab41df0e6eaec34330
|
||||
size 3669787
|
3
ibus-1.5.26.tar.gz
Normal file
3
ibus-1.5.26.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c2fd118e7bfd4e9a42c3a20e6175a263426c90b6256f94989ed3d0384f4c9fc
|
||||
size 3715263
|
@ -1,30 +0,0 @@
|
||||
diff -Naur ibus-1.5.25/client/gtk2/ibusimcontext.c ibus-1.5.25.new/client/gtk2/ibusimcontext.c
|
||||
--- ibus-1.5.25/client/gtk2/ibusimcontext.c 2021-08-20 02:48:40.000000000 +0200
|
||||
+++ ibus-1.5.25.new/client/gtk2/ibusimcontext.c 2021-09-08 14:58:40.500448136 +0200
|
||||
@@ -1497,7 +1497,10 @@
|
||||
|
||||
#if GTK_CHECK_VERSION (3, 98, 4)
|
||||
#elif GTK_CHECK_VERSION (2, 91, 0)
|
||||
- area.y += gdk_window_get_height (ibusimcontext->client_window);
|
||||
+ if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
|
||||
+ area.x = 0;
|
||||
+ area.y += gdk_window_get_height (ibusimcontext->client_window);
|
||||
+ }
|
||||
#else
|
||||
if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
|
||||
gint w, h;
|
||||
diff -Naur ibus-1.5.25/client/gtk3/ibusimcontext.c ibus-1.5.25.new/client/gtk3/ibusimcontext.c
|
||||
--- ibus-1.5.25/client/gtk3/ibusimcontext.c 2021-08-20 02:48:40.000000000 +0200
|
||||
+++ ibus-1.5.25.new/client/gtk3/ibusimcontext.c 2021-09-08 14:59:39.992371070 +0200
|
||||
@@ -1497,7 +1497,10 @@
|
||||
|
||||
#if GTK_CHECK_VERSION (3, 98, 4)
|
||||
#elif GTK_CHECK_VERSION (2, 91, 0)
|
||||
- area.y += gdk_window_get_height (ibusimcontext->client_window);
|
||||
+ if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
|
||||
+ area.x = 0;
|
||||
+ area.y += gdk_window_get_height (ibusimcontext->client_window);
|
||||
+ }
|
||||
#else
|
||||
if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
|
||||
gint w, h;
|
31
ibus.changes
31
ibus.changes
@ -1,3 +1,34 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 27 04:28:04 UTC 2022 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Update version to 1.5.26
|
||||
* Enhance compose keys
|
||||
* Enhance Emoji features
|
||||
* Implement clear preedit for GTK4
|
||||
* Calculate keycode from keysym in GTK3 forward-key-event
|
||||
* Fix to send char position at update_preedit_text
|
||||
* Deprecate gettext.bind_textdomain_codeset() since Python 3.8
|
||||
* Fix ibus_key_event_from_string for gobject-introspection
|
||||
* Fix a key event loop with forwarding keys
|
||||
* Delete gnome-autogen dependency
|
||||
* Change XKB layout string color in panel
|
||||
* Add IBUS_INPUT_HINT_PRIVATE for browser private mode
|
||||
* mkdir socket dirs instead of socket paths
|
||||
* Add org.freedesktop.IBus.session.generic.service
|
||||
* Check XDG_SESSION_DESKTOP for Plasma desktop
|
||||
* Update simple.xml with xkeyboard-config 2.35.1
|
||||
* Update ibusunicodegen.h with unicode-ucd 14.0.0
|
||||
* Enhance CI
|
||||
* Fix typos
|
||||
* Fix wrong cursor location in gtk3 apps
|
||||
* Update URLS
|
||||
* invalidate cache based on symlink mtime too
|
||||
* Fix unref problems with floating references
|
||||
* Update man page for Emoji shortcut key
|
||||
* Add systemd unit file
|
||||
* Fix forward key keycode for GTK4
|
||||
- Drop ibus-fix-wrong-cursor-location.patch, merged by upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 5 11:56:17 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
13
ibus.spec
13
ibus.spec
@ -35,7 +35,7 @@
|
||||
|
||||
%define _name ibus
|
||||
Name: %{_name}%{?nsuffix}
|
||||
Version: 1.5.25
|
||||
Version: 1.5.26
|
||||
Release: 0
|
||||
Summary: The "Intelligent Input Bus" input method
|
||||
License: LGPL-2.1-or-later
|
||||
@ -73,9 +73,8 @@ Patch12: ibus-disable-engines-preload-in-GNOME.patch
|
||||
# it still needs this patch on leap 15. (boo#1187202)
|
||||
Patch15: ibus-socket-name-compatibility.patch
|
||||
Patch16: ibus-missing-include.patch
|
||||
# PATCH-FIX-UPSTREAM ibus-fix-wrong-cursor-location.patch gh#ibus/ibus#2337
|
||||
Patch17: ibus-fix-wrong-cursor-location.patch
|
||||
BuildRequires: pkgconfig(iso-codes)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
%if ! 0%{?with_gtk4}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gettext-devel
|
||||
@ -232,7 +231,6 @@ cp -r %{SOURCE11} .
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%endif
|
||||
%patch17 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-static \
|
||||
@ -347,6 +345,8 @@ rm -rf %{buildroot}%{_bindir}
|
||||
rm -rf %{buildroot}%{_libdir}/ibus
|
||||
rm -rf %{buildroot}%{_libdir}/libibus*
|
||||
rm -rf %{buildroot}%{_libdir}/pkgconfig
|
||||
rm -rf %{buildroot}%{_prefix}/lib/systemd
|
||||
rm -rf %{buildroot}%{_sysconfdir}/xdg
|
||||
|
||||
%post -n %{_name}-gtk4
|
||||
%{gtk4_immodule_post}
|
||||
@ -374,6 +374,8 @@ fi
|
||||
%else
|
||||
%config %{_sysconfdir}/X11/xim.d/*
|
||||
%endif
|
||||
%dir %{_sysconfdir}/xdg/Xwayland-session.d
|
||||
%{_sysconfdir}/xdg/Xwayland-session.d/10-ibus-x11
|
||||
%{_bindir}/ibus
|
||||
%{_bindir}/ibus-autostart
|
||||
%{_bindir}/ibus-daemon
|
||||
@ -407,6 +409,9 @@ fi
|
||||
%{_mandir}/man1/ibus-setup.1%{ext_man}
|
||||
%{_mandir}/man5/00-upstream-settings.5%{ext_man}
|
||||
%{_mandir}/man5/ibus.5%{ext_man}
|
||||
%dir %{_prefix}/lib/systemd/user/gnome-session.target.wants
|
||||
%{_prefix}/lib/systemd/user/gnome-session.target.wants/org.freedesktop.IBus.session.GNOME.service
|
||||
%{_prefix}/lib/systemd/user/*.service
|
||||
|
||||
%if %{with_emoji}
|
||||
%{_datadir}/applications/org.freedesktop.IBus.Panel.Emojier.desktop
|
||||
|
Loading…
Reference in New Issue
Block a user