gentoo resync : 18.11.2018

3 files changed, 34 insertions, 2 deletions

diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 947260c54daf..0e66a12437d4 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,6 @@
+AUX konsole-18.08.3-desktop.patch 821 BLAKE2B 3b86d8c03bbc23e991ad2e84172f64591ccca3cf5877c3b1812593df8e817adaaf5a34c72d34ba57af09adb7f64eaa9e78732f724de8adfec523c17ee65d1e5d SHA512 0a6b36edff6067c18312b44d5b7fbe6f4c8659dd34ddda5edd5b483bea462fc4abe4c07710530997adf83be1dfc77c3fd72a74f60398ccdae8f8bdb84f3822ee
 DIST konsole-18.04.3.tar.xz 1043452 BLAKE2B 341d589ea00536913d008548affecf301f9c455661eb5630e345481d75c3feb0138e5dff23d25421d0f375381586c4dc72b511042cb4803dc75873a943c20658 SHA512 0809cf4db6e10e672a4a976609045fb88879fe615b48e452f140da0a6c44971f31a7b4606124ed3b7642ee3f3556ace45b31e0b5c466df611fea98a9cf702066
-DIST konsole-18.08.2.tar.xz 1076752 BLAKE2B 0d1152fe5a98df942c11767707133e8d5af4a9184d5d3bf8496fc4bec3e9e8ea2dd2d4abce6a47aa1da6001f8e528c71bb237c718bec0297dbfc4397289aea07 SHA512 a8eae209ec3a60be27b06ba850353b0d85a533cbea691114c2aa2c812f9d884153b2915d8fb52977ae9ed7ce08161e10d3f378d31b0ca166750e7e4584842959
+DIST konsole-18.08.3.tar.xz 1077100 BLAKE2B 76ffc17c72ef6ccfc9618fd7ae59aeac00f8d686dcbe8fa61ef57248ba494d5dde94bc7f320c373f119e2ae60530d49640be7914aba7868b69e36c3673211f83 SHA512 3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82
 EBUILD konsole-18.04.3.ebuild 1420 BLAKE2B f940eacd6525caabc7f69e5e89a8cf1b470d255a3334f98ade87b950b5c91ed45bdeec7769cfd274c32d39abf99e0ba9475d4284c5ea042ba546949d78e7f1b8 SHA512 8da1c3cc6e9ae895ba7fc992bad527de09e8355dc6d49fc74d5a925fa18b0b64b79233aaf5fad2617d7ac93ebe56594669a07487ddb1de0c8c825c5ce223fcc2
-EBUILD konsole-18.08.2.ebuild 1419 BLAKE2B 1c787a82f2609f08edcdcbdab31abc8816b6278cc577f9a033620bd736a2740117ff708262eaece4689d45fb3b99958ea3357c6bcb85027e4835a39d65a7dba3 SHA512 d0c8509f9f7ca3cafc8c4dcfc790dc524f1f6dc9227620a6d3617b3324d22d4eaa20a2e3327615c949c8e52b4c14e06016e5e06325fa1bd3cc1f9af8e8f22a84
+EBUILD konsole-18.08.3-r1.ebuild 1465 BLAKE2B 3c05b1fc9acf278919cd93d21d6f86db948053375c9e7c9682c307ccf7729753e63b1dc644dfc81f885bcfef6a5eb513745f89c778209b5650698acf1e9dbbca SHA512 7edaa956ad37143b3626d37ced1025afd3d5ac414b44a352a11cc19f94ed707d5b435f5cd90d09913d7023e6bbaa6ad67374345b90cfe51087c5b917d0552007
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-18.08.3-desktop.patch b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
new file mode 100644
index 000000000000..8c204fe2bd24
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.08.3-desktop.patch
@@ -0,0 +1,29 @@
+From 1506ecdfd0f91d4b8b39c01bad1fe301193d6e82 Mon Sep 17 00:00:00 2001
+From: David Hallas <david@davidhallas.dk>
+Date: Sun, 11 Nov 2018 10:26:31 -0500
+Subject: Add StartupWMClass to .desktop file
+
+The org.kde.konsole.desktop file is missing a StartupWMClass setting.
+
+BUG: 372441
+FIXED-IN: 18.12
+
+Differential Revision: https://phabricator.kde.org/D16546
+---
+ desktop/org.kde.konsole.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/desktop/org.kde.konsole.desktop b/desktop/org.kde.konsole.desktop
+index adc472c..86c2160 100755
+--- a/desktop/org.kde.konsole.desktop
++++ b/desktop/org.kde.konsole.desktop
+@@ -10,6 +10,7 @@ X-DocPath=konsole/index.html
+ X-DBUS-StartupType=Unique
+ StartupNotify=true
+ X-KDE-AuthorizeAction=shell_access
++StartupWMClass=konsole
+ 
+ Name=Konsole
+ Name[af]=Konsole
+-- 
+cgit v0.11.2
diff --git a/kde-apps/konsole/konsole-18.08.2.ebuild b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
index 87c52af1ea21..5bc727ab78c7 100644
--- a/kde-apps/konsole/konsole-18.08.2.ebuild
+++ b/kde-apps/konsole/konsole-18.08.3-r1.ebuild
@@ -48,6 +48,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-desktop.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package X X11)