From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- app-i18n/ibus/Manifest | 2 + .../ibus/files/ibus-1.5.25-ibusimcontext.patch | 35 ++++ app-i18n/ibus/ibus-1.5.25-r1.ebuild | 194 +++++++++++++++++++++ 3 files changed, 231 insertions(+) create mode 100644 app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch create mode 100644 app-i18n/ibus/ibus-1.5.25-r1.ebuild (limited to 'app-i18n/ibus') diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index a68742ac91ee..d0c3ad5603cc 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,3 +1,4 @@ +AUX ibus-1.5.25-ibusimcontext.patch 1440 BLAKE2B 500b9e26933cd174c476a6ed16af43d1c85631276d182bdd8f80118a54be785655c5638f09de0caaf845bf6fe9f48e07bbfcee8cc64f8c0acd9767c557c093e2 SHA512 fda744135768e4aa2e2bb7dc9d2cad6a92d7653a2e96cf5a69b757637e875b649284523b8c55e142ff3b2db85a8c3b27dc23dc7cef135eada69f485ba88024ea DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05 DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205 @@ -6,5 +7,6 @@ DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5 EBUILD ibus-1.5.22.ebuild 4143 BLAKE2B e539ca4998d07537d138fe2b8d88fb49865471875759512289c8b388ea5e01931822bf2af986484b8f3bd3f791cb964a112473e3b51c62a774b59ec16c6b0e27 SHA512 6165d5f700ef3ca7a66098b5f2463b40ac025bda2ac5df148bc341e08827717ef58370e564c883ae8a7526f9f79e97e1ff927eb316244d69e516498ab85de931 EBUILD ibus-1.5.23.ebuild 4450 BLAKE2B c88dc256f2ffbe8cf035a27d4081e5473dabf4875ea39b0f7695d086328ba58a3fde097f1a6dcfc55ede344faa8607eaa93812f89280100802be78cf7f765f3e SHA512 685ca1cc3bebc48ce15c68f3fe5587a1ac646245ffad3e627bf2de705bfc92cd0373336fc6767b11ac16dd3df7c2ca79fc9e266021af00ca965e3a2c3556fabf EBUILD ibus-1.5.24.ebuild 4483 BLAKE2B 1400cbebfb9b2dc425786261a75274d5c1d4748af74334517087aba27bcc55fc331f1c32401927499f3fc6780ffabbd4a73f866f6388f3bc9c3835b60c57ab5d SHA512 a7dce123b28947240d7ee13f2161a80aa884c2ea68879aa403fefa76f2cf1a5d240d411f08e4102cf7a4e97dfd61203d4939c1c9cd34898f264459b554d7aab9 +EBUILD ibus-1.5.25-r1.ebuild 4561 BLAKE2B 8895ace0bc547e935acf1dbfaf4a4ecf03868bba4235764f447c1ac8a4fb0297731e67af2e95bc554d98148aae3c64065a1d642ce3e10662ab9ee20d9a258e34 SHA512 631dd778c4aebb1dd9116e6f8bf1d7f7e5f974c77382f54e4301c32fdbbb05c063dccd83df60355c7db175388054045d56874f0f6203591d6a037ce681cc431f EBUILD ibus-1.5.25.ebuild 4509 BLAKE2B 88a60da65725ed03ffa3f3c6a19301d518622e286d7905bc432a957b61bc13108874849f425ad5855b3a8c923c0710ed5ba0f31aba27216e8818efd200a46e28 SHA512 85f85d88b231fb8b5d38e5d34bb834a81c4f96583bdd7bbbd37f2ac8122047174d09b454a9d4fc9fe2abd0ae207d2ac338fe34b9c7088f32d911237468d1e8e9 MISC metadata.xml 866 BLAKE2B f6a00311b03da6e54d020fef05fee2f168834ea624a362bf15eaa4a52c72e8db828e7a9da8066b4facbd449d6395eedc9dace2d57465ae6f0aac3e80055267ee SHA512 7b595b5228656e6cc49c8875cc2e7fe75bfb95e94f7fd324bfabd55d03f180475554fe77949e154b9281a8426bcc7eae025329c6a5b141a0dec7341a2136b94d diff --git a/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch b/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch new file mode 100644 index 000000000000..6187ff77fbac --- /dev/null +++ b/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch @@ -0,0 +1,35 @@ +https://github.com/ibus/ibus/issues/2337 +https://bugs.gentoo.org/824494 +--- +diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c +index da9a402..b1ccede 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/client/gtk3/ibusimcontext.c b/client/gtk3/ibusimcontext.c +index da9a402..b1ccede 100644 +--- a/client/gtk3/ibusimcontext.c ++++ b/client/gtk3/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/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild new file mode 100644 index 000000000000..e4d24fa2a59a --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.25-r1.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +VALA_MIN_API_VERSION="0.34" +VALA_MAX_API_VERSION="0.50" +VALA_USE_DEPEND="vapigen" + +inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils + +GENTOO_VER= +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" + +[[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz + ${GENTOO_PATCHSET_URI}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE="emoji? ( gtk ) + gtk2? ( gtk ) + kde? ( gtk ) + python? ( + ${PYTHON_REQUIRED_USE} + introspection + ) + test? ( gtk ) + vala? ( introspection )" + +CDEPEND="app-text/iso-codes + dev-libs/glib:2 + gnome-base/dconf + gnome-base/librsvg:2 + sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + !gtk? ( x11-libs/gtk+:2 ) + ) + gtk? ( + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXi + gtk2? ( x11-libs/gtk+:2 ) + ) + introspection? ( dev-libs/gobject-introspection ) + kde? ( dev-qt/qtgui:5 ) + nls? ( virtual/libintl ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + )" +RDEPEND="${CDEPEND} + python? ( + gtk? ( + x11-libs/gtk+:3[introspection] + ) + )" +DEPEND="${CDEPEND} + $(vala_depend) + dev-util/glib-utils + virtual/pkgconfig + x11-misc/xkeyboard-config + emoji? ( + app-i18n/unicode-cldr + app-i18n/unicode-emoji + ) + nls? ( sys-devel/gettext ) + unicode? ( app-i18n/unicode-data )" + +PATCHES=( "${FILESDIR}"/${P}-ibusimcontext.patch ) + +src_prepare() { + vala_src_prepare --ignore-use + sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac + if ! has_version 'x11-libs/gtk+:3[wayland]'; then + touch ui/gtk3/panelbinding.vala + fi + if ! use emoji; then + touch \ + tools/main.vala \ + ui/gtk3/panel.vala + fi + if ! use kde; then + touch ui/gtk3/panel.vala + fi + if [[ -n ${GENTOO_VER} ]]; then + einfo "Try to apply Gentoo specific patch set" + eapply "${WORKDIR}"/patches-gentoo/*.patch + fi + + # for multiple Python implementations + sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am + # fix for parallel install + sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am + # require user interaction + sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am + + sed -i "/^bash_completion/d" tools/Makefile.am + + default + eautoreconf + xdg_environment_reset +} + +src_configure() { + local unicodedir="${EPREFIX}"/usr/share/unicode + local python_conf=() + if use python; then + python_setup + python_conf+=( + $(use_enable gtk setup) + --with-python=${EPYTHON} + ) + else + python_conf+=( --disable-setup ) + fi + + econf \ + $(use_enable X xim) \ + $(use_enable emoji emoji-dict) \ + $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \ + $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \ + $(use_enable gtk gtk3) \ + $(use_enable gtk ui) \ + $(use_enable gtk2) \ + $(use_enable introspection) \ + $(use_enable kde appindicator) \ + $(use_enable nls) \ + $(use_enable test tests) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ + $(use_enable vala) \ + $(use_enable wayland) \ + "${python_conf[@]}" +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + virtx emake -j1 check +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + + if use python; then + python_install() { + emake -C bindings/pygobject \ + pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ + DESTDIR="${D}" \ + install + + python_optimize + } + python_foreach_impl python_install + fi + + keepdir /usr/share/ibus/engine + + newbashcomp tools/${PN}.bash ${PN} + + insinto /etc/X11/xinit/xinput.d + newins xinput-${PN} ${PN}.conf + + # Undo compression of man page + find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die +} + +pkg_postinst() { + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 + xdg_icon_cache_update + gnome2_schemas_update + dconf update +} + +pkg_postrm() { + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 + xdg_icon_cache_update + gnome2_schemas_update +} -- cgit v1.2.3