summaryrefslogtreecommitdiffstats
path: root/kde/patch/umbrello
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-07-30 19:45:19 +0200
committer Eric Hameleers <alien@slackware.com>2020-07-30 19:45:19 +0200
commit52b1f1cb9f8d4e1fb1fcbde59930a105a819b0b4 (patch)
tree22f1205f0276563548f2864997c82a8af7307fcd /kde/patch/umbrello
parent42f29689f597520389829b6d22c56ee21ace7657 (diff)
downloadktown-52b1f1cb9f8d4e1fb1fcbde59930a105a819b0b4.tar.gz
ktown-52b1f1cb9f8d4e1fb1fcbde59930a105a819b0b4.tar.xz
Cleanup unused KDE patches
Thanks to Patrick Volkerding for the effort.
Diffstat (limited to '')
-rw-r--r--kde/patch/umbrello.patch10
-rw-r--r--kde/patch/umbrello/umbrello-4.11.4_listitem.patch13
-rw-r--r--kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch33
3 files changed, 0 insertions, 56 deletions
diff --git a/kde/patch/umbrello.patch b/kde/patch/umbrello.patch
deleted file mode 100644
index 641688c..0000000
--- a/kde/patch/umbrello.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-# Fix compilation error (undefined listitem in classifierlistpage.cpp)
-# Fixed post KDE 4.11.4 in
-# 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<class T> 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-4.11.4_listitem.patch b/kde/patch/umbrello/umbrello-4.11.4_listitem.patch
deleted file mode 100644
index f5cb615..0000000
--- a/kde/patch/umbrello/umbrello-4.11.4_listitem.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/umbrello/dialogs/classifierlistpage.cpp
-+++ b/umbrello/dialogs/classifierlistpage.cpp
-@@ -346,7 +346,7 @@
- }
-
- if (itemIndex >= 0 && (itemIndex < getItemList().size())) {
-- listItem = getItemList().at( itemIndex );
-+ UMLClassifierListItem* listItem = getItemList().at( itemIndex );
-
- //now update screen
- m_docTE->setText( listItem->doc() );
-
-
diff --git a/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch b/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch
deleted file mode 100644
index a27b0ed..0000000
--- a/kde/patch/umbrello/umbrello_qt510_kaboutdata_h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 v0.11.2
-