diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-06 14:14:11 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-04-11 16:23:00 +0200 |
commit | 81610521de144cef8396511ce080bc5fa0490cdc (patch) | |
tree | cb97b3fee4986979b564c85baf87f8c79169c595 /kde-frameworks/kio | |
parent | kde-frameworks/kinit: drop 5.77.0* (diff) | |
download | gentoo-81610521de144cef8396511ce080bc5fa0490cdc.tar.gz gentoo-81610521de144cef8396511ce080bc5fa0490cdc.tar.bz2 gentoo-81610521de144cef8396511ce080bc5fa0490cdc.zip |
kde-frameworks/kio: drop 5.77.0*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r-- | kde-frameworks/kio/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.77.0-crashfix.patch | 29 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch | 36 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch | 100 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.77.0-gcc11.patch | 32 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-5.77.0-r2.ebuild | 100 |
6 files changed, 0 insertions, 298 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index a11c641fb332..1c3ff9164cb6 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,3 +1,2 @@ -DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213 DIST kio-5.81.0.tar.xz 3319696 BLAKE2B 9ce742ecc5f00223b6dd2b4adc2a8591796c0553f027414112c5bf2bc67c4a93708d2710c822697fbe38eb17b2a154a026bcb05a8914fb7bdd33f7479268544b SHA512 e2466412eb6360dc93eace9f44c161c7ac44ce1339688e4b64cba8f716733552610374627dd3e99205aeea735f0144beb0468f429f238a6be05f91827ff9ee3b diff --git a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch deleted file mode 100644 index d24a0d976c01..000000000000 --- a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001 -From: Ismael Asensio <isma.af@gmail.com> -Date: Tue, 22 Dec 2020 22:23:17 +0100 -Subject: [PATCH] RenameDialog: Add missing nullptr initialization - -It fixes a crash when pressing `Apply to All` in those cases where -the action was not present, as the code checks for nullptr - -BUG: 430374 -FIXED-IN: 5.78 ---- - src/widgets/renamedialog.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp -index ac1d91d2..c3e04753 100644 ---- a/src/widgets/renamedialog.cpp -+++ b/src/widgets/renamedialog.cpp -@@ -161,6 +161,7 @@ public: - bCancel = nullptr; - bRename = bSkip = nullptr; - bOverwrite = nullptr; -+ bOverwriteWhenOlder = nullptr; - bResume = bSuggestNewName = nullptr; - bApplyAll = nullptr; - m_pLineEdit = nullptr; --- -GitLab - 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 deleted file mode 100644 index 8f589b796aa5..000000000000 --- a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-1.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 deleted file mode 100644 index 90f4bb5b0a95..000000000000 --- a/kde-frameworks/kio/files/kio-5.77.0-fix-default-codec-not-usascii-2.patch +++ /dev/null @@ -1,100 +0,0 @@ -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/files/kio-5.77.0-gcc11.patch b/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch deleted file mode 100644 index 7432364a9864..000000000000 --- a/kde-frameworks/kio/files/kio-5.77.0-gcc11.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9965ec1b9e6f6db192a2355e4e3eb80bc27fc092 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Sun, 24 Jan 2021 11:10:27 +0200 -Subject: [PATCH] Fix build with gcc11 - -Apparently now we need to #include <limit>. - -Patch by Geoff Leach: -https://bugs.gentoo.org/766480 -https://invent.kde.org/frameworks/kio/-/issues/3 - -NO_CHANGELOG ---- - src/kntlm/des.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp -index 18d85bfd..65c86f06 100644 ---- a/src/kntlm/des.cpp -+++ b/src/kntlm/des.cpp -@@ -29,6 +29,8 @@ - #include <string.h> - #include <qendian.h> - -+#include <limits> -+ - static void permute_ip(unsigned char *inblock, DES_KEY *key, unsigned char *outblock); - static void permute_fp(unsigned char *inblock, DES_KEY *key, unsigned char *outblock); - static void perminit_ip(DES_KEY *key); --- -GitLab - diff --git a/kde-frameworks/kio/kio-5.77.0-r2.ebuild b/kde-frameworks/kio/kio-5.77.0-r2.ebuild deleted file mode 100644 index 7c108fb21091..000000000000 --- a/kde-frameworks/kio/kio-5.77.0-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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 -} |