commit: 2a92a4173950c9f5491aaf8dfdd5e4d0447de73c Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 18 22:19:45 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 18 22:19:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a92a417
kde-misc/kolor-manager: Drop obsolete patch Upstream finally came to the same conclusion. Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../kolor-manager/files/kolor-manager-cmake.patch | 75 ---------------------- kde-misc/kolor-manager/kolor-manager-9999.ebuild | 2 - 2 files changed, 77 deletions(-) diff --git a/kde-misc/kolor-manager/files/kolor-manager-cmake.patch b/kde-misc/kolor-manager/files/kolor-manager-cmake.patch deleted file mode 100644 index cc493e527f..0000000000 --- a/kde-misc/kolor-manager/files/kolor-manager-cmake.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 aee2b8bb5e..06623abec8 100644 --- a/kde-misc/kolor-manager/kolor-manager-9999.ebuild +++ b/kde-misc/kolor-manager/kolor-manager-9999.ebuild @@ -24,5 +24,3 @@ DEPEND=" x11-libs/libXrandr " RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-cmake.patch" )
