commit: fef7fd441a44f4d38435a326bf21172eb26e3589 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 22 15:32:32 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Mar 22 15:44:07 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fef7fd44
kde-plasma/plasma-desktop: Add USE emoji Bug: https://bugs.gentoo.org/709742 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/plasma-desktop/metadata.xml | 1 + .../plasma-desktop-5.18.49.9999.ebuild | 22 +++++++++++++++++++--- .../plasma-desktop/plasma-desktop-9999.ebuild | 20 ++++++++++++++++++-- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index cf13ed12c3..9b61884e37 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <use> + <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag> <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> <flag name="mouse">Enable mouse KCM</flag> <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild index c4c2f1f880..0f09b8a685 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.18.49.9999.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="KDE Plasma desktop" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad" +IUSE="emoji +fontconfig ibus +mouse scim +semantic-desktop touchpad" COMMON_DEPEND=" >=dev-qt/qtconcurrent-${QTMIN}:5 @@ -78,6 +78,11 @@ COMMON_DEPEND=" x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile + emoji? ( + app-i18n/ibus[emoji] + dev-libs/glib:2 + media-fonts/noto-emoji + ) fontconfig? ( media-libs/fontconfig media-libs/freetype @@ -85,7 +90,7 @@ COMMON_DEPEND=" x11-libs/xcb-util-image ) ibus? ( - app-i18n/ibus + app-i18n/ibus[emoji?] dev-libs/glib:2 >=dev-qt/qtx11extras-${QTMIN}:5 x11-libs/libxcb @@ -117,16 +122,27 @@ RDEPEND="${COMMON_DEPEND} !<kde-plasma/kdeplasma-addons-5.15.80 " +src_prepare() { + ecm_src_prepare + + if ! use ibus; then + sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ + -i applets/kimpanel/backend/ibus/CMakeLists.txt || die + fi +} + src_configure() { local mycmakeargs=( $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package ibus IBus) $(cmake_use_find_package mouse Evdev) $(cmake_use_find_package mouse XorgLibinput) $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) $(cmake_use_find_package touchpad Synaptics) ) + if ! use emoji && ! use ibus; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON ) + fi ecm_src_configure } diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index 8e59833d68..cc1a9a9ec6 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="KDE Plasma desktop" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="" -IUSE="+fontconfig ibus +mouse scim +semantic-desktop touchpad" +IUSE="emoji +fontconfig ibus +mouse scim +semantic-desktop touchpad" COMMON_DEPEND=" >=dev-qt/qtconcurrent-${QTMIN}:5 @@ -78,6 +78,11 @@ COMMON_DEPEND=" x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile + emoji? ( + app-i18n/ibus[emoji] + dev-libs/glib:2 + media-fonts/noto-emoji + ) fontconfig? ( media-libs/fontconfig media-libs/freetype @@ -117,16 +122,27 @@ RDEPEND="${COMMON_DEPEND} !<kde-plasma/kdeplasma-addons-5.15.80 " +src_prepare() { + ecm_src_prepare + + if ! use ibus; then + sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ + -i applets/kimpanel/backend/ibus/CMakeLists.txt || die + fi +} + src_configure() { local mycmakeargs=( $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package ibus IBus) $(cmake_use_find_package mouse Evdev) $(cmake_use_find_package mouse XorgLibinput) $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) $(cmake_use_find_package touchpad Synaptics) ) + if ! use emoji && ! use ibus; then + mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON ) + fi ecm_src_configure }
