From 669ca0e18f93e8b52e53b4ba699be081eeff13a8 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 9 Dec 2018 15:40:20 +0100 Subject: Add a patch to make umbrello compile against Qt >= 5.10 --- kde/patch/umbrello.patch | 5 ++++ .../umbrello/umbrello_qt510_kaboutdata_h.patch | 33 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch diff --git a/kde/patch/umbrello.patch b/kde/patch/umbrello.patch index 96c9e17..f351ad1 100644 --- a/kde/patch/umbrello.patch +++ b/kde/patch/umbrello.patch @@ -3,3 +3,8 @@ # http://quickgit.kde.org/?p=umbrello.git&a=commit&h=5f9f6a68716a8aced2c5f962247d9b05b326fcf5 #cat $CWD/patch/umbrello/umbrello-4.11.4_listitem.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +# Fix compilation error "specialization of template struct QMetaTypeId in different namespace [-fpermissive]". +# Fixed in Applications 18.12.0 +# https://cgit.kde.org/umbrello.git/patch/?id=62a9e5e6afdd920779f1211afb0381857659e578 +cat $CWD/patch/umbrello/umbrello_qt510_kaboutdata_h.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } + diff --git a/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch b/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch new file mode 100644 index 0000000..a27b0ed --- /dev/null +++ b/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch @@ -0,0 +1,33 @@ +From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001 +From: Ralf Habacker +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 +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 +-} ++// prevent including of ++#define KABOUTDATA_H + #include + #define KAboutData K4AboutData + #include +-- +cgit v0.11.2 + -- cgit v1.2.3