commit: 0bab4991442bc50bbca56075d3842cc2bf90a4a4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 28 23:11:20 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Sep 29 12:46:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bab4991
kde-plasma/plasma-desktop: Add IUSE=emoji Closes: https://bugs.gentoo.org/709742 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...5.19.5-force-emojier-use-color-emoji-font.patch | 24 ++++++++++++++++++++++ kde-plasma/plasma-desktop/metadata.xml | 1 + .../plasma-desktop/plasma-desktop-5.19.5.ebuild | 10 +++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch new file mode 100644 index 00000000000..69f33cb402e --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch @@ -0,0 +1,24 @@ +From e7cb58f156a240c70c085be38a12e2a01dc5ede6 Mon Sep 17 00:00:00 2001 +From: Guo Yunhe <[email protected]> +Date: Sun, 20 Sep 2020 21:12:08 +0300 +Subject: [PATCH] Force Emojier using color emoji font + +--- + applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml +index 858cbd935..e7198156b 100644 +--- a/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml ++++ b/applets/kimpanel/backend/ibus/emojier/ui/CategoryPage.qml +@@ -113,6 +113,7 @@ Kirigami.ScrollablePage + delegate: MouseArea { + QQC2.Label { + font.pointSize: 25 ++ font.family: 'emoji' // Avoid monochrome fonts like DejaVu Sans + fontSizeMode: model.display.length > 5 ? Text.Fit : Text.FixedSize + minimumPointSize: 10 + text: model.display +-- +GitLab + diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index 52f99fa25fe..49d2b2bec6a 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="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> </use> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild index 6b5dc7ffb41..da3b4ac5fc3 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.19.5.ebuild @@ -18,7 +18,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"; LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="+fontconfig ibus scim +semantic-desktop" +IUSE="emoji +fontconfig ibus scim +semantic-desktop" COMMON_DEPEND=" >=dev-qt/qtconcurrent-${QTMIN}:5 @@ -80,6 +80,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 @@ -116,6 +121,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch + "${FILESDIR}/${P}-force-emojier-use-color-emoji-font.patch" ) src_prepare() { @@ -137,7 +143,7 @@ src_configure() { $(cmake_use_find_package scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) ) - if ! use ibus; then + if ! use emoji && ! use ibus; then mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON ) fi
