Upgrade ibus to the latest stable release: ibus-1.5.22

ok sthen@ robert@ jasper@
2020-04-20 10:15:16 +00:00 · 2020-04-20 10:15:16 +00:00 · a97d13df90
commit a97d13df90
parent 1a847ff03b
12 changed files with 158 additions and 229 deletions
--- a/inputmethods/ibus/Makefile
+++ b/inputmethods/ibus/Makefile
@ -1,13 +1,12 @@
-# $OpenBSD: Makefile,v 1.63 2020/01/26 11:14:32 jasper Exp $
+# $OpenBSD: Makefile,v 1.64 2020/04/20 10:15:16 ajacoutot Exp $

 COMMENT =		intelligent input bus framework

 GH_PROJECT =		ibus
 GH_ACCOUNT =		ibus
-GH_TAGNAME =	1.5.5
-REVISION =	15
+GH_TAGNAME =		1.5.22

-SHARED_LIBS =	ibus-1.0	4.0 # 5.504
+SHARED_LIBS =	ibus-1.0	4.1 # 5.522

 CATEGORIES =		inputmethods chinese japanese korean

@ -16,53 +15,68 @@ HOMEPAGE =	https://github.com/ibus/ibus/wiki
 # LGPLv2+
 PERMIT_PACKAGE =	Yes

-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi c cairo
-WANTLIB += cairo-gobject dbus-1 dconf epoxy expat ffi fontconfig
-WANTLIB += freetype fribidi gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
-WANTLIB += gtk-x11-2.0 harfbuzz iconv intl m notify pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread xcb
-WANTLIB += xcb-render xcb-shm z
-
-# XXX: Remove when upgrading to newer tag
-MASTER_SITES =	https://distfiles.sigtrap.nl/
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
+WANTLIB += dbus-1 dconf epoxy expat ffi fontconfig freetype fribidi
+WANTLIB += gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 gtk-x11-2.0
+WANTLIB += harfbuzz iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pcre pixman-1 png pthread xcb xcb-render xcb-shm z

 MODULES =		devel/dconf \
-		devel/gconf2 \
 			lang/python \
 			textproc/intltool

+MODPY_VERSION =		${MODPY_DEFAULT_VERSION_3}
+
 BUILD_DEPENDS =		devel/iso-codes \
-		devel/py-gobject3 \
-		lang/vala
+			devel/py-gobject3${MODPY_FLAVOR} \
+			lang/vala \
+			textproc/unicode-ucd
+
 RUN_DEPENDS =		devel/desktop-file-utils \
 			devel/iso-codes \
 			x11/gtk+3,-guic

 # MODPY_LIBDIR/gi/overrides/
-RUN_DEPENDS +=	devel/py-gobject3
+RUN_DEPENDS +=		devel/py-gobject3${MODPY_FLAVOR}

-LIB_DEPENDS =	devel/libnotify \
-		x11/gtk+2 \
+LIB_DEPENDS =		x11/gtk+2 \
 			x11/gtk+3

 MODGCONF2_LIBDEP =	No

 USE_GMAKE =		Yes
-LIBTOOL_FLAGS =	--tag=disable-static

-CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = --mandir=${PREFIX}/man \
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.16
+
+CONFIGURE_STYLE =	autoreconf
+CONFIGURE_ARGS =	--disable-python2 \
 			--enable-introspection \
-		 --enable-vala
-CONFIGURE_ENV =	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
+		 	--enable-vala \
+			--with-ucd-dir=${LOCALBASE}/share/unicode/ucd
+
+# requires unicode-emoji
+CONFIGURE_ARGS +=	--disable-emoji-dict
+CONFIGURE_ARGS +=	--with-unicode-emoji-dir=${LOCALBASE}/share/unicode/emoji \
+			--with-emoji-annotation-dir=${LOCALBASE}/share/unicode/cldr/common/annotations \
+			
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

+DEBUG_PACKAGES =	${BUILD_PACKAGES}
+
 FAKE_FLAGS =		bash_completiondir=${PREFIX}/share/examples/ibus/bash_completion.d \
 			sysconfdir=${PREFIX}/share/examples/ibus

