summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-01-16 21:10:40 +0100
committer Eric Hameleers <alien@slackware.com>2019-01-16 21:10:40 +0100
commitc1e8f2bff70a1fca5b7866f62062fc2625409a96 (patch)
tree159777caf231f5fd1c0ce989cd7054a4a697686a
parent57362c3b2112726be159861f922faf7ae66858ca (diff)
downloadktown-c1e8f2bff70a1fca5b7866f62062fc2625409a96.tar.gz
ktown-c1e8f2bff70a1fca5b7866f62062fc2625409a96.tar.xz
Remove the upstreamed patches
-rw-r--r--kde/patch/kpat.patch3
-rw-r--r--kde/patch/messagelib.patch2
-rw-r--r--kde/patch/plasma-desktop.patch4
-rw-r--r--kde/patch/plasma-desktop/plasma-desktop_kdebug_401508.patch39
-rw-r--r--kde/patch/umbrello.patch2
5 files changed, 47 insertions, 3 deletions
diff --git a/kde/patch/kpat.patch b/kde/patch/kpat.patch
index 1651937..5bda77a 100644
--- a/kde/patch/kpat.patch
+++ b/kde/patch/kpat.patch
@@ -1,5 +1,6 @@
# Commit https://cgit.kde.org/kpat.git/patch/?id=fc1d54ced6a727382599d767e55879b6843c3456
# Introduces a hard dependency on fc-solver which in turn has new dependencies
# So, we revert this commit to avoid dropping kpat altogether in 18.08.0.
-cat $CWD/patch/kpat/kpat_no_freecell_solver_dep.patch | patch -p1 --reverse --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# For 18.12.0 we will have to add freecell-solver anyway.
+#cat $CWD/patch/kpat/kpat_no_freecell_solver_dep.patch | patch -p1 --reverse --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/messagelib.patch b/kde/patch/messagelib.patch
index 982de5c..a76851e 100644
--- a/kde/patch/messagelib.patch
+++ b/kde/patch/messagelib.patch
@@ -1,4 +1,4 @@
# CVE-2018-19516: HTML email can open browser window automatically.
# Fixed in messagelib of KDE Applications 18.12.0.
-cat $CWD/patch/messagelib/messagelib_CVE-2018-19516.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+#cat $CWD/patch/messagelib/messagelib_CVE-2018-19516.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/plasma-desktop.patch b/kde/patch/plasma-desktop.patch
index bdc18a4..e2fc54e 100644
--- a/kde/patch/plasma-desktop.patch
+++ b/kde/patch/plasma-desktop.patch
@@ -6,3 +6,7 @@
# Fix for Plasma 5.5.0 (KDEBUG #356398):
#cat $CWD/patch/plasma-desktop//plasma-desktop_kickoff_kdebug_356398.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix for Plasma 5.14.4 (KDEBUG #401508):
+#cat $CWD/patch/plasma-desktop/plasma-desktop_kdebug_401508.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-desktop/plasma-desktop_kdebug_401508.patch b/kde/patch/plasma-desktop/plasma-desktop_kdebug_401508.patch
new file mode 100644
index 0000000..2e4a099
--- /dev/null
+++ b/kde/patch/plasma-desktop/plasma-desktop_kdebug_401508.patch
@@ -0,0 +1,39 @@
+From ed34cc5f181e61d1fc98872866c5d7300a90af86 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Thu, 29 Nov 2018 00:22:17 +0900
+Subject: Fix group popup dialog
+
+Summary:
+Fixes regression introduced with ab26ebb18b74: That diff contained
+a change unrelated to the original submission, swapping a || out for
+&& in response to a review note. This turns out to have broken things.
+
+BUG:401508
+
+Reviewers: davidedmundson
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D17219
+---
+ applets/taskmanager/package/contents/ui/GroupDialog.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/applets/taskmanager/package/contents/ui/GroupDialog.qml b/applets/taskmanager/package/contents/ui/GroupDialog.qml
+index 6f59275..28238dc 100644
+--- a/applets/taskmanager/package/contents/ui/GroupDialog.qml
++++ b/applets/taskmanager/package/contents/ui/GroupDialog.qml
+@@ -262,7 +262,7 @@ PlasmaCore.Dialog {
+ // Setting VisualDataModel.rootIndex drops groupRepeater.count to 0
+ // before the actual row count. updateSize is therefore invoked twice;
+ // only update size once the repeater count matches the model role.
+- } else if (!groupRepeater.aboutToPopulate && visualParent.childCount == groupRepeater.count) {
++ } else if (!groupRepeater.aboutToPopulate || visualParent.childCount == groupRepeater.count) {
+ var task;
+ var maxWidth = 0;
+ var maxHeight = 0;
+--
+cgit v1.1
+
diff --git a/kde/patch/umbrello.patch b/kde/patch/umbrello.patch
index f351ad1..641688c 100644
--- a/kde/patch/umbrello.patch
+++ b/kde/patch/umbrello.patch
@@ -6,5 +6,5 @@
# 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 ; }
+#cat $CWD/patch/umbrello/umbrello_qt510_kaboutdata_h.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }