From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11C26138351 for ; Thu, 9 Apr 2020 21:37:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ACDBCE0905; Thu, 9 Apr 2020 21:37:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AF83E08FC for ; Thu, 9 Apr 2020 21:37:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD31F34F0AB for ; Thu, 9 Apr 2020 21:37:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E17121D7 for ; Thu, 9 Apr 2020 21:37:15 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1586468186.99ec5f37f59f0c3d5077988b765d2b93896c6c73.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/dolphin/dolphin-19.12.3-r1.ebuild kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch X-VCS-Directories: kde-apps/dolphin/files/ kde-apps/dolphin/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 99ec5f37f59f0c3d5077988b765d2b93896c6c73 X-VCS-Branch: master Date: Thu, 9 Apr 2020 21:37:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 82a307e3-bc9c-44ad-b8c2-386c0538caff X-Archives-Hash: 65f399c02260e36761f5a5838d752fb7 commit: 99ec5f37f59f0c3d5077988b765d2b93896c6c73 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 7 22:30:22 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 9 21:36:26 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ec5f37 kde-apps/dolphin: Fix crashes with Qt 5.14.2 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/dolphin/dolphin-19.12.3-r1.ebuild | 102 +++++++++++++++++++++ .../dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch | 22 +++++ 2 files changed, 124 insertions(+) diff --git a/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild new file mode 100644 index 00000000000..4f5ca6b530c --- /dev/null +++ b/kde-apps/dolphin/dolphin-19.12.3-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=5.63.0 +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Plasma filemanager focusing on usability" +HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin +https://userbase.kde.org/Dolphin" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="activities semantic-desktop" + +DEPEND=" + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/solid-${KFMIN}:5 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + media-libs/phonon[qt5(+)] + activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) + semantic-desktop? ( + >=kde-frameworks/baloo-${KFMIN}:5 + >=kde-frameworks/kfilemetadata-${KFMIN}:5 + >=kde-apps/baloo-widgets-${PVCUT}:5 + ) +" +RDEPEND="${DEPEND} + >=kde-apps/kio-extras-${PVCUT}:5 +" + +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}/${PN}-19.12.2-create-new-consistency.patch" # from 20.04 + "${FILESDIR}/${P}-fix-crash-w-qt-5.14.2.patch" # KDE-Bug 419585 +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package activities KF5Activities) + $(cmake_use_find_package semantic-desktop KF5Baloo) + $(cmake_use_find_package semantic-desktop KF5BalooWidgets) + $(cmake_use_find_package semantic-desktop KF5FileMetaData) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + has_version "kde-apps/ark:${SLOT}" || \ + elog "For compress/extract and other actions install kde-apps/ark:${SLOT}" + + has_version "kde-apps/kleopatra:${SLOT}" || \ + elog "For crypto actions install kde-apps/kleopatra:${SLOT}" + + has_version "kde-apps/ffmpegthumbs:${SLOT}" || \ + elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}" + + has_version "kde-apps/thumbnailers:${SLOT}" || \ + elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}" + + has_version "kde-frameworks/purpose:${SLOT}" || \ + elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}" + fi +} diff --git a/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch new file mode 100644 index 00000000000..3e5245001bb --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-19.12.3-fix-crash-w-qt-5.14.2.patch @@ -0,0 +1,22 @@ +diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp +--- a/src/kitemviews/kfileitemmodel.cpp ++++ b/src/kitemviews/kfileitemmodel.cpp +@@ -33,6 +33,9 @@ + #include + #include + #include ++#include ++ ++Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive)) + + // #define KFILEITEMMODEL_DEBUG + +@@ -1878,6 +1881,8 @@ + + int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const + { ++ QMutexLocker collatorLock(s_collatorMutex()); ++ + if (m_naturalSorting) { + return collator.compare(a, b); + }