1 |
commit: 1df4f7998a84657aeb071bee1f4a6daeda4f0a22 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 13 10:18:03 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 13 10:18:24 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df4f799 |
7 |
|
8 |
kde-frameworks/plasma: Add fix for Plasma crash |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
.../plasma/files/plasma-5.56.0-crashfix.patch | 40 ++++++++++++ |
14 |
kde-frameworks/plasma/plasma-5.56.0-r1.ebuild | 73 ++++++++++++++++++++++ |
15 |
2 files changed, 113 insertions(+) |
16 |
|
17 |
diff --git a/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch b/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..844ddf6a234 |
20 |
--- /dev/null |
21 |
+++ b/kde-frameworks/plasma/files/plasma-5.56.0-crashfix.patch |
22 |
@@ -0,0 +1,40 @@ |
23 |
+From ebae2d63033647950cf0f9d97410723a8c7db1f3 Mon Sep 17 00:00:00 2001 |
24 |
+From: Laurent Montel <montel@×××.org> |
25 |
+Date: Tue, 12 Mar 2019 07:03:10 +0100 |
26 |
+Subject: Remove crash in plasmashell |
27 |
+ |
28 |
+Summary: remove bug in plasmashell Bug 405341 |
29 |
+ |
30 |
+Test Plan: can't reproduce bug |
31 |
+ |
32 |
+Reviewers: dfaure, #frameworks, #plasma, broulik |
33 |
+ |
34 |
+Reviewed By: #plasma, broulik |
35 |
+ |
36 |
+Subscribers: broulik, kde-frameworks-devel |
37 |
+ |
38 |
+Tags: #frameworks |
39 |
+ |
40 |
+Differential Revision: https://phabricator.kde.org/D19698 |
41 |
+--- |
42 |
+ src/declarativeimports/core/datamodel.cpp | 5 ++++- |
43 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
44 |
+ |
45 |
+diff --git a/src/declarativeimports/core/datamodel.cpp b/src/declarativeimports/core/datamodel.cpp |
46 |
+index 50dc6c5..03bea20 100644 |
47 |
+--- a/src/declarativeimports/core/datamodel.cpp |
48 |
++++ b/src/declarativeimports/core/datamodel.cpp |
49 |
+@@ -64,7 +64,10 @@ void SortFilterModel::syncRoleNames() |
50 |
+ |
51 |
+ QHash<int,QByteArray> SortFilterModel::roleNames() const |
52 |
+ { |
53 |
+- return sourceModel()->roleNames(); |
54 |
++ if (sourceModel()) { |
55 |
++ return sourceModel()->roleNames(); |
56 |
++ } |
57 |
++ return {}; |
58 |
+ } |
59 |
+ |
60 |
+ int SortFilterModel::roleNameToId(const QString &name) const |
61 |
+-- |
62 |
+cgit v1.1 |
63 |
|
64 |
diff --git a/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild b/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild |
65 |
new file mode 100644 |
66 |
index 00000000000..fce285228be |
67 |
--- /dev/null |
68 |
+++ b/kde-frameworks/plasma/plasma-5.56.0-r1.ebuild |
69 |
@@ -0,0 +1,73 @@ |
70 |
+# Copyright 1999-2019 Gentoo Authors |
71 |
+# Distributed under the terms of the GNU General Public License v2 |
72 |
+ |
73 |
+EAPI=7 |
74 |
+ |
75 |
+KMNAME="${PN}-framework" |
76 |
+VIRTUALX_REQUIRED="test" |
77 |
+inherit kde5 |
78 |
+ |
79 |
+DESCRIPTION="Plasma framework" |
80 |
+LICENSE="LGPL-2+" |
81 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
82 |
+IUSE="gles2 wayland X" |
83 |
+ |
84 |
+BDEPEND=" |
85 |
+ $(add_frameworks_dep kdoctools) |
86 |
+" |
87 |
+RDEPEND=" |
88 |
+ $(add_frameworks_dep kactivities) |
89 |
+ $(add_frameworks_dep karchive) |
90 |
+ $(add_frameworks_dep kconfig) |
91 |
+ $(add_frameworks_dep kconfigwidgets) |
92 |
+ $(add_frameworks_dep kcoreaddons) |
93 |
+ $(add_frameworks_dep kdeclarative) |
94 |
+ $(add_frameworks_dep kglobalaccel) |
95 |
+ $(add_frameworks_dep kguiaddons) |
96 |
+ $(add_frameworks_dep ki18n) |
97 |
+ $(add_frameworks_dep kiconthemes) |
98 |
+ $(add_frameworks_dep kio) |
99 |
+ $(add_frameworks_dep kirigami) |
100 |
+ $(add_frameworks_dep knotifications) |
101 |
+ $(add_frameworks_dep kpackage) |
102 |
+ $(add_frameworks_dep kservice) |
103 |
+ $(add_frameworks_dep kwidgetsaddons) |
104 |
+ $(add_frameworks_dep kwindowsystem) |
105 |
+ $(add_frameworks_dep kxmlgui) |
106 |
+ $(add_qt_dep qtdbus) |
107 |
+ $(add_qt_dep qtdeclarative) |
108 |
+ $(add_qt_dep qtgui 'gles2=') |
109 |
+ $(add_qt_dep qtquickcontrols) |
110 |
+ $(add_qt_dep qtsql) |
111 |
+ $(add_qt_dep qtsvg) |
112 |
+ $(add_qt_dep qtwidgets) |
113 |
+ !gles2? ( virtual/opengl ) |
114 |
+ wayland? ( |
115 |
+ $(add_frameworks_dep kwayland) |
116 |
+ media-libs/mesa[egl] |
117 |
+ ) |
118 |
+ X? ( |
119 |
+ $(add_qt_dep qtx11extras) |
120 |
+ x11-libs/libX11 |
121 |
+ x11-libs/libxcb |
122 |
+ ) |
123 |
+" |
124 |
+DEPEND="${RDEPEND} |
125 |
+ X? ( x11-base/xorg-proto ) |
126 |
+" |
127 |
+ |
128 |
+RESTRICT+=" test" |
129 |
+ |
130 |
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) |
131 |
+ |
132 |
+src_configure() { |
133 |
+ local mycmakeargs=( |
134 |
+ $(cmake-utils_use_find_package !gles2 OpenGL) |
135 |
+ $(cmake-utils_use_find_package wayland EGL) |
136 |
+ $(cmake-utils_use_find_package wayland KF5Wayland) |
137 |
+ $(cmake-utils_use_find_package X X11) |
138 |
+ $(cmake-utils_use_find_package X XCB) |
139 |
+ ) |
140 |
+ |
141 |
+ kde5_src_configure |
142 |
+} |