-pre-configure:
-	${SUBST_CMD} ${WRKSRC}/src/ibusshare.c
+BUILD_DEPENDS +=	textproc/gtk-doc
+do-gen:
+	cd ${WRKSRC} && gtkdocize
+
+post-install:
+	gunzip ${PREFIX}/man/man{1,5}/*.gz
+	rm ${PREFIX}/lib/gtk-2.0/2.10.0/immodules/*.{a,la}
+	rm ${PREFIX}/lib/gtk-3.0/3.0.0/immodules/*.{a,la}

 .include <bsd.port.mk>
--- a/inputmethods/ibus/distinfo
+++ b/inputmethods/ibus/distinfo
@ -1,2 +1,2 @@
-SHA256 (ibus-1.5.5.tar.gz) = Aqs2r2BIOZ/tvo2FB0sWEhm4nfUCCTLfM8+IKXZPiuw=
-SIZE (ibus-1.5.5.tar.gz) = 2063794
+SHA256 (ibus-1.5.22.tar.gz) = T4e61TRbWxFnUCXIAbTOfQexyYHBD9jfKWd0sK14Ydw=
+SIZE (ibus-1.5.22.tar.gz) = 1316284
--- a/inputmethods/ibus/patches/patch-bus_Makefile_in
+++ b/inputmethods/ibus/patches/patch-bus_Makefile_in
@ -1,15 +0,0 @@
-$OpenBSD: patch-bus_Makefile_in,v 1.4 2014/07/17 15:59:43 ajacoutot Exp $
--- bus/Makefile.in.orig	Sat Sep 28 20:06:28 2013
-+++ bus/Makefile.in	Sat Sep 28 20:06:53 2013
-@@ -1371,9 +1371,9 @@ mostlyclean-libtool:
- 
- clean-libtool:
- 	-rm -rf .libs _libs
-install-man_oneDATA: $(man_one_DATA)
-+install-man_oneDATA: $(man_one_files)
- 	@$(NORMAL_INSTALL)
-	@list='$(man_one_DATA)'; test -n "$(man_onedir)" || list=; \
-+	@list='$(man_one_files)'; test -n "$(man_onedir)" || list=; \
- 	if test -n "$$list"; then \
- 	  echo " $(MKDIR_P) '$(DESTDIR)$(man_onedir)'"; \
- 	  $(MKDIR_P) "$(DESTDIR)$(man_onedir)" || exit 1; \
--- a/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c
+++ b/inputmethods/ibus/patches/patch-client_gtk2_ibusimcontext_c
@ -1,7 +1,9 @@
-$OpenBSD: patch-client_gtk2_ibusimcontext_c,v 1.2 2013/10/01 21:21:17 fgsch Exp $
--- client/gtk2/ibusimcontext.c.orig	Fri Sep 20 04:15:51 2013
-+++ client/gtk2/ibusimcontext.c	Sat Sep 28 19:31:13 2013
-@@ -593,10 +593,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
+$OpenBSD: patch-client_gtk2_ibusimcontext_c,v 1.3 2020/04/20 10:15:16 ajacoutot Exp $
+
+Index: client/gtk2/ibusimcontext.c
+--- client/gtk2/ibusimcontext.c.orig
+++ client/gtk2/ibusimcontext.c
+@@ -688,10 +688,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
 
     /* always install snooper */
     if (_key_snooper_id == 0) {
@ -12,7 +14,7 @@ $OpenBSD: patch-client_gtk2_ibusimcontext_c,v 1.2 2013/10/01 21:21:17 fgsch Exp
     }
 
     _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -613,10 +610,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
