* [gentoo-commits] proj/kde:master commit in: kde-misc/kolor-manager/files/, kde-misc/kolor-manager/
@ 2017-01-01 22:32 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-01-01 22:32 UTC (permalink / raw
To: gentoo-commits
commit: ee6764e066c6801b7c6dc7f04def45d886a6e8c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 1 22:31:10 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 22:31:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee6764e0
kde-misc/kolor-manager: 1.1.0 version bump
Package-Manager: portage-2.3.0
.../files/kolor-manager-1.1.0-deps.patch | 32 ++++++++++++++++++++++
kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild | 29 ++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/kde-misc/kolor-manager/files/kolor-manager-1.1.0-deps.patch b/kde-misc/kolor-manager/files/kolor-manager-1.1.0-deps.patch
new file mode 100644
index 0000000..2c2e9ad
--- /dev/null
+++ b/kde-misc/kolor-manager/files/kolor-manager-1.1.0-deps.patch
@@ -0,0 +1,32 @@
+commit 930dc70f4f4d815525067bbc098b82bbb223d965
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue Nov 29 17:36:05 2016 +0100
+
+ Add missing dep and feature_summary
+
+ REVIEW: 129585
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96d982c..9cd3834 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,11 +24,11 @@ INCLUDE(FeatureSummary)
+ INCLUDE(GenerateExportHeader)
+
+ FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets)
+-FIND_PACKAGE(KF5 REQUIRED COMPONENTS I18n ConfigWidgets)
++FIND_PACKAGE(KF5 REQUIRED COMPONENTS ConfigWidgets CoreAddons I18n)
+
+ FIND_PACKAGE(Oyranos REQUIRED)
+ FIND_PACKAGE(Synnefo REQUIRED)
+-
++
+
+ INCLUDE_DIRECTORIES(${OYRANOS_INCLUDE_DIRS} ${XCM_INCLUDE_DIRS} ${SYNNEFO_INCLUDE_DIR})
+ LINK_DIRECTORIES(
+@@ -77,3 +77,5 @@ ADD_CUSTOM_TARGET( debsrc
+ COMMENT Make a ${PROJECT_NAME} DEB source package
+ VERBATIM
+ )
++
++feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
new file mode 100644
index 0000000..3997f64
--- /dev/null
+++ b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="KControl module for Oyranos CMS cross desktop settings"
+HOMEPAGE="http://www.oyranos.org/kolormanager"
+SRC_URI="https://github.com/KDE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_qt_dep qtwidgets)
+ media-gfx/synnefo
+ media-libs/libXcm
+ >=media-libs/oyranos-0.9.6
+ x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-deps.patch )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/kolor-manager/files/, kde-misc/kolor-manager/
@ 2017-01-04 18:30 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2017-01-04 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 66b1d215f6647b000de76ad05ffad226264a72fd
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 4 18:26:24 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 18:26:24 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=66b1d215
kde-misc/kolor-manager: Remove 1.1.0
Moved to gentoo main tree.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/kolor-manager-1.1.0-deps.patch | 32 ----------------------
kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild | 29 --------------------
2 files changed, 61 deletions(-)
diff --git a/kde-misc/kolor-manager/files/kolor-manager-1.1.0-deps.patch b/kde-misc/kolor-manager/files/kolor-manager-1.1.0-deps.patch
deleted file mode 100644
index 2c2e9ad..0000000
--- a/kde-misc/kolor-manager/files/kolor-manager-1.1.0-deps.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 930dc70f4f4d815525067bbc098b82bbb223d965
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue Nov 29 17:36:05 2016 +0100
-
- Add missing dep and feature_summary
-
- REVIEW: 129585
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 96d982c..9cd3834 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -24,11 +24,11 @@ INCLUDE(FeatureSummary)
- INCLUDE(GenerateExportHeader)
-
- FIND_PACKAGE(Qt5 REQUIRED COMPONENTS Core Widgets)
--FIND_PACKAGE(KF5 REQUIRED COMPONENTS I18n ConfigWidgets)
-+FIND_PACKAGE(KF5 REQUIRED COMPONENTS ConfigWidgets CoreAddons I18n)
-
- FIND_PACKAGE(Oyranos REQUIRED)
- FIND_PACKAGE(Synnefo REQUIRED)
--
-+
-
- INCLUDE_DIRECTORIES(${OYRANOS_INCLUDE_DIRS} ${XCM_INCLUDE_DIRS} ${SYNNEFO_INCLUDE_DIR})
- LINK_DIRECTORIES(
-@@ -77,3 +77,5 @@ ADD_CUSTOM_TARGET( debsrc
- COMMENT Make a ${PROJECT_NAME} DEB source package
- VERBATIM
- )
-+
-+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild b/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
deleted file mode 100644
index 3997f64..0000000
--- a/kde-misc/kolor-manager/kolor-manager-1.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KControl module for Oyranos CMS cross desktop settings"
-HOMEPAGE="http://www.oyranos.org/kolormanager"
-SRC_URI="https://github.com/KDE/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_qt_dep qtwidgets)
- media-gfx/synnefo
- media-libs/libXcm
- >=media-libs/oyranos-0.9.6
- x11-libs/libXrandr
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}"-deps.patch )
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-misc/kolor-manager/files/, kde-misc/kolor-manager/
@ 2017-07-09 18:00 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-07-09 18:00 UTC (permalink / raw
To: gentoo-commits
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 <andreas.sturmlechner@gmail.com>
+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" )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-09 18:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-04 18:30 [gentoo-commits] proj/kde:master commit in: kde-misc/kolor-manager/files/, kde-misc/kolor-manager/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2017-07-09 18:00 Andreas Sturmlechner
2017-01-01 22:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox