Tue Mar 15 13:13:36 2022 UTC ()
ibus: update to 1.5.26.

pkgsrc changes:
- explicitly disable systemd support
- explicitly require the latest unicode packages
- no need to specify python 2.x

Upstream changes:
 https://github.com/ibus/ibus/releases/tag/1.5.26

1.5.26

  * Enhance compose keys df664b1 19377ad
  * Enhance Emoji features acc5570 104148b d9ff2bb
  * Implement clear preedit for GTK4 5487a6b
  * Calculate keycode from keysym in GTK3 forward-key-event 4957d14
  * Fix to send char position at update_preedit_text f5757ad
  * Deprecate gettext.bind_textdomain_codeset() since Python 3.8 28acfd4
  * Fix ibus_key_event_from_string for gobject-introspection c69b61a
  * Fix a key event loop with forwarding keys 6b979e7
  * Delete gnome-autogen dependency 2bc47f0
  * Change XKB layout string color in panel 0e118e7
  * Add IBUS_INPUT_HINT_PRIVATE for browser private mode 0f1485b
  * mkdir socket dirs instead of socket paths 787b564 dfd3fbf
  * Add org.freedesktop.IBus.session.generic.service b5423f0
  * Check XDG_SESSION_DESKTOP for Plasma desktop 1f27521
  * Update simple.xml with xkeyboard-config 2.35.1 a3c0724
  * Update ibusunicodegen.h with unicode-ucd 14.0.0 9bf9ef0
  * Enhance CI fbea544 51e3295 d53d31d be17934 675b94f
  * Fix typos a82bda5

Code Contributors:

  * Fix wrong cursor location in gtk3 apps (Alynx Zhou) 936a0e7
  * Update URLS (Eberhard Beilharz) ecca9db
  * invalidate cache based on symlink mtime too (Naim Favier) cfcc6f1
  * Fix unref problems with floating references (Eberhard Beilharz) 5a455b1
  * Update man page for Emoji shortcut key (Sibo Dong) ad95015
  * Add systemd unit file (Carlos Garnacho) a076b38
  * Fix forward key keycode for GTK4 (Changwoo Ryu) 5cfe838

Translation Contributors:

  * Update translation (Finnish) (Jan Kuparinen) e77f80c
  * Update translation (Korean) (simmon) 6df55eb
  * Update translation (Chinese (Simplified) (zh_CN)) (Dingzhong Chen) 0199dde
  * Update translation (Turkish) (Oguz Ersen) 58fe1e5
  * Update translation (Catalan) (Jordi Mas) a1528a0
  * Update translation (Arabic) (Abdullah Albaroty) 0e522c4
  * Update translation (Arabic) (Zayed Al-Saidi) 20c5dc9


(tsutsui)
diff -r1.84 -r1.85 pkgsrc/inputmethod/ibus/Makefile
diff -r1.18 -r1.19 pkgsrc/inputmethod/ibus/Makefile.common
diff -r1.20 -r1.21 pkgsrc/inputmethod/ibus/PLIST
diff -r1.28 -r1.29 pkgsrc/inputmethod/ibus/distinfo
cvs diff -r1.84 -r1.85 pkgsrc/inputmethod/ibus/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile 2022/03/12 08:01:50 1.84
+++ pkgsrc/inputmethod/ibus/Makefile 2022/03/15 13:13:36 1.85
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.84 2022/03/12 08:01:50 nia Exp $ 1# $NetBSD: Makefile,v 1.85 2022/03/15 13:13:36 tsutsui Exp $
2 2
3PKGREVISION= 2 
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6COMMENT= Intelligent Input Bus 5COMMENT= Intelligent Input Bus
7 6
8DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject32 7DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
9BUILD_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation 8BUILD_DEPENDS+= cldr-emoji-annotation>=37.0.13.0.0.2:../../textproc/cldr-emoji-annotation
10BUILD_DEPENDS+= unicode-character-database>=13.0.0:../../textproc/unicode-character-database 9BUILD_DEPENDS+= unicode-character-database>=14.0.0:../../textproc/unicode-character-database
11BUILD_DEPENDS+= unicode-emoji>=13.1:../../textproc/unicode-emoji 10BUILD_DEPENDS+= unicode-emoji>=14.0:../../textproc/unicode-emoji
12 11
13PYTHON_VERSIONS_ACCEPTED= 27 12PYTHON_VERSIONS_INCOMPATIBLE= 27
14 13
15GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
16USE_LIBTOOL= yes 15USE_LIBTOOL= yes
17USE_TOOLS+= pkg-config intltool msgfmt gmake msgmerge 16USE_TOOLS+= pkg-config intltool msgfmt gmake msgmerge
18USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
19USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
20 19
21GCONF_SCHEMAS+= ibus.schemas 20GCONF_SCHEMAS+= ibus.schemas
22PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in 21PKGCONFIG_OVERRIDE+= ibus-1.0.pc.in
23 22
24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
25CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale 24CONFIGURE_ARGS+= --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
26CONFIGURE_ARGS+= --enable-dconf 25CONFIGURE_ARGS+= --enable-dconf
27CONFIGURE_ARGS+= --enable-gtk2 26CONFIGURE_ARGS+= --enable-gtk2
28CONFIGURE_ARGS+= --enable-gtk3 27CONFIGURE_ARGS+= --enable-gtk3
29CONFIGURE_ARGS+= --enable-surrounding-text 28CONFIGURE_ARGS+= --enable-surrounding-text
30CONFIGURE_ARGS+= --enable-introspection=yes 29CONFIGURE_ARGS+= --enable-introspection=yes
 30CONFIGURE_ARGS+= --disable-systemd-services
