commit: 02d5c896c9451a96c4b949ccb0286b8e5ca0073e Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Tue Aug 28 12:55:22 2018 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Tue Aug 28 12:57:29 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02d5c896
app-i18n/ibus: new upstream release Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-i18n/ibus/Manifest | 1 + app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch | 88 ++++++++++ app-i18n/ibus/ibus-1.5.19.ebuild | 187 ++++++++++++++++++++++ 3 files changed, 276 insertions(+) diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 1290bc19446..8d1ff04e919 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,3 +1,4 @@ DIST ibus-1.5.12.tar.gz 2190284 BLAKE2B 57ac7f9e8e8f0419bad1bf3aa629282ef3c0188d29e98bc872e594955f69e0863020d600c674cabed56db156a85210b5b3c1fe137b135395a27d2535e4938164 SHA512 a443bf0d1b71a52c18e7d13a0c69f38c48f6924cfb1669912880b87be1bf41bcb7d8d6252aafd6799e43d41c081fd94cf334fd836a0505c93a4e5c5b68241c81 DIST ibus-1.5.16.tar.gz 2375719 BLAKE2B cf4cbd4556e43403c73da3cd2cb9f6da8e0baf5f90b3bc74f6d12c1bad057198ed828053dcbb3ddfd28c37d9011b6166e834385720aa827a68f594dbd4cf9298 SHA512 494ead69cf9c0111fd25fd1de27e796d89db4f08443afa1ec469f638469b25d8b19a59ea7ab0db0f3a130b9a89b3f2819667099ba38fc973d6efc61b367ce237 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3 +DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc diff --git a/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch b/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch new file mode 100644 index 00000000000..8eed29daf39 --- /dev/null +++ b/app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch @@ -0,0 +1,88 @@ +From aa0f4252ff965729b871c91b4ed089bf98963c0b Mon Sep 17 00:00:00 2001 +From: fujiwarat <takao.fujiwa...@gmail.com> +Date: Fri, 10 Aug 2018 15:43:58 +0900 +Subject: [PATCH] ui/gtk3: Check if gdk-wayland is installed + +BUG=https://github.com/ibus/ibus/issues/2035 +--- + configure.ac | 10 ++++++++++ + ui/gtk3/Makefile.am | 5 ++++- + ui/gtk3/panelbinding.vala | 5 +++++ + 3 files changed, 19 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 091e20f2..4b6a7a21 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -237,12 +237,21 @@ if test x"$enable_gtk3" = x"yes"; then + PKG_CHECK_MODULES(GTK3, [ + gtk+-3.0 + ]) ++ PKG_CHECK_EXISTS([gdk-wayland-3.0], ++ [enable_gdk3_wayland=yes], ++ [enable_gdk3_wayland=no] ++ ) + + gtk3_binary_version=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` + GTK3_IM_MODULEDIR="$libdir"/gtk-3.0/$gtk3_binary_version/immodules + else + enable_gtk3="no (disabled, use --enable-gtk3 to enable)" ++ enable_gdk3_wayland=no ++fi ++if test x"$enable_gdk3_wayland" != x"yes"; then ++ enable_gdk3_wayland="no (disabled, need to install gdk-wayland-3.0.pc)" + fi ++AM_CONDITIONAL([ENABLE_GDK3_WAYLAND], [test x"$enable_gdk3_wayland" = x"yes"]) + + if test x"$enable_xim" = x"yes"; then + # Check for x11 +@@ -785,6 +794,7 @@ Build options: + Build gtk3 immodule $enable_gtk3 + Build XIM agent server $enable_xim + Build wayland support $enable_wayland ++ Build gdk3 wayland support $enable_gdk3_wayland + Build appindicator support $enable_appindicator + Build appindicator engine icon $enable_appindicator_engine_icon + Build python library $enable_python_library +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index aaba7a4d..6ebc96ce 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -78,7 +78,6 @@ AM_VALAFLAGS = \ + --pkg=ibus-1.0 \ + --pkg=config \ + --pkg=xi \ +- --pkg=gdk-wayland \ + --target-glib="$(VALA_TARGET_GLIB_VERSION)" \ + $(NULL) + +@@ -105,6 +104,10 @@ if ENABLE_APPINDICATOR_ENGINE_ICON + AM_VALAFLAGS += --define=INDICATOR_ENGINE_ICON + endif + ++if ENABLE_GDK3_WAYLAND ++AM_VALAFLAGS += --pkg=gdk-wayland --define=USE_GDK_WAYLAND ++endif ++ + libexec_PROGRAMS = ibus-ui-gtk3 + + ibus_ui_gtk3_SOURCES = \ +diff --git a/ui/gtk3/panelbinding.vala b/ui/gtk3/panelbinding.vala +index 95115b13..981b5509 100644 +--- a/ui/gtk3/panelbinding.vala ++++ b/ui/gtk3/panelbinding.vala +@@ -237,9 +237,14 @@ class PanelBinding : IBus.PanelService { + GLib.Object(connection : bus.get_connection(), + object_path : IBus.PATH_PANEL_EXTENSION_EMOJI); + ++#if USE_GDK_WAYLAND + Type instance_type = Gdk.Display.get_default().get_type(); + Type wayland_type = typeof(GdkWayland.Display); + m_is_wayland = instance_type.is_a(wayland_type); ++#else ++ m_is_wayland = false; ++ warning("Checking Wayland is disabled"); ++#endif + + m_bus = bus; + m_application = application; diff --git a/app-i18n/ibus/ibus-1.5.19.ebuild b/app-i18n/ibus/ibus-1.5.19.ebuild new file mode 100644 index 00000000000..f318087a003 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.19.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +VALA_MIN_API_VERSION="0.34" +VALA_USE_DEPEND="vapigen" + +inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki"; +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"; + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland" +REQUIRED_USE="emoji? ( gtk ) + gtk2? ( gtk ) + kde? ( gtk ) + libnotify? ( 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 + !gtk? ( x11-libs/gtk+:2 ) + ) + gconf? ( gnome-base/gconf: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 ) + libnotify? ( x11-libs/libnotify ) + 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/intltool + virtual/pkgconfig + emoji? ( + app-i18n/unicode-cldr + app-i18n/unicode-emoji + ) + nls? ( sys-devel/gettext ) + unicode? ( app-i18n/unicode-data )" + +PATCHES=( "${FILESDIR}"/${P}-gdk-wayland.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 ! use libnotify; then + touch ui/gtk3/panel.vala + 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 gconf) \ + $(use_enable gtk gtk3) \ + $(use_enable gtk ui) \ + $(use_enable gtk2) \ + $(use_enable introspection) \ + $(use_enable kde appindicator) \ + $(use_enable libnotify) \ + $(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_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_preinst() { + use gconf && gnome2_gconf_savelist +} + +pkg_postinst() { + use gconf && gnome2_gconf_install + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 + gnome2_icon_cache_update + gnome2_schemas_update + dconf update +} + +pkg_postrm() { + use gtk && gnome2_query_immodules_gtk3 + use gtk2 && gnome2_query_immodules_gtk2 + gnome2_icon_cache_update + gnome2_schemas_update +}
