From a94290f906c44580bb804908b89873ab3158bab5 Mon Sep 17 00:00:00 2001 From: fgsch Date: Thu, 17 Jan 2013 23:31:41 +0000 Subject: [PATCH] Update to ibus 1.5.1. With input and comments from ajacoutot@. --- inputmethods/ibus/Makefile | 45 ++-- inputmethods/ibus/distinfo | 7 +- .../ibus/patches/patch-engine_Makefile_in | 11 + .../ibus/patches/patch-ibus_common_py | 12 -- .../ibus/patches/patch-src_Makefile_in | 21 -- .../ibus/patches/patch-src_ibusshare_c | 15 +- .../ibus/patches/patch-tools_Makefile_in | 11 + .../ibus/patches/patch-ui_gtk3_Makefile_in | 11 + inputmethods/ibus/pkg/PLIST | 204 +++++------------- 9 files changed, 119 insertions(+), 218 deletions(-) create mode 100644 inputmethods/ibus/patches/patch-engine_Makefile_in delete mode 100644 inputmethods/ibus/patches/patch-ibus_common_py delete mode 100644 inputmethods/ibus/patches/patch-src_Makefile_in create mode 100644 inputmethods/ibus/patches/patch-tools_Makefile_in create mode 100644 inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in diff --git a/inputmethods/ibus/Makefile b/inputmethods/ibus/Makefile index 0f2bc4d9106..20e2d504fad 100644 --- a/inputmethods/ibus/Makefile +++ b/inputmethods/ibus/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.28 2012/09/21 14:48:05 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2013/01/17 23:31:41 fgsch Exp $ SHARED_ONLY = Yes COMMENT = intelligent input bus framework -DISTNAME = ibus-1.4.1 -REVISION = 0 +DISTNAME = ibus-1.5.1 -SHARED_LIBS = ibus-1.0 1.0 +SHARED_LIBS = ibus-1.0 2.0 CATEGORIES = inputmethods chinese japanese korean @@ -19,44 +18,46 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo \ - cairo-gobject dbus-1 dbus-glib-1 drm expat ffi fontconfig \ - freetype gdk-3 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ - gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 gtk-x11-2.0 \ - m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \ - png pthread pthread-stubs stdc++ xcb xcb-render xcb-shm z +WANTLIB = GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \ + Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 \ + atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 dconf \ + drm expat ffi fontconfig freetype gdk-3 gdk-x11-2.0 \ + gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \ + gthread-2.0 gtk-3 gtk-x11-2.0 harfbuzz icudata icule \ + icuuc m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \ + pixman-1 png pthread pthread-stubs stdc++ xcb xcb-render \ + xcb-shm z MASTER_SITES = http://ibus.googlecode.com/files/ -MODULES = devel/gconf2 \ +MODULES = devel/dconf \ devel/gettext \ lang/python \ textproc/intltool BUILD_DEPENDS = devel/gobject-introspection \ devel/iso-codes \ - x11/dbus-python \ + devel/py-gobject3 \ lang/vala RUN_DEPENDS = devel/iso-codes \ devel/desktop-file-utils \ - devel/py-notify \ - x11/dbus-python \ + devel/py-gobject3 \ + devel/py-xdg \ x11/gnome/librsvg \ x11/gtk+2,-guic LIB_DEPENDS = x11/gtk+2 \ x11/gtk+3 -MODGCONF2_SCHEMAS_DIR = ibus - USE_GMAKE = Yes USE_LIBTOOL = Yes LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = --enable-introspection \ - --enable-gtk-doc-html=no +CONFIGURE_ARGS = --disable-gtk-doc-html \ + --enable-introspection \ + --enable-vala \ + --enable-dconf CONFIGURE_ENV = CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -66,4 +67,10 @@ CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \ ac_cv_path_GTKDOC_REBASE="" \ ac_cv_path_GTKDOC_MKPDF="" +FAKE_FLAGS = bash_completiondir=${PREFIX}/share/examples/ibus/bash_completion.d \ + sysconfdir=${PREFIX}/share/examples/ibus + +pre-configure: + ${SUBST_CMD} ${WRKSRC}/src/ibusshare.c + .include diff --git a/inputmethods/ibus/distinfo b/inputmethods/ibus/distinfo index ecaf55103d5..9c4539589c8 100644 --- a/inputmethods/ibus/distinfo +++ b/inputmethods/ibus/distinfo @@ -1,5 +1,2 @@ -MD5 (ibus-1.4.1.tar.gz) = iO992nIM7C3pK4ZzgypwLg== -RMD160 (ibus-1.4.1.tar.gz) = QAP8k5LFnONQSGiapQqUHP0VHP8= -SHA1 (ibus-1.4.1.tar.gz) = TMBFVTiF01oRjsS0TCaUkQIJUJ4= -SHA256 (ibus-1.4.1.tar.gz) = L0beJ57zwKSNP1IGF5TPxlRK2M/j8E2dErJR0RmhgNY= -SIZE (ibus-1.4.1.tar.gz) = 1479412 +SHA256 (ibus-1.5.1.tar.gz) = YCOAnO0nlLdfrQfrGx1iiBVLNzkg7NzVFYKkzeTg0Bc= +SIZE (ibus-1.5.1.tar.gz) = 1888861 diff --git a/inputmethods/ibus/patches/patch-engine_Makefile_in b/inputmethods/ibus/patches/patch-engine_Makefile_in new file mode 100644 index 00000000000..6975dee62a4 --- /dev/null +++ b/inputmethods/ibus/patches/patch-engine_Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-engine_Makefile_in,v 1.1 2013/01/17 23:31:41 fgsch Exp $ +--- engine/Makefile.in.orig Mon Jan 7 09:34:31 2013 ++++ engine/Makefile.in Mon Jan 7 09:34:33 2013 +@@ -441,7 +441,6 @@ AM_CFLAGS = \ + -DBINDIR=\"@bindir@\" \ + -DIBUS_DISABLE_DEPRECATED \ + -Wno-unused-variable \ +- -Wno-unused-but-set-variable \ + -Wno-unused-function \ + $(NULL) + diff --git a/inputmethods/ibus/patches/patch-ibus_common_py b/inputmethods/ibus/patches/patch-ibus_common_py deleted file mode 100644 index 73a98b24dfe..00000000000 --- a/inputmethods/ibus/patches/patch-ibus_common_py +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-ibus_common_py,v 1.3 2012/02/29 21:09:00 fgsch Exp $ ---- ibus/common.py.orig Sun Feb 26 14:16:09 2012 -+++ ibus/common.py Sun Feb 26 14:16:11 2012 -@@ -104,7 +104,7 @@ import ctypes - # return None - # return address - --libibus = ctypes.CDLL("libibus-1.0.so.0") -+libibus = ctypes.CDLL("libibus-1.0.so") - get_address = libibus.ibus_get_address - get_address.restype=ctypes.c_char_p - diff --git a/inputmethods/ibus/patches/patch-src_Makefile_in b/inputmethods/ibus/patches/patch-src_Makefile_in deleted file mode 100644 index c49040acf45..00000000000 --- a/inputmethods/ibus/patches/patch-src_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.4 2012/02/29 21:09:00 fgsch Exp $ ---- src/Makefile.in.orig Sun Feb 5 14:08:21 2012 -+++ src/Makefile.in Sun Feb 26 18:51:27 2012 -@@ -298,7 +298,7 @@ INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ - INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ - INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ - INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ --INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ -+INTROSPECTION_SCANNER = PKG_CONFIG_PATH=.. @INTROSPECTION_SCANNER@ - INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ - ISOCODES_CFLAGS = @ISOCODES_CFLAGS@ - ISOCODES_LIBS = @ISOCODES_LIBS@ -@@ -457,7 +457,7 @@ libibus_1_0_la_LIBADD = \ - libibus_1_0_la_LDFLAGS = \ - -no-undefined \ - -export-symbols-regex "ibus_.*" \ -- -version-info @LT_VERSION_INFO@ \ -+ $(libibus_la_LDFLAGS} \ - $(NULL) - - ibus_sources = \ diff --git a/inputmethods/ibus/patches/patch-src_ibusshare_c b/inputmethods/ibus/patches/patch-src_ibusshare_c index 84ee258941e..b37ff99c277 100644 --- a/inputmethods/ibus/patches/patch-src_ibusshare_c +++ b/inputmethods/ibus/patches/patch-src_ibusshare_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-src_ibusshare_c,v 1.1 2011/12/12 12:23:14 fgsch Exp $ ---- src/ibusshare.c.orig Sun Nov 13 22:48:27 2011 -+++ src/ibusshare.c Sun Nov 13 22:48:33 2011 -@@ -41,11 +41,11 @@ ibus_get_local_machine_id (void) +$OpenBSD: patch-src_ibusshare_c,v 1.2 2013/01/17 23:31:41 fgsch Exp $ +--- src/ibusshare.c.orig Thu Jan 10 23:07:00 2013 ++++ src/ibusshare.c Thu Jan 10 23:07:14 2013 +@@ -41,15 +41,15 @@ ibus_get_local_machine_id (void) if (machine_id == NULL) { GError *error = NULL; @@ -9,7 +9,12 @@ $OpenBSD: patch-src_ibusshare_c,v 1.1 2011/12/12 12:23:14 fgsch Exp $ + if (!g_file_get_contents ("/var/db/dbus/machine-id", &machine_id, NULL, - &error)) { + &error) && +- !g_file_get_contents ("/etc/machine-id", ++ !g_file_get_contents ("${SYSCONFDIR}/machine-id", + &machine_id, + NULL, + NULL)) { - g_warning ("Unable to load /var/lib/dbus/machine-id: %s", error->message); + g_warning ("Unable to load /var/db/dbus/machine-id: %s", error->message); g_error_free (error); diff --git a/inputmethods/ibus/patches/patch-tools_Makefile_in b/inputmethods/ibus/patches/patch-tools_Makefile_in new file mode 100644 index 00000000000..a08300c13f9 --- /dev/null +++ b/inputmethods/ibus/patches/patch-tools_Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-tools_Makefile_in,v 1.1 2013/01/17 23:31:41 fgsch Exp $ +--- tools/Makefile.in.orig Tue Dec 11 13:48:16 2012 ++++ tools/Makefile.in Mon Jan 7 11:05:03 2013 +@@ -440,7 +440,6 @@ AM_CFLAGS = \ + -DG_LOG_DOMAIN=\"IBUS\" \ + -DIBUS_DISABLE_DEPRECATED \ + -Wno-unused-variable \ +- -Wno-unused-but-set-variable \ + -Wno-unused-function \ + $(NULL) + diff --git a/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in b/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in new file mode 100644 index 00000000000..fe8abf09f33 --- /dev/null +++ b/inputmethods/ibus/patches/patch-ui_gtk3_Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-ui_gtk3_Makefile_in,v 1.1 2013/01/17 23:31:42 fgsch Exp $ +--- ui/gtk3/Makefile.in.orig Mon Jan 7 09:34:01 2013 ++++ ui/gtk3/Makefile.in Mon Jan 7 09:34:03 2013 +@@ -459,7 +459,6 @@ AM_CFLAGS = \ + -DIBUS_DISABLE_DEPRECATED \ + -DSWITCHER_USE_SYMBOL_ICON=$(USE_SYMBOL_ICON) \ + -Wno-unused-variable \ +- -Wno-unused-but-set-variable \ + -Wno-unused-function \ + $(NULL) + diff --git a/inputmethods/ibus/pkg/PLIST b/inputmethods/ibus/pkg/PLIST index 1dcad3e660f..0dc0f95796d 100644 --- a/inputmethods/ibus/pkg/PLIST +++ b/inputmethods/ibus/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.12 2012/06/15 08:32:16 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.13 2013/01/17 23:31:42 fgsch Exp $ +@bin bin/ibus @bin bin/ibus-daemon bin/ibus-setup include/ibus-1.0/ @@ -12,6 +13,7 @@ include/ibus-1.0/ibusconfigservice.h include/ibus-1.0/ibusdebug.h include/ibus-1.0/ibusengine.h include/ibus-1.0/ibusenginedesc.h +include/ibus-1.0/ibusenginesimple.h include/ibus-1.0/ibusenumtypes.h include/ibus-1.0/ibuserror.h include/ibus-1.0/ibusfactory.h @@ -19,6 +21,7 @@ include/ibus-1.0/ibushotkey.h include/ibus-1.0/ibusinputcontext.h include/ibus-1.0/ibuskeymap.h include/ibus-1.0/ibuskeys.h +include/ibus-1.0/ibuskeysyms-compat.h include/ibus-1.0/ibuskeysyms.h include/ibus-1.0/ibuslookuptable.h include/ibus-1.0/ibusobject.h @@ -43,123 +46,38 @@ lib/gtk-3.0/3.0.0/immodules/im-ibus.so @comment 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/ibus/ -lib/python${MODPY_VERSION}/site-packages/ibus/__init__.py -lib/python${MODPY_VERSION}/site-packages/ibus/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/__init__.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/_config.py -lib/python${MODPY_VERSION}/site-packages/ibus/_config.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/_config.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/_gtk.py -lib/python${MODPY_VERSION}/site-packages/ibus/_gtk.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/_gtk.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/application.py -lib/python${MODPY_VERSION}/site-packages/ibus/application.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/application.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/ascii.py -lib/python${MODPY_VERSION}/site-packages/ibus/ascii.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/ascii.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/attribute.py -lib/python${MODPY_VERSION}/site-packages/ibus/attribute.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/attribute.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/bus.py -lib/python${MODPY_VERSION}/site-packages/ibus/bus.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/bus.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/common.py -lib/python${MODPY_VERSION}/site-packages/ibus/common.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/common.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/component.py -lib/python${MODPY_VERSION}/site-packages/ibus/component.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/component.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/config.py -lib/python${MODPY_VERSION}/site-packages/ibus/config.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/config.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/engine.py -lib/python${MODPY_VERSION}/site-packages/ibus/engine.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/engine.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/enginedesc.py -lib/python${MODPY_VERSION}/site-packages/ibus/enginedesc.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/enginedesc.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/exception.py -lib/python${MODPY_VERSION}/site-packages/ibus/exception.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/exception.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/factory.py -lib/python${MODPY_VERSION}/site-packages/ibus/factory.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/factory.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/inputcontext.py -lib/python${MODPY_VERSION}/site-packages/ibus/inputcontext.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/inputcontext.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ -lib/python${MODPY_VERSION}/site-packages/ibus/interface/__init__.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/__init__.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iconfig.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iconfig.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iconfig.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iengine.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iengine.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iengine.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ienginefactory.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ienginefactory.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ienginefactory.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iibus.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iibus.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iibus.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iinputcontext.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iinputcontext.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/iinputcontext.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/inotifications.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/inotifications.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/inotifications.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ipanel.py -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ipanel.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/interface/ipanel.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/keysyms.py -lib/python${MODPY_VERSION}/site-packages/ibus/keysyms.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/keysyms.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/lang.py -lib/python${MODPY_VERSION}/site-packages/ibus/lang.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/lang.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/lookuptable.py -lib/python${MODPY_VERSION}/site-packages/ibus/lookuptable.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/lookuptable.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/modifier.py -lib/python${MODPY_VERSION}/site-packages/ibus/modifier.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/modifier.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/notifications.py -lib/python${MODPY_VERSION}/site-packages/ibus/notifications.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/notifications.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/object.py -lib/python${MODPY_VERSION}/site-packages/ibus/object.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/object.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/observedpath.py -lib/python${MODPY_VERSION}/site-packages/ibus/observedpath.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/observedpath.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/panel.py -lib/python${MODPY_VERSION}/site-packages/ibus/panel.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/panel.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/property.py -lib/python${MODPY_VERSION}/site-packages/ibus/property.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/property.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/serializable.py -lib/python${MODPY_VERSION}/site-packages/ibus/serializable.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/serializable.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/text.py -lib/python${MODPY_VERSION}/site-packages/ibus/text.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/text.pyo -lib/python${MODPY_VERSION}/site-packages/ibus/utility.py -lib/python${MODPY_VERSION}/site-packages/ibus/utility.pyc -lib/python${MODPY_VERSION}/site-packages/ibus/utility.pyo -@bin libexec/ibus-gconf -libexec/ibus-ui-gtk +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 +@bin libexec/ibus-dconf +@bin libexec/ibus-engine-simple +@bin libexec/ibus-ui-gtk3 @bin libexec/ibus-x11 +share/GConf/ +share/GConf/gsettings/ +share/GConf/gsettings/ibus.convert share/applications/ibus-setup.desktop share/applications/ibus.desktop @sample ${SYSCONFDIR}/xdg/ @sample ${SYSCONFDIR}/xdg/autostart/ @sample ${SYSCONFDIR}/xdg/autostart/ibus.desktop share/doc/pkg-readmes/${FULLPKGNAME} +share/examples/ibus/ +share/examples/ibus/bash_completion.d/ +@sample ${SYSCONFDIR}/bash_completion.d/ +share/examples/ibus/bash_completion.d/ibus.bash +@sample ${SYSCONFDIR}/bash_completion.d/ibus.bash +share/examples/ibus/dconf/ +share/examples/ibus/dconf/db/ +share/examples/ibus/dconf/db/ibus.d/ +@sample ${SYSCONFDIR}/dconf/db/ibus.d/ +share/examples/ibus/dconf/db/ibus.d/00-upstream-settings +@sample ${SYSCONFDIR}/dconf/db/ibus.d/00-upstream-settings +share/examples/ibus/dconf/profile/ +share/examples/ibus/dconf/profile/ibus +@sample ${SYSCONFDIR}/dconf/profile/ibus 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 @@ -183,6 +101,9 @@ share/gtk-doc/html/ibus/IBusProxy.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 @@ -190,11 +111,15 @@ 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 @@ -206,10 +131,10 @@ share/gtk-doc/html/ibus/style.css share/gtk-doc/html/ibus/up.png share/ibus/ share/ibus/component/ -share/ibus/component/gconf.xml +share/ibus/component/dconf.xml share/ibus/component/gtkpanel.xml +share/ibus/component/simple.xml share/ibus/engine/ -share/ibus/icons/ share/ibus/keymaps/ share/ibus/keymaps/common share/ibus/keymaps/in @@ -240,44 +165,6 @@ share/ibus/setup/main.py share/ibus/setup/main.pyc share/ibus/setup/main.pyo share/ibus/setup/setup.ui -share/ibus/ui/ -share/ibus/ui/gtk/ -share/ibus/ui/gtk/candidatepanel.py -share/ibus/ui/gtk/candidatepanel.pyc -share/ibus/ui/gtk/candidatepanel.pyo -share/ibus/ui/gtk/engineabout.py -share/ibus/ui/gtk/engineabout.pyc -share/ibus/ui/gtk/engineabout.pyo -share/ibus/ui/gtk/handle.py -share/ibus/ui/gtk/handle.pyc -share/ibus/ui/gtk/handle.pyo -share/ibus/ui/gtk/i18n.py -share/ibus/ui/gtk/i18n.pyc -share/ibus/ui/gtk/i18n.pyo -share/ibus/ui/gtk/icon.py -share/ibus/ui/gtk/icon.pyc -share/ibus/ui/gtk/icon.pyo -share/ibus/ui/gtk/languagebar.py -share/ibus/ui/gtk/languagebar.pyc -share/ibus/ui/gtk/languagebar.pyo -share/ibus/ui/gtk/main.py -share/ibus/ui/gtk/main.pyc -share/ibus/ui/gtk/main.pyo -share/ibus/ui/gtk/menu.py -share/ibus/ui/gtk/menu.pyc -share/ibus/ui/gtk/menu.pyo -share/ibus/ui/gtk/notifications.py -share/ibus/ui/gtk/notifications.pyc -share/ibus/ui/gtk/notifications.pyo -share/ibus/ui/gtk/panel.py -share/ibus/ui/gtk/panel.pyc -share/ibus/ui/gtk/panel.pyo -share/ibus/ui/gtk/propitem.py -share/ibus/ui/gtk/propitem.pyc -share/ibus/ui/gtk/propitem.pyo -share/ibus/ui/gtk/toolitem.py -share/ibus/ui/gtk/toolitem.pyc -share/ibus/ui/gtk/toolitem.pyo share/icons/hicolor/16x16/apps/ibus-keyboard.png share/icons/hicolor/22x22/apps/ibus-keyboard.png share/icons/hicolor/24x24/apps/ibus-keyboard.png @@ -289,12 +176,15 @@ share/icons/hicolor/scalable/apps/ibus-setup.svg share/icons/hicolor/scalable/apps/ibus.svg share/locale/ar/LC_MESSAGES/ibus10.mo share/locale/as/LC_MESSAGES/ibus10.mo +share/locale/bg/LC_MESSAGES/ibus10.mo share/locale/bn_IN/LC_MESSAGES/ibus10.mo share/locale/ca/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 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/fr/LC_MESSAGES/ibus10.mo share/locale/gu/LC_MESSAGES/ibus10.mo @@ -307,6 +197,7 @@ share/locale/ko/LC_MESSAGES/ibus10.mo share/locale/lv/LC_MESSAGES/ibus10.mo share/locale/ml/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 @@ -325,10 +216,10 @@ 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 -@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null -${SCHEMAS_INSTDIR}/ -${SCHEMAS_INSTDIR}/ibus.schemas -@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null +share/vala/vapi/ibus-1.0.deps +share/vala/vapi/ibus-1.0.vapi +@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null +@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null @exec %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules @unexec-delete %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules @exec %D/bin/gtk-query-immodules-3.0 > ${SYSCONFDIR}/gtk-3.0/gtk.immodules @@ -337,5 +228,6 @@ ${SCHEMAS_INSTDIR}/ibus.schemas @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database -share/vala/vapi/ibus-1.0.deps -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