diff options
Diffstat (limited to 'kde-frameworks/kio')
6 files changed, 0 insertions, 298 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index f9876336187f..62860c244851 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,2 +1 @@ -DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213 DIST kio-5.82.0.tar.xz 3330028 BLAKE2B be2d22adec291f8e5f6be5227d33e4ca505b43c3888174cfe667dc7fc3bf6d1a383178238540b4598028c61c51498e5d94f3ba3c7e354d82f8dfdf11f7c7fbd0 SHA512 a14f42a8c96fb8b1f435d4120805628f877132b588c2c1f983af6409603baffbcdad99f1c296fef99dd78fb7edbf526fd95f85970ccbf91887619eb5728cb3dc diff --git a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch deleted file mode 100644 index a25898fb88b5..000000000000 --- a/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Tue, 23 Mar 2021 00:29:31 +0100 -Subject: [PATCH] MimeTypeFinderJob: don't put job on hold for local files - -Fixes: 434455 ---- - src/core/mimetypefinderjob.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/core/mimetypefinderjob.cpp b/src/core/mimetypefinderjob.cpp -index 147f3aa9a..f5e50cdc4 100644 ---- a/src/core/mimetypefinderjob.cpp -+++ b/src/core/mimetypefinderjob.cpp -@@ -241,8 +241,10 @@ void KIO::MimeTypeFinderJobPrivate::scanFileWithGet() - m_suggestedFileName = job->queryMetaData(QStringLiteral("content-disposition-filename")); - } - -- job->putOnHold(); -- KIO::Scheduler::publishSlaveOnHold(); -+ if (!m_url.isLocalFile()) { // #434455 -+ job->putOnHold(); -+ KIO::Scheduler::publishSlaveOnHold(); -+ } - q->emitResult(); - }); - } --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch deleted file mode 100644 index 059c9f824241..000000000000 --- a/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch +++ /dev/null @@ -1,104 +0,0 @@ -From a68cb73c4e071ed24b18a95e11fbbbc8d59840b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven29@gmail.com> -Date: Sun, 21 Mar 2021 05:22:57 +0100 -Subject: [PATCH] PreviewJob: Initialize cachesSize with 0, only pass size > 0 - to shmget, improve createThumbnail - -BUG: 430862 ---- - src/widgets/previewjob.cpp | 48 +++++++++++++++++++++++--------------- - 1 file changed, 29 insertions(+), 19 deletions(-) - -diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp -index 988da16b0..9b6e661e8 100644 ---- a/src/widgets/previewjob.cpp -+++ b/src/widgets/previewjob.cpp -@@ -70,7 +70,7 @@ public: - : initialItems(items) - , width(size.width()) - , height(size.height()) -- , cacheSize(-1) -+ , cacheSize(0) - , bScale(true) - , bSave(true) - , ignoreMaximumSize(false) -@@ -114,8 +114,8 @@ public: - // Size of thumbnail - int width; - int height; -- // Unscaled size of thumbnail (128 or 256 if cache is enabled) -- int cacheSize; -+ // Unscaled size of thumbnail (128, 256 or 512 if cache is enabled) -+ ushort cacheSize; - // Whether the thumbnail should be scaled - bool bScale; - // Whether we should save the thumbnail -@@ -712,39 +712,49 @@ void PreviewJobPrivate::createThumbnail(const QString &pixPath) - }); - - bool save = bSave && currentItem.plugin->property(QStringLiteral("CacheThumbnail")).toBool() && !sequenceIndex; -+ int thumb_width = width; -+ int thumb_height = height; -+ int thumb_iconSize = iconSize; -+ if (save) { -+ thumb_width = thumb_height = cacheSize; -+ thumb_iconSize = 64; -+ } -+ - job->addMetaData(QStringLiteral("mimeType"), currentItem.item.mimetype()); -- job->addMetaData(QStringLiteral("width"), QString().setNum(save ? cacheSize : width)); -- job->addMetaData(QStringLiteral("height"), QString().setNum(save ? cacheSize : height)); -- job->addMetaData(QStringLiteral("iconSize"), QString().setNum(save ? 64 : iconSize)); -- job->addMetaData(QStringLiteral("iconAlpha"), QString().setNum(iconAlpha)); -+ job->addMetaData(QStringLiteral("width"), QString::number(thumb_width)); -+ job->addMetaData(QStringLiteral("height"), QString::number(thumb_height)); -+ job->addMetaData(QStringLiteral("iconSize"), QString::number(thumb_iconSize)); -+ job->addMetaData(QStringLiteral("iconAlpha"), QString::number(iconAlpha)); - job->addMetaData(QStringLiteral("plugin"), currentItem.plugin->library()); - job->addMetaData(QStringLiteral("enabledPlugins"), enabledPlugins.join(QLatin1Char(','))); - job->addMetaData(QStringLiteral("devicePixelRatio"), QString::number(devicePixelRatio)); - if (sequenceIndex) { -- job->addMetaData(QStringLiteral("sequence-index"), QString().setNum(sequenceIndex)); -+ job->addMetaData(QStringLiteral("sequence-index"), QString::number(sequenceIndex)); - } - - #if WITH_SHM - if (shmid == -1) { - if (shmaddr) { -+ // clean previous shared memory segment - shmdt((char *)shmaddr); - shmctl(shmid, IPC_RMID, nullptr); -+ shmaddr = nullptr; - } -- auto size = std::max(cacheSize * cacheSize, width * height); -- shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600); -- if (shmid != -1) { -- shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY)); -- if (shmaddr == (uchar *)-1) { -- shmctl(shmid, IPC_RMID, nullptr); -- shmaddr = nullptr; -- shmid = -1; -+ auto size = thumb_width * thumb_height; -+ if (size > 0) { -+ shmid = shmget(IPC_PRIVATE, size * 4 * devicePixelRatio * devicePixelRatio, IPC_CREAT | 0600); -+ if (shmid != -1) { -+ shmaddr = (uchar *)(shmat(shmid, nullptr, SHM_RDONLY)); -+ if (shmaddr == (uchar *)-1) { -+ shmctl(shmid, IPC_RMID, nullptr); -+ shmaddr = nullptr; -+ shmid = -1; -+ } - } -- } else { -- shmaddr = nullptr; - } - } - if (shmid != -1) { -- job->addMetaData(QStringLiteral("shmid"), QString().setNum(shmid)); -+ job->addMetaData(QStringLiteral("shmid"), QString::number(shmid)); - } - #endif - } --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch deleted file mode 100644 index cece00965294..000000000000 --- a/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 71c7420e4b33b4bace8ed6d4fa45fa5e281d38bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com> -Date: Sat, 27 Mar 2021 11:00:07 +0100 -Subject: [PATCH] KNewFileMenu: use destination side to stat destination - -BUG: 429541 ---- - src/filewidgets/knewfilemenu.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/filewidgets/knewfilemenu.cpp b/src/filewidgets/knewfilemenu.cpp -index 64c4b1c2e..48fdf8622 100644 ---- a/src/filewidgets/knewfilemenu.cpp -+++ b/src/filewidgets/knewfilemenu.cpp -@@ -1242,7 +1242,7 @@ void KNewFileMenuPrivate::_k_slotTextChanged(const QString &text) - } else { - url = QUrl(m_baseUrl.toString() + QLatin1Char('/') + text); - } -- KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::SourceSide, KIO::StatDetail::StatBasic); -+ KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::StatSide::DestinationSide, KIO::StatDetail::StatBasic); - QObject::connect(job, &KJob::result, q, [this](KJob *job) { - _k_slotStatResult(job); - }); --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch deleted file mode 100644 index e3675ce02345..000000000000 --- a/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 493188b3d616f3223ccf3a41327a4c7e69282df8 Mon Sep 17 00:00:00 2001 -From: Ahmad Samir <a.samirh78@gmail.com> -Date: Mon, 15 Mar 2021 14:29:42 +0200 -Subject: [PATCH] Fix #include's order - -According to[1] <limits> needs to be included first when building with -GCC 11. - -[1] https://invent.kde.org/frameworks/kio/-/issues/3 - -GIT_SILENT ---- - src/kntlm/des.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kntlm/des.cpp b/src/kntlm/des.cpp -index d90e6d21a..78c7a3fd2 100644 ---- a/src/kntlm/des.cpp -+++ b/src/kntlm/des.cpp -@@ -26,11 +26,11 @@ - - #include "des.h" - -+#include <limits> // This needs to be first with GCC 11 -+ - #include <qendian.h> - #include <string.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.80.1-r2.ebuild b/kde-frameworks/kio/kio-5.80.1-r2.ebuild deleted file mode 100644 index ca570e4df59f..000000000000 --- a/kde-frameworks/kio/kio-5.80.1-r2.ebuild +++ /dev/null @@ -1,101 +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.2 -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}-MimeTypeFinderJob-file.so.patch # KDE-Bug 434455 - "${FILESDIR}"/${P}-gcc11-include-order.patch # bug 766480 - "${FILESDIR}"/${P}-fix-create-files-on-ftp.patch # KDE-Bug 429541 - "${FILESDIR}"/${P}-fix-crash-in-ThumbnailProtocol.patch # KDE-Bug 430862 -) - -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 -} |