commit: da142c953d5d2df787df3bacfb63856163d445ec Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Mar 25 22:44:26 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Mar 25 23:13:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da142c95
kde-frameworks/kio: Fix kinit not terminating file.so, build w/ GCC-11 Upstream commits: 05e1090603ca81eb54a23febe41a8823a0e7d572 493188b3d616f3223ccf3a41327a4c7e69282df8 KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=434455 Closes: https://bugs.gentoo.org/766480 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kio-5.80.1-MimeTypeFinderJob-file.so.patch | 30 +++++++ .../kio/files/kio-5.80.1-gcc11-include-order.patch | 36 ++++++++ kde-frameworks/kio/kio-5.80.1-r1.ebuild | 99 ++++++++++++++++++++++ 3 files changed, 165 insertions(+) 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 new file mode 100644 index 00000000000..a25898fb88b --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.80.1-MimeTypeFinderJob-file.so.patch @@ -0,0 +1,30 @@ +From 05e1090603ca81eb54a23febe41a8823a0e7d572 Mon Sep 17 00:00:00 2001 +From: David Faure <[email protected]> +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-gcc11-include-order.patch b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch new file mode 100644 index 00000000000..e3675ce0234 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.80.1-gcc11-include-order.patch @@ -0,0 +1,36 @@ +From 493188b3d616f3223ccf3a41327a4c7e69282df8 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <[email protected]> +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-r1.ebuild b/kde-frameworks/kio/kio-5.80.1-r1.ebuild new file mode 100644 index 00000000000..44f71537990 --- /dev/null +++ b/kde-frameworks/kio/kio-5.80.1-r1.ebuild @@ -0,0 +1,99 @@ +# 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 +) + +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 +}
