commit: f4543f87cc876308fd33ac4200e8e1e1fe1f3a58 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 9 17:59:11 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Jul 9 17:59:11 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f4543f87
kde-misc/kolor-manager: Fix cmake Gentoo-bug: 620914 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../kolor-manager/files/kolor-manager-cmake.patch | 75 ++++++++++++++++++++++ kde-misc/kolor-manager/kolor-manager-9999.ebuild | 4 +- 2 files changed, 78 insertions(+), 1 deletion(-) diff --git a/kde-misc/kolor-manager/files/kolor-manager-cmake.patch b/kde-misc/kolor-manager/files/kolor-manager-cmake.patch new file mode 100644 index 0000000000..cc493e527f --- /dev/null +++ b/kde-misc/kolor-manager/files/kolor-manager-cmake.patch @@ -0,0 +1,75 @@ +commit 9a248c1ca916a956366b6c5e4fafa603d5d1ae9d +Author: Andreas Sturmlechner <[email protected]> +Date: Sun Jul 9 19:53:44 2017 +0200 + + CMakeLists.txt: Minor improvements + + Summary: + CMAKE_MINIMUM_REQUIRED first line + Remove duplicate lines + KF5DocTools optional + subdirs -> add_subdirectory + + Reviewers: behrmann + + Differential Revision: https://phabricator.kde.org/D6588 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5b3eb2b..fd1ecf1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,11 +1,10 @@ +-#cmake file for building Kolor-Manager and related modules ++CMAKE_MINIMUM_REQUIRED(VERSION 3.0 FATAL_ERROR) + + PROJECT(kolor-manager) + SET( PACKAGE_NAME kolor-manager ) + + SET( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules ) + +- + # project version + SET( ${PROJECT_NAME}_MAJOR_VERSION 1) + SET( ${PROJECT_NAME}_MINOR_VERSION 1) +@@ -13,10 +12,9 @@ SET( ${PROJECT_NAME}_MICRO_VERSION 1) + + SET( ${PROJECT_NAME}_VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_MICRO_VERSION} ) + +-FIND_PACKAGE(Qt5Widgets) +-CMAKE_MINIMUM_REQUIRED(VERSION 3.0) + FIND_PACKAGE(ECM REQUIRED NO_MODULE) + SET(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH}) ++ + INCLUDE(KDEInstallDirs) + INCLUDE(KDECompilerSettings) + INCLUDE(KDECMakeSettings) +@@ -24,7 +22,9 @@ INCLUDE(FeatureSummary) + INCLUDE(GenerateExportHeader) + + FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets) +-FIND_PACKAGE(KF5 REQUIRED COMPONENTS ConfigWidgets CoreAddons I18n DocTools) ++FIND_PACKAGE(KF5 REQUIRED COMPONENTS ConfigWidgets CoreAddons I18n) ++ ++FIND_PACKAGE(KF5DocTools) + + FIND_PACKAGE(Oyranos REQUIRED) + FIND_PACKAGE(Synnefo REQUIRED) +@@ -39,11 +39,13 @@ LINK_DIRECTORIES( + + SET( ${CMAKE_BUILD_TYPE} Debug) + +-SUBDIRS( devices +- information +- settings +- doc +- ) ++ADD_SUBDIRECTORY( devices ) ++ADD_SUBDIRECTORY( information ) ++ADD_SUBDIRECTORY( settings ) ++ ++IF(KF5DocTools_FOUND) ++ ADD_SUBDIRECTORY( doc ) ++ENDIF() + + + INSTALL( FILES settings-kolor-management.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/kde-misc/kolor-manager/kolor-manager-9999.ebuild b/kde-misc/kolor-manager/kolor-manager-9999.ebuild index 82f0278fee..8692e194b8 100644 --- a/kde-misc/kolor-manager/kolor-manager-9999.ebuild +++ b/kde-misc/kolor-manager/kolor-manager-9999.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_HANDBOOK="forceoptional" +KDE_HANDBOOK="optional" inherit kde5 DESCRIPTION="KControl module for Oyranos CMS cross desktop settings" @@ -24,3 +24,5 @@ DEPEND=" x11-libs/libXrandr " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )
