From a0fad0f4611efabdb614a93b304cf52aab8e06cc Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 28 Jan 2025 19:28:40 -0500 Subject: [PATCH] app-i18n/ibus: correctly depend on gtk interfaces to wayland/X The upstream code checks whether GDK_WINDOWING_WAYLAND is defined by the gtk headers, and if so will compile against the wayland symbols it provides. We must unconditionally depend on the gdk X11 backend, since the code unconditionally tries to use it (even when headers themselves are conditional, which they aren't always). We can now solve this using a special Gentoo macro to hide these automagic macros to simulate building on a system with more minimal gtk packages. Bug: https://bugs.gentoo.org/624960 Closes: https://bugs.gentoo.org/910646 Closes: https://bugs.gentoo.org/921671 Signed-off-by: Eli Schwartz --- app-i18n/ibus/ibus-1.5.29-r1.ebuild | 236 ++++++++++++++++++ ...us-1.5.30.ebuild => ibus-1.5.30-r1.ebuild} | 9 +- ...us-1.5.31.ebuild => ibus-1.5.31-r1.ebuild} | 9 +- profiles/arch/alpha/package.use.mask | 1 + profiles/features/big-endian/package.use.mask | 3 +- 5 files changed, 251 insertions(+), 7 deletions(-) create mode 100644 app-i18n/ibus/ibus-1.5.29-r1.ebuild rename app-i18n/ibus/{ibus-1.5.30.ebuild => ibus-1.5.30-r1.ebuild} (95%) rename app-i18n/ibus/{ibus-1.5.31.ebuild => ibus-1.5.31-r1.ebuild} (96%) diff --git a/app-i18n/ibus/ibus-1.5.29-r1.ebuild b/app-i18n/ibus/ibus-1.5.29-r1.ebuild new file mode 100644 index 0000000000000..7c1ad0e700ad5 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.29-r1.ebuild @@ -0,0 +1,236 @@ +# Copyright 1999-2025 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 flag-o-matic 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 ~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? ( gtk3 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[X,wayland?] ) + gtk4? ( gui-libs/gtk:4[X,wayland?] ) + 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 + # Under various circumstances, vala transpiles will need to be redone due to + # encoding false assumptions about enabled features at the time the distfile + # was produced. Vala's conditional compilation encodes the configure options + # from the maintainer's machine when creating distfiles. + # + # See: + # - https://github.com/ibus/ibus/issues/2609 + # - https://gitlab.gnome.org/GNOME/vala/-/issues/1580 + # + # Force all vala files to be regenerated no matter what. + find . -name '*.vala' -exec touch {} + || die + + 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 + + # defang automagic dependencies + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + + 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.30.ebuild b/app-i18n/ibus/ibus-1.5.30-r1.ebuild similarity index 95% rename from app-i18n/ibus/ibus-1.5.30.ebuild rename to app-i18n/ibus/ibus-1.5.30-r1.ebuild index ff30e4b764a91..78886f0e2bcd9 100644 --- a/app-i18n/ibus/ibus-1.5.30.ebuild +++ b/app-i18n/ibus/ibus-1.5.30-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx +inherit autotools bash-completion-r1 flag-o-matic gnome2-utils python-r1 toolchain-funcs vala virtualx DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" HOMEPAGE="https://github.com/ibus/ibus/wiki" @@ -45,8 +45,8 @@ DEPEND=" ) appindicator? ( dev-libs/libdbusmenu[gtk3?] ) gtk2? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - gtk4? ( gui-libs/gtk:4 ) + gtk3? ( x11-libs/gtk+:3[X,wayland?] ) + gtk4? ( gui-libs/gtk:4[X,wayland?] ) gui? ( x11-libs/libX11 x11-libs/libXi @@ -128,6 +128,9 @@ src_configure() { python_conf+=( --disable-setup ) fi + # defang automagic dependencies + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + if tc-is-cross-compiler && { use emoji || use unicode; }; then mkdir -p "${S}-build" pushd "${S}-build" >/dev/null 2>&1 || die diff --git a/app-i18n/ibus/ibus-1.5.31.ebuild b/app-i18n/ibus/ibus-1.5.31-r1.ebuild similarity index 96% rename from app-i18n/ibus/ibus-1.5.31.ebuild rename to app-i18n/ibus/ibus-1.5.31-r1.ebuild index 45f554b527e76..9f41a2a7d6247 100644 --- a/app-i18n/ibus/ibus-1.5.31.ebuild +++ b/app-i18n/ibus/ibus-1.5.31-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools bash-completion-r1 gnome2-utils flag-o-matic python-r1 toolchain-funcs vala virtualx +inherit autotools bash-completion-r1 flag-o-matic gnome2-utils python-r1 toolchain-funcs vala virtualx DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" HOMEPAGE="https://github.com/ibus/ibus/wiki" @@ -45,8 +45,8 @@ DEPEND=" ) appindicator? ( dev-libs/libdbusmenu[gtk3?] ) gtk2? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - gtk4? ( gui-libs/gtk:4 ) + gtk3? ( x11-libs/gtk+:3[X,wayland?] ) + gtk4? ( gui-libs/gtk:4[X,wayland?] ) gui? ( x11-libs/libX11 x11-libs/libXi @@ -131,6 +131,9 @@ src_configure() { python_conf+=( --disable-setup ) fi + # defang automagic dependencies + use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND + if tc-is-cross-compiler && { use emoji || use unicode; }; then mkdir -p "${S}-build" pushd "${S}-build" >/dev/null 2>&1 || die diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask index 4623b370371ee..676b01c1c8ea3 100644 --- a/profiles/arch/alpha/package.use.mask +++ b/profiles/arch/alpha/package.use.mask @@ -120,6 +120,7 @@ app-alternatives/ninja samurai # https://buildd.debian.org/status/logs.php?pkg=weston&arch=alpha gui-libs/gtk wayland dev-libs/libportal wayland +app-i18n/ibus wayland # matoro (2023-06-18) # sci-physics/bullet not keyworded here (#908240) diff --git a/profiles/features/big-endian/package.use.mask b/profiles/features/big-endian/package.use.mask index 57cd68309a34e..1272812b2df49 100644 --- a/profiles/features/big-endian/package.use.mask +++ b/profiles/features/big-endian/package.use.mask @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Michał Górny (2024-06-05) @@ -43,6 +43,7 @@ mail-client/thunderbird system-av1 # dev-libs/weston casualties (#833010) # https://gitlab.freedesktop.org/wayland/weston/-/issues/739 gui-libs/gtk wayland +app-i18n/ibus wayland gnome-base/gnome-control-center wayland sys-apps/xdg-desktop-portal-gnome wayland net-libs/webkit-gtk:6 wayland