gentoo christmass resync : 25.12.2020

7 files changed, 36 insertions, 6 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 866c5683fb17..b239dc124da3 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 62ebb5361c7e..c482e2c649da 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-20.12.0-crashfix.patch 930 BLAKE2B 7cfdc024cc5e8c95d1e04ccd9e2128dead38f342a2d18a1305f1e786e2807f8732ae88c946732d9775cb0d975608ce171ddf1f01dcf6e5aad61a4630699edd34 SHA512 ca4851d58249a531febaad2633f8653379ac1cbad0a6a503ec972c4d89fc0347ad453d46de3cff02f616cec05cca7e389ee3d828ee199fbff4dcffc77bef0643
 DIST dolphin-20.08.3.tar.xz 5094964 BLAKE2B 368eca6e1972361bdb02bb3b1d3b449074d7d48af7bb88df60447ac9a7c88e8562fcac185c96596c57520df3efb87859cd21ad19e3b8515ec4ce40ebc7d2b3a5 SHA512 6fb1533597d886a7a032b68dbe2d9d05c0b856c006ba06d08eeda5ae267530f528fa4c4b7a8e2caf1cb074284a27d01a223922b606fde238984588a7df3abe6c
 DIST dolphin-20.12.0.tar.xz 5115360 BLAKE2B 45a392641c627bce430c816c51bada0d0e8037b1f6a25fe68659ca8fa00cac81ecbbac196af842c237f0b628b5dec6655f54fe297c13d9e25bf80263506cf7d2 SHA512 0485c2775d941b379deb3c9b68c9d60a3e978e504af63457df4c6f3acea373db7f69be31b9e0451a40662a845695ab1e78d3513d05f2f6bf3a1782fde75bb9d2
 EBUILD dolphin-20.08.3.ebuild 3065 BLAKE2B d935f22318e5aa0dfdc22ba1f6dc9b6c9a79bd8e19509c75e918c7ee6855e8fabc55351d5e8bb0e01f349d305c448cafbee77fb6aaceef4e7afdd1c25892af39 SHA512 e78165d126936b7b1e324e3cbdc57f6af5632d27f3c9ed6be3a742d60a71c1edcf2949c78fa4ecf50c8661b841ac8a80fc80bd754e1c1a8d35cdb4b2e3afd3c3
