summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-08-08 21:57:23 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-08-08 21:59:40 +0200
commitbd5d96ae06e6aab02191d726d32f128b1f854eb5 (patch)
treea3ca420592e718ef29de076b2e4724a63d9648a3 /kde-misc/kshutdown
parentsavedconfig.eclass: Only check config file candidate once (diff)
downloadgentoo-bd5d96ae06e6aab02191d726d32f128b1f854eb5.tar.gz
gentoo-bd5d96ae06e6aab02191d726d32f128b1f854eb5.tar.bz2
gentoo-bd5d96ae06e6aab02191d726d32f128b1f854eb5.zip
kde-misc/kshutdown: Fix build with USE=kde and cmake-3.15
Closes: https://bugs.gentoo.org/691758 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/kshutdown')
-rw-r--r--kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch34
-rw-r--r--kde-misc/kshutdown/kshutdown-5.0.ebuild2
2 files changed, 36 insertions, 0 deletions
diff --git a/kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch b/kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch
new file mode 100644
index 00000000000..4911fc4daf0
--- /dev/null
+++ b/kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch
@@ -0,0 +1,34 @@
+--- a/CMakeLists.txt 2019-05-04 16:33:55.000000000 +0200
++++ b/CMakeLists.txt 2019-08-08 21:53:36.255257785 +0200
+@@ -1,6 +1,6 @@
+ project(kshutdown)
+
+-cmake_minimum_required(VERSION 3.0.0)
++cmake_minimum_required(VERSION 3.1)
+ cmake_policy(SET CMP0063 NEW) # disables cmake warning
+
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+@@ -45,7 +45,9 @@
+ add_subdirectory(po)
+ endif()
+
+-include(FeatureSummary)
+-feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++set (CMAKE_CXX_STANDARD 14)
+
+ add_subdirectory(src)
++
++include(FeatureSummary)
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--- a/src/CMakeLists.txt 2019-05-04 16:33:55.000000000 +0200
++++ b/src/CMakeLists.txt 2019-08-08 21:53:48.791385858 +0200
+@@ -31,9 +31,6 @@
+ add_executable(kshutdown ${kshutdown_SRC} ${kshutdown_MOC_SOURCES})
+ endif()
+
+-# HACK: Add -std=gnu++14 option (cmake horror):
+-target_compile_features(kshutdown PUBLIC cxx_std_14)
+-
+ if(KS_PURE_QT)
+ target_link_libraries(kshutdown
+ Qt5::DBus
diff --git a/kde-misc/kshutdown/kshutdown-5.0.ebuild b/kde-misc/kshutdown/kshutdown-5.0.ebuild
index c8a2047def2..adb5989ac72 100644
--- a/kde-misc/kshutdown/kshutdown-5.0.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.0.ebuild
@@ -42,6 +42,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-cmake-3.15.patch" )
+
src_configure() {
local mycmakeargs=(
-DKS_PURE_QT=$(usex !kde)