Andreas Wacknitz
2022-03-20 4856baa9a573ef17187add94c2feada670fab95c
ibus: update to 1.5.26 & switch to python-3.9

1 files deleted
4 files modified
1 files renamed
157 ■■■■ changed files
components/inputmethod/ibus/Makefile 13 ●●●●● patch | view | raw | blame | history
components/inputmethod/ibus/ibus.p5m 62 ●●●● patch | view | raw | blame | history
components/inputmethod/ibus/manifests/sample-manifest.p5m 53 ●●●● patch | view | raw | blame | history
components/inputmethod/ibus/pkg5 1 ●●●● patch | view | raw | blame | history
components/inputmethod/ibus/test/results-64.master 26 ●●●●● patch | view | raw | blame | history
components/inputmethod/ibus/test/results-all.master 2 ●●● patch | view | raw | blame | history
components/inputmethod/ibus/Makefile
@@ -13,23 +13,22 @@
# Copyright 2017 Alexander Pyhalov
#
BUILD_BITS=64_and_32
BUILD_BITS= 64_and_32
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= ibus
COMPONENT_VERSION= 1.5.25
COMPONENT_VERSION= 1.5.26
COMPONENT_SUMMARY= iBus - Intelligent Input Bus
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= sha256:dea4f663c485267cc3313e40a0bc89b977c397e19644f8ab41df0e6eaec34330
COMPONENT_ARCHIVE_HASH= sha256:5c2fd118e7bfd4e9a42c3a20e6175a263426c90b6256f94989ed3d0384f4c9fc
COMPONENT_PROJECT_URL=    https://github.com/ibus/ibus
COMPONENT_ARCHIVE_URL=    $(COMPONENT_PROJECT_URL)/releases/download/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
include $(WS_MAKE_RULES)/common.mk
PATH = $(PATH.gnu)
PYTHON_VERSION = 3.5
PYTHON_VERSION = 3.9
GTK_BIN_VER := $(shell pkg-config --variable=gtk_binary_version gtk+-2.0)
@@ -52,6 +51,7 @@
CONFIGURE_OPTIONS.64 += --with-gtk-im-module-dir=/usr/lib/$(MACH64)/gtk-2.0/$(GTK_BIN_VER)/immodules/
CONFIGURE_OPTIONS += --disable-emoji-dict
CONFIGURE_OPTIONS += --disable-unicode-dict
CONFIGURE_OPTIONS += --disable-systemd-services
CONFIGURE_ENV += PYTHON="$(PYTHON)"
CONFIGURE_ENV += am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
@@ -61,8 +61,10 @@
COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)"
COMPONENT_BUILD_ENV += CC="$(CC)"
# Note: Running the tests need X11.
unexport SHELLOPTS
COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
COMPONENT_TEST_TRANSFORMS += \
         '-n ' \
         '-e "/^PASS:/p" ' \
