gentoo resync : 30.09.2020

4 files changed, 36 insertions, 4 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 9755bcad6bac..c9af113e7ffa 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -5,10 +5,11 @@ AUX plasma-desktop-5.18.5-findxorgserver.patch 5195 BLAKE2B b8ebbe59a5a2ef80a6cf
 AUX plasma-desktop-5.18.5-fix-animate-in-animation.patch 1434 BLAKE2B a84e839180ca1aeb5eddfd07e504d88d8fbfe52ca210d4f976955d753770b5572a5e55c7773368241fa3ff61c38ef7699879b829c19a54e6665d4dbf3fd2570e SHA512 7496b34f1243070160e9875998d1ab5ef5227acb68b4b3545c32f5e4be041459e3234fb56b186c2578cf573dd50251e8be751546bba68b11f6c2d170bb3b7fac
 AUX plasma-desktop-5.18.5-fix-fonts-kcm-w-kf-5.68.patch 6390 BLAKE2B fb0f4c70c94dc583745f92d14f4cb479d71da7c115f58d187ae6931c2dd3435abcfe9c2b773fc851f44fe605f47e2242d801da18a23f7943c025a901da8f28ee SHA512 d5f3820ee21422d46112bd9635bd65ce11068f9cf3bb14cd23c0050f35256b09344d934534794685997e8daeaae709c81e53b5b6ad54e7ecd709c6e5624be040
 AUX plasma-desktop-5.18.5-stop-multiplying-duration-values.patch 5184 BLAKE2B 35f25bc8a325b947a44cf64f81e42c53746220329a35335e997a4a6ef8f87834be03f68fff951641e78d322804e08aa4f9e0c76556d41b00335ddf44da4dd643 SHA512 9e604ba5b99bf5e48b2cf1ed5afd7a5a8b413348fbc0c4e7f663660ac27aed8f1f3d268ba2a2b376afe86fee0165e3a27c5c35471ffa7acfae9956a47a50b82f
+AUX plasma-desktop-5.19.5-force-emojier-use-color-emoji-font.patch 980 BLAKE2B b7b9cb993d7209182f92fa1924e28b66aadeca88eab3ceb98db1edea10c9d2fe65128cf0f019791478a270d645d6bbd9115a9a9372c6d4e63c8806b5bc06029f SHA512 e184cfaec2910a7389309e43c1f550c48de6b2c6c23a522a1c8bd5f6087fc57b2f3533e6b862d5801aa97f1eee8cc22ea0c4e415b44bef873f612ee039aefdb0
 DIST plasma-desktop-5.18.5.tar.xz 9412644 BLAKE2B cc4ba658e42cf8956f07ef6cdf7e34191d14d922958155ed19a9c5224f6a8dcfc7f1ea0c605066c28eb0d08b714f2f19e321e499bed78055ad2592aa0176d10c SHA512 14f86d1158f976e8f0fbf80fb7f5bea74393febc35592bd95806548883b3bc2e77ee55cc300119275ad322f6b8bcfbed84bb6b78a3a19868ce4695a1fb57a029
 DIST plasma-desktop-5.19.5.tar.xz 9430088 BLAKE2B 02894dfdc8c0d4535782629059b7d69e7722c63ef47c44077d5b49ac489b53af8440ba361a31a327783fe7a2b56d1812d59c8f6f0797c8fcc81aa90c1fac96c4 SHA512 d7c7b26dc5a7d4804a780833f8d22797312b845962ed4f9218c448fcb3c720c032eca1e79bec5f9c084f1825f0b6f26c34ffe032320396c9092e04a5b05c3d12
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
 EBUILD plasma-desktop-5.18.5-r1.ebuild 4865 BLAKE2B 87cf5b0e69bda73c0241cb0059e92b2344a87e625479201b683f20edc96f295dc5e80dfc46b234b5a513721d368c53d26d7df56425a434ee41adad44dc46dec5 SHA512 3290f48cf99c6810874e8c152d171770e57ee8d1400a2acb8d67046dab374c33c2ef2d454464e642b0a1f372742f8d79c9f26af2c4f49be31aab7640386edf46
 EBUILD plasma-desktop-5.18.5-r2.ebuild 4935 BLAKE2B 1334ac02567ae7992a6a8b7f7b94cf54348df407dbe4ef5130dd76bf2df43bcf66949105dfd23ac49aecfd55d63fbdea1026edf43d48d9fc5966fc0ead46ed89 SHA512 a5686e7f768aa87e67b6abbcb20478954027e63d5cea5cd9d545e9ac5699ec1be029d8badad7250b00aab12621b005c196a0b8d64c43b15252e13caaa4c51534
-EBUILD plasma-desktop-5.19.5.ebuild 4556 BLAKE2B 317513f08054224a6bad77bfcecc072e74039a45afc505ccb68f0c5a833e695e2fa4bb43ee7be0af6a6502d0cb58b74e649b8c7afa1d4c2ee00982d1fde41468 SHA512 2c6a23555243ca530f6df35d765a06ace6b41c72a8bc1ff14c262adf848637b9c662cd6058aa6cfc5a9113974da208e6ddf6f74cb7626a53b94ff7def0666bf0
-MISC metadata.xml 418 BLAKE2B f68267099811af01f47317ec163041980f834d34a61f6eb5584969e1172b9fa819a635664a1ec8ec49496a42fe0b27ed0cb0de34485e866836719aa185e2d37e SHA512 537579f9f3c1fe8b457826637da7b8fb5ea46986f2a71d28fb2de29fe010d5b08596059bb59160e36f346ba2fea4df18ad16896c27561528e2e9fef139e64ec5
+EBUILD plasma-desktop-5.19.5.ebuild 4717 BLAKE2B 6a1fe126b3d55789ed56d0c1c3c1074793d18a2971b91d5960ac0346f626be2e9d934e9571ba9d9cd52e3e95b5ce62c08bcb940c792f51bf4a12e0d5ff5ed33f SHA512 80430feece9661d318b53258e63e28c10d6c39690c37354d7f05f0918e4e6193ec887f43cb816dac15e881103327a538f512bacab63212d594bb5cf32e1eb721
+MISC metadata.xml 540 BLAKE2B 3953467f0fea68209d7b5cbb5f5d23bc1b1aadf0e88ec5dfc28d688f7d68e560fda165330da32940bbf43d82f6f7bc178451977870cf3e2e69f4159e4c2018d8 SHA512 5d48a9f5bd4e990a52eaa894e3572bfa66d966a0665b495a5539484cb29f6a2a4f81193c80556cf712a76e3661ac575bc582276be22acc3817e7758e727065a1
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 000000000000..69f33cb402e8
--- /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 <i@guoyunhe.me>
+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 52f99fa25fe2..49d2b2bec6af 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 6b5dc7ffb412..da3b4ac5fc3f 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