+@@ -708,10 +705,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
 {
     if (_key_snooper_id != 0) {
         IDEBUG ("snooper is terminated.");
--- a/inputmethods/ibus/patches/patch-client_gtk3_ibusimcontext_c
+++ b/inputmethods/ibus/patches/patch-client_gtk3_ibusimcontext_c
@ -1,25 +0,0 @@
-$OpenBSD: patch-client_gtk3_ibusimcontext_c,v 1.2 2013/10/01 21:21:17 fgsch Exp $
--- client/gtk3/ibusimcontext.c.orig	Fri Sep 20 04:15:51 2013
-+++ client/gtk3/ibusimcontext.c	Sat Sep 28 19:31:13 2013
-@@ -593,10 +593,7 @@ ibus_im_context_class_init (IBusIMContextClass *class)
- 
-     /* always install snooper */
-     if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-         _key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
-     }
- 
-     _daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-@@ -613,10 +610,7 @@ ibus_im_context_class_fini (IBusIMContextClass *class)
- {
-     if (_key_snooper_id != 0) {
-         IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-         gtk_key_snooper_remove (_key_snooper_id);
-#pragma GCC diagnostic pop
-         _key_snooper_id = 0;
-     }
- 
--- a/inputmethods/ibus/patches/patch-configure_ac
+++ b/inputmethods/ibus/patches/patch-configure_ac
@ -0,0 +1,16 @@
+$OpenBSD: patch-configure_ac,v 1.1 2020/04/20 10:15:16 ajacoutot Exp $
+
+Makefile.am: error: required file './ChangeLog' not found
+
+Index: configure.ac
+--- configure.ac.orig
+++ configure.ac
+@@ -62,7 +62,7 @@ VALA_TARGET_GLIB_VERSION=2.46
+ AC_SUBST(VALA_TARGET_GLIB_VERSION)
+ 
+ # Init automake.
+-AM_INIT_AUTOMAKE([1.11.1 parallel-tests])
+AM_INIT_AUTOMAKE([1.11.1 foreign parallel-tests])
+ AM_MAINTAINER_MODE([enable])
+ AC_GNU_SOURCE
+ 
--- a/inputmethods/ibus/patches/patch-data_dconf_make-dconf-override-db_sh
+++ b/inputmethods/ibus/patches/patch-data_dconf_make-dconf-override-db_sh
@ -0,0 +1,20 @@
+$OpenBSD: patch-data_dconf_make-dconf-override-db_sh,v 1.1 2020/04/20 10:15:16 ajacoutot Exp $
+
+Index: data/dconf/make-dconf-override-db.sh
+--- data/dconf/make-dconf-override-db.sh.orig
+++ data/dconf/make-dconf-override-db.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
+#!/bin/sh
+ 
+ set -e
+ 
+@@ -6,7 +6,7 @@ set -e
+ # breaks dbus-launch.  There's dbus-run-session which is
+ # better, but not everyone has it yet.
+ export DBUS_FATAL_WARNINGS=0
+-export TMPDIR=$(mktemp -d --tmpdir="$PWD")
+export TMPDIR=$(mktemp -d -t -p "$PWD")
+ export XDG_CONFIG_HOME="$TMPDIR/config"
+ export XDG_CACHE_HOME="$TMPDIR/cache"
+ export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
--- a/inputmethods/ibus/patches/patch-engine_Makefile_in
+++ b/inputmethods/ibus/patches/patch-engine_Makefile_in
@ -1,11 +0,0 @@
-$OpenBSD: patch-engine_Makefile_in,v 1.4 2014/07/17 15:59:43 ajacoutot Exp $
--- engine/Makefile.in.orig	Tue Jan 14 05:00:23 2014
-+++ engine/Makefile.in	Fri Jul 11 12:54:18 2014
-@@ -497,7 +497,6 @@ AM_CFLAGS = \
- 	-DBINDIR=\"@bindir@\" \
-     -DIBUS_DISABLE_DEPRECATED \
- 	-Wno-unused-variable \
-	-Wno-unused-but-set-variable \
- 	-Wno-unused-function \
- 	$(NULL)
- 
--- a/inputmethods/ibus/patches/patch-setup_Makefile_in
+++ b/inputmethods/ibus/patches/patch-setup_Makefile_in
@ -1,15 +0,0 @@
-$OpenBSD: patch-setup_Makefile_in,v 1.4 2014/07/17 15:59:43 ajacoutot Exp $
--- setup/Makefile.in.orig	Sat Sep 28 20:07:05 2013
-+++ setup/Makefile.in	Sat Sep 28 20:07:26 2013
-@@ -626,9 +626,9 @@ uninstall-ibussetupDATA:
- 	@list='$(ibussetup_DATA)'; test -n "$(ibussetupdir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(ibussetupdir)'; $(am__uninstall_files_from_dir)
-install-man_oneDATA: $(man_one_DATA)
-+install-man_oneDATA: $(man_one_files)
- 	@$(NORMAL_INSTALL)
-	@list='$(man_one_DATA)'; test -n "$(man_onedir)" || list=; \
-+	@list='$(man_one_files)'; test -n "$(man_onedir)" || list=; \
- 	if test -n "$$list"; then \
- 	  echo " $(MKDIR_P) '$(DESTDIR)$(man_onedir)'"; \
- 	  $(MKDIR_P) "$(DESTDIR)$(man_onedir)" || exit 1; \
--- a/inputmethods/ibus/patches/patch-tools_Makefile_in
+++ b/inputmethods/ibus/patches/patch-tools_Makefile_in
@ -1,23 +0,0 @@
-$OpenBSD: patch-tools_Makefile_in,v 1.4 2014/07/17 15:59:43 ajacoutot Exp $
--- tools/Makefile.in.orig	Tue Jan 14 05:00:23 2014
-+++ tools/Makefile.in	Fri Jul 11 12:54:18 2014
-@@ -489,7 +489,6 @@ AM_CFLAGS = \
- 	-DG_LOG_DOMAIN=\"IBUS\" \
- 	-DIBUS_DISABLE_DEPRECATED \
- 	-Wno-unused-variable \
-	-Wno-unused-but-set-variable \
- 	-Wno-unused-function \
- 	$(NULL)
- 
-@@ -689,9 +688,9 @@ uninstall-bash_completionDATA:
- 	@list='$(bash_completion_DATA)'; test -n "$(bash_completiondir)" || list=; \
- 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- 	dir='$(DESTDIR)$(bash_completiondir)'; $(am__uninstall_files_from_dir)
-install-man_oneDATA: $(man_one_DATA)
-+install-man_oneDATA: $(man_one_files)
- 	@$(NORMAL_INSTALL)
-	@list='$(man_one_DATA)'; test -n "$(man_onedir)" || list=; \
-+	@list='$(man_one_files)'; test -n "$(man_onedir)" || list=; \
- 	if test -n "$$list"; then \
- 	  echo " $(MKDIR_P) '$(DESTDIR)$(man_onedir)'"; \
- 	  $(MKDIR_P) "$(DESTDIR)$(man_onedir)" || exit 1; \
--- a/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in
+++ b/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-ui_gtk3_Makefile_in,v 1.3 2013/10/01 21:21:17 fgsch Exp $
--- ui/gtk3/Makefile.in.orig	Sat Sep 28 19:32:48 2013
-+++ ui/gtk3/Makefile.in	Sat Sep 28 19:32:55 2013
-@@ -516,7 +516,7 @@ AM_CFLAGS = @GLIB2_CFLAGS@ @GIO2_CFLAGS@ @GTHREAD2_CFL
- 	@GTK3_CFLAGS@ @X11_CFLAGS@ -DG_LOG_DOMAIN=\"IBUS\" \
- 	-DBINDIR=\"$(bindir)\" -DIBUS_DISABLE_DEPRECATED \
- 	-DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \
-	-Wno-unused-variable -Wno-unused-but-set-variable \
-+	-Wno-unused-variable \
- 	-Wno-unused-function $(NULL) $(am__append_1)
- AM_LDADD = @GOBJECT2_LIBS@ @GLIB2_LIBS@ @GIO2_LIBS@ @GTHREAD2_LIBS@ \
- 	@GTK3_LIBS@ @X11_LIBS@ -lXi $(libibus) $(NULL) $(am__append_2)
--- a/inputmethods/ibus/pkg/PLIST
+++ b/inputmethods/ibus/pkg/PLIST
@ -1,9 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.24 2018/09/04 12:46:14 espie Exp $
+@comment $OpenBSD: PLIST,v 1.25 2020/04/20 10:15:17 ajacoutot Exp $
@bin bin/ibus
@bin bin/ibus-daemon
 bin/ibus-setup
 include/ibus-1.0/
 include/ibus-1.0/ibus.h
+include/ibus-1.0/ibusaccelgroup.h
 include/ibus-1.0/ibusattribute.h
 include/ibus-1.0/ibusattrlist.h
 include/ibus-1.0/ibusbus.h
@ -11,6 +12,7 @@ include/ibus-1.0/ibuscomponent.h
 include/ibus-1.0/ibusconfig.h
 include/ibus-1.0/ibusconfigservice.h
 include/ibus-1.0/ibusdebug.h
+include/ibus-1.0/ibusemoji.h
 include/ibus-1.0/ibusengine.h
 include/ibus-1.0/ibusenginedesc.h
 include/ibus-1.0/ibusenginesimple.h
@ -36,31 +38,37 @@ include/ibus-1.0/ibusservice.h
 include/ibus-1.0/ibusshare.h
 include/ibus-1.0/ibustext.h
 include/ibus-1.0/ibustypes.h
+include/ibus-1.0/ibusunicode.h
 include/ibus-1.0/ibusutil.h
 include/ibus-1.0/ibusversion.h
+include/ibus-1.0/ibusxevent.h
 include/ibus-1.0/ibusxml.h
 lib/girepository-1.0/IBus-1.0.typelib
-@comment lib/gtk-2.0/2.10.0/immodules/im-ibus.la
-lib/gtk-2.0/2.10.0/immodules/im-ibus.so
-@comment lib/gtk-3.0/3.0.0/immodules/im-ibus.la
-lib/gtk-3.0/3.0.0/immodules/im-ibus.so
-@comment lib/libibus-1.0.la
+@so lib/gtk-2.0/2.10.0/immodules/im-ibus.so
+@so lib/gtk-3.0/3.0.0/immodules/im-ibus.so
+@static-lib lib/libibus-1.0.a
+lib/libibus-1.0.la
@lib lib/libibus-1.0.so.${LIBibus-1.0_VERSION}
 lib/pkgconfig/ibus-1.0.pc
 lib/python${MODPY_VERSION}/site-packages/gi/overrides/IBus.py
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/IBus.pyc
-lib/python${MODPY_VERSION}/site-packages/gi/overrides/IBus.pyo
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}IBus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/gi/overrides/${MODPY_PYCACHE}IBus.${MODPY_PYC_MAGIC_TAG}pyc
@bin libexec/ibus-dconf
@bin libexec/ibus-engine-simple
+@bin libexec/ibus-portal
@bin libexec/ibus-ui-gtk3
@bin libexec/ibus-x11
@man man/man1/ibus-daemon.1
@man man/man1/ibus-setup.1
@man man/man1/ibus.1
+@man man/man5/00-upstream-settings.5
+@man man/man5/ibus.5
 share/GConf/
 share/GConf/gsettings/
 share/GConf/gsettings/ibus.convert
-share/applications/ibus-setup.desktop
+share/applications/org.freedesktop.IBus.Setup.desktop
+share/dbus-1/services/org.freedesktop.IBus.service
+share/dbus-1/services/org.freedesktop.portal.IBus.service
 share/doc/pkg-readmes/${PKGSTEM}
 share/examples/ibus/
 share/examples/ibus/bash_completion.d/
@ -76,65 +84,18 @@ share/examples/ibus/dconf/db/ibus.d/00-upstream-settings
 share/examples/ibus/dconf/profile/
 share/examples/ibus/dconf/profile/ibus
@sample ${SYSCONFDIR}/dconf/profile/ibus
+share/gettext/its/ibus.its
+share/gettext/its/ibus.loc
 share/gir-1.0/IBus-1.0.gir
 share/glib-2.0/schemas/org.freedesktop.ibus.gschema.xml
-share/gtk-doc/html/ibus/
-share/gtk-doc/html/ibus/IBusAttrList.html
-share/gtk-doc/html/ibus/IBusAttribute.html
-share/gtk-doc/html/ibus/IBusBus.html
-share/gtk-doc/html/ibus/IBusComponent.html
-share/gtk-doc/html/ibus/IBusConfig.html
-share/gtk-doc/html/ibus/IBusConfigService.html
-share/gtk-doc/html/ibus/IBusEngine.html
-share/gtk-doc/html/ibus/IBusEngineDesc.html
-share/gtk-doc/html/ibus/IBusFactory.html
-share/gtk-doc/html/ibus/IBusHotkeyProfile.html
-share/gtk-doc/html/ibus/IBusInputContext.html
-share/gtk-doc/html/ibus/IBusKeymap.html
-share/gtk-doc/html/ibus/IBusLookupTable.html
-share/gtk-doc/html/ibus/IBusObject.html
-share/gtk-doc/html/ibus/IBusObservedPath.html
-share/gtk-doc/html/ibus/IBusPanelService.html
-share/gtk-doc/html/ibus/IBusPropList.html
-share/gtk-doc/html/ibus/IBusProperty.html
-share/gtk-doc/html/ibus/IBusProxy.html
-share/gtk-doc/html/ibus/IBusRegistry.html
-share/gtk-doc/html/ibus/IBusSerializable.html
-share/gtk-doc/html/ibus/IBusService.html
-share/gtk-doc/html/ibus/IBusText.html
-share/gtk-doc/html/ibus/annotation-glossary.html
-share/gtk-doc/html/ibus/api-index-deprecated.html
-share/gtk-doc/html/ibus/api-index-full.html
-share/gtk-doc/html/ibus/ch01.html
-share/gtk-doc/html/ibus/ch02.html
-share/gtk-doc/html/ibus/ch03.html
-share/gtk-doc/html/ibus/ch04.html
-share/gtk-doc/html/ibus/ch05.html
-share/gtk-doc/html/ibus/ch06.html
-share/gtk-doc/html/ibus/home.png
-share/gtk-doc/html/ibus/ibus-IBusEngineSimple.html
-share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
-share/gtk-doc/html/ibus/ibus-ibusdebug.html
-share/gtk-doc/html/ibus/ibus-ibuserror.html
-share/gtk-doc/html/ibus/ibus-ibuskeys.html
-share/gtk-doc/html/ibus/ibus-ibuskeysyms-compat.html
-share/gtk-doc/html/ibus/ibus-ibusshare.html
-share/gtk-doc/html/ibus/ibus-ibustypes.html
-share/gtk-doc/html/ibus/ibus-ibusutil.html
-share/gtk-doc/html/ibus/ibus-ibusversion.html
-share/gtk-doc/html/ibus/ibus-ibusxml.html
-share/gtk-doc/html/ibus/ibus.devhelp2
-share/gtk-doc/html/ibus/index.html
-share/gtk-doc/html/ibus/index.sgml
-share/gtk-doc/html/ibus/left.png
-share/gtk-doc/html/ibus/right.png
-share/gtk-doc/html/ibus/style.css
-share/gtk-doc/html/ibus/up.png
 share/ibus/
 share/ibus/component/
 share/ibus/component/dconf.xml
 share/ibus/component/gtkpanel.xml
 share/ibus/component/simple.xml
+share/ibus/dicts/
+share/ibus/dicts/unicode-blocks.dict
+share/ibus/dicts/unicode-names.dict
 share/ibus/engine/
 share/ibus/keymaps/
 share/ibus/keymaps/common
@ -144,27 +105,34 @@ share/ibus/keymaps/kr
 share/ibus/keymaps/modifiers
 share/ibus/keymaps/us
 share/ibus/setup/
+${MODPY_COMMENT}share/ibus/setup/${MODPY_PYCACHE}/
+share/ibus/setup/${MODPY_PYCACHE}emojilang.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}emojilang.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}engineabout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}engineabout.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}enginecombobox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}enginecombobox.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}enginedialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}enginedialog.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}enginetreeview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}enginetreeview.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}icon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}icon.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}keyboardshortcut.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}keyboardshortcut.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus/setup/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus/setup/emojilang.py
 share/ibus/setup/engineabout.py
