* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
@ 2021-05-04 22:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-05-04 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 2b1351baed7d36f5e66d801c8323b916d410d552
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 2 12:04:38 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 4 22:56:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b1351ba
kde-apps/umbrello: remove unused patch
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20656
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.08.3-unused-qtwebkit.patch | 25 ----------------------
1 file changed, 25 deletions(-)
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
deleted file mode 100644
index bb1fde2878e..00000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unused-qtwebkit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5263f4e391c50c72e000da6c2bcf1123c28192e5 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Wed, 21 Jun 2017 14:05:28 +0200
-Subject: [PATCH] Remove finding WebKitWidgets, not used
-
----
- lib/kdev5-php/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/kdev5-php/CMakeLists.txt b/lib/kdev5-php/CMakeLists.txt
-index 2a40b48ae..6ef58b0c9 100644
---- a/lib/kdev5-php/CMakeLists.txt
-+++ b/lib/kdev5-php/CMakeLists.txt
-@@ -28,7 +28,7 @@ include(KDECMakeSettings)
- include(GenerateExportHeader)
- include(FeatureSummary)
-
--find_package(Qt5 REQUIRED Core Widgets Test WebKitWidgets)
-+find_package(Qt5 REQUIRED Core Widgets Test)
- find_package(KF5 REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
- find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
- find_package(KDevelop-PG-Qt REQUIRED)
---
-2.28.0
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
@ 2021-10-31 2:44 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-10-31 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 8c3e2277df52ef8f701d8c51223c63eb84d33a12
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sat Oct 30 06:38:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 02:44:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3e2277
kde-apps/umbrello: fix configure with tests
exclude Qt5::WebKitWidgets from unittests CMakeLists.txt
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22755
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/umbrello-20.08.3-no-qtwebkit.patch | 30 +++++++++++++++-------
1 file changed, 21 insertions(+), 9 deletions(-)
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
index bf41c2d4098..74a1e9b3e6d 100644
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ b/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 398415f09..7144f0990 100644
+index 50b0bd163..8673740cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -95,9 +95,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
+@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
Test
Widgets
Xml
@@ -34,10 +34,10 @@ index 398415f09..7144f0990 100644
find_package(KF5 REQUIRED COMPONENTS
Archive
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 264b25fde..f3286ae46 100644
+index 4a2168542..fd5ef8fbf 100644
--- a/umbrello/CMakeLists.txt
+++ b/umbrello/CMakeLists.txt
-@@ -549,7 +551,6 @@ else()
+@@ -549,7 +549,6 @@ else()
Qt5::Xml
Qt5::PrintSupport
Qt5::Svg
@@ -45,7 +45,7 @@ index 264b25fde..f3286ae46 100644
KF5::Archive
KF5::Completion
KF5::CoreAddons
-@@ -565,6 +566,9 @@ else()
+@@ -565,6 +564,9 @@ else()
${LIBXML2_LIBRARIES}
codeimport
)
@@ -56,10 +56,10 @@ index 264b25fde..f3286ae46 100644
ICONS
${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index a85de1f22..a7212cc8d 100644
+index 0c832048d..ad425a37f 100644
--- a/umbrello/umlappprivate.h
+++ b/umbrello/umlappprivate.h
-@@ -42,7 +42,11 @@
+@@ -37,7 +37,11 @@
#include <QFileInfo>
#include <QListWidget>
#include <QObject>
@@ -71,7 +71,7 @@ index a85de1f22..a7212cc8d 100644
class QWidget;
-@@ -160,6 +164,7 @@ public slots:
+@@ -155,6 +159,7 @@ public slots:
// qDebug() << html;
welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
@@ -79,7 +79,7 @@ index a85de1f22..a7212cc8d 100644
QWebView *view = new QWebView;
view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
view->setContextMenuPolicy(Qt::NoContextMenu);
-@@ -167,6 +172,14 @@ public slots:
+@@ -162,6 +167,14 @@ public slots:
view->setHtml(html);
view->show();
welcomeWindow->setWidget(view);
@@ -94,6 +94,18 @@ index a85de1f22..a7212cc8d 100644
parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
+diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
+index 26bd4b870..9dadb484a 100644
+--- a/unittests/CMakeLists.txt
++++ b/unittests/CMakeLists.txt
+@@ -59,7 +59,6 @@ else()
+ Qt5::Xml
+ Qt5::Test
+ Qt5::Widgets
+- Qt5::WebKitWidgets
+ KF5::I18n
+ KF5::Crash
+ ${LIBXML2_LIBRARIES}
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
@ 2022-12-03 10:57 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-12-03 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 7f321a3d5b3e5b157baf5beab89fa855d556fb48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 10:55:56 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 10:57:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f321a3d
kde-apps/umbrello: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/umbrello-20.08.3-no-qtwebkit.patch | 111 ---------------------
1 file changed, 111 deletions(-)
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
deleted file mode 100644
index 74a1e9b3e6d4..000000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-no-qtwebkit.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From eb753a7eb0f49c6ac5b349f81387ca4b4c64342b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 12 Oct 2020 11:46:24 +0200
-Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
- QTextBrowser fallback
-
-Thanks-to: Ralf Habacker <ralf.habacker@freenet.de> for QTextBrowser fallback code.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 7 ++++++-
- umbrello/CMakeLists.txt | 4 +++-
- umbrello/umlappprivate.h | 13 +++++++++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 50b0bd163..8673740cc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -102,9 +102,14 @@ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS
- Test
- Widgets
- Xml
-- WebKitWidgets
- )
-
-+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION})
-+if(Qt5WebKitWidgets_FOUND)
-+ add_definitions(-DWEBKIT_WELCOMEPAGE)
-+ set(WEBKIT_WELCOMEPAGE 1)
-+endif()
-+
- # search packages used by KDE
- find_package(KF5 REQUIRED COMPONENTS
- Archive
-diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
-index 4a2168542..fd5ef8fbf 100644
---- a/umbrello/CMakeLists.txt
-+++ b/umbrello/CMakeLists.txt
-@@ -549,7 +549,6 @@ else()
- Qt5::Xml
- Qt5::PrintSupport
- Qt5::Svg
-- Qt5::WebKitWidgets
- KF5::Archive
- KF5::Completion
- KF5::CoreAddons
-@@ -565,6 +564,9 @@ else()
- ${LIBXML2_LIBRARIES}
- codeimport
- )
-+ if(WEBKIT_WELCOMEPAGE)
-+ target_link_libraries(libumbrello Qt5::WebKitWidgets)
-+ endif()
- ecm_add_app_icon(umbrello_SRCS
- ICONS
- ${CMAKE_CURRENT_SOURCE_DIR}/pics/global/16-apps-umbrello.png
-diff --git a/umbrello/umlappprivate.h b/umbrello/umlappprivate.h
-index 0c832048d..ad425a37f 100644
---- a/umbrello/umlappprivate.h
-+++ b/umbrello/umlappprivate.h
-@@ -37,7 +37,11 @@
- #include <QFileInfo>
- #include <QListWidget>
- #include <QObject>
-+#ifdef WEBKIT_WELCOMEPAGE
- #include <QWebView>
-+#else
-+#include <QTextBrowser>
-+#endif
-
- class QWidget;
-
-@@ -155,6 +159,7 @@ public slots:
- // qDebug() << html;
- welcomeWindow = new QDockWidget(i18n("Welcome"), parent);
- welcomeWindow->setObjectName(QLatin1String("WelcomeDock"));
-+#ifdef WEBKIT_WELCOMEPAGE
- QWebView *view = new QWebView;
- view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
- view->setContextMenuPolicy(Qt::NoContextMenu);
-@@ -162,6 +167,14 @@ public slots:
- view->setHtml(html);
- view->show();
- welcomeWindow->setWidget(view);
-+#else
-+ QTextBrowser *tb = new QTextBrowser(dynamic_cast<QWidget*>(this));
-+ tb->setOpenExternalLinks(true);
-+ tb->setOpenLinks(false);
-+ tb->setHtml(html);
-+ connect(tb, SIGNAL(anchorClicked(const QUrl)), this, SLOT(slotWelcomeWindowLinkClicked(const QUrl)));
-+ welcomeWindow->setWidget(tb);
-+#endif
- parent->addDockWidget(Qt::RightDockWidgetArea, welcomeWindow);
-
- viewWelcomeWindow = parent->actionCollection()->add<KToggleAction>(QLatin1String("view_show_welcome"));
-diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
-index 26bd4b870..9dadb484a 100644
---- a/unittests/CMakeLists.txt
-+++ b/unittests/CMakeLists.txt
-@@ -59,7 +59,6 @@ else()
- Qt5::Xml
- Qt5::Test
- Qt5::Widgets
-- Qt5::WebKitWidgets
- KF5::I18n
- KF5::Crash
- ${LIBXML2_LIBRARIES}
---
-2.29.2
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-03 10:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-03 10:57 [gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-10-31 2:44 Sam James
2021-05-04 22:57 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox