diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-09-29 21:47:53 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-09-29 22:07:06 +0200 |
| commit | 925dd6589015d7741309faf139c2932378aec3e4 (patch) | |
| tree | 3a35bef66a94bac3dd0fc505ca2a3532dc88f1b6 /mail-client | |
| parent | mail-client/kube: Accept kde-frameworks/kcalendarcore (diff) | |
| download | gentoo-925dd6589015d7741309faf139c2932378aec3e4.tar.gz gentoo-925dd6589015d7741309faf139c2932378aec3e4.tar.bz2 gentoo-925dd6589015d7741309faf139c2932378aec3e4.zip | |
mail-client/kube: Fix build with GCC-9
Closes: https://bugs.gentoo.org/695830
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/kube/files/kube-0.7.0-require-cxx14.patch | 36 | ||||
| -rw-r--r-- | mail-client/kube/kube-0.7.0.ebuild | 5 |
2 files changed, 40 insertions, 1 deletions
diff --git a/mail-client/kube/files/kube-0.7.0-require-cxx14.patch b/mail-client/kube/files/kube-0.7.0-require-cxx14.patch new file mode 100644 index 000000000000..9375a28c410f --- /dev/null +++ b/mail-client/kube/files/kube-0.7.0-require-cxx14.patch @@ -0,0 +1,36 @@ +From c38edcfe12b68585641eb925321067e3db811766 Mon Sep 17 00:00:00 2001 +From: Christian Mollekopf <mollekopf@kolabsys.com> +Date: Tue, 18 Sep 2018 20:51:54 +0200 +Subject: [PATCH] Properly require c++ 14 + +--- + extensions/api/src/CMakeLists.txt | 3 ++- + framework/src/CMakeLists.txt | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/extensions/api/src/CMakeLists.txt b/extensions/api/src/CMakeLists.txt +index 051fec3c..45cd08ce 100644 +--- a/extensions/api/src/CMakeLists.txt ++++ b/extensions/api/src/CMakeLists.txt +@@ -1,5 +1,6 @@ + set(CMAKE_CXX_VISIBILITY_PRESET default) +-set(CMAKE_CXX_STANDARD_REQUIRED 14) ++set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) + + find_package(Qt5 COMPONENTS REQUIRED Core Concurrent Quick Qml WebEngineWidgets Test WebEngine Gui) + find_package(KF5Mime 4.87.0 CONFIG REQUIRED) +diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt +index 67512c6e..b29ef059 100644 +--- a/framework/src/CMakeLists.txt ++++ b/framework/src/CMakeLists.txt +@@ -11,7 +11,8 @@ find_package(KF5Contacts CONFIG REQUIRED) + include(GenerateExportHeader) + + set(CMAKE_CXX_VISIBILITY_PRESET default) +-set(CMAKE_CXX_STANDARD_REQUIRED 14) ++set(CMAKE_CXX_STANDARD 14) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) + + include_directories(. domain/mime/mimetreeparser domain/ domain/mime) + diff --git a/mail-client/kube/kube-0.7.0.ebuild b/mail-client/kube/kube-0.7.0.ebuild index 9b40730b0d69..76639df6f238 100644 --- a/mail-client/kube/kube-0.7.0.ebuild +++ b/mail-client/kube/kube-0.7.0.ebuild @@ -38,7 +38,10 @@ DEPEND="${RDEPEND} RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" ) +PATCHES=( + "${FILESDIR}/${P}-tests-optional.patch" + "${FILESDIR}/${P}-require-cxx14.patch" +) src_prepare() { kde5_src_prepare |