diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /kde-frameworks/kio | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r-- | kde-frameworks/kio/Manifest | 13 | ||||
-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/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch | 104 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch | 26 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch | 46 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-5.80.1-r2.ebuild (renamed from kde-frameworks/kio/kio-5.77.0-r2.ebuild) | 9 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-5.81.0-r1.ebuild (renamed from kde-frameworks/kio/kio-5.80.1-r1.ebuild) | 4 |
10 files changed, 189 insertions, 210 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 7ae9c8daa250..922e1130d2ac 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,11 +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 AUX kio-5.80.1-MimeTypeFinderJob-file.so.patch 970 BLAKE2B cd73c817449e154d3dc711a1e4ee69b10b433ad37d57a685113d51fb0dad1a4f5019b5f9887bbcb0c157cdaf9a8e1be08305c9fe19ef8acbf39e954465af682f SHA512 a142b9140d2f694336b64d5f333b1f3bf83f913c441eebdec74d79236ab7aa131ae4437b0bab08ac9d6497c42d3513a5a40d2bb76db41254d1a2697d109672d1 +AUX kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch 4334 BLAKE2B d3895b59787a97f46dc8868555eb00043679f75014b1c01d9ba6b853225e17517e74fc2ab0865a8a76d882ab4d2bb566dffe47f1153efccb43d3c2bdca228f2b SHA512 433a06c038d9b965c8d12f485aa353b64aed72b839a80ca8c1243bf9a4d251fd930223a4d6a94b840ed5c33f303b14595cab19ed877e8a942f58ca47f5f2ea87 +AUX kio-5.80.1-fix-create-files-on-ftp.patch 1096 BLAKE2B 9e577af9aeec00d3c95ea1e39df1d06b3e8d548f630a4597041776d6b2b01faf72b32e8492dfcd493ae75f2038aa107369dc1cfc734235d1efb5ac72bbb09f53 SHA512 5d0838e0afb506dda607ab70d245de67459027458cb493e4cb4a9f395df8fa56c489f4ffe1663b44b1deb1003fbfcdd9767d233700070cf3fe94f0773a9907c0 AUX kio-5.80.1-gcc11-include-order.patch 944 BLAKE2B a95cd2765a528e5d3d11e84cf935271c61e837d22f8d1344a78f5f09889b9a6947c9180854bb1dbdcec857b7b1210a4f4ad46d1de79df0acf4a539fa09380c0d SHA512 73ee379c8acc25ab4a9dc2fbc09ba5a012bc76e67453ca96faa415b0e0688c76ea786785d0caeb75bb167ebd22e50ee778eb8cc024892bb9ac36270115ea5e3a -DIST kio-5.77.0.tar.xz 3293128 BLAKE2B 67c4d637d3497ca1d488ee2d73e85cfd81950bb0fc5fe8968a0c7a6d1603f1b6a4ff3acd9f944c1314138c53fdba90f3fdf8efed2340bcb10e6aa92b757f8f38 SHA512 36760771dd152d4da4d2f8905ee7d978a2b7718e286ffe2323f1ac1b7975a5577e47e6145a4592b9700a8069867b42f55fd6e4eee4a006318483e5e0ee06ee4c +AUX kio-5.81.0-fix-qtconcurrent-private-link.patch 1544 BLAKE2B f2e24a00addd20b60f93ee85ab8dab532b95c7dbfe85ba411ad83ff59ccb563e63560b557e33caafac3a385ac3d640bbabb801481ac709b06784c8d6d4a3326c SHA512 afc541a93607ad4e3544bb06631fbba4770d1e3a2d67ece951479dcf6e8bc8c8e12bb44ff79ddf491b526a98e74f350cfce6358da073310122ecd809e56d047c DIST kio-5.80.1.tar.xz 3318204 BLAKE2B 46657d0fb8ae95dd6208b0298c5444e79c0b041f3801dffd9d76078d778cbdfa7f7b1be7923d73a880f67d5365b18b834d75e246382f9727cea53375a9314a1a SHA512 c3080291d06956bd197e7104eacdfbab3e166fb5b598bc6c902c4e6ff9cc7922b59c2ae5acb2a565e61d2a6047ca09651446f0a41d268568b4cb192477969213 -EBUILD kio-5.77.0-r2.ebuild 2500 BLAKE2B 1c94508c137cb2e1d83580decf1c410c1ff455b1b20a1484ad8803d2d10b948ada989d18d76c40f06b3899e5a89125080f33dd98e411c2833f7dda3198546653 SHA512 8f63fca6f9494bd76ce1e40cc4184503b46d41c7511fab1528d426ea3bd1c027bc2c7d7461cf23250bbbfed80300ab6b523e65ca93c4bbefea56b85e591acc3a -EBUILD kio-5.80.1-r1.ebuild 2476 BLAKE2B 2e794fe2a321b2b4458e14546fd447103bcbcec41200760e8c3c06cd79c8382559eb4d544ec2109263b82a4856d4372ab7d8dd26cd5dbb00be59cec42ee787da SHA512 265c4b70bc5ceaeba87e11d8e367c94382c9896c5b4a7335fe27088ff52d065945acf660ddbfee51c78d52fcdb42267b4e9693956b7ed3f8df042b3ab4f9f13b +DIST kio-5.81.0.tar.xz 3319696 BLAKE2B 9ce742ecc5f00223b6dd2b4adc2a8591796c0553f027414112c5bf2bc67c4a93708d2710c822697fbe38eb17b2a154a026bcb05a8914fb7bdd33f7479268544b SHA512 e2466412eb6360dc93eace9f44c161c7ac44ce1339688e4b64cba8f716733552610374627dd3e99205aeea735f0144beb0468f429f238a6be05f91827ff9ee3b +EBUILD kio-5.80.1-r2.ebuild 2614 BLAKE2B 4ef207fb64570f85403458b350e7ceb31fefe8d0f22dc09ee567e97c2bc3a1c0ac0c13b1050b2ab949b1b2036bbacdce0ad1050477c202799043720dff8fea96 SHA512 533a59b34d618f3ebff2a12de264c1bf2734b5f3149cc787bc3fc950b2af659422153db77883c381a6aa782e0819399d88b8641769766c747d1c46c8dc91267e +EBUILD kio-5.81.0-r1.ebuild 2487 BLAKE2B 38900adf588eb210067bebeadd6d9026fa9ca49c06dcfd6879c5157d0576d250017c9b55341f25d2a7e96ccfa75bafb6abb2b9f3c9684bdd29cbaa287cf27b42 SHA512 7055bdd3e560252162417320f95b2d31e1f35c15919d3339673f8582ed1270a429e1190a94cafa73a32f92b0f42d44fd92f00f8a6c6c6849a6fe34e37220c109 MISC metadata.xml 465 BLAKE2B f419d817ff7a98c06ebb921974d1c68f1c50eef4548f1d7bb819fb907b7379ad4d4b4424b598f9f216dc96f00a4e9acf7f051cc628af067954b13c3cb80ddada SHA512 6fae28d51cefecbf80962e976366b86ef54ac666421477787b8a438ae18101ea936865db76464b6a95e8ec6559138a063b269b1a17ff1687c73bb6ad398d4f89 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/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch new file mode 100644 index 000000000000..059c9f824241 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.80.1-fix-crash-in-ThumbnailProtocol.patch @@ -0,0 +1,104 @@ +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 new file mode 100644 index 000000000000..cece00965294 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.80.1-fix-create-files-on-ftp.patch @@ -0,0 +1,26 @@ +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.81.0-fix-qtconcurrent-private-link.patch b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch new file mode 100644 index 000000000000..42637cd6e1e7 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.81.0-fix-qtconcurrent-private-link.patch @@ -0,0 +1,46 @@ +From e6825658b7f59a3a933559def9aebf21ff0efb7f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 23 Apr 2021 20:10:31 +0200 +Subject: [PATCH] Drop find_dependency(Qt5Concurrent) from + KF5KIOConfig.cmake.in + +This was added in 2f83dde2c8e8a25f0fe3dd52012bb49cb69e1ea5 but as far as I can +see it is only a KIO build time dependency with no Qt5Concurrent header being +used in KIO headers. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + KF5KIOConfig.cmake.in | 1 - + src/core/CMakeLists.txt | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in +index 687ec512..749e9b9b 100644 +--- a/KF5KIOConfig.cmake.in ++++ b/KF5KIOConfig.cmake.in +@@ -21,7 +21,6 @@ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") + endif() + + find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") +-find_dependency(Qt5Concurrent "@REQUIRED_QT_VERSION@") + find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5KIOTargets.cmake") +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index 76c3061c..fe4be56b 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -188,9 +188,9 @@ PUBLIC + KF5::CoreAddons # KJob + KF5::Service # TODO KF6 move to PRIVATE + Qt5::Network +- Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp + Qt5::DBus + PRIVATE ++ Qt5::Concurrent # QtConcurrentRun in hostinfo.cpp + Qt5::Xml # davjob.cpp uses QDom + KF5::ConfigCore + KF5::I18n +-- +2.31.1 + diff --git a/kde-frameworks/kio/kio-5.77.0-r2.ebuild b/kde-frameworks/kio/kio-5.80.1-r2.ebuild index 7c108fb21091..ca570e4df59f 100644 --- a/kde-frameworks/kio/kio-5.77.0-r2.ebuild +++ b/kde-frameworks/kio/kio-5.80.1-r2.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 @@ -72,9 +72,10 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}"/${P}-crashfix.patch - "${FILESDIR}"/${P}-gcc11.patch # bug 766480 - "${FILESDIR}"/${P}-fix-default-codec-not-usascii-{1,2}.patch # bug 765430 + "${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() { diff --git a/kde-frameworks/kio/kio-5.80.1-r1.ebuild b/kde-frameworks/kio/kio-5.81.0-r1.ebuild index 44f715379906..8a640363ec96 100644 --- a/kde-frameworks/kio/kio-5.80.1-r1.ebuild +++ b/kde-frameworks/kio/kio-5.81.0-r1.ebuild @@ -72,8 +72,8 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}"/${P}-MimeTypeFinderJob-file.so.patch # KDE-Bug 434455 - "${FILESDIR}"/${P}-gcc11-include-order.patch # bug 766480 + # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 + "${FILESDIR}"/${P}-fix-qtconcurrent-private-link.patch # bug 784971 ) src_configure() { |