diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
| commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
| tree | 326613a08f25851c388715e205576a2e7d25dc4f /kde-misc/kshutdown | |
| parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) | |
gentoo resync : 18.08.2019
Diffstat (limited to 'kde-misc/kshutdown')
| -rw-r--r-- | kde-misc/kshutdown/Manifest | 3 | ||||
| -rw-r--r-- | kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch | 34 | ||||
| -rw-r--r-- | kde-misc/kshutdown/kshutdown-5.0.ebuild | 2 |
3 files changed, 38 insertions, 1 deletions
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest index 44d251581fe0..e19a67b00f85 100644 --- a/kde-misc/kshutdown/Manifest +++ b/kde-misc/kshutdown/Manifest @@ -1,3 +1,4 @@ +AUX kshutdown-5.0-cmake-3.15.patch 996 BLAKE2B 9529d6fb2a82e6c3b3d5be901b9aa48c41df7f871733842b37986cfba3e87ca301672fe9cb1623b7e270a4bfb6bae62f4fbab9c2989bf4c430dba408e88c75b9 SHA512 415c53f8554971f448fa869b6e9a8dbbd0ada064cf6c5af45c445a1d2f42dfdc3305fc7a177d79fc9aecbe89b303f90168f5f6e9378c888129f6fd135d4edd09 DIST kshutdown-source-5.0.zip 454848 BLAKE2B 481cafbf5bd3831088ec9168b6eb82e342106b9b570279b6b8ca1db1f2df8c5640b3942f76032559396b504903b18fe106eb940e81822472a63f235e1a004644 SHA512 7a3920315db142f150227e624fa4a765966ec8367a08686214cb072d94a62d24f3a22fbef8fc84411d385be935102cf85df1b001b2922399455cc320c1e0f0db -EBUILD kshutdown-5.0.ebuild 1056 BLAKE2B deef254027bd03410be3fac46d18f9dc303dfad049ad833cfdbd32f1588b18a7bd6a6c7603961b5f59d411f9b78db1fdee1fcf0c494781120f457e70f0bcf4ab SHA512 1a8b4ee855b6379b1ef1fa0fae9b3027cc4f87c79c9e35b213dffbc00cff7bac67a798baf3a1fed9152633562e8275a6162c33b52cdd952da932e8ee4f68602c +EBUILD kshutdown-5.0.ebuild 1105 BLAKE2B 42e92eadbab70f27f41e76ec2ce0d4500976830eb0c333b76315c1dd473687d5e4af7764e5776cadbee74b491991e973f940f6599376aba5e855016dbe709758 SHA512 1c7776029fdbee8bf6775464747db33685c94a5fc964c26363428e0988c6c30b0ea995c15780688e5bd95868c3970b29f5367963e704517403074f74aea202da MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775 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 000000000000..4911fc4daf05 --- /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 c8a2047def2c..adb5989ac72d 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) |