-share/ibus/setup/engineabout.pyc
-share/ibus/setup/engineabout.pyo
 share/ibus/setup/enginecombobox.py
-share/ibus/setup/enginecombobox.pyc
-share/ibus/setup/enginecombobox.pyo
+share/ibus/setup/enginedialog.py
 share/ibus/setup/enginetreeview.py
-share/ibus/setup/enginetreeview.pyc
-share/ibus/setup/enginetreeview.pyo
 share/ibus/setup/i18n.py
-share/ibus/setup/i18n.pyc
-share/ibus/setup/i18n.pyo
 share/ibus/setup/icon.py
-share/ibus/setup/icon.pyc
-share/ibus/setup/icon.pyo
 share/ibus/setup/keyboardshortcut.py
-share/ibus/setup/keyboardshortcut.pyc
-share/ibus/setup/keyboardshortcut.pyo
 share/ibus/setup/main.py
-share/ibus/setup/main.pyc
-share/ibus/setup/main.pyo
 share/ibus/setup/setup.ui
 share/icons/hicolor/16x16/apps/ibus-keyboard.png
 share/icons/hicolor/22x22/apps/ibus-keyboard.png
@ -181,6 +149,7 @@ share/locale/bg/LC_MESSAGES/ibus10.mo
 share/locale/bn/LC_MESSAGES/ibus10.mo
 share/locale/bn_IN/LC_MESSAGES/ibus10.mo
 share/locale/ca/LC_MESSAGES/ibus10.mo
