diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2022-11-27 12:13:36 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-11-27 12:20:25 +0100 |
commit | 055421201fc763afbea5526c9eefba2319e93627 (patch) | |
tree | b001ece55ec281d7587ebe37d8586454b053b873 /kde-frameworks | |
parent | kde-frameworks/kinit: drop 5.96.0-r1 (diff) | |
download | gentoo-055421201fc763afbea5526c9eefba2319e93627.tar.gz gentoo-055421201fc763afbea5526c9eefba2319e93627.tar.bz2 gentoo-055421201fc763afbea5526c9eefba2319e93627.zip |
kde-frameworks/kio: drop 5.96.0-r3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks')
-rw-r--r-- | kde-frameworks/kio/Manifest | 1 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch | 37 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch | 45 | ||||
-rw-r--r-- | kde-frameworks/kio/files/kio-5.96.0-with_x11.patch | 72 | ||||
-rw-r--r-- | kde-frameworks/kio/kio-5.96.0-r3.ebuild | 96 |
5 files changed, 0 insertions, 251 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest index 6bb49d8ed3dd..f73e93f3f0ef 100644 --- a/kde-frameworks/kio/Manifest +++ b/kde-frameworks/kio/Manifest @@ -1,3 +1,2 @@ DIST kio-5.100.0.tar.xz 3759832 BLAKE2B a98798bd35662699bd50b767c5a4c69ea85be616794dcbade560c3f212cfa0ed757dd67fa49afe4747d950416dc5d9c005a4183b53c199ce94ed2af16478aa60 SHA512 855ff7ff62a54a20d636c501fcb77e6d5bcb6376219152643298c7a3b2c4262ac61397c82f21711403482346c4cadb2b2e67f40d43a471bb03f25fe0a36cfa74 -DIST kio-5.96.0.tar.xz 3349852 BLAKE2B 981f0568c30678173f1c38972641b0a53071cce4b03cecdd1f829de7ace7244e3b67f9d63269501866474bcd64d22edc8d98e012f2197cb83f8cafd301a93da0 SHA512 70e7291efbd4b97916023cee7c44a96f3226355773f764f92a2c58c9110b75b04896196ab663ff468b757d1c2a5911f6e9021246044e7754a2ac47723eff8bd3 DIST kio-5.99.0.tar.xz 3407180 BLAKE2B 2014bb1e2ae020dbe47dd0964e003814fabde5cf14cbb74b05f5703ffc5fea2e6f22f26ae2a9cfc3806043d4618115ed14b9b60ab38bf9d5acb7ca8b2d5c2e06 SHA512 b18e6c79913b8da0f800bbf58433069531a6c79d711876c46785d88c79f6a45503d69dcd0fee958f727c7dd394f398c951b660e47f77e8372f3be75367ad9014 diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch deleted file mode 100644 index 12d4a4c05f2d..000000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-fix-RAW-file-image-preview.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5002a07e71ff270a8717911b965a75c33993f883 Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Fri, 8 Jul 2022 11:00:42 +0200 -Subject: [PATCH] Fix thumbnailer result for parent mime types being - overwritten - -BUG: 453480 ---- - src/widgets/previewjob.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp -index c53bcc88a..91be5575e 100644 ---- a/src/widgets/previewjob.cpp -+++ b/src/widgets/previewjob.cpp -@@ -384,11 +384,13 @@ void PreviewJobPrivate::startPreview() - } - } - -- // Check the wildcards last, see BUG 453480 -- QString groupMimeType = mimeType; -- static const QRegularExpression expr(QStringLiteral("/.*")); -- groupMimeType.replace(expr, QStringLiteral("/*")); -- pluginIt = mimeMap.constFind(groupMimeType); -+ if (pluginIt == mimeMap.constEnd()) { -+ // Check the wildcards last, see BUG 453480 -+ QString groupMimeType = mimeType; -+ static const QRegularExpression expr(QStringLiteral("/.*")); -+ groupMimeType.replace(expr, QStringLiteral("/*")); -+ pluginIt = mimeMap.constFind(groupMimeType); -+ } - } - - if (pluginIt != mimeMap.constEnd()) { --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch b/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch deleted file mode 100644 index 638a03f6eb98..000000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-fix-crash-in-dropjob.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 29bdf541aa83c78bc8e9d90487a7e1dd505ef013 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Fri, 8 Jul 2022 15:46:11 +0100 -Subject: [PATCH] Fix crash in DropJob - -QMimeData is owned by the backend and can be deleted during any event -processing. - -DropJob has a deferred start operation. One path in this is to call -PasteJob with mimedata. It could be dangling by this point. - -Pastejob follows a similar pattern in -1d668a9fe65c5bc178487fc32e6662ff815147f6 internally but we also need to -handle this usage before PasteJob. - -BUG: 454747 ---- - src/widgets/dropjob.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp -index fa2bf4ccc..5af578d28 100644 ---- a/src/widgets/dropjob.cpp -+++ b/src/widgets/dropjob.cpp -@@ -139,7 +139,7 @@ public: - void addPluginActions(KIO::DropMenu *popup, const KFileItemListProperties &itemProps); - void doCopyToDirectory(); - -- const QMimeData *m_mimeData; -+ QPointer<const QMimeData> m_mimeData; - const QList<QUrl> m_urls; - QMap<QString, QString> m_metaData; - Qt::DropAction m_dropAction; -@@ -271,7 +271,7 @@ void DropJobPrivate::slotStart() - q->emitResult(); - } - } -- } else { -+ } else if (m_mimeData) { - // Dropping raw data - KIO::PasteJob *job = KIO::PasteJobPrivate::newJob(m_mimeData, m_destUrl, KIO::HideProgressInfo, false /*not clipboard*/); - QObject::connect(job, &KIO::PasteJob::itemCreated, q, &KIO::DropJob::itemCreated); --- -GitLab - diff --git a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch b/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch deleted file mode 100644 index 9f87ec989af1..000000000000 --- a/kde-frameworks/kio/files/kio-5.96.0-with_x11.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c7a277e6810b74b7f664b029573beab592932421 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 1 Aug 2022 22:10:02 +0200 -Subject: [PATCH] Drop obsolete X11 dependency, introduce WITH_X11 option - instead - -This will only determine whether to search for Qt5X11Extras and then -set HAVE_X11 accordingly. This is a behavior change as previously it was -silently disabled if X11 was not found. - -We want to be able to build without X11 support even if some of the used -libraries may not work w/o X11 themselves yet or need to be built with -X11 support for other reverse dependencies. - -HAVE_X11 already exists and is set automagically so far, but using --DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11 -as required in their cmake config. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 19 +++++++++---------- - src/ioslaves/http/CMakeLists.txt | 3 --- - 2 files changed, 9 insertions(+), 13 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95b5db299..c3372f7ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -117,17 +117,16 @@ set_package_properties(GSSAPI PROPERTIES DESCRIPTION "Allows KIO to make use of - PURPOSE "A MIT or HEIMDAL flavor of GSSAPI can be used" - ) - --if (NOT APPLE AND NOT WIN32) -- find_package(X11) --endif() -- --set(HAVE_X11 ${X11_FOUND}) --if (HAVE_X11) -- if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -- else() -- # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above -+if (NOT APPLE AND NOT WIN32 AND NOT ANDROID) -+ option(WITH_X11 "Build with X11 integration" ON) -+ if(WITH_X11) -+ if (QT_MAJOR_VERSION STREQUAL "5") -+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) -+ else() -+ # qtx11extras_p.h is in Qt6Gui, which is implied by the find_package(QtWidgets) above -+ endif() - endif() -+ set(HAVE_X11 ${WITH_X11}) - endif() - - find_package(ACL) -diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt -index 4fbddb4a3..689f63dd8 100644 ---- a/src/ioslaves/http/CMakeLists.txt -+++ b/src/ioslaves/http/CMakeLists.txt -@@ -3,9 +3,6 @@ include(ECMMarkNonGuiExecutable) - include(ConfigureChecks.cmake) - configure_file(config-kioslave-http.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kioslave-http.h ) - --find_package(X11) --set(HAVE_X11 ${X11_FOUND}) -- - if(GSSAPI_FOUND) - set(HAVE_LIBGSSAPI 1) - if(GSSAPI_FLAVOR STREQUAL "MIT") --- -GitLab - diff --git a/kde-frameworks/kio/kio-5.96.0-r3.ebuild b/kde-frameworks/kio/kio-5.96.0-r3.ebuild deleted file mode 100644 index ba5dd490e22e..000000000000 --- a/kde-frameworks/kio/kio-5.96.0-r3.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm frameworks.kde.org xdg-utils - -DESCRIPTION="Framework providing transparent file and data management" - -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv 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/kguiaddons-${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[X?] - =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 ) -" -PDEPEND=">=kde-frameworks/kded-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}/${P}-fix-crash-in-dropjob.patch" # KDE-bug 454747 - "${FILESDIR}/${P}-fix-RAW-file-image-preview.patch" # KDE-bug 453480 - # Approved upstream: https://invent.kde.org/frameworks/kio/-/merge_requests/943 - "${FILESDIR}/${P}-with_x11.patch" -) - -src_configure() { - local mycmakeargs=( - -DKIO_NO_PUBLIC_QTCONCURRENT=ON - $(cmake_use_find_package acl ACL) - $(cmake_use_find_package handbook KF5DocTools) - $(cmake_use_find_package kerberos GSSAPI) - $(cmake_use_find_package kwallet KF5Wallet) - -DWITH_X11=$(usex X) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - xdg_desktop_database_update -} - -pkg_postrm() { - ecm_pkg_postrm - xdg_desktop_database_update -} |