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 CC73C138334 for ; Mon, 22 Oct 2018 18:14:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9197E092F; Mon, 22 Oct 2018 18:14:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 97E7BE092F for ; Mon, 22 Oct 2018 18:14:48 +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 87BA2335CFD for ; Mon, 22 Oct 2018 18:14:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C94AB45F for ; Mon, 22 Oct 2018 18:14:39 +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: <1540231572.0d96ded4d0064c4562b3a118c97e0fdca07fdf3c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0d96ded4d0064c4562b3a118c97e0fdca07fdf3c X-VCS-Branch: master Date: Mon, 22 Oct 2018 18:14:39 +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: f8d98909-8bf0-43d3-b40d-5caf59083360 X-Archives-Hash: 4b5c0efc3d3bdf2ea9b94693ea8aeeb6 commit: 0d96ded4d0064c4562b3a118c97e0fdca07fdf3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Oct 22 09:15:58 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 22 18:06:12 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0d96ded4 kde-plasma/plasma-workspace: DEPEND on standalone libkworkspace Disabling build of libkworkspace subdirectory. Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 ...asma-workspace-5.14.2-split-libkworkspace.patch | 35 ++++++++++++++++++++++ .../plasma-workspace-5.14.49.9999.ebuild | 8 +++++ .../plasma-workspace/plasma-workspace-9999.ebuild | 10 ++++++- 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch new file mode 100644 index 0000000000..f12d9f4daf --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch @@ -0,0 +1,35 @@ +From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 22 Oct 2018 10:35:10 +0200 +Subject: [PATCH] libkworkspace: Allow standalone build + +--- + CMakeLists.txt | 6 +++- + 1 file changed, 5 insertions(+), 1 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e587a386..d1a63527 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" + + find_package(KF5TextEditor) + find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(LibKWorkspace 5.14.1) + + find_package(KScreenLocker 5.13.80 REQUIRED) + find_package(ScreenSaverDBusInterface CONFIG REQUIRED) +@@ -135,7 +136,10 @@ endif() + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + + add_subdirectory(doc) +-add_subdirectory(libkworkspace) ++if(NOT LibKWorkspace_FOUND) ++ message(STATUS "System LibKWorkspace not found, using bundled.") ++ add_subdirectory(libkworkspace) ++endif() + add_subdirectory(libdbusmenuqt) + add_subdirectory(appmenu) + +-- +2.19.1 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild index ed436f5d27..4c1e1c34c3 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.49.9999.ebuild @@ -55,6 +55,7 @@ COMMON_DEPEND=" $(add_plasma_dep kscreenlocker) $(add_plasma_dep kwin) $(add_plasma_dep libksysguard) + $(add_plasma_dep libkworkspace) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') $(add_qt_dep qtgui 'jpeg') @@ -126,6 +127,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" + "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) RESTRICT+=" test" @@ -135,6 +137,12 @@ src_prepare() { sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi } src_configure() { diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index a7560f18b4..4c1e1c34c3 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,6 +55,7 @@ COMMON_DEPEND=" $(add_plasma_dep kscreenlocker) $(add_plasma_dep kwin) $(add_plasma_dep libksysguard) + $(add_plasma_dep libkworkspace) $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative 'widgets') $(add_qt_dep qtgui 'jpeg') @@ -126,6 +127,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" "${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" + "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" ) RESTRICT+=" test" @@ -135,6 +137,12 @@ src_prepare() { sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \ -i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die + + cmake_comment_add_subdirectory libkworkspace + # delete colliding libkworkspace translations + if [[ ${KDE_BUILD_TYPE} = release ]]; then + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die + fi } src_configure() {