+share/locale/cs/LC_MESSAGES/ibus10.mo
 share/locale/da/LC_MESSAGES/ibus10.mo
 share/locale/de/LC_MESSAGES/ibus10.mo
 share/locale/en_GB/LC_MESSAGES/ibus10.mo
@ -188,37 +157,47 @@ share/locale/es/LC_MESSAGES/ibus10.mo
 share/locale/et/LC_MESSAGES/ibus10.mo
 share/locale/eu/LC_MESSAGES/ibus10.mo
 share/locale/fa/LC_MESSAGES/ibus10.mo
+share/locale/fi/LC_MESSAGES/ibus10.mo
 share/locale/fr/LC_MESSAGES/ibus10.mo
 share/locale/gu/LC_MESSAGES/ibus10.mo
+share/locale/he/LC_MESSAGES/ibus10.mo
 share/locale/hi/LC_MESSAGES/ibus10.mo
 share/locale/hu/LC_MESSAGES/ibus10.mo
 share/locale/ia/LC_MESSAGES/ibus10.mo
+share/locale/id/LC_MESSAGES/ibus10.mo
 share/locale/it/LC_MESSAGES/ibus10.mo
 share/locale/ja/LC_MESSAGES/ibus10.mo
 share/locale/kn/LC_MESSAGES/ibus10.mo
 share/locale/ko/LC_MESSAGES/ibus10.mo
 share/locale/lv/LC_MESSAGES/ibus10.mo
 share/locale/ml/LC_MESSAGES/ibus10.mo
