diff options
Diffstat (limited to 'app-i18n/ibus')
| -rw-r--r-- | app-i18n/ibus/Manifest | 5 | ||||
| -rw-r--r-- | app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch | 35 | ||||
| -rw-r--r-- | app-i18n/ibus/files/ibus-1.5.26-src-Fix-refcounting-issues.patch | 273 | ||||
| -rw-r--r-- | app-i18n/ibus/ibus-1.5.25-r1.ebuild | 194 | ||||
| -rw-r--r-- | app-i18n/ibus/ibus-1.5.27.ebuild (renamed from app-i18n/ibus/ibus-1.5.26-r1.ebuild) | 24 | ||||
| -rw-r--r-- | app-i18n/ibus/ibus-1.5.29.ebuild | 234 | ||||
| -rw-r--r-- | app-i18n/ibus/ibus-1.5.29_rc1.ebuild | 232 |
7 files changed, 483 insertions, 514 deletions
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 0408ab57270a..3fd054db1f2c 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,2 +1,3 @@ -DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6 -DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714 +DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4 +DIST ibus-1.5.29-rc1.tar.gz 3989492 BLAKE2B c99f42fcd18bed240bf5e9f5b406bc879b05b12f3d0c14713e21b8c99fbcde32cd880dead1374731914289c022b1f160d9961bdbd9e9a0a3ced86949c5beb811 SHA512 776a01bcfd730be67e0f7d730f7b4b0a586d39744deb605359330a1786542acae52efbc085c39b8417b20164e45c259b40b29725f53fb1b69e2b340778ff28dc +DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7 diff --git a/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch b/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch deleted file mode 100644 index 6187ff77fbac..000000000000 --- a/app-i18n/ibus/files/ibus-1.5.25-ibusimcontext.patch +++ /dev/null @@ -1,35 +0,0 @@ -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/files/ibus-1.5.26-src-Fix-refcounting-issues.patch b/app-i18n/ibus/files/ibus-1.5.26-src-Fix-refcounting-issues.patch deleted file mode 100644 index 5bd610024a1b..000000000000 --- a/app-i18n/ibus/files/ibus-1.5.26-src-Fix-refcounting-issues.patch +++ /dev/null @@ -1,273 +0,0 @@ -https://github.com/ibus/ibus/issues/2387 -https://bugs.gentoo.org/843725 - -From 17648f0522910480b6c5dd4f5356ca1f6c160bf5 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Tue, 29 Mar 2022 22:48:19 +0200 -Subject: [PATCH] src: Fix refcounting issues - -Commit 5a455b1ead attempted to fix both GLib warnings around -floating references and other presumed refcounting issues. However -it missed 2 kinds of bugs: - -- The places that take an IBusText created from a static string - were made to avoid freeing it afterwards, but the staticness refers - to the string content, not the object itself. -- The places that are documented to emit signals on floating object - references used to do the following after signal emission: - - if (g_object_is_floating (object)) - g_object_unref (object) - - And did possibly trigger GLib warnings were changed to: - - if (g_object_is_floating (object)) - g_object_sink_ref (object); - g_object_unref (object); - - Which fixes the GLib warning for floating references, but do - unintendedly steal one reference away for non floating references. - -This commit is essentially a revert of commit 5a455b1ead, but -addressing both things differently: - -- All label/tooltip/symbol IBusText properties in IBusProperty do - now always sink the reference of the stored object. - -- All places documented as maybe using objects with a floating reference - on signals changed to doing: - - if (g_object_is_floating (object)) { - g_object_ref_sink (object); - g_object_unref (object); - } - - So the floating reference is owned and unreferenced without warnings, - but already owned references are left unchanged. - -This addresses the possible GLib warnings, fixes the possible double -unrefs happening on IBusText used in signals, and fixes the missing -unrefs on IBusText objects created from static strings. - -BUG=https://github.com/ibus/ibus/issues/2393 -BUG=https://github.com/ibus/ibus/issues/2387 ---- - src/ibusinputcontext.c | 35 +++++++++++++++++++++-------------- - src/ibusproperty.c | 32 +++++++++++++++++--------------- - 2 files changed, 38 insertions(+), 29 deletions(-) - -diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c -index 4b27551b..7981de38 100644 ---- a/src/ibusinputcontext.c -+++ b/src/ibusinputcontext.c -@@ -549,9 +549,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - g_variant_unref (variant); - g_signal_emit (context, context_signals[COMMIT_TEXT], 0, text); - -- if (g_object_is_floating (text)) -+ if (g_object_is_floating (text)) { - g_object_ref_sink (text); -- g_object_unref (text); -+ g_object_unref (text); -+ } - return; - } - if (g_strcmp0 (signal_name, "UpdatePreeditText") == 0) { -@@ -569,9 +570,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - cursor_pos, - visible); - -- if (g_object_is_floating (text)) -+ if (g_object_is_floating (text)) { - g_object_ref_sink (text); -- g_object_unref (text); -+ g_object_unref (text); -+ } - return; - } - if (g_strcmp0 (signal_name, "UpdatePreeditTextWithMode") == 0) { -@@ -592,9 +594,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - visible, - mode); - -- if (g_object_is_floating (text)) -+ if (g_object_is_floating (text)) { - g_object_ref_sink (text); -- g_object_unref (text); -+ g_object_unref (text); -+ } - return; - } - -@@ -621,9 +624,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - 0, - text, - visible); -- if (g_object_is_floating (text)) -+ if (g_object_is_floating (text)) { - g_object_ref_sink (text); -- g_object_unref (text); -+ g_object_unref (text); -+ } - return; - } - -@@ -640,9 +644,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - 0, - table, - visible); -- if (g_object_is_floating (table)) -+ if (g_object_is_floating (table)) { - g_object_ref_sink (table); -- g_object_unref (table); -+ g_object_unref (table); -+ } - return; - - } -@@ -659,9 +664,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - 0, - prop_list); - -- if (g_object_is_floating (prop_list)) -+ if (g_object_is_floating (prop_list)) { - g_object_ref_sink (prop_list); -- g_object_unref (prop_list); -+ g_object_unref (prop_list); -+ } - return; - } - -@@ -673,9 +679,10 @@ ibus_input_context_g_signal (GDBusProxy *proxy, - - g_signal_emit (context, context_signals[UPDATE_PROPERTY], 0, prop); - -- if (g_object_is_floating (prop)) -+ if (g_object_is_floating (prop)) { - g_object_ref_sink (prop); -- g_object_unref (prop); -+ g_object_unref (prop); -+ } - return; - } - -diff --git a/src/ibusproperty.c b/src/ibusproperty.c -index 6d4ed088..cd8a0e2a 100644 ---- a/src/ibusproperty.c -+++ b/src/ibusproperty.c -@@ -336,20 +336,17 @@ ibus_property_destroy (IBusProperty *prop) - prop->priv->icon = NULL; - - if (prop->priv->label) { -- if (!ibus_text_get_is_static (prop->priv->label)) -- g_object_unref (prop->priv->label); -+ g_object_unref (prop->priv->label); - prop->priv->label = NULL; - } - - if (prop->priv->symbol) { -- if (!ibus_text_get_is_static (prop->priv->symbol)) -- g_object_unref (prop->priv->symbol); -+ g_object_unref (prop->priv->symbol); - prop->priv->symbol = NULL; - } - - if (prop->priv->tooltip) { -- if (!ibus_text_get_is_static (prop->priv->tooltip)) -- g_object_unref (prop->priv->tooltip); -+ g_object_unref (prop->priv->tooltip); - prop->priv->tooltip = NULL; - } - -@@ -404,7 +401,7 @@ ibus_property_deserialize (IBusProperty *prop, - g_variant_get_child (variant, retval++, "u", &prop->priv->type); - - GVariant *subvar = g_variant_get_child_value (variant, retval++); -- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) { -+ if (prop->priv->label) { - g_object_unref (prop->priv->label); - } - prop->priv->label = IBUS_TEXT (ibus_serializable_deserialize (subvar)); -@@ -414,7 +411,7 @@ ibus_property_deserialize (IBusProperty *prop, - ibus_g_variant_get_child_string (variant, retval++, &prop->priv->icon); - - subvar = g_variant_get_child_value (variant, retval++); -- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) { -+ if (prop->priv->tooltip) { - g_object_unref (prop->priv->tooltip); - } - prop->priv->tooltip = IBUS_TEXT (ibus_serializable_deserialize (subvar)); -@@ -435,7 +432,7 @@ ibus_property_deserialize (IBusProperty *prop, - - /* Keep the serialized order for the compatibility when add new members. */ - subvar = g_variant_get_child_value (variant, retval++); -- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) { -+ if (prop->priv->symbol) { - g_object_unref (prop->priv->symbol); - } - prop->priv->symbol = IBUS_TEXT (ibus_serializable_deserialize (subvar)); -@@ -567,7 +564,7 @@ ibus_property_set_label (IBusProperty *prop, - g_assert (IBUS_IS_PROPERTY (prop)); - g_return_if_fail (label == NULL || IBUS_IS_TEXT (label)); - -- if (prop->priv->label && !ibus_text_get_is_static (prop->priv->label)) { -+ if (prop->priv->label) { - g_object_unref (prop->priv->label); - } - -@@ -575,8 +572,10 @@ ibus_property_set_label (IBusProperty *prop, - prop->priv->label = ibus_text_new_from_static_string (""); - } - else { -- prop->priv->label = g_object_ref_sink (label); -+ prop->priv->label = label; - } -+ -+ g_object_ref_sink (prop->priv->label); - } - - void -@@ -586,7 +585,7 @@ ibus_property_set_symbol (IBusProperty *prop, - g_assert (IBUS_IS_PROPERTY (prop)); - g_return_if_fail (symbol == NULL || IBUS_IS_TEXT (symbol)); - -- if (prop->priv->symbol && !ibus_text_get_is_static (prop->priv->symbol)) { -+ if (prop->priv->symbol) { - g_object_unref (prop->priv->symbol); - } - -@@ -594,8 +593,10 @@ ibus_property_set_symbol (IBusProperty *prop, - prop->priv->symbol = ibus_text_new_from_static_string (""); - } - else { -- prop->priv->symbol = g_object_ref_sink (symbol); -+ prop->priv->symbol = symbol; - } -+ -+ g_object_ref_sink (prop->priv->symbol); - } - - void -@@ -615,7 +616,7 @@ ibus_property_set_tooltip (IBusProperty *prop, - g_assert (IBUS_IS_PROPERTY (prop)); - g_assert (tooltip == NULL || IBUS_IS_TEXT (tooltip)); - -- if (prop->priv->tooltip && !ibus_text_get_is_static (prop->priv->tooltip)) { -+ if (prop->priv->tooltip) { - g_object_unref (prop->priv->tooltip); - } - -@@ -624,8 +625,9 @@ ibus_property_set_tooltip (IBusProperty *prop, - } - else { - prop->priv->tooltip = tooltip; -- g_object_ref_sink (prop->priv->tooltip); - } -+ -+ g_object_ref_sink (prop->priv->tooltip); - } - - void --- -2.35.1 - diff --git a/app-i18n/ibus/ibus-1.5.25-r1.ebuild b/app-i18n/ibus/ibus-1.5.25-r1.ebuild deleted file mode 100644 index 44c67f7e9ccc..000000000000 --- a/app-i18n/ibus/ibus-1.5.25-r1.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# 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 -} diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild index 47f1c6bd63f4..22c0f865df55 100644 --- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild +++ b/app-i18n/ibus/ibus-1.5.27.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils @@ -18,8 +18,8 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" -IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland" RESTRICT="!test? ( test )" REQUIRED_USE=" appindicator? ( gtk3 ) @@ -49,6 +49,7 @@ DEPEND=" x11-libs/libXi ) introspection? ( dev-libs/gobject-introspection ) + libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( ${PYTHON_DEPS} @@ -75,17 +76,14 @@ BDEPEND=" app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) + test? ( x11-apps/setxkbmap ) unicode? ( app-i18n/unicode-data )" -PATCHES=( - "${FILESDIR}"/${P}-src-Fix-refcounting-issues.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 \ + ui/gtk3/panel.vala \ ui/gtk3/emojierapp.vala || die fi if ! use emoji; then @@ -106,7 +104,7 @@ src_prepare() { # fix for parallel install sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die # require user interaction - sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die + sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die sed -i "/^bash_completion/d" tools/Makefile.am || die @@ -151,6 +149,7 @@ src_configure() { $(use_enable gtk4) $(use_enable gui ui) $(use_enable introspection) + $(use_enable libnotify) $(use_enable nls) $(use_enable systemd systemd-services) $(use_enable test tests) @@ -186,8 +185,13 @@ src_test() { src_install() { default + # Remove la files find "${ED}" -name '*.la' -delete || die + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + if use python; then python_install() { emake -C bindings/pygobject \ diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild new file mode 100644 index 000000000000..59113f00aaf8 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.29.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" + +MY_PV=$(ver_rs 3 '-') +MY_PV_DERP="${MY_PV}-rc2" # Upstream retagged rc2 as the final release +GENTOO_VER= +[[ -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/${MY_PV}/${PN}-${MY_PV_DERP}.tar.gz + ${GENTOO_PATCHSET_URI}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + appindicator? ( gtk3 ) + python? ( + ${PYTHON_REQUIRED_USE} + introspection + ) + test? ( gtk3 ) + vala? ( introspection ) + X? ( gtk3 ) +" +REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359 +DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.65.0:2 + gnome-base/dconf + gnome-base/librsvg:2 + sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + ) + appindicator? ( dev-libs/libdbusmenu[gtk3?] ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + gtk4? ( gui-libs/gtk:4 ) + gui? ( + x11-libs/libX11 + x11-libs/libXi + ) + introspection? ( dev-libs/gobject-introspection ) + libnotify? ( x11-libs/libnotify ) + nls? ( virtual/libintl ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + )" +RDEPEND="${DEPEND} + python? ( + gui? ( + x11-libs/gtk+:3[introspection] + ) + )" +BDEPEND=" + $(vala_depend) + dev-libs/glib:2 + dev-util/glib-utils + virtual/pkgconfig + x11-misc/xkeyboard-config + emoji? ( + app-i18n/unicode-cldr + app-i18n/unicode-emoji + ) + nls? ( sys-devel/gettext ) + test? ( x11-apps/setxkbmap ) + unicode? ( app-i18n/unicode-data )" + +S=${WORKDIR}/${PN}-${MY_PV_DERP} + +src_prepare() { + vala_setup --ignore-use + if ! has_version 'x11-libs/gtk+:3[wayland]'; then + touch ui/gtk3/panelbinding.vala \ + ui/gtk3/panel.vala \ + ui/gtk3/emojierapp.vala || die + fi + if ! use emoji; then + touch \ + tools/main.vala \ + ui/gtk3/panel.vala || die + fi + if ! use appindicator; then + touch ui/gtk3/panel.vala || die + 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 || die + # fix for parallel install + sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die + # require user interaction + sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die + + sed -i "/^bash_completion/d" tools/Makefile.am || die + + 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 gui setup) + --with-python=${EPYTHON} + ) + else + python_conf+=( --disable-setup ) + fi + + if tc-is-cross-compiler && { use emoji || use unicode; }; then + mkdir -p "${S}-build" + pushd "${S}-build" >/dev/null 2>&1 || die + ECONF_SOURCE=${S} econf_build --enable-static \ + --disable-{dconf,gtk{2,3},python-library,shared,xim} \ + ISOCODES_{CFLAG,LIB}S=-DSKIP \ + $(use_enable emoji emoji-dict) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + popd >/dev/null 2>&1 || die + fi + + local myconf=( + $(use_enable X xim) + $(use_enable appindicator) + $(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 gtk2) + $(use_enable gtk3) + $(use_enable gtk4) + $(use_enable gui ui) + $(use_enable introspection) + $(use_enable libnotify) + $(use_enable nls) + $(use_enable systemd systemd-services) + $(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[@]}" + ) + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler && { use emoji || use unicode; }; then + emake -C "${S}-build/src" \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + emake -C src \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + cp \ + $(usex emoji "${S}-build/src/emoji-parser" '') \ + $(usex unicode "${S}-build/src/unicode-parser" '') \ + src || die + fi + emake +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + virtx dbus-run-session emake check +} + +src_install() { + default + # Remove la files + find "${ED}" -name '*.la' -delete || die + + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || 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 +} + +pkg_postinst() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update + dconf update +} + +pkg_postrm() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/app-i18n/ibus/ibus-1.5.29_rc1.ebuild b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild new file mode 100644 index 000000000000..10fdab116676 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" + +MY_PV=$(ver_rs 3 '-') +GENTOO_VER= +[[ -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/${MY_PV}/${PN}-${MY_PV}.tar.gz + ${GENTOO_PATCHSET_URI}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + appindicator? ( gtk3 ) + python? ( + ${PYTHON_REQUIRED_USE} + introspection + ) + test? ( gtk3 ) + vala? ( introspection ) + X? ( gtk3 ) +" +DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.65.0:2 + gnome-base/dconf + gnome-base/librsvg:2 + sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + ) + appindicator? ( dev-libs/libdbusmenu[gtk3?] ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + gtk4? ( gui-libs/gtk:4 ) + gui? ( + x11-libs/libX11 + x11-libs/libXi + ) + introspection? ( dev-libs/gobject-introspection ) + libnotify? ( x11-libs/libnotify ) + nls? ( virtual/libintl ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + )" +RDEPEND="${DEPEND} + python? ( + gui? ( + x11-libs/gtk+:3[introspection] + ) + )" +BDEPEND=" + $(vala_depend) + dev-libs/glib:2 + dev-util/glib-utils + virtual/pkgconfig + x11-misc/xkeyboard-config + emoji? ( + app-i18n/unicode-cldr + app-i18n/unicode-emoji + ) + nls? ( sys-devel/gettext ) + test? ( x11-apps/setxkbmap ) + unicode? ( app-i18n/unicode-data )" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_prepare() { + vala_setup --ignore-use + if ! has_version 'x11-libs/gtk+:3[wayland]'; then + touch ui/gtk3/panelbinding.vala \ + ui/gtk3/panel.vala \ + ui/gtk3/emojierapp.vala || die + fi + if ! use emoji; then + touch \ + tools/main.vala \ + ui/gtk3/panel.vala || die + fi + if ! use appindicator; then + touch ui/gtk3/panel.vala || die + 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 || die + # fix for parallel install + sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die + # require user interaction + sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die + + sed -i "/^bash_completion/d" tools/Makefile.am || die + + 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 gui setup) + --with-python=${EPYTHON} + ) + else + python_conf+=( --disable-setup ) + fi + + if tc-is-cross-compiler && { use emoji || use unicode; }; then + mkdir -p "${S}-build" + pushd "${S}-build" >/dev/null 2>&1 || die + ECONF_SOURCE=${S} econf_build --enable-static \ + --disable-{dconf,gtk{2,3},python-library,shared,xim} \ + ISOCODES_{CFLAG,LIB}S=-DSKIP \ + $(use_enable emoji emoji-dict) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + popd >/dev/null 2>&1 || die + fi + + local myconf=( + $(use_enable X xim) + $(use_enable appindicator) + $(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 gtk2) + $(use_enable gtk3) + $(use_enable gtk4) + $(use_enable gui ui) + $(use_enable introspection) + $(use_enable libnotify) + $(use_enable nls) + $(use_enable systemd systemd-services) + $(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[@]}" + ) + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler && { use emoji || use unicode; }; then + emake -C "${S}-build/src" \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + emake -C src \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + cp \ + $(usex emoji "${S}-build/src/emoji-parser" '') \ + $(usex unicode "${S}-build/src/unicode-parser" '') \ + src || die + fi + emake +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + virtx dbus-run-session emake check +} + +src_install() { + default + # Remove la files + find "${ED}" -name '*.la' -delete || die + + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || 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 +} + +pkg_postinst() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update + dconf update +} + +pkg_postrm() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update +} |