summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-10-01 19:31:42 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-10-02 01:41:42 +0200
commit2326f3ed0c2cf02ca9fc719ea5696040906fb9a2 (patch)
tree83f8f5730411b87066ca2fbe1332f7e40e6930cd /mail-client/kube/files
parentdev-libs/sink: Switch to cmake-utils (diff)
downloadgentoo-2326f3ed0c2cf02ca9fc719ea5696040906fb9a2.tar.gz
gentoo-2326f3ed0c2cf02ca9fc719ea5696040906fb9a2.tar.bz2
gentoo-2326f3ed0c2cf02ca9fc719ea5696040906fb9a2.zip
mail-client/kube: Properly fix build with GCC-9, update HOMEPAGE
Switch to kde.org tar.xz Depend on slots 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/kube/files')
-rw-r--r--mail-client/kube/files/kube-0.7.0-require-cxx14.patch41
1 files changed, 21 insertions, 20 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
index 9375a28c410f..86578099e269 100644
--- a/mail-client/kube/files/kube-0.7.0-require-cxx14.patch
+++ b/mail-client/kube/files/kube-0.7.0-require-cxx14.patch
@@ -1,36 +1,37 @@
-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
+Upstream commits combined (and backported) to save space:
+c38edcfe12b68585641eb925321067e3db811766
+6b15ef07013259176aac938ac529715aaf88fdfe
+fceffd0d10ff203334a933e99a3ea52593ea14d5
----
- extensions/api/src/CMakeLists.txt | 3 ++-
- framework/src/CMakeLists.txt | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
+Subject: [PATCH] Properly require c++ 14
-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
+++ b/extensions/api/src/CMakeLists.txt
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,4 @@
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
+++ b/framework/src/CMakeLists.txt
-@@ -11,7 +11,8 @@ find_package(KF5Contacts CONFIG REQUIRED)
+@@ -11,7 +11,6 @@
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)
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -50,6 +50,9 @@ configure_file(kube_version.h.in ${CMAKE_BINARY_DIR}/kube_version.h)
+
+ enable_testing()
+
++set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD_REQUIRED ON)
++
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ add_subdirectory(framework)
+ add_subdirectory(components)