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
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>
-rw-r--r--mail-client/kube/Manifest1
-rw-r--r--mail-client/kube/files/kube-0.7.0-require-cxx14.patch41
-rw-r--r--mail-client/kube/kube-0.7.0-r1.ebuild58
3 files changed, 80 insertions, 20 deletions
diff --git a/mail-client/kube/Manifest b/mail-client/kube/Manifest
index 38b60949885a..768f07d9f9db 100644
--- a/mail-client/kube/Manifest
+++ b/mail-client/kube/Manifest
@@ -1 +1,2 @@
DIST kube-0.7.0.tar.gz 1073502 BLAKE2B 0636167ed1717b8e3eed8e82b805b3bf2de0131365d5f72a15c85f2eaff7c1fd4c9b27a1afc1ecadcd6276ed9307403533ee335b1b93019efb402f2f0b23d303 SHA512 0399eba9c39b1d35be00c502c84cb7e903ab3f23b0b9dffd154e8fb2c071d8bdfdd16b606c66e5e7d52c5440a60008771d15d8e6abf866df86d2bb3733f34deb
+DIST kube-0.7.0.tar.xz 627968 BLAKE2B 3dcdbd3a26c7940e360a8a97039ae832dd0e143b0a595f7a5dc30ddf20b41d0fdb3132bb6aa26d0322dac66fd1a6b0adc52e684c76205066d751a0b3067b3a5a SHA512 48ca740e54393da4aaa9b662860a479f2d9458f1d2da0fce3efa7091ccabc56d7e4778b9df994d53c3bcd6f26a367280337e785da6f0a34bd31e81c764fcd8ad
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)
diff --git a/mail-client/kube/kube-0.7.0-r1.ebuild b/mail-client/kube/kube-0.7.0-r1.ebuild
new file mode 100644
index 000000000000..2ed5fa359135
--- /dev/null
+++ b/mail-client/kube/kube-0.7.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Mail client based on KDE Frameworks"
+HOMEPAGE="https://kube-project.com"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ $(add_frameworks_dep breeze-icons)
+ $(add_frameworks_dep kcodecs)
+ || (
+ $(add_frameworks_dep kcontacts)
+ $(add_kdeapps_dep kcontacts)
+ )
+ $(add_kdeapps_dep kmime)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtquickcontrols)
+ $(add_qt_dep qtquickcontrols2)
+ $(add_qt_dep qttest)
+ $(add_qt_dep qtwebengine 'widgets')
+ $(add_qt_dep qtwidgets)
+ >=app-crypt/gpgme-1.7.1:=[cxx,qt5]
+ dev-libs/kasync:5
+ >=dev-libs/sink-0.7.0:5
+"
+DEPEND="${RDEPEND}
+ test? ( $(add_qt_dep qttest) )
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-tests-optional.patch"
+ "${FILESDIR}/${P}-require-cxx14.patch"
+)
+
+src_prepare() {
+ kde5_src_prepare
+
+ if ! use test; then
+ sed \
+ -e "/Qt5::Test/s/^/#DISABLED/" \
+ -e "/set(BUILD_TESTING ON)/s/^/#DISABLED /" \
+ -e "/domain\/modeltest.cpp/s/^/#DISABLED /" \
+ -i framework/src/CMakeLists.txt || die
+ fi
+}