From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- kde-apps/dolphin/Manifest | 5 +- kde-apps/dolphin/dolphin-18.08.2.ebuild | 85 --------------------- kde-apps/dolphin/dolphin-18.08.3.ebuild | 87 ++++++++++++++++++++++ .../files/dolphin-18.08.3-kcrash-init.patch | 56 ++++++++++++++ 4 files changed, 146 insertions(+), 87 deletions(-) delete mode 100644 kde-apps/dolphin/dolphin-18.08.2.ebuild create mode 100644 kde-apps/dolphin/dolphin-18.08.3.ebuild create mode 100644 kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch (limited to 'kde-apps/dolphin') diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest index d51e946842d4..57f898bb0e61 100644 --- a/kde-apps/dolphin/Manifest +++ b/kde-apps/dolphin/Manifest @@ -3,8 +3,9 @@ AUX dolphin-18.04.3-memleak-1.patch 1651 BLAKE2B dff558ec7e3ba2dafe676c43da09409 AUX dolphin-18.04.3-memleak-2.patch 1180 BLAKE2B 4b546aefe5b1c5342522fae2a0bcf7e74f023f45f0e39950a104188b40e51a480e638d864b953033ec3f3630c89095315fb73a1ab45782c34adffa11b6a0f77c SHA512 533a449113f3c196cac02634f5c4baf25225fbca6747f3d47c6a69986329bfc2f52d95bc20c7a7c603e80e18dfb65a47e0608835fe4eeeea906035136fe541b1 AUX dolphin-18.04.3-root-user.patch 2198 BLAKE2B e92b053b53f7f1c2c6ce25eb7a81e8c26f5dc9497f9bff6e2d02d125c9b57b7722352d18ee4d0ea001b73a71904d729485544596904229700d4a29a240e1c28f SHA512 c9f419f67ffae57ccf057fb5aa7352e3fb652cec3a9a21459ae5d3e9fba0b1dede993058afe83ced5c3fc036c11649476bc25435a29bc5d910257443e21cb43a AUX dolphin-18.04.3-root-warn.patch 1488 BLAKE2B 8e9536926b0b9e9f37c0e2be7e23fafc60f34ca1e25ef83423097d49e5f575cb762008b6c4cbf2c8d664cdbd010db5ed52a15226e812c5988c2e3431770334a6 SHA512 ae763f8fcef45108f812bccdb485d8da31fd27997583195e612c2ded82f041441849ae680f20d7259b3621b9609d55ff12dc6b3044b993e8f3063a1abc85aebd +AUX dolphin-18.08.3-kcrash-init.patch 1741 BLAKE2B f569dfc4fc07790b1c69697b2259b6cf13e4bd7ff0d98be5e3b09a8bf0d404f86fdfee001349c8631b8c74c5ba1a73bf6573b130a5d8bf30241560d2dc6a6eef SHA512 34393a2285647ee8e33eebccc2bb563e5ea5298252c88ece505389bceae58ecc953e5daec3ca5f05cf7838f39375474ef97e4b54ec120d0396cd7e3cc5ac0d7b DIST dolphin-18.04.3.tar.xz 4850916 BLAKE2B 1d2a5c4f5e94e2f30055804d96c205eb2c03864ad2b6c245d917549986fbac26686e654818dacf93fcb711f59bfe6e7f3a011e578988f5bf9e6b6cb82fc33876 SHA512 167a35225dd4e75b7ff863771287a471273e0594c247ef058adc718682eb07f014ca84bc373e1c3a846e99711aad3d9a16b12aab8543aa3603e17f944b206b21 -DIST dolphin-18.08.2.tar.xz 4859700 BLAKE2B b7d16f3e3b8cd459a0089a4b37da86c7d4f095bbc3f8450b709259a820dd8a8fd26dd7a03e2bafbc103bdf588df23436eb2c3dcef5e946a4cc0b054f718fbdee SHA512 44e2a55cfb80c267cd56e5da2af7c1446859adb100a68eda82d052279402cf8f7233e79522ecd8a2d098a8a51a977d3fec37da7d2544cca5f43212d4ef2a61fa +DIST dolphin-18.08.3.tar.xz 4859384 BLAKE2B 60361ce997e0e4734fe953f988774dbe28aef9dcb7c2837c3860cfad5f56345d4d635f1478ce42a1649a6d5bd0d3838f722c95a747e1c77f17828d0d38b0ab29 SHA512 f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c EBUILD dolphin-18.04.3-r1.ebuild 2395 BLAKE2B b19b63b7c8c21be681ebdbffb31f6393d52deb82e84ec57ac0309eb40940e457f24f327c697433127d7e9987b14f01b76ee719d9781e1210a2d0520aba4d4bb1 SHA512 9b2cb58ed674f4a18580a36b18ba1f7ccde9fe440d759304dec97b66c278e3a69ffe1e63772899add41cbc611742f3539c0caf10a47eb7a801ca60db5decdf7a -EBUILD dolphin-18.08.2.ebuild 2229 BLAKE2B 007059e142da10de31ed3ee7a2388681ac38c848b05618854eecc057e37476bec1bbb836ee3736b8f9f34fab5ece251a1760e33768686422e6bab82d8da9804e SHA512 c4cefffef55fb7478bf529d6428e88fefc1238a162d60ee977aa5398b373e5565f599d412a1b5d60f3101d380ce285a47285cbfbbcc09e3a6a7f55fdc2b309c5 +EBUILD dolphin-18.08.3.ebuild 2279 BLAKE2B 3751ba86049a6b3a0b7ae4c8ae6c255281110ecfdd939c8b0a566ae54f62a59bb8f77f1d78de6be7e740d70c54d82f7f37b1c1848d49e69e840eebaa09024716 SHA512 9316c267dddba8e21b7cd7ebc216b00a1fae6966caa48480cd9079f7374362475b74e6ecf0bb06ca1056ba25f48748c34e5eab3e40a12e9eeca85200ffbe9e77 MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169 diff --git a/kde-apps/dolphin/dolphin-18.08.2.ebuild b/kde-apps/dolphin/dolphin-18.08.2.ebuild deleted file mode 100644 index 47da3a35d622..000000000000 --- a/kde-apps/dolphin/dolphin-18.08.2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Plasma filemanager focusing on usability" -HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin" -KEYWORDS="~amd64 ~x86" -IUSE="semantic-desktop thumbnail" - -DEPEND=" - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kinit) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - semantic-desktop? ( - $(add_frameworks_dep baloo) - $(add_frameworks_dep kfilemetadata) - $(add_kdeapps_dep baloo-widgets) - ) - !semantic-desktop? ( - $(add_frameworks_dep kdelibs4support) - ) -" -RDEPEND="${DEPEND} - $(add_kdeapps_dep kio-extras) - thumbnail? ( - $(add_kdeapps_dep ffmpegthumbs) - $(add_kdeapps_dep thumbnailers) - ) -" - -RESTRICT+=" test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package semantic-desktop KF5Baloo) - $(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets) - $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) - ) - - kde5_src_configure -} - -pkg_postinst() { - kde5_pkg_postinst - - if ! has_version "kde-apps/ark:${SLOT}" ; then - elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}" - fi - - if ! has_version "kde-apps/kleopatra:${SLOT}" ; then - elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}" - fi -} diff --git a/kde-apps/dolphin/dolphin-18.08.3.ebuild b/kde-apps/dolphin/dolphin-18.08.3.ebuild new file mode 100644 index 000000000000..e38021b24876 --- /dev/null +++ b/kde-apps/dolphin/dolphin-18.08.3.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Plasma filemanager focusing on usability" +HOMEPAGE="https://www.kde.org/applications/system/dolphin https://userbase.kde.org/Dolphin" +KEYWORDS="~amd64 ~x86" +IUSE="semantic-desktop thumbnail" + +DEPEND=" + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcmutils) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kinit) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + media-libs/phonon[qt5(+)] + semantic-desktop? ( + $(add_frameworks_dep baloo) + $(add_frameworks_dep kfilemetadata) + $(add_kdeapps_dep baloo-widgets) + ) + !semantic-desktop? ( + $(add_frameworks_dep kdelibs4support) + ) +" +RDEPEND="${DEPEND} + $(add_kdeapps_dep kio-extras) + thumbnail? ( + $(add_kdeapps_dep ffmpegthumbs) + $(add_kdeapps_dep thumbnailers) + ) +" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-kcrash-init.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package semantic-desktop KF5Baloo) + $(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + ) + + kde5_src_configure +} + +pkg_postinst() { + kde5_pkg_postinst + + if ! has_version "kde-apps/ark:${SLOT}" ; then + elog "For compress/extract and other actions, please install kde-apps/ark:${SLOT}" + fi + + if ! has_version "kde-apps/kleopatra:${SLOT}" ; then + elog "For crypto actions, please install kde-apps/kleopatra:${SLOT}" + fi +} diff --git a/kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch b/kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch new file mode 100644 index 000000000000..cb7923534c3e --- /dev/null +++ b/kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch @@ -0,0 +1,56 @@ +From a4cddf7517dab5f666f1c1ede2a58900f3bc5e53 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Thu, 15 Nov 2018 14:43:57 +0100 +Subject: move kcrash link to dolphin app (which is the effective user) + +Summary: +to successfully use kcrash when linking with as-needed (which is a default +flag on many linux distros) one also needs to call KCrash::initialize. +this call happens in the app's main.cpp. as such the kcrash link target +on the dolphinprivate library doesn't do anything for dolphinprivate but +only kicks into action for dolphin itself. +to avoid confusion and make it clear that kcrash is only initialized in the +application scope the KF5::Crash link target is now on the application +target, not the library target. + +(this makes no difference in the output, kcrash was still correctly linked + via dolphinprivate; but only for kdeinit_dolphin, dolphinprivate did + not get linked to it with as-needed) + +Test Plan: builds; links as expected + +Reviewers: elvisangelaccio, #dolphin + +Reviewed By: elvisangelaccio, #dolphin + +Subscribers: kfm-devel + +Tags: #dolphin + +Differential Revision: https://phabricator.kde.org/D16896 +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4a1f173..d5206be 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -136,7 +136,6 @@ target_link_libraries( + dolphinvcs + Qt5::Concurrent + Qt5::Gui +- KF5::Crash + KF5::I18n + KF5::IconThemes + KF5::KIOCore +@@ -301,6 +300,7 @@ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS}) + target_link_libraries(kdeinit_dolphin PRIVATE + dolphinstatic + dolphinprivate ++ KF5::Crash + ) + + include(DbusInterfaceMacros) +-- +cgit v0.11.2 -- cgit v1.2.3