-EBUILD dolphin-20.12.0.ebuild 3171 BLAKE2B ebabcadcb5ec207b9e769b73d615b50ccca626752ac7da41dae514efbfa83de40cb08bec5a24d917a8b29c88182b7c3469b5eb50e72b527623bf182c2329beb4 SHA512 0b80c0217468a04394202bbc5c524ac8fbc1405622821d3f82b6b322c6ce88c916e50e78feb5421ed4576af8956fc6af5a585ae4816d8b5bbeac103bb43f170f
+EBUILD dolphin-20.12.0-r1.ebuild 3218 BLAKE2B f2bfda75bf0c43a42bf8808ed040ebef699714b003f0e718daea838253baebbc11c7d5e1c8762237fc29c3fd4a426cd1bcd026ca91aa80ba2333019fb1a2bfd7 SHA512 5405c9fadb506f49ab7d678fdc045abfff5e538d3cb42f5eb04131dbb75b3583e9e4a73113b968f2a0ab54101da55fa9dd5d6bd050c563044b7ea7333410e8d0
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.12.0.ebuild b/kde-apps/dolphin/dolphin-20.12.0-r1.ebuild
index 40cafe986d86..ffeb5b378fe8 100644
--- a/kde-apps/dolphin/dolphin-20.12.0.ebuild
+++ b/kde-apps/dolphin/dolphin-20.12.0-r1.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
diff --git a/kde-apps/dolphin/files/dolphin-20.12.0-crashfix.patch b/kde-apps/dolphin/files/dolphin-20.12.0-crashfix.patch
new file mode 100644
index 000000000000..65350b7ba3e6
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-20.12.0-crashfix.patch
@@ -0,0 +1,27 @@
+From c95d7fae79a309ed7f2df393fa20257cb20d54a8 Mon Sep 17 00:00:00 2001
+From: Anthony Fieroni <bvbfan@abv.bg>
+Date: Sat, 12 Dec 2020 12:36:23 +0200
+Subject: [PATCH] Fix access url navigator while creating new tab in filename
+ search view BUG: 429628 BUG: 430434
+
+Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
+---
+ src/dolphinviewcontainer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
+index 7260d2c4c..8dd309314 100644
+--- a/src/dolphinviewcontainer.cpp
++++ b/src/dolphinviewcontainer.cpp
+@@ -390,7 +390,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
+     m_searchBox->setVisible(enabled);
+ 
+     if (enabled) {
+-        const QUrl& locationUrl = m_urlNavigatorConnected->locationUrl();
++        const QUrl& locationUrl = m_urlNavigator->locationUrl();
+         m_searchBox->fromSearchUrl(locationUrl);
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
index 5205a5da46b5..7642400cf9f1 100644
--- a/kde-apps/libkgapi/Manifest
+++ b/kde-apps/libkgapi/Manifest
@@ -1,6 +1,6 @@
 AUX libkgapi-20.08.3-fix-contactfetchjobtest-w-qt-5.15.patch 1048 BLAKE2B 749a388aff619216b076975bcddaccfb13f33a41606e3ca93dd7bf53264269460ab38ff1493bdd3e1085cf57c13186b82da0cad079b7e0725e43d39a49156444 SHA512 55f0a8a18334d5f0d9dfc1fad782ae723f53a663aa505ee87876a2f233cfba57b7721615dbbeb00162d1219983ddcbf3bc96452e8fe3dcacc23d9b92fea89ed7
 DIST libkgapi-20.08.3.tar.xz 242676 BLAKE2B 86b04cea376eb46081632fb571bdb3a67f4f44f3dd6c8a3af0144598634417ee39defb445324f33969420718daa999f43c5ea5d9c01634a0ec944bf457219fd7 SHA512 de7062632660777074f4d0d8b754b072c7f2b0550260e994d1db3e99d8f258f2507ad605d91cb6c465794ced92b740a742ab99947737edea73fd928c087d4388
 DIST libkgapi-20.12.0.tar.xz 245920 BLAKE2B 0ae0fd3b4ab8148bb86e5987292b4cd48ba4d014eecb10af0c7a1976284a77aa85225e4d4361407900fad2741837440b1b4e7ddea33c366798e9cad61d7dbbbc SHA512 20ce9bcc4ca916760de2a68d3a25a84525c805a86aea4f32e0db362907a72517c16a11d4978cf60631409158d8a423bd2cc7a865aed0abea2a14854ec81cd9ac
-EBUILD libkgapi-20.08.3.ebuild 966 BLAKE2B 5d42eaa020215cba834808cf9e0799fd2f516176f1109bc2577af7526d1ffadbf88d5dc59baed8b918de6f640ea4f34559eb3611855cd586cc86613dcc9774da SHA512 30f125a74bc493a157307e8444f8ce307a66b9d42e83ddbee5484f111ce297ddc472b0088c29a14e7b5d302d57cb394779bf678c7574792520eda85cf772af68
-EBUILD libkgapi-20.12.0.ebuild 726 BLAKE2B 060aa5b78a63a203955751c62c807982cf49061fa528fb609f2d01868259acca033a9f91fdcc169bbe52dd5569c210dca85f6173a112e7a5f2167fbaeb2a1699 SHA512 1ad9f37cf96469734c984495861bfce337a4730eba1d42c561337f7f3b06af8d372f8f0bac460de6027c9ccb6c1c3326110137406bcb94a5bc97c43a66e76197
+EBUILD libkgapi-20.08.3-r1.ebuild 964 BLAKE2B c0b64df147b671cd0195741608dd6ff4371ebff462501607379b7d3a2feb8d4445d0ee149113776acd79714077a1b589e6b8353aa870076302c5e45bd71ae2a6 SHA512 bbf84ea6f0e690c627fdde90be1206e2f8f8b62b56e4072a23b4459db3808914093fa258d6c7a11d1171f3a2cdd4246a88572d556b76345c196772606b97124b
+EBUILD libkgapi-20.12.0-r1.ebuild 763 BLAKE2B 0ee9cc66e8a4866a7b4e3b9f313cdf6ad0db11bc7b6fa10cc2cd75888bc980c1da73fbcd04a5f38394bd8a6830c0956f0f85289e79e08240a48db619dcbb7b1e SHA512 19c2b9685e1b16f1583d561f73f37c56e4181c816a7e7b2960a518d0643ed1091ea0d65ff9d4323d05f57be337eb2d3c1aad77a7f6206aeec8a4def71b2f405b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkgapi/libkgapi-20.08.3.ebuild b/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
index 536782245214..99b60fac04bf 100644
--- a/kde-apps/libkgapi/libkgapi-20.08.3.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.08.3-r1.ebuild
@@ -30,11 +30,10 @@ DEPEND="
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 "
-RDEPEND="${DEPEND}
-	!<kde-apps/kdepim-runtime-18.07.80:5
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-contactfetchjobtest-w-qt-5.15.patch" # bug 754159
diff --git a/kde-apps/libkgapi/libkgapi-20.12.0.ebuild b/kde-apps/libkgapi/libkgapi-20.12.0-r1.ebuild
index eff90215a5ff..5d34175c0fa3 100644
--- a/kde-apps/libkgapi/libkgapi-20.12.0.ebuild
+++ b/kde-apps/libkgapi/libkgapi-20.12.0-r1.ebuild
@@ -28,5 +28,6 @@ DEPEND="
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"