+share/locale/mn/LC_MESSAGES/ibus10.mo
 share/locale/mr/LC_MESSAGES/ibus10.mo
 share/locale/nb/LC_MESSAGES/ibus10.mo
 share/locale/nl/LC_MESSAGES/ibus10.mo
 share/locale/or/LC_MESSAGES/ibus10.mo
 share/locale/pa/LC_MESSAGES/ibus10.mo
 share/locale/pl/LC_MESSAGES/ibus10.mo
+share/locale/pt/LC_MESSAGES/ibus10.mo
 share/locale/pt_BR/LC_MESSAGES/ibus10.mo
 share/locale/ru/LC_MESSAGES/ibus10.mo
+share/locale/sq/LC_MESSAGES/ibus10.mo
 share/locale/sr/LC_MESSAGES/ibus10.mo
 share/locale/sr@latin/LC_MESSAGES/ibus10.mo
+share/locale/sv/LC_MESSAGES/ibus10.mo
 share/locale/ta/LC_MESSAGES/ibus10.mo
 share/locale/te/LC_MESSAGES/ibus10.mo
 share/locale/tg/LC_MESSAGES/ibus10.mo
+share/locale/tr/LC_MESSAGES/ibus10.mo
 share/locale/uk/LC_MESSAGES/ibus10.mo
+share/locale/ur/LC_MESSAGES/ibus10.mo
 share/locale/vi/LC_MESSAGES/ibus10.mo
 share/locale/zh_CN/LC_MESSAGES/ibus10.mo
 share/locale/zh_HK/LC_MESSAGES/ibus10.mo
 share/locale/zh_TW/LC_MESSAGES/ibus10.mo
 share/vala/vapi/ibus-1.0.deps
 share/vala/vapi/ibus-1.0.vapi
+@sample /var/cache/ibus/
@tag glib-compile-schemas
@tag gtk-query-immodules-2.0
@tag gtk-query-immodules-3.0
@ -227,4 +206,3 @@ share/vala/vapi/ibus-1.0.vapi
@exec %D/bin/dconf update
@unexec-delete %D/bin/dconf update
@unexec-delete rm -f ${SYSCONFDIR}/dconf/db/ibus
-@sample /var/cache/ibus/