31CONFIGURE_ARGS+= --with-python=${PYTHONBIN} 31CONFIGURE_ARGS+= --with-python=${PYTHONBIN}
32CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji 32CONFIGURE_ARGS+= --with-unicode-emoji-dir=${PREFIX}/share/unicode/emoji
33CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations 33CONFIGURE_ARGS+= --with-emoji-annotation-dir=${PREFIX}/share/unicode/cldr/common/annotations
34CONFIGURE_ARGS+= --with-ucd-dir=${PREFIX}/share/unicode/ucd 34CONFIGURE_ARGS+= --with-ucd-dir=${PREFIX}/share/unicode/ucd
35 35
36SUBST_CLASSES+= dbus 36SUBST_CLASSES+= dbus
37SUBST_STAGE.dbus= post-configure 37SUBST_STAGE.dbus= post-configure
38SUBST_FILES.dbus= src/ibusshare.c 38SUBST_FILES.dbus= src/ibusshare.c
39SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g' 39SUBST_SED.dbus= -e 's,/var/lib/dbus/machine-id,${VARBASE}/lib/dbus/machine-id,g'
40 40
41BUILD_DEFS+= PKG_SYSCONFBASE VARBASE 41BUILD_DEFS+= PKG_SYSCONFBASE VARBASE
42MANCOMPRESSED= yes 42MANCOMPRESSED= yes
43 43
cvs diff -r1.18 -r1.19 pkgsrc/inputmethod/ibus/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/Makefile.common 2021/08/21 17:40:17 1.18
+++ pkgsrc/inputmethod/ibus/Makefile.common 2022/03/15 13:13:36 1.19
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: Makefile.common,v 1.18 2021/08/21 17:40:17 tsutsui Exp $ 1# $NetBSD: Makefile.common,v 1.19 2022/03/15 13:13:36 tsutsui Exp $
2# 2#
3# used by inputmethod/ibus/Makefile 3# used by inputmethod/ibus/Makefile
4# used by inputmethod/ibus-python/Makefile 4# used by inputmethod/ibus-python/Makefile
5 5
6DISTNAME= ibus-1.5.25 6DISTNAME= ibus-1.5.26
7CATEGORIES= inputmethod 7CATEGORIES= inputmethod
8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/ 8MASTER_SITES= https://github.com/ibus/ibus/releases/download/${PKGVERSION_NOREV}/
9 9
10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../inputmethod/ibus/distinfo
11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches 11PATCHDIR= ${.CURDIR}/../../inputmethod/ibus/patches
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/ibus/ibus/wiki 14HOMEPAGE= https://github.com/ibus/ibus/wiki
15LICENSE= gnu-lgpl-v2.1 15LICENSE= gnu-lgpl-v2.1
cvs diff -r1.20 -r1.21 pkgsrc/inputmethod/ibus/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/PLIST 2021/08/21 17:40:17 1.20
+++ pkgsrc/inputmethod/ibus/PLIST 2022/03/15 13:13:36 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2021/08/21 17:40:17 tsutsui Exp $ 1@comment $NetBSD: PLIST,v 1.21 2022/03/15 13:13:36 tsutsui Exp $
2bin/ibus 2bin/ibus
3bin/ibus-daemon 3bin/ibus-daemon
4bin/ibus-setup 4bin/ibus-setup
5include/ibus-1.0/ibus.h 5include/ibus-1.0/ibus.h
6include/ibus-1.0/ibusaccelgroup.h 6include/ibus-1.0/ibusaccelgroup.h
7include/ibus-1.0/ibusattribute.h 7include/ibus-1.0/ibusattribute.h
8include/ibus-1.0/ibusattrlist.h 8include/ibus-1.0/ibusattrlist.h
9include/ibus-1.0/ibusbus.h 9include/ibus-1.0/ibusbus.h
10include/ibus-1.0/ibuscomponent.h 10include/ibus-1.0/ibuscomponent.h
11include/ibus-1.0/ibusconfig.h 11include/ibus-1.0/ibusconfig.h
12include/ibus-1.0/ibusconfigservice.h 12include/ibus-1.0/ibusconfigservice.h
13include/ibus-1.0/ibusdebug.h 13include/ibus-1.0/ibusdebug.h
14include/ibus-1.0/ibusemoji.h 14include/ibus-1.0/ibusemoji.h
@@ -59,26 +59,27 @@ man/man1/ibus-setup.1 @@ -59,26 +59,27 @@ man/man1/ibus-setup.1
59man/man1/ibus.1 59man/man1/ibus.1
60man/man5/00-upstream-settings.5 60man/man5/00-upstream-settings.5
61man/man5/ibus.5 61man/man5/ibus.5
62man/man7/ibus-emoji.7 62man/man7/ibus-emoji.7
63share/GConf/gsettings/ibus.convert 63share/GConf/gsettings/ibus.convert
64share/applications/org.freedesktop.IBus.Panel.Emojier.desktop 64share/applications/org.freedesktop.IBus.Panel.Emojier.desktop
65share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop 65share/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
66share/applications/org.freedesktop.IBus.Setup.desktop 66share/applications/org.freedesktop.IBus.Setup.desktop
67share/bash-completion/completions/ibus.bash 67share/bash-completion/completions/ibus.bash
68share/dbus-1/services/org.freedesktop.IBus.service 68share/dbus-1/services/org.freedesktop.IBus.service
69share/dbus-1/services/org.freedesktop.portal.IBus.service 69share/dbus-1/services/org.freedesktop.portal.IBus.service
70share/examples/ibus/dconf/db/ibus.d/00-upstream-settings 70share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
71share/examples/ibus/dconf/profile/ibus 71share/examples/ibus/dconf/profile/ibus
 72share/examples/ibus/xdg/Xwayland-session.d/10-ibus-x11
