summaryrefslogtreecommitdiff
path: root/kde-apps/umbrello
diff options
context:
space:
mode:
Diffstat (limited to 'kde-apps/umbrello')
-rw-r--r--kde-apps/umbrello/Manifest3
-rw-r--r--kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch32
-rw-r--r--kde-apps/umbrello/umbrello-18.08.3.ebuild4
3 files changed, 37 insertions, 2 deletions
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index f1d4376ed4cf..dd8169d4dc38 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,5 +1,6 @@
+AUX umbrello-18.08.3-kf-5.54.patch 892 BLAKE2B f9c8601fb32b698e7e45ff51d67a0911a9b3cf3337ca86cb0362eb967df2093679bd73bc3674d442ad4a4d111e7604c13d91d314ee53408f4792c020be9eaa07 SHA512 912666ef5bcbc665482d0dbef4ec3e7f50aa0cd2ff87216a2ec3b6410f2ef0cfed4d4240784aad7d7e76ca026de17ef6fc366a85e96073a63e32c8850db18fa6
DIST umbrello-18.08.3.tar.xz 3048228 BLAKE2B 0aeb03360ac8633a738f8066816376991bba83569b4c3d5ada61c481a7009866497da6315b6bbe474a180ce779c5421d90e415ac26ebea8ee32cae961250926e SHA512 2aaceb8e351e4a0a13834ce6ad1c8dd5575ea591e4c69ac080ad53798338200fa9768460ee63f7462941e372ddb9458afba8b602843c63c9cad2cee6f763d6b1
DIST umbrello-18.12.2.tar.xz 3054440 BLAKE2B 36ac05cdf7bd2e7a35f2a7749a9e7d5827e9e6536f5a846a403a64248e47f55d59a169b3f5f390f2cb8f09d3bb5c2e400123eaa36b62cf614e582d68077e2a13 SHA512 b251425ef28e656d258ed6dec9fa737115c16d3fa0f663de734f2c27200c92f158cd2b22b2f2786c9bb721961feca014408d42c101f87fcaf9af8b06bfd7234b
-EBUILD umbrello-18.08.3.ebuild 1369 BLAKE2B e5dc34a20a9b3747064d73002d6f6d853cf2f6982f82133137f0284732dfa4a73bd48ea3ec8c0038ea330084db0d0491be7f326965d08ff2d53bfd41793704ba SHA512 34179cc8cb4f5cbab83459ee483df4bb0336a40c17fa7af914609b32da9dad92bc458a0fdb078ef6c5a658891976e73fcc2ad6d0c0ac4f296f27c8e8cf5a46e3
+EBUILD umbrello-18.08.3.ebuild 1415 BLAKE2B aa0bddca04db4dba15093bdee3dd98ca4b6ce974da869ca526d68b060f3665d336f2470735b7eab9c8c38f9d2aee1efc914b4f991ce8f62e146a2e307833932a SHA512 1a668d61d106a7cc152148ad6268353aa2ec1aefca2c5262f99ce7067007823305ee042b3dd527ceddfcefc9f5ed62297202b2dccfb2c0c13d611b16f6862f6e
EBUILD umbrello-18.12.2.ebuild 1388 BLAKE2B 6613720cd30f0aba0fe99fe13230fa74746826ad3ee2234bf0c3601af928fd461a2e7e6a607dcce14054760d291d3459f3a13b7225bfa1ed7c3533c235b84ac9 SHA512 7cc6923810ee7ec9ec56755bd5e0f295b7df22e1dce70b2808b14fba42bf317b01073647bb0c5e356f0ef8df41988e607bfaf6e5478978dc50d0b57674ab0f43
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
new file mode 100644
index 000000000000..2cf4e6a72ee4
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
@@ -0,0 +1,32 @@
+From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@freenet.de>
+Date: Thu, 6 Dec 2018 13:36:34 +0100
+Subject: Fix KDE CI compile error with Qt 5.10 on linux
+
+The error was "specialization of template<class T>
+struct QMetaTypeId in different namespace [-fpermissive]"
+
+The Qt 5.10 related issue is fixed by using another approach
+to exclude KF5 class KAboutData.
+---
+ umbrello/main.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index e3315fa..9d2acd8 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -19,9 +19,8 @@
+
+ // kde includes
+ #if QT_VERSION > 0x050000
+-namespace dummy {
+-#include <kaboutdata.h>
+-}
++// prevent including of <kaboutdata.h>
++#define KABOUTDATA_H
+ #include <k4aboutdata.h>
+ #define KAboutData K4AboutData
+ #include <KCrash>
+--
+cgit v1.1
diff --git a/kde-apps/umbrello/umbrello-18.08.3.ebuild b/kde-apps/umbrello/umbrello-18.08.3.ebuild
index c570c012f3e5..2afd90e22b90 100644
--- a/kde-apps/umbrello/umbrello-18.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -48,6 +48,8 @@ RDEPEND="${COMMON_DEPEND}
!<kde-apps/kde4-l10n-17.07.80
"
+PATCHES=( "${FILESDIR}/${P}-kf-5.54.patch" )
+
src_configure() {
local mycmakeargs=(
-DBUILD_KF5=ON