aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Correa Gómez <ablocorrea@hotmail.com>2022-07-29 15:01:00 +0200
committeralice <alice@ayaya.dev>2022-07-29 23:53:38 +0000
commit2f4a34c59f9ee613b3bd6e0f9a1b3028b7c3a173 (patch)
tree777e2ebbd237040a7f682b41e12cd0f6ebab8f42
parentfc1de0467c2644b97313d8655433f57f7bf0519b (diff)
downloadaports-2f4a34c59f9ee613b3bd6e0f9a1b3028b7c3a173.tar.gz
aports-2f4a34c59f9ee613b3bd6e0f9a1b3028b7c3a173.tar.bz2
aports-2f4a34c59f9ee613b3bd6e0f9a1b3028b7c3a173.tar.xz
community/ibus: upgrade to 1.5.26
-rw-r--r--community/ibus/APKBUILD11
-rw-r--r--community/ibus/Fix-wrong-cursor-location-in-gtk3-apps.patch30
2 files changed, 5 insertions, 36 deletions
diff --git a/community/ibus/APKBUILD b/community/ibus/APKBUILD
index 51ef6c11cc..d7a92a779b 100644
--- a/community/ibus/APKBUILD
+++ b/community/ibus/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=ibus
-pkgver=1.5.25
-pkgrel=1
+pkgver=1.5.26
+pkgrel=0
pkgdesc="Next Generation Input Bus for Linux"
url="https://github.com/ibus/ibus/wiki"
arch="all"
@@ -12,7 +12,7 @@ depends="
makedepends="
bash dconf-dev gtk+2.0-dev gtk+3.0-dev libnotify-dev iso-codes-dev
gobject-introspection-dev vala intltool qt5-qtbase
- automake autoconf gnome-common gtk-doc wayland-dev wayland-protocols
+ automake autoconf gtk-doc wayland-dev wayland-protocols
dbus-x11 unicode-character-database xz cldr-emoji-annotation
"
subpackages="
@@ -25,7 +25,6 @@ subpackages="
source="
$pkgname-$pkgver.tar.gz::https://github.com/ibus/ibus/archive/$pkgver.tar.gz
0001-Use-more-portable-call-to-mktemp.patch
- Fix-wrong-cursor-location-in-gtk3-apps.patch
"
install="$pkgname.post-install"
@@ -47,6 +46,7 @@ build() {
--disable-memconf \
--enable-ui \
--disable-gtk-doc \
+ --disable-systemd-services \
--enable-emoji-dict \
--with-ucd-dir=/usr/share/unicode/
make
@@ -77,7 +77,6 @@ bashcomp() {
}
sha512sums="
-128373c6c35c7c8df02fa9e8e5458db6e38a35a7a7debf340c2b21d8e2ec803e3c95ed800211785b13b99210e1877322adb67ce47e5e9ef25e2734487af388fa ibus-1.5.25.tar.gz
+96c988063a78e6c1b3fc19dcd8d5d158ac8c132d8b2126225d71603f67421fb25139f5e72c286394b1f543ab92caeef510ae5d32b7aaf5fad948d0a0b5b5c850 ibus-1.5.26.tar.gz
1e2e62ce52becf75d794c403e8f21bb72e8406aacbdbc5189f62a3b7c54166c40da0032d3f3865f5a23d9d2c782f974b7bcc9ba5ce437d9eb435dd3db3ff0b06 0001-Use-more-portable-call-to-mktemp.patch
-426c261b79d1e6f57527edbc02f10ba01aefd444222638a370ed5213d9667624d608951845cd749ad6f4d6c7d2a17b7d1698147608b60edfb1a1be554fb00534 Fix-wrong-cursor-location-in-gtk3-apps.patch
"
diff --git a/community/ibus/Fix-wrong-cursor-location-in-gtk3-apps.patch b/community/ibus/Fix-wrong-cursor-location-in-gtk3-apps.patch
deleted file mode 100644
index 1bf43c789c..0000000000
--- a/community/ibus/Fix-wrong-cursor-location-in-gtk3-apps.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 936a0e76df79d92a8bdc03e9205330fb84a2083e Mon Sep 17 00:00:00 2001
-From: Alynx Zhou <alynx.zhou@gmail.com>
-Date: Wed, 1 Sep 2021 12:04:12 +0900
-Subject: [PATCH] client/gtk2/ibusimcontext: Fix wrong cursor location in gtk3
- apps
-
-If you apply this patch in your tarball, please also apply this to
-client/gtk3/ibusimcontext.c besides client/gtk2/ibusimcontext.c .
-
-BUG=https://github.com/ibus/ibus/issues/2337
----
- client/gtk2/ibusimcontext.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
-index da9a402ff..b1ccede95 100644
---- a/client/gtk2/ibusimcontext.c
-+++ b/client/gtk2/ibusimcontext.c
-@@ -1497,7 +1497,10 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
-
- #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;