1 |
commit: 7e0b86ffcfea5131615561ef631204ba4bf2a11a |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 12 14:32:16 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 12 15:00:03 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e0b86ff |
7 |
|
8 |
kde-apps/umbrello: Patch out dev-qt/qtwebkit dependency, fix DEPENDs |
9 |
|
10 |
- Update HOMEPAGE |
11 |
- kde-frameworks/kdelibs4support is being linked to |
12 |
|
13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
.../files/umbrello-20.08.3-no-qtwebkit.patch | 105 +++++++++++++++++++++ |
17 |
.../files/umbrello-20.08.3-unused-qtwebkit.patch | 25 +++++ |
18 |
kde-apps/umbrello/umbrello-20.08.49.9999.ebuild | 11 +-- |
19 |
kde-apps/umbrello/umbrello-9999.ebuild | 11 +-- |
20 |
4 files changed, 140 insertions(+), 12 deletions(-) |
21 |
|
22 |
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch |
23 |
new file mode 100644 |
24 |
index 0000000000..8f1a63675d |
25 |
--- /dev/null |
26 |
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch |
27 |
@@ -0,0 +1,105 @@ |
28 |
+From 0500feddb6ff02cd42624b0d3018c5292481b031 Mon Sep 17 00:00:00 2001 |
29 |
+From: Andreas Sturmlechner <asturm@g.o> |
30 |
+Date: Mon, 12 Oct 2020 11:46:24 +0200 |
31 |
+Subject: [PATCH] Disable defunct WelcomePage to get rid of QtWebKit |
32 |
+ |
33 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
34 |
+--- |
35 |
+ CMakeLists.txt | 1 - |
36 |
+ cmake/modules/ECMKDE4Macros.cmake | 2 +- |
37 |
+ umbrello/CMakeLists.txt | 2 -- |
38 |
+ umbrello/uml.cpp | 2 +- |
39 |
+ umbrello/umlappprivate.h | 5 ++++- |
40 |
+ 5 files changed, 6 insertions(+), 6 deletions(-) |
41 |
+ |
42 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
43 |
+index d2d897683..ac70ffe4e 100644 |
44 |
+--- a/CMakeLists.txt |
45 |
++++ b/CMakeLists.txt |
46 |
+@@ -89,7 +89,6 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS |
47 |
+ Test |
48 |
+ Widgets |
49 |
+ Xml |
50 |
+- WebKitWidgets |
51 |
+ ) |
52 |
+ |
53 |
+ # search packages used by KDE |
54 |
+diff --git a/cmake/modules/ECMKDE4Macros.cmake b/cmake/modules/ECMKDE4Macros.cmake |
55 |
+index 3de472295..28eb1c180 100644 |
56 |
+--- a/cmake/modules/ECMKDE4Macros.cmake |
57 |
++++ b/cmake/modules/ECMKDE4Macros.cmake |
58 |
+@@ -106,7 +106,7 @@ macro(find_package package) |
59 |
+ #message("-- ${ARGV} --") |
60 |
+ if("${package}" MATCHES "^(Qt5)") |
61 |
+ #message("-- replaced by finding Qt4 --") |
62 |
+- _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest QtWebKit) |
63 |
++ _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest) |
64 |
+ elseif("${package}" MATCHES "^(KF5)$") |
65 |
+ #message("-- replaced by finding KDE4 --") |
66 |
+ _find_package(KDE4 REQUIRED) |
67 |
+diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt |
68 |
+index 264b25fde..22480642d 100644 |
69 |
+--- a/umbrello/CMakeLists.txt |
70 |
++++ b/umbrello/CMakeLists.txt |
71 |
+@@ -525,7 +525,6 @@ if(NOT BUILD_KF5) |
72 |
+ Qt4::QtCore |
73 |
+ Qt4::QtGui |
74 |
+ Qt4::QtXml |
75 |
+- Qt4::QtWebKit |
76 |
+ ${LIBXML2_LIBRARIES} |
77 |
+ ${LIBXSLT_LIBRARIES} |
78 |
+ ${KDE4_KTEXTEDITOR_LIBS} |
79 |
+@@ -549,7 +548,6 @@ else() |
80 |
+ Qt5::Xml |
81 |
+ Qt5::PrintSupport |
82 |
+ Qt5::Svg |
83 |
+- Qt5::WebKitWidgets |
84 |
+ KF5::Archive |
85 |
+ KF5::Completion |
86 |
+ KF5::CoreAddons |
87 |
+diff --git a/umbrello/uml.cpp b/umbrello/uml.cpp |
88 |
+index 1e0be0c5a..98ce70aef 100644 |
89 |
+--- a/umbrello/uml.cpp |
90 |
++++ b/umbrello/uml.cpp |
91 |
+@@ -996,7 +996,7 @@ void UMLApp::initView() |
92 |
+ m_d->createObjectsWindow(); |
93 |
+ #endif |
94 |
+ m_d->createStereotypesWindow(); |
95 |
+- m_d->createWelcomeWindow(); |
96 |
++// m_d->createWelcomeWindow(); |
97 |
+ |
98 |
+ m_debugDock = new QDockWidget(i18n("&Debug"), this); |
99 |
+ m_debugDock->setObjectName(QLatin1String("DebugDock")); |
100 |
+diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h |
101 |
+index a85de1f22..b9d50a5c1 100644 |
102 |
+--- a/umbrello/umlappprivate.h |
103 |
++++ b/umbrello/umlappprivate.h |
104 |
+@@ -42,7 +42,7 @@ |
105 |
+ #include <QFileInfo> |
106 |
+ #include <QListWidget> |
107 |
+ #include <QObject> |
108 |
+-#include <QWebView> |
109 |
++// #include <QWebView> |
110 |
+ |
111 |
+ class QWidget; |
112 |
+ |
113 |
+@@ -151,6 +151,8 @@ public slots: |
114 |
+ |
115 |
+ void createWelcomeWindow() |
116 |
+ { |
117 |
++ return; |
118 |
++/* |
119 |
+ QString file = findWelcomeFile(); |
120 |
+ if (file.isEmpty()) |
121 |
+ return; |
122 |
+@@ -171,6 +173,7 @@ public slots: |
123 |
+ |
124 |
+ viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome")); |
125 |
+ connect(viewWelcomeWindow, SIGNAL(triggered(bool)), welcomeWindow, SLOT(setVisible(bool))); |
126 |
++*/ |
127 |
+ } |
128 |
+ |
129 |
+ void slotWelcomeWindowLinkClicked(const QUrl &url) |
130 |
+-- |
131 |
+2.28.0 |
132 |
+ |
133 |
|
134 |
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch |
135 |
new file mode 100644 |
136 |
index 0000000000..bb1fde2878 |
137 |
--- /dev/null |
138 |
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch |
139 |
@@ -0,0 +1,25 @@ |
140 |
+From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001 |
141 |
+From: "Friedrich W. H. Kossebau" <kossebau@×××.org> |
142 |
+Date: Wed, 21 Jun 2017 14:05:28 +0200 |
143 |
+Subject: [PATCH] Remove finding WebKitWidgets, not used |
144 |
+ |
145 |
+--- |
146 |
+ lib/kdev5-php/CMakeLists.txt | 2 +- |
147 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
148 |
+ |
149 |
+diff --git a/lib/kdev5-php/CMakeLists.txt b/lib/kdev5-php/CMakeLists.txt |
150 |
+index 2a40b48ae..6ef58b0c9 100644 |
151 |
+--- a/lib/kdev5-php/CMakeLists.txt |
152 |
++++ b/lib/kdev5-php/CMakeLists.txt |
153 |
+@@ -28,7 +28,7 @@ include(KDECMakeSettings) |
154 |
+ include(GenerateExportHeader) |
155 |
+ include(FeatureSummary) |
156 |
+ |
157 |
+-find_package(Qt5 REQUIRED Core Widgets Test WebKitWidgets) |
158 |
++find_package(Qt5 REQUIRED Core Widgets Test) |
159 |
+ find_package(KF5 REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils) |
160 |
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED) |
161 |
+ find_package(KDevelop-PG-Qt REQUIRED) |
162 |
+-- |
163 |
+2.28.0 |
164 |
+ |
165 |
|
166 |
diff --git a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild |
167 |
index 91d98e8993..8bcf216d57 100644 |
168 |
--- a/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild |
169 |
+++ b/kde-apps/umbrello/umbrello-20.08.49.9999.ebuild |
170 |
@@ -12,8 +12,7 @@ VIRTUALX_REQUIRED="test" |
171 |
inherit ecm kde.org |
172 |
|
173 |
DESCRIPTION="KDE UML Modeller" |
174 |
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello |
175 |
-https://umbrello.kde.org" |
176 |
+HOMEPAGE="https://kde.org/applications/en/umbrello https://umbrello.kde.org" |
177 |
|
178 |
LICENSE="GPL-2" # TODO: CHECK |
179 |
SLOT="5" |
180 |
@@ -26,7 +25,6 @@ RDEPEND=" |
181 |
>=dev-qt/qtgui-${QTMIN}:5 |
182 |
>=dev-qt/qtprintsupport-${QTMIN}:5 |
183 |
>=dev-qt/qtsvg-${QTMIN}:5 |
184 |
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5 |
185 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
186 |
>=dev-qt/qtxml-${QTMIN}:5 |
187 |
>=kde-frameworks/karchive-${KFMIN}:5 |
188 |
@@ -35,6 +33,7 @@ RDEPEND=" |
189 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
190 |
>=kde-frameworks/kcoreaddons-${KFMIN}:5 |
191 |
>=kde-frameworks/kcrash-${KFMIN}:5 |
192 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
193 |
>=kde-frameworks/ki18n-${KFMIN}:5 |
194 |
>=kde-frameworks/kiconthemes-${KFMIN}:5 |
195 |
>=kde-frameworks/kio-${KFMIN}:5 |
196 |
@@ -49,9 +48,9 @@ RDEPEND=" |
197 |
dev-util/kdevelop-pg-qt |
198 |
) |
199 |
" |
200 |
-DEPEND="${RDEPEND} |
201 |
- >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
202 |
-" |
203 |
+DEPEND="${RDEPEND}" |
204 |
+ |
205 |
+PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch ) |
206 |
|
207 |
src_configure() { |
208 |
local mycmakeargs=( |
209 |
|
210 |
diff --git a/kde-apps/umbrello/umbrello-9999.ebuild b/kde-apps/umbrello/umbrello-9999.ebuild |
211 |
index 7801f5d544..02559c7bca 100644 |
212 |
--- a/kde-apps/umbrello/umbrello-9999.ebuild |
213 |
+++ b/kde-apps/umbrello/umbrello-9999.ebuild |
214 |
@@ -12,8 +12,7 @@ VIRTUALX_REQUIRED="test" |
215 |
inherit ecm kde.org |
216 |
|
217 |
DESCRIPTION="KDE UML Modeller" |
218 |
-HOMEPAGE="https://kde.org/applications/development/org.kde.umbrello |
219 |
-https://umbrello.kde.org" |
220 |
+HOMEPAGE="https://kde.org/applications/en/umbrello https://umbrello.kde.org" |
221 |
|
222 |
LICENSE="GPL-2" # TODO: CHECK |
223 |
SLOT="5" |
224 |
@@ -26,7 +25,6 @@ RDEPEND=" |
225 |
>=dev-qt/qtgui-${QTMIN}:5 |
226 |
>=dev-qt/qtprintsupport-${QTMIN}:5 |
227 |
>=dev-qt/qtsvg-${QTMIN}:5 |
228 |
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5 |
229 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
230 |
>=dev-qt/qtxml-${QTMIN}:5 |
231 |
>=kde-frameworks/karchive-${KFMIN}:5 |
232 |
@@ -35,6 +33,7 @@ RDEPEND=" |
233 |
>=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
234 |
>=kde-frameworks/kcoreaddons-${KFMIN}:5 |
235 |
>=kde-frameworks/kcrash-${KFMIN}:5 |
236 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
237 |
>=kde-frameworks/ki18n-${KFMIN}:5 |
238 |
>=kde-frameworks/kiconthemes-${KFMIN}:5 |
239 |
>=kde-frameworks/kio-${KFMIN}:5 |
240 |
@@ -49,9 +48,9 @@ RDEPEND=" |
241 |
dev-util/kdevelop-pg-qt |
242 |
) |
243 |
" |
244 |
-DEPEND="${RDEPEND} |
245 |
- >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
246 |
-" |
247 |
+DEPEND="${RDEPEND}" |
248 |
+ |
249 |
+PATCHES=( "${FILESDIR}"/${PN}-20.08.3-{no,unused}-qtwebkit.patch ) |
250 |
|
251 |
src_configure() { |
252 |
local mycmakeargs=( |