commit b8115b295d76abc694ea4b7ed8f6793891899ae1 Author: Tim Biermann <tbier@posteo.de> Date: Sat Mar 19 02:37:25 2022 +0100 ibus: 1.5.25 -> 1.5.26 diff --git a/ibus/.footprint b/ibus/.footprint index f2b46a4c8..84ef06af4 100644 --- a/ibus/.footprint +++ b/ibus/.footprint @@ -1,3 +1,7 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/xdg/ +drwxr-xr-x root/root etc/xdg/Xwayland-session.d/ +-rwxr-xr-x root/root etc/xdg/Xwayland-session.d/10-ibus-x11 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/ibus @@ -58,9 +62,9 @@ drwxr-xr-x root/root usr/lib/ibus/ -rwxr-xr-x root/root usr/lib/ibus/ibus-portal -rwxr-xr-x root/root usr/lib/ibus/ibus-x11 -rwxr-xr-x root/root usr/lib/libibus-1.0.la -lrwxrwxrwx root/root usr/lib/libibus-1.0.so -> libibus-1.0.so.5.0.525 -lrwxrwxrwx root/root usr/lib/libibus-1.0.so.5 -> libibus-1.0.so.5.0.525 --rwxr-xr-x root/root usr/lib/libibus-1.0.so.5.0.525 +lrwxrwxrwx root/root usr/lib/libibus-1.0.so -> libibus-1.0.so.5.0.526 +lrwxrwxrwx root/root usr/lib/libibus-1.0.so.5 -> libibus-1.0.so.5.0.526 +-rwxr-xr-x root/root usr/lib/libibus-1.0.so.5.0.526 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/ibus-1.0.pc drwxr-xr-x root/root usr/lib/python3.9/ @@ -114,6 +118,7 @@ drwxr-xr-x root/root usr/share/ibus/dicts/ -rw-r--r-- root/root usr/share/ibus/dicts/emoji-de.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-de_CH.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-doi.dict +-rw-r--r-- root/root usr/share/ibus/dicts/emoji-dsb.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-el.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-en.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-en_001.dict @@ -138,9 +143,11 @@ drwxr-xr-x root/root usr/share/ibus/dicts/ -rw-r--r-- root/root usr/share/ibus/dicts/emoji-gl.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-gu.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-ha.dict +-rw-r--r-- root/root usr/share/ibus/dicts/emoji-ha_NE.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-he.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-hi.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-hr.dict +-rw-r--r-- root/root usr/share/ibus/dicts/emoji-hsb.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-hu.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-hy.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-ia.dict @@ -174,10 +181,10 @@ drwxr-xr-x root/root usr/share/ibus/dicts/ -rw-r--r-- root/root usr/share/ibus/dicts/emoji-ms.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-mt.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-my.dict --rw-r--r-- root/root usr/share/ibus/dicts/emoji-nb.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-ne.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-nl.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-nn.dict +-rw-r--r-- root/root usr/share/ibus/dicts/emoji-no.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-or.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-pa.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-pa_Arab.dict @@ -193,6 +200,7 @@ drwxr-xr-x root/root usr/share/ibus/dicts/ -rw-r--r-- root/root usr/share/ibus/dicts/emoji-rw.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-sa.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-sat.dict +-rw-r--r-- root/root usr/share/ibus/dicts/emoji-sc.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-sd.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-si.dict -rw-r--r-- root/root usr/share/ibus/dicts/emoji-sk.dict diff --git a/ibus/.signature b/ibus/.signature index d6161c297..90e249550 100644 --- a/ibus/.signature +++ b/ibus/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF349g4SYvLFtJsE0J8cSM00zxduWn6iDWnDTpcIwILOFhtaYe4ji31vs0WTXsdCKH/wjxavSjg86gVMHDQZsdBw4= -SHA256 (Pkgfile) = 78783960a43734e4c41968144c9b6b446be23f357d7fafc3af4f311775c6fdaf -SHA256 (.footprint) = bd5fead6f5a37c2e567ca108bbbae8d304ff2123d4d08072513c7a2328e9f7fb -SHA256 (ibus-1.5.25.tar.gz) = dea4f663c485267cc3313e40a0bc89b977c397e19644f8ab41df0e6eaec34330 +RWSagIOpLGJF392JQWsHOc/TYowTQ3i6PYCm7UrRitMqdYtkzMarC8N5EtqSE8xvqILAj4PNtFCk1JOvteQSkU6nVYoUWuKwGAc= +SHA256 (Pkgfile) = bc1e6d01b7e102181b7ea56cc9beb6a1235a60e9462d418e0796cf58edffa871 +SHA256 (.footprint) = 0cdafa1097f60b71e4dcefdd04e566781027280d18b12f773dac024093ade5c9 +SHA256 (ibus-1.5.26.tar.gz) = 5c2fd118e7bfd4e9a42c3a20e6175a263426c90b6256f94989ed3d0384f4c9fc SHA256 (denylist.txt) = b5dcc13587179e54330e37bb6c4622ef1d3bf25806ea179b767bc9a6b14ec18c -SHA256 (936a0e76df79d92a8bdc03e9205330fb84a2083e.patch) = f0acf52cee711356eccd3b87d292f7b41855465ce13540a41c55c0f397424eb4 diff --git a/ibus/936a0e76df79d92a8bdc03e9205330fb84a2083e.patch b/ibus/936a0e76df79d92a8bdc03e9205330fb84a2083e.patch deleted file mode 100644 index 1bf43c789..000000000 --- a/ibus/936a0e76df79d92a8bdc03e9205330fb84a2083e.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; diff --git a/ibus/Pkgfile b/ibus/Pkgfile index 8bc39a4f0..e88202330 100644 --- a/ibus/Pkgfile +++ b/ibus/Pkgfile @@ -5,11 +5,10 @@ # Optional: dconf desktop-file-utils gtk4 libappindicator-gtk3 unicode-character-database vala xorg-setxkbmap wayland-protocols # xorg-libxcomposite xorg-libxcursor xorg-libxinerama name=ibus -version=1.5.25 -release=2 +version=1.5.26 +release=1 source=(https://github.com/ibus/ibus/releases/download/$version/$name-$version.tar.g... - https://raw.githubusercontent.com/ibus/ibus/dd4cc5b028c35f9bb8fa9d3bdc8f26bc... - 936a0e76df79d92a8bdc03e9205330fb84a2083e.patch) + https://raw.githubusercontent.com/ibus/ibus/dd4cc5b028c35f9bb8fa9d3bdc8f26bc...) build() { cd $name-$version @@ -17,7 +16,6 @@ build() { sed -i 's|$(libibus) $(libibus_emoji_dialog)|$(libibus_emoji_dialog) $(libibus)|' ui/gtk3/Makefile.am sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac grep -r -l '#!/usr/bin/python' . | xargs sed -i '1s|python|python3|' - patch -Np1 -i $SRC/936a0e76df79d92a8bdc03e9205330fb84a2083e.patch prt-get isinst dconf && PKGMK_IBUS+=' --enable-dconf' || PKGMK_IBUS+=' --disable-dconf' prt-get isinst gtk3 && PKGMK_IBUS+=' --enable-gtk3' || PKGMK_IBUS+=' --disable-gtk3' @@ -40,9 +38,10 @@ build() { --disable-memconf \ --disable-nls \ --disable-python2 \ - --disable-schemas-compile + --disable-schemas-compile \ + --disable-systemd-services sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - mv $SRC/denylist.txt engine/denylist.txt + #mv $SRC/denylist.txt engine/denylist.txt make make DESTDIR=$PKG install