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 EB1EA138334 for ; Sun, 18 Nov 2018 00:17:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD6D2E0C22; Sun, 18 Nov 2018 00:17:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 98F37E0C22 for ; Sun, 18 Nov 2018 00:17:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 DDD04335C39 for ; Sun, 18 Nov 2018 00:17:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A690458 for ; Sun, 18 Nov 2018 00:17:02 +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: <1542500205.c49e785e16c43104a9b2e8c2f7df3eaf35c6c57a.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-18.08.3.ebuild kde-apps/dolphin/files/dolphin-18.08.3-kcrash-init.patch X-VCS-Directories: kde-apps/dolphin/ kde-apps/dolphin/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c49e785e16c43104a9b2e8c2f7df3eaf35c6c57a X-VCS-Branch: master Date: Sun, 18 Nov 2018 00:17:02 +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-Archives-Salt: ee4bac4f-0561-4293-a2f7-ee1c33757f0e X-Archives-Hash: f6264d43ebb73bc41b1a2a15e2db227e commit: c49e785e16c43104a9b2e8c2f7df3eaf35c6c57a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 17 23:47:36 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 18 00:16:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49e785e kde-apps/dolphin: Move kcrash link to dolphin app Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/dolphin/dolphin-18.08.3.ebuild | 2 + .../files/dolphin-18.08.3-kcrash-init.patch | 56 ++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/kde-apps/dolphin/dolphin-18.08.3.ebuild b/kde-apps/dolphin/dolphin-18.08.3.ebuild index 47da3a35d62..e38021b2487 100644 --- a/kde-apps/dolphin/dolphin-18.08.3.ebuild +++ b/kde-apps/dolphin/dolphin-18.08.3.ebuild @@ -62,6 +62,8 @@ RDEPEND="${DEPEND} RESTRICT+=" test" +PATCHES=( "${FILESDIR}/${P}-kcrash-init.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package semantic-desktop KF5Baloo) 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 00000000000..cb7923534c3 --- /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