[gentoo-commits] repo/gentoo:master commit in: mail-client/kube/files/, mail-client/kube/

[Andreas Sturmlechner]

commit:     925dd6589015d7741309faf139c2932378aec3e4
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 19:47:53 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 20:07:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=925dd658

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 <AT> gentoo.org>

 .../kube/files/kube-0.7.0-require-cxx14.patch      | 36 ++++++++++++++++++++++
 mail-client/kube/kube-0.7.0.ebuild                 |  5 ++-
 2 files changed, 40 insertions(+), 1 deletion(-)

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 00000000000..9375a28c410
--- /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@××××××××.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 9b40730b0d6..76639df6f23 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