@@ -79,6 +81,7 @@
# Manually added build dependencies
REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
REQUIRED_PACKAGES += runtime/python-39
# Auto-generated dependencies
REQUIRED_PACKAGES += gnome/config/dconf
components/inputmethod/ibus/ibus.p5m
@@ -26,15 +26,21 @@
<transform file path=usr/share/locale/([^/]+)(\..+){0,1}(/.+){0,1} -> default facet.locale.%<\1> true>
<transform file path=usr/lib/ibus/.* -> default mode 0555>
# Drop 32-bit binaries
<transform file path=.*/bin/$(MACH32)/.+ -> drop>
<transform file path=.*\.py$ -> default pkg.tmp.autopyc false>
depend fmri=system/input-method/imf-startup type=require
file files/ibus-xinput path=etc/X11/xinit/imf.d/0010.ibus mode=0555
file path=etc/dconf/db/ibus.d/00-upstream-settings
file path=etc/dconf/profile/ibus
#file path=usr/bin/$(MACH32)/ibus
#file path=usr/bin/$(MACH32)/ibus-daemon
#file path=usr/bin/$(MACH32)/ibus-setup
file path=etc/xdg/Xwayland-session.d/10-ibus-x11
file path=usr/bin/$(MACH32)/ibus
file path=usr/bin/$(MACH32)/ibus-daemon
file path=usr/bin/$(MACH32)/ibus-setup
file path=usr/bin/ibus
file path=usr/bin/ibus-daemon
file path=usr/bin/ibus-setup
@@ -81,9 +87,9 @@
file path=usr/lib/$(MACH64)/girepository-1.0/IBus-1.0.typelib
file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/immodules/im-ibus.so
file path=usr/lib/$(MACH64)/gtk-3.0/3.0.0/immodules/im-ibus.so
link path=usr/lib/$(MACH64)/libibus-1.0.so target=libibus-1.0.so.5.0.525
link path=usr/lib/$(MACH64)/libibus-1.0.so.5 target=libibus-1.0.so.5.0.525
file path=usr/lib/$(MACH64)/libibus-1.0.so.5.0.525
link path=usr/lib/$(MACH64)/libibus-1.0.so target=libibus-1.0.so.5.0.526
link path=usr/lib/$(MACH64)/libibus-1.0.so.5 target=libibus-1.0.so.5.0.526
file path=usr/lib/$(MACH64)/libibus-1.0.so.5.0.526
file path=usr/lib/$(MACH64)/pkgconfig/ibus-1.0.pc
file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.so
file path=usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.so
@@ -97,11 +103,11 @@
file path=usr/lib/ibus/ibus-portal
file path=usr/lib/ibus/ibus-ui-gtk3
file path=usr/lib/ibus/ibus-x11
link path=usr/lib/libibus-1.0.so target=libibus-1.0.so.5.0.525
link path=usr/lib/libibus-1.0.so.5 target=libibus-1.0.so.5.0.525
file path=usr/lib/libibus-1.0.so.5.0.525
link path=usr/lib/libibus-1.0.so target=libibus-1.0.so.5.0.526
link path=usr/lib/libibus-1.0.so.5 target=libibus-1.0.so.5.0.526
file path=usr/lib/libibus-1.0.so.5.0.526
file path=usr/lib/pkgconfig/ibus-1.0.pc
file path=usr/lib/python3.5/vendor-packages/gi/overrides/IBus.py
file path=usr/lib/python3.9/vendor-packages/gi/overrides/IBus.py
file path=usr/share/GConf/gsettings/ibus.convert
file path=usr/share/applications/org.freedesktop.IBus.Setup.desktop
file path=usr/share/bash-completion/completions/ibus.bash
@@ -172,24 +178,24 @@
file path=usr/share/ibus/keymaps/kr
file path=usr/share/ibus/keymaps/modifiers
file path=usr/share/ibus/keymaps/us
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-39.pyc
file path=usr/share/ibus/setup/emojilang.py
file path=usr/share/ibus/setup/engineabout.py
file path=usr/share/ibus/setup/enginecombobox.py
components/inputmethod/ibus/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
# Copyright 2021 <contributor>
# Copyright 2022 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -24,6 +24,7 @@
file path=etc/dconf/db/ibus.d/00-upstream-settings
file path=etc/dconf/profile/ibus
file path=etc/xdg/Xwayland-session.d/10-ibus-x11
file path=usr/bin/$(MACH32)/ibus
file path=usr/bin/$(MACH32)/ibus-daemon
file path=usr/bin/$(MACH32)/ibus-setup
@@ -73,9 +74,9 @@
file path=usr/lib/$(MACH64)/girepository-1.0/IBus-1.0.typelib
file path=usr/lib/$(MACH64)/gtk-2.0/2.10.0/immodules/im-ibus.so
file path=usr/lib/$(MACH64)/gtk-3.0/3.0.0/immodules/im-ibus.so
link path=usr/lib/$(MACH64)/libibus-1.0.so target=libibus-1.0.so.5.0.525
link path=usr/lib/$(MACH64)/libibus-1.0.so.5 target=libibus-1.0.so.5.0.525
file path=usr/lib/$(MACH64)/libibus-1.0.so.5.0.525
link path=usr/lib/$(MACH64)/libibus-1.0.so target=libibus-1.0.so.5.0.526
link path=usr/lib/$(MACH64)/libibus-1.0.so.5 target=libibus-1.0.so.5.0.526
file path=usr/lib/$(MACH64)/libibus-1.0.so.5.0.526
file path=usr/lib/$(MACH64)/pkgconfig/ibus-1.0.pc
file path=usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.so
file path=usr/lib/gtk-3.0/3.0.0/immodules/im-ibus.so
@@ -89,11 +90,11 @@
file path=usr/lib/ibus/ibus-portal
file path=usr/lib/ibus/ibus-ui-gtk3
file path=usr/lib/ibus/ibus-x11
link path=usr/lib/libibus-1.0.so target=libibus-1.0.so.5.0.525
link path=usr/lib/libibus-1.0.so.5 target=libibus-1.0.so.5.0.525
file path=usr/lib/libibus-1.0.so.5.0.525
link path=usr/lib/libibus-1.0.so target=libibus-1.0.so.5.0.526
link path=usr/lib/libibus-1.0.so.5 target=libibus-1.0.so.5.0.526
file path=usr/lib/libibus-1.0.so.5.0.526
file path=usr/lib/pkgconfig/ibus-1.0.pc
file path=usr/lib/python3.5/vendor-packages/gi/overrides/IBus.py
file path=usr/lib/python3.9/vendor-packages/gi/overrides/IBus.py
file path=usr/share/GConf/gsettings/ibus.convert
file path=usr/share/applications/org.freedesktop.IBus.Setup.desktop
file path=usr/share/bash-completion/completions/ibus.bash
@@ -164,24 +165,24 @@
file path=usr/share/ibus/keymaps/kr
file path=usr/share/ibus/keymaps/modifiers
file path=usr/share/ibus/keymaps/us
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-35.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-35.pyc
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/emojilang.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/engineabout.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginecombobox.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginedialog.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/enginetreeview.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/i18n.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/icon.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/keyboardshortcut.cpython-39.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-39.opt-1.pyc
file path=usr/share/ibus/setup/__pycache__/main.cpython-39.pyc
file path=usr/share/ibus/setup/emojilang.py
file path=usr/share/ibus/setup/engineabout.py
file path=usr/share/ibus/setup/enginecombobox.py
components/inputmethod/ibus/pkg5
@@ -10,6 +10,7 @@
        "library/desktop/gtk3",
        "library/desktop/pango",
        "library/glib2",
        "runtime/python-39",
        "shell/ksh93",
        "system/library",
        "x11/library/libx11",
components/inputmethod/ibus/test/results-64.master
File was deleted
components/inputmethod/ibus/test/results-all.master
File was renamed from components/inputmethod/ibus/test/results-32.master
@@ -13,7 +13,7 @@
PASS: ibus-compose
PASS: ibus-keypress
============================================================================
Testsuite summary for ibus 1.5.25
Testsuite summary for ibus 1.5.26
============================================================================
============================================================================
See src/tests/test-suite.log