72share/gettext/its/ibus.its 73share/gettext/its/ibus.its
73share/gettext/its/ibus.loc 74share/gettext/its/ibus.loc
74share/gir-1.0/IBus-1.0.gir 75share/gir-1.0/IBus-1.0.gir
75share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml 76share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
76share/gtk-doc/html/ibus/IBusAttrList.html 77share/gtk-doc/html/ibus/IBusAttrList.html
77share/gtk-doc/html/ibus/IBusAttribute.html 78share/gtk-doc/html/ibus/IBusAttribute.html
78share/gtk-doc/html/ibus/IBusBus.html 79share/gtk-doc/html/ibus/IBusBus.html
79share/gtk-doc/html/ibus/IBusComponent.html 80share/gtk-doc/html/ibus/IBusComponent.html
80share/gtk-doc/html/ibus/IBusConfig.html 81share/gtk-doc/html/ibus/IBusConfig.html
81share/gtk-doc/html/ibus/IBusConfigService.html 82share/gtk-doc/html/ibus/IBusConfigService.html
82share/gtk-doc/html/ibus/IBusEngine.html 83share/gtk-doc/html/ibus/IBusEngine.html
83share/gtk-doc/html/ibus/IBusEngineDesc.html 84share/gtk-doc/html/ibus/IBusEngineDesc.html
84share/gtk-doc/html/ibus/IBusEngineSimple.html 85share/gtk-doc/html/ibus/IBusEngineSimple.html
cvs diff -r1.28 -r1.29 pkgsrc/inputmethod/ibus/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/ibus/distinfo 2021/10/26 10:49:33 1.28
+++ pkgsrc/inputmethod/ibus/distinfo 2022/03/15 13:13:36 1.29
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.28 2021/10/26 10:49:33 nia Exp $ 1$NetBSD: distinfo,v 1.29 2022/03/15 13:13:36 tsutsui Exp $
2 2
3BLAKE2s (ibus-1.5.25.tar.gz) = 381812c1f41f77c0abe73a7a9cd5d71e45edf9a3ab767fd3152292a6b340bc25 3BLAKE2s (ibus-1.5.26.tar.gz) = 4fe347ac8e771822e53d8c9b723a243e0b7694d1585f47a7e8d23cfbaf17ad28
4SHA512 (ibus-1.5.25.tar.gz) = 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6 4SHA512 (ibus-1.5.26.tar.gz) = 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
5Size (ibus-1.5.25.tar.gz) = 3669787 bytes 5Size (ibus-1.5.26.tar.gz) = 3715263 bytes
6SHA1 (patch-client_gtk2_ibusimcontext.c) = 8c7d0134600e0a56997853f51b9b05689bc35d83 6SHA1 (patch-client_gtk2_ibusimcontext.c) = 8c7d0134600e0a56997853f51b9b05689bc35d83
7SHA1 (patch-client_gtk3_ibusimcontext.c) = 27fa6ecf69299f4db5f5788fa6fc1aec02254266 7SHA1 (patch-client_gtk3_ibusimcontext.c) = 27fa6ecf69299f4db5f5788fa6fc1aec02254266
8SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650 8SHA1 (patch-ui_gtk3_Makefile.am) = dd0c6bc9383b57c1451e4f8c96e41f7398e3e650
9SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4 9SHA1 (patch-ui_gtk3_Makefile.in) = 8e7391e77eefe78c69db7814df9ae536ccdc14b4