summaryrefslogtreecommitdiff
path: root/mail-client/kube/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client/kube/files')
-rw-r--r--mail-client/kube/files/kube-0.7.0-require-cxx14.patch37
-rw-r--r--mail-client/kube/files/kube-0.7.0-tests-optional.patch62
2 files changed, 99 insertions, 0 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..86578099e269
--- /dev/null
+++ b/mail-client/kube/files/kube-0.7.0-require-cxx14.patch
@@ -0,0 +1,37 @@
+Upstream commits combined (and backported) to save space:
+c38edcfe12b68585641eb925321067e3db811766
+6b15ef07013259176aac938ac529715aaf88fdfe
+fceffd0d10ff203334a933e99a3ea52593ea14d5
+
+Subject: [PATCH] Properly require c++ 14
+
+--- b/extensions/api/src/CMakeLists.txt
++++ b/extensions/api/src/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ set(CMAKE_CXX_VISIBILITY_PRESET default)
+-set(CMAKE_CXX_STANDARD_REQUIRED 14)
+
+ find_package(Qt5 COMPONENTS REQUIRED Core Concurrent Quick Qml WebEngineWidgets Test WebEngine Gui)
+ find_package(KF5Mime 4.87.0 CONFIG REQUIRED)
+--- b/framework/src/CMakeLists.txt
++++ b/framework/src/CMakeLists.txt
+@@ -11,7 +11,6 @@
+ include(GenerateExportHeader)
+
+ set(CMAKE_CXX_VISIBILITY_PRESET default)
+-set(CMAKE_CXX_STANDARD_REQUIRED 14)
+
+ 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)
diff --git a/mail-client/kube/files/kube-0.7.0-tests-optional.patch b/mail-client/kube/files/kube-0.7.0-tests-optional.patch
new file mode 100644
index 000000000000..0756cfb0cadd
--- /dev/null
+++ b/mail-client/kube/files/kube-0.7.0-tests-optional.patch
@@ -0,0 +1,62 @@
+--- a/CMakeLists.txt 2019-09-29 21:36:28.419106801 +0200
++++ b/CMakeLists.txt 2019-09-29 21:36:28.423106839 +0200
+@@ -43,7 +43,9 @@
+ add_subdirectory(applications)
+ add_subdirectory(views)
+ add_subdirectory(accounts)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ if (${ENABLE_EXTENSION})
+ add_subdirectory(extensions)
+ endif()
+--- a/framework/CMakeLists.txt 2019-09-29 21:36:28.428106886 +0200
++++ b/framework/CMakeLists.txt 2019-09-29 21:36:28.433106934 +0200
+@@ -4,4 +4,6 @@
+ install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR})
+
+ add_subdirectory(src)
++if(BUILD_TESTING)
+ add_subdirectory(qml/tests)
++endif()
+--- a/framework/src/CMakeLists.txt 2019-09-29 21:36:28.437106972 +0200
++++ b/framework/src/CMakeLists.txt 2019-09-29 21:36:28.450107095 +0200
+@@ -86,10 +86,16 @@
+
+ set(BUILD_TESTING ON)
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(domain/mime)
++if(BUILD_TESTING)
+ add_subdirectory(domain/mime/tests)
++endif()
+ add_subdirectory(domain/mime/mimetreeparser)
++if(BUILD_TESTING)
+ add_subdirectory(domain/settings/tests)
++endif()
+
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--- a/framework/src/domain/mime/mimetreeparser/CMakeLists.txt 2019-09-29 21:36:28.455107143 +0200
++++ b/framework/src/domain/mime/mimetreeparser/CMakeLists.txt 2019-09-29 21:36:28.458107171 +0200
+@@ -49,5 +49,7 @@
+ Gpgme::Gpgme
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
++endif()
+--- a/components/CMakeLists.txt 2019-09-29 21:36:28.463107218 +0200
++++ b/components/CMakeLists.txt 2019-09-29 21:36:28.476107341 +0200
+@@ -8,7 +8,9 @@
+ endmacro(install_qml_component)
+
+ install_qml_component(kube)
++if(BUILD_TESTING)
+ add_subdirectory(kube/tests)
++endif()
+ install_qml_component(accounts)
+
+