gentoo (valentine's day) resync : 14.02.2021

5 files changed, 242 insertions, 5 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index c7bfb4ea860e..967c5d66937f 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,7 +1,10 @@
 AUX kio-5.77.0-crashfix.patch 902 BLAKE2B 5b129abe281a871d7d7a3e068fe17744078acb33ef53efb50499e86ec2c0f85d29e87c6c1e78fc486379fae748741bebd29917611d44e1ff056ab7f7aa246db8 SHA512 df49c4c858051f01f5a5cb9b0733caaee8b9ffee31400954dfab4947f5eb7a52a4805b9d4c9c6214113aed9ecd4d072e4ad0821cf6993fe51e4256936dbb1d99
+AUX kio-5.77.0-fix-default-codec-not-usascii-1.patch 1237 BLAKE2B 8244d30803b2d602b3098dcaa550e70c4ef8cc5715c5fa5089edad90c07215d1ba7d5690450404c412c13764d5760c64fd78e78466e15537b52885cc6d7fbeac SHA512 9865ef4944942e8141c7e78f96ec3ab10bf8546b24a9d5c9d53802a6e28b1d4cbb64c253bde19d6018d6163151b275b1e5af83a925a06a1ba0be0e6481ecda53
+AUX kio-5.77.0-fix-default-codec-not-usascii-2.patch 3741 BLAKE2B 7c9aba87be64665f56d87a2c2224979764227e205ccbcecfc4eba365fc35fb7ba1c3f678c6e900a0ad689367b44c2ea2a217e8c6d77ac5afc4f8e411775f800a SHA512 2a93e4c7ffb3ded5ff3e707b14b2ae0b35b529ebd5475af3072faad78d73b320c11b89942212d5883ce8ca258717204d487d331ec642ceed927a90f29a5952e9
 AUX kio-5.77.0-gcc11.patch 857 BLAKE2B a57f60686001fb291a4eebb548ece5b57ec523547f01cb878f98648a38685ecd1c29f2e3330ef1ed3a3de10034e6fb102a6b2e19d2579f52d61b19e70815e89f SHA512 fd2b82fad35328bb65237a1d96f02b127b1c8b6eb48014b7d7ef32fb597fd64368a5959b459cfc35ae078a05331e38e6333e67268b0c80a56f5b4258398be0af
 DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c
-DIST kio-5.78.0.tar.xz 3308004 BLAKE2B b21cdde13013d7a3df91e821c8562df650b727e521b6552e9875c9aa74a97bb8b8b4a1d8b8cfd8f7d2c2eb68989ba2b7efc0fe77d46e57759e34ac1b39f9999c SHA512 55996a35f77442f3cc2ff98708da6dfd2734b0afffd7b3b90b5b2845c9770f3ec68a1e4e72d21b1c4e41d06778ab376b96ab64d958c89dd4f8b7fad6501a5db7
+DIST kio-5.79.0.tar.xz 3309016 BLAKE2B 804989eab7eb80bb40282da92d752f70f41dc9897037a530482f92ee60f9cf339ccd802b1ff59945300e2656153ce203cc928d362170ac7c7e82dd0aa08d4d6e SHA512 7d7588ec61b3c85ec1d89e95ebee5c6d98626dafc4d80525e13baa96840e91a00a7fa6e6fd2e8055c78b22c27d37cdc395da6c23e521a4ae7ccbe4992f1f7c43
 EBUILD kio-5.77.0-r1.ebuild 2425 BLAKE2B 160ed5b733deabdcff51093ec622a8f4e717338a02dfd46788faff0b1c5256b7902f86377644c2801f475389d176a57b6cb3e6de7d35515d7b0e7180033910af SHA512 f09524897dcc1d31e6542d8aeb91002251cf78da37cefe8b55af75df7120e126f9f8642e46e294f250fc9a4146a74afe50486ee730b5c44210752f4dfce9efbe
-EBUILD kio-5.78.0.ebuild 2400 BLAKE2B ce9147cafc66ba000f9ebbd941561857c4df8165827cb327ea8419e6dbd0a6a2f076ad2639ebd3b3f81aeb1ce28cfc569c0e5a4355ab2b201f25d94397232590 SHA512 9af4aeed6718371b5618e08c028894de3c8e7fb52ac27597e164b858cda753882ea4bdf398a93ba8bed26e187d55f1ba81d6de456132009965fb3e91df5fd532
+EBUILD kio-5.77.0-r2.ebuild 2503 BLAKE2B e52ca912e5fbe73bc297dac1e73793b773bdaf8bc1647c013e865b445b4a369df9f855228612c2faf17900ea4a82df5a53736606a43103bd3599674804128b62 SHA512 5c8e4afa0db36348c700a041966ff2f95ee511e5cb4d93162b5e37795e9de7935e87418ec6e51f0451058248e2d8391a3fc4b9f109d0f51c3933df3bae20219a
+EBUILD kio-5.79.0.ebuild 2335 BLAKE2B d8f41285cf4264dd116f43f5261289e83d9eb8fb0732a52dce7a306ffc22fa216e4bb39ac4c61f17d21d2b0830e5da4a9b49f90c5500a59452451922525bb11a SHA512 77171f1ddddaa9cec45169f8582f4cdd7bec468960f4ec3c8fc494cefe23bd44b943f9f2d179238f4c8fefd75cec6a933a1198ce70a8f089900e2ea3df09ca53
 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
new file mode 100644
index 000000000000..8f589b796aa5
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch
@@ -0,0 +1,36 @@
+From 0a13e0a3e830be2b2b2e5c2c6cf8cef25bd68bd8 Mon Sep 17 00:00:00 2001
+From: Tusooa Zhu <tusooa@vista.aero>
+Date: Thu, 4 Feb 2021 08:36:26 -0500
+Subject: [PATCH] Fix default codec being set to "US-ASCII" in KIO apps
+
+From https://doc.qt.io/qt-5/qloggingcategory.html#Q_LOGGING_CATEGORY-1 :
+"The implicitly-defined QLoggingCategory object is created on first use,
+in a thread-safe manner."
+
+The original way to explicitly define a static QLoggingCategory will lead
+to a call to ucnv_getDefaultName() before QApplication constructor (where
+setlocale() is called), thus making QTextCodec::codecForLocale() misbehave.
+Here we replace the explicit definition with the Q_LOGGING_CATEGORY macro,
+and thus avoid this problem.
+
+BUG: 432406
+---
+ src/widgets/kdirmodel.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp
+index a48ab462..aa049e3d 100644
+--- a/src/widgets/kdirmodel.cpp
++++ b/src/widgets/kdirmodel.cpp
+@@ -36,7 +36,7 @@
+ #include <qt_windows.h>
+ #endif
+ 
+-static QLoggingCategory category("kf.kio.widgets.kdirmodel", QtInfoMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.widgets.kdirmodel", QtInfoMsg)
+ 
+ class KDirModelNode;
+ class KDirModelDirNode;
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
new file mode 100644
index 000000000000..90f4bb5b0a95
--- /dev/null
+++ b/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch
@@ -0,0 +1,100 @@
+From 423bea37e4bb06b9c04a62a9a91b720ec5d5e3d5 Mon Sep 17 00:00:00 2001
+From: Tusooa Zhu <tusooa@vista.aero>
+Date: Thu, 4 Feb 2021 18:06:23 -0500
+Subject: [PATCH] Use Q_LOGGING_CATEGORY macro instead of explicit
+ QLoggingCategory
+
+Explicitly defining a QLoggingCategory will make QTextCodec::codecForLocale()
+misbehave, so we change it to Q_LOGGING_CATEGORY macro.
+
+CCBUG: 432406
+---
+ src/kpasswdserver/kpasswdserver.cpp                 | 2 +-
+ src/urifilters/ikws/kuriikwsfilter.cpp              | 2 +-
+ src/urifilters/ikws/kuriikwsfiltereng.cpp           | 2 +-
+ src/urifilters/ikws/kurisearchfilter.cpp            | 2 +-
+ src/urifilters/localdomain/localdomainurifilter.cpp | 2 +-
+ src/urifilters/shorturi/kshorturifilter.cpp         | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/kpasswdserver/kpasswdserver.cpp b/src/kpasswdserver/kpasswdserver.cpp
+index 4ed73085..a832a0ab 100644
+--- a/src/kpasswdserver/kpasswdserver.cpp
++++ b/src/kpasswdserver/kpasswdserver.cpp
+@@ -28,7 +28,7 @@
+ #include <QTimer>
+ #include <ctime>
+ 
+-static QLoggingCategory category("kf.kio.kpasswdserver", QtInfoMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.kpasswdserver", QtInfoMsg)
+ 
+ #define AUTHINFO_EXTRAFIELD_DOMAIN QStringLiteral("domain")
+ #define AUTHINFO_EXTRAFIELD_ANONYMOUS QStringLiteral("anonymous")
+diff --git a/src/urifilters/ikws/kuriikwsfilter.cpp b/src/urifilters/ikws/kuriikwsfilter.cpp
+index 3a516fd8..bbc17678 100644
+--- a/src/urifilters/ikws/kuriikwsfilter.cpp
++++ b/src/urifilters/ikws/kuriikwsfilter.cpp
+@@ -22,7 +22,7 @@
+ #define QL1C(x)  QLatin1Char(x)
+ 
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
+ }
+ 
+ /**
+diff --git a/src/urifilters/ikws/kuriikwsfiltereng.cpp b/src/urifilters/ikws/kuriikwsfiltereng.cpp
+index 5b1bbc48..29647e3e 100644
+--- a/src/urifilters/ikws/kuriikwsfiltereng.cpp
++++ b/src/urifilters/ikws/kuriikwsfiltereng.cpp
+@@ -22,7 +22,7 @@
+ #include <QLoggingCategory>
+ 
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
+ }
+ 
+ #define PDVAR(n, v) qCDebug(category) << n << " = '" << v << "'"
+diff --git a/src/urifilters/ikws/kurisearchfilter.cpp b/src/urifilters/ikws/kurisearchfilter.cpp
+index a12a9f59..669246c1 100644
+--- a/src/urifilters/ikws/kurisearchfilter.cpp
++++ b/src/urifilters/ikws/kurisearchfilter.cpp
+@@ -26,7 +26,7 @@
+ K_PLUGIN_CLASS_WITH_JSON(KUriSearchFilter, "kurisearchfilter.json")
+ 
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.ikws", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.ikws", QtWarningMsg)
+ }
+ 
+ KUriSearchFilter::KUriSearchFilter(QObject *parent, const QVariantList &)
+diff --git a/src/urifilters/localdomain/localdomainurifilter.cpp b/src/urifilters/localdomain/localdomainurifilter.cpp
+index 862419a7..94a53606 100644
+--- a/src/urifilters/localdomain/localdomainurifilter.cpp
++++ b/src/urifilters/localdomain/localdomainurifilter.cpp
+@@ -20,7 +20,7 @@
+ #define QL1S(x)   QLatin1String(x)
+ 
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.localdomain", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.localdomain", QtWarningMsg)
+ }
+ 
+ /**
+diff --git a/src/urifilters/shorturi/kshorturifilter.cpp b/src/urifilters/shorturi/kshorturifilter.cpp
+index dc866e6c..62d810c4 100644
+--- a/src/urifilters/shorturi/kshorturifilter.cpp
++++ b/src/urifilters/shorturi/kshorturifilter.cpp
+@@ -27,7 +27,7 @@
+ #include <KUser>
+ 
+ namespace {
+-QLoggingCategory category("kf.kio.urifilters.shorturi", QtWarningMsg);
++Q_LOGGING_CATEGORY(category, "kf.kio.urifilters.shorturi", QtWarningMsg)
+ }
+ 
+ /**
+-- 
+GitLab
+
diff --git a/kde-frameworks/kio/kio-5.77.0-r2.ebuild b/kde-frameworks/kio/kio-5.77.0-r2.ebuild
new file mode 100644
index 000000000000..641fae6d8a58
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.77.0-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_DESIGNERPLUGIN="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org xdg-utils
+
+DESCRIPTION="Framework providing transparent file and data management"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl +handbook kerberos +kwallet X"
+
+# tests hang
+RESTRICT+=" test"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5[ssl]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	=kde-frameworks/kauth-${PVCUT}*:5
+	=kde-frameworks/karchive-${PVCUT}*:5
+	=kde-frameworks/kbookmarks-${PVCUT}*:5
+	=kde-frameworks/kcodecs-${PVCUT}*:5
+	=kde-frameworks/kcompletion-${PVCUT}*:5
+	=kde-frameworks/kconfig-${PVCUT}*:5
+	=kde-frameworks/kconfigwidgets-${PVCUT}*:5
+	=kde-frameworks/kcoreaddons-${PVCUT}*:5
+	=kde-frameworks/kcrash-${PVCUT}*:5
+	=kde-frameworks/kdbusaddons-${PVCUT}*:5
+	=kde-frameworks/ki18n-${PVCUT}*:5
+	=kde-frameworks/kiconthemes-${PVCUT}*:5
+	=kde-frameworks/kitemviews-${PVCUT}*:5
+	=kde-frameworks/kjobwidgets-${PVCUT}*:5
+	=kde-frameworks/knotifications-${PVCUT}*:5
+	=kde-frameworks/kservice-${PVCUT}*:5
+	=kde-frameworks/ktextwidgets-${PVCUT}*:5
+	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
+	=kde-frameworks/kxmlgui-${PVCUT}*:5
+	=kde-frameworks/solid-${PVCUT}*:5
+	acl? (
+		sys-apps/attr
+		virtual/acl
+	)
+	handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
+	kerberos? ( virtual/krb5 )
+	kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
+	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	test? ( sys-libs/zlib )
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+		x11-libs/libXrender
+	)
+"
+PDEPEND="
+	>=kde-frameworks/kded-${PVCUT}:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-crashfix.patch
+	"${FILESDIR}"/${P}-gcc11.patch # bug 766480
+	"${FILESDIR}"/${P}-fix-default-codec-not-usascii-{1,2}.patch # bug 765430
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package acl ACL)
+		$(cmake_use_find_package handbook KF5DocTools)
+		$(cmake_use_find_package kerberos GSSAPI)
+		$(cmake_use_find_package kwallet KF5Wallet)
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	ecm_pkg_postrm
+	xdg_desktop_database_update
+}
diff --git a/kde-frameworks/kio/kio-5.78.0.ebuild b/kde-frameworks/kio/kio-5.79.0.ebuild
index 4b22f628f1f7..2a72c6140615 100644
--- a/kde-frameworks/kio/kio-5.78.0.ebuild
+++ b/kde-frameworks/kio/kio-5.79.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 ECM_DESIGNERPLUGIN="true"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org xdg-utils
 
@@ -71,8 +71,6 @@ PDEPEND="
 	>=kde-frameworks/kded-${PVCUT}:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.77.0-gcc11.patch" ) # bug 766480
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package acl ACL)