From 12bb627384ddfd47382b9f1b6464481a58d01ebb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Aug 2018 20:19:23 +0100 Subject: gentoo resync : 29.08.2018 --- app-i18n/ibus/Manifest | 9 +- app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch | 88 ++++++++++ app-i18n/ibus/ibus-1.5.12.ebuild | 2 - app-i18n/ibus/ibus-1.5.16.ebuild | 2 - app-i18n/ibus/ibus-1.5.18.ebuild | 4 +- app-i18n/ibus/ibus-1.5.19.ebuild | 187 ++++++++++++++++++++++ 6 files changed, 282 insertions(+), 10 deletions(-) create mode 100644 app-i18n/ibus/files/ibus-1.5.19-gdk-wayland.patch create mode 100644 app-i18n/ibus/ibus-1.5.19.ebuild (limited to 'app-i18n/ibus') diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 9cce5b734554..e97fbb46584a 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,7 +1,10 @@ +AUX ibus-1.5.19-gdk-wayland.patch 2996 BLAKE2B d203c843a0ba692c1be81c1172866bea6ea30e6ea25c562d04ad31934af48f4e2bcc5d5ec862af049a026c3656c0fce960715c7271514e1d4faa54c8f6ed369c SHA512 e53619feafc4f5e7cc662d0c59be5beda916dc3b2ec2f74121b6b3fb874ed3bc15f43ee739b272f2304344c9acbc399b5c522d2f5d54695aca7e48d4b68430bb 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 -EBUILD ibus-1.5.12.ebuild 3725 BLAKE2B d851008dd04bc0131c13cc79056061cd4a9d6484e3b29a1d87a8e6f149c9f5fe22a46171a4e4df7229309e1e1bf63c6da7ac69eb41f8c11347835ef25f92d0ef SHA512 5a04b1bcc9687e567cadf7429d01c80911200031359854c630856e47573885a28e2548c2fb91e5ffd8cbce3da85a519b790aa2b2feb948eb98f55ceed0f0127b -EBUILD ibus-1.5.16.ebuild 4006 BLAKE2B 46b44039cae41cd693372b94586fc17a9b2678895b84f5177aead172f62ae7f50ff7b331b4aecce697a303024ba7ad587c2ffd26e0ce0f789cfb6eb456471908 SHA512 7861b4ea5f207e6d3c014687e07af74a4a34afefaa79abf718815a3e4a92981f2e3f62d17b872eea8de5813cfd9200c4b30c60aa121d6443e643d59bed6ca5b2 -EBUILD ibus-1.5.18.ebuild 4271 BLAKE2B 08c1e5ac33927c935922c070dea574d2ac5650c6ec0e89fce32e2007ea0b0407929b1e460f95beca0d755295a37016c583677c0894ac98e0277cb974c2b35509 SHA512 26d0ecd660cd1a0059f3d3b166e34a34606f23116e12c972b3cd5f7757e8812f597f2d28b5d5ed5e1e8f0ad01c68ae3b8b7175ebe4ef7a0fb574cae674ea778b +DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc +EBUILD ibus-1.5.12.ebuild 3678 BLAKE2B 8b08b4f6cf2c188d387c43741f0e430749ba003dd7693ce4b70e36c21d5c046f8f0be82ecc2401df577603f7c074d99904d6dfc3aa60f1327157e835563779a7 SHA512 178fdf0169e444161b598ee800a99328060ec7a28a6cd73ca2c26ddce10372072faabe63234d2a9b7c0e31b758cdf7f533c508f05491be80a9ae130f466a5679 +EBUILD ibus-1.5.16.ebuild 3959 BLAKE2B 7a8872f49d619d6079915884ff25ee90a74653fa4614c61043d34414989cafebe122cedc65d72999b2eaca668f0ab0d76484d6ef177e419a3e284476430bb1ff SHA512 b664b04cc0010f3e6da17f7e2dfd5f10ba2241def9a807d5da176c8b1f0eb14a066dd9df6af3b750f06f3b476d867a30b18e32ce85ab1b4efa44274132b75e96 +EBUILD ibus-1.5.18.ebuild 4223 BLAKE2B 98c21d40535a94e2acf0d82ec6a19d68e76f99401818e4f8aac46b745f7b28369d62299fbde3a50f5a42b1572f33cff7d55e6e9ed5801550aab7b13513c73d04 SHA512 9ccc923eecc135d413da43de8e10fed0f1d0149f066a542e268b4f6370560ef9cfe2db770bfb4e3f7b6194ab1a95cf78e0c97b92b0cd263b3d337e1ec4c9457e +EBUILD ibus-1.5.19.ebuild 4340 BLAKE2B 2550c7270052bdcdedf645f7698f3e972bc3e22c4456e976e9a161678e8e96ddeddbb6bfba13b8db976538d3f97f3c860773320f3d790c03a726979bdd3b1c41 SHA512 14f9d43bd461806e4bc0fe116ea3c983c691975e8285bba5d919d3c0cf52d4f3e41fb58f749866cc0f5d674e9db6e26aee9da77e431d5b11c29169228b0a7b7a MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100 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 000000000000..8eed29daf397 --- /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 +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.12.ebuild b/app-i18n/ibus/ibus-1.5.12.ebuild index b3d6a397f2ce..5e7791469af2 100644 --- a/app-i18n/ibus/ibus-1.5.12.ebuild +++ b/app-i18n/ibus/ibus-1.5.12.ebuild @@ -145,8 +145,6 @@ src_install() { pkg_preinst() { use gconf && gnome2_gconf_savelist - gnome2_icon_savelist - gnome2_schemas_savelist } pkg_postinst() { diff --git a/app-i18n/ibus/ibus-1.5.16.ebuild b/app-i18n/ibus/ibus-1.5.16.ebuild index b84815cfa142..e4ffeb871fa3 100644 --- a/app-i18n/ibus/ibus-1.5.16.ebuild +++ b/app-i18n/ibus/ibus-1.5.16.ebuild @@ -161,8 +161,6 @@ src_install() { pkg_preinst() { use gconf && gnome2_gconf_savelist - gnome2_icon_savelist - gnome2_schemas_savelist } pkg_postinst() { diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild index d32b42660caf..8c9b39101dc1 100644 --- a/app-i18n/ibus/ibus-1.5.18.ebuild +++ b/app-i18n/ibus/ibus-1.5.18.ebuild @@ -14,7 +14,7 @@ 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" +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 ) @@ -166,8 +166,6 @@ src_install() { pkg_preinst() { use gconf && gnome2_gconf_savelist - gnome2_icon_savelist - gnome2_schemas_savelist } pkg_postinst() { 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 000000000000..f318087a0030 --- /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 +} -- cgit v1.2.3