| 1 |
commit: 8c3e2277df52ef8f701d8c51223c63eb84d33a12 |
| 2 |
Author: James Beddek <telans <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sat Oct 30 06:38:38 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 31 02:44:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3e2277 |
| 7 |
|
| 8 |
kde-apps/umbrello: fix configure with tests |
| 9 |
|
| 10 |
exclude Qt5::WebKitWidgets from unittests CMakeLists.txt |
| 11 |
|
| 12 |
Signed-off-by: James Beddek <telans <AT> posteo.de> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/22755 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
.../files/umbrello-20.08.3-no-qtwebkit.patch | 30 +++++++++++++++------- |
| 17 |
1 file changed, 21 insertions(+), 9 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
index bf41c2d4098..74a1e9b3e6d 100644 |
| 21 |
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch |
| 22 |
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch |
| 23 |
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 24 |
3 files changed, 22 insertions(+), 2 deletions(-) |
| 25 |
|
| 26 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 27 |
-index 398415f09..7144f0990 100644 |
| 28 |
+index 50b0bd163..8673740cc 100644 |
| 29 |
--- a/CMakeLists.txt |
| 30 |
+++ b/CMakeLists.txt |
| 31 |
-@@ -95,9 +95,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS |
| 32 |
+@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS |
| 33 |
Test |
| 34 |
Widgets |
| 35 |
Xml |
| 36 |
@@ -34,10 +34,10 @@ index 398415f09..7144f0990 100644 |
| 37 |
find_package(KF5 REQUIRED COMPONENTS |
| 38 |
Archive |
| 39 |
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt |
| 40 |
-index 264b25fde..f3286ae46 100644 |
| 41 |
+index 4a2168542..fd5ef8fbf 100644 |
| 42 |
--- a/umbrello/CMakeLists.txt |
| 43 |
+++ b/umbrello/CMakeLists.txt |
| 44 |
-@@ -549,7 +551,6 @@ else() |
| 45 |
+@@ -549,7 +549,6 @@ else() |
| 46 |
Qt5::Xml |
| 47 |
Qt5::PrintSupport |
| 48 |
Qt5::Svg |
| 49 |
@@ -45,7 +45,7 @@ index 264b25fde..f3286ae46 100644 |
| 50 |
KF5::Archive |
| 51 |
KF5::Completion |
| 52 |
KF5::CoreAddons |
| 53 |
-@@ -565,6 +566,9 @@ else() |
| 54 |
+@@ -565,6 +564,9 @@ else() |
| 55 |
${LIBXML2_LIBRARIES} |
| 56 |
codeimport |
| 57 |
) |
| 58 |
@@ -56,10 +56,10 @@ index 264b25fde..f3286ae46 100644 |
| 59 |
ICONS |
| 60 |
${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png |
| 61 |
diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h |
| 62 |
-index a85de1f22..a7212cc8d 100644 |
| 63 |
+index 0c832048d..ad425a37f 100644 |
| 64 |
--- a/umbrello/umlappprivate.h |
| 65 |
+++ b/umbrello/umlappprivate.h |
| 66 |
-@@ -42,7 +42,11 @@ |
| 67 |
+@@ -37,7 +37,11 @@ |
| 68 |
#include <QFileInfo> |
| 69 |
#include <QListWidget> |
| 70 |
#include <QObject> |
| 71 |
@@ -71,7 +71,7 @@ index a85de1f22..a7212cc8d 100644 |
| 72 |
|
| 73 |
class QWidget; |
| 74 |
|
| 75 |
-@@ -160,6 +164,7 @@ public slots: |
| 76 |
+@@ -155,6 +159,7 @@ public slots: |
| 77 |
// qDebug() << html; |
| 78 |
welcomeWindow = new QDockWidget(i18n("Welcome"), parent); |
| 79 |
welcomeWindow->setObjectName(QLatin1String("WelcomeDock")); |
| 80 |
@@ -79,7 +79,7 @@ index a85de1f22..a7212cc8d 100644 |
| 81 |
QWebView *view = new QWebView; |
| 82 |
view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); |
| 83 |
view->setContextMenuPolicy(Qt::NoContextMenu); |
| 84 |
-@@ -167,6 +172,14 @@ public slots: |
| 85 |
+@@ -162,6 +167,14 @@ public slots: |
| 86 |
view->setHtml(html); |
| 87 |
view->show(); |
| 88 |
welcomeWindow->setWidget(view); |
| 89 |
@@ -94,6 +94,18 @@ index a85de1f22..a7212cc8d 100644 |
| 90 |
parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow); |
| 91 |
|
| 92 |
viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome")); |
| 93 |
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt |
| 94 |
+index 26bd4b870..9dadb484a 100644 |
| 95 |
+--- a/unittests/CMakeLists.txt |
| 96 |
++++ b/unittests/CMakeLists.txt |
| 97 |
+@@ -59,7 +59,6 @@ else() |
| 98 |
+ Qt5::Xml |
| 99 |
+ Qt5::Test |
| 100 |
+ Qt5::Widgets |
| 101 |
+- Qt5::WebKitWidgets |
| 102 |
+ KF5::I18n |
| 103 |
+ KF5::Crash |
| 104 |
+ ${LIBXML2_LIBRARIES} |
| 105 |
-- |
| 106 |
2.29.2 |
Archives