[gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
commit: 7f321a3d5b3e5b157baf5beab89fa855d556fb48
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 3 10:55:56 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 3 10:57:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f321a3d
kde-apps/umbrello: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner 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..
--- 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
-Date: Mon, 12 Oct 2020 11:46:24 +0200
-Subject: [PATCH] Make QtWebKit usage in WelcomePage optional, with
- QTextBrowser fallback
-
-Thanks-to: Ralf Habacker for QTextBrowser fallback
code.
-
-Signed-off-by: Andreas Sturmlechner
- 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
- #include
- #include
-+#ifdef WEBKIT_WELCOMEPAGE
- #include
-+#else
-+#include
-+#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(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(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
-
[gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
commit: 8c3e2277df52ef8f701d8c51223c63eb84d33a12
Author: James Beddek posteo de>
AuthorDate: Sat Oct 30 06:38:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 31 02:44:02 2021 +
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 posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22755
Signed-off-by: Sam James 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
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
#include
#include
@@ -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(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
[gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/
commit: 2b1351baed7d36f5e66d801c8323b916d410d552
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sun May 2 12:04:38 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 4 22:56:47 2021 +
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 levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20656
Signed-off-by: Andreas Sturmlechner 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..000
--- 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"
-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
-
[gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/files/, kde-apps/umbrello/
commit: 33108594992db78a518bf3a9a92b09379433ae65
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 4 17:07:35 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Apr 6 08:23:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33108594
kde-apps/umbrello: drop 20.08.3*
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/umbrello/Manifest | 1 -
.../umbrello-20.08.3-unbundle-kdevelop-php.patch | 92 --
kde-apps/umbrello/umbrello-20.08.3.ebuild | 76 --
3 files changed, 169 deletions(-)
diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index ee65e951e9c..96769a301aa 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,2 +1 @@
-DIST umbrello-20.08.3.tar.xz 108 BLAKE2B
c8ccc39d43f061d78889776e6adc6d1a07a67608b8cbfc8c18e8f94a3d1608b3764c15d496538bb76db2672cd6bdfa8158b30a24f38f3c40e8b18dfe72262155
SHA512
541d637cd892f5b162fa88e3380c9ed4c9c175d5479bb1947b415b8fa59a419fd90eac2e47d939ec3d9b7b43b14fbf6777683f884b7ff10e7dee85eccb59f813
DIST umbrello-20.12.3.tar.xz 804 BLAKE2B
a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57
SHA512
619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a
diff --git
a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
deleted file mode 100644
index cce395a837f..000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
-From: Ralf Habacker
-Date: Fri, 30 Oct 2020 08:32:41 +0100
-Subject: [PATCH] Add support to use external KDevPHP packaga
-
-If no external development package has been found fallback to embedded
-version.
-
-This commit adds an additional optional dependency for the KDevPHP package,
which
-named e.g. on openSUSE 'kdevelop5-plugin-php-devel'.
-
-BUG:428460
-FIXED-IN:2.32.80 (KDE releases 20.11.80)
- CMakeLists.txt| 20 ++--
- umbrello/codeimport/phpimport.cpp | 19 +++
- 2 files changed, 25 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 221c04e31..398415f09 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND)
- include_directories(
- ${KDEVPGQT_INCLUDE_DIR}
- ${KDEVPLATFORM_INCLUDE_DIR}
--${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser
--${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser
- )
--set(NO_INSTALL 1)
--set(BUILD_PARSER_ONLY 1)
- set(BUILD_PHP_IMPORT 1)
- add_definitions(
---DKDEVPHPPARSER_EXPORT=
- -DENABLE_PHP_IMPORT
- )
- add_subdirectory(lib/kdevplatform)
--add_subdirectory(${KDEV_SOURCE_DIR})
-+find_package(KDevPHP)
-+if(NOT KDevPHP_FOUND)
-+set(NO_INSTALL 1)
-+set(BUILD_PARSER_ONLY 1)
-+set(BUILD_PHP_IMPORT 1)
-+add_definitions(
-+-DKDEVPHPPARSER_EXPORT=
-+)
-+include_directories(
-+${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}
-+${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}
-+)
-+add_subdirectory(${KDEV_SOURCE_DIR})
-+endif()
- else()
- set(BUILD_PHP_IMPORT 0)
- endif()
-diff --git a/umbrello/codeimport/phpimport.cpp
b/umbrello/codeimport/phpimport.cpp
-index f45f1416f..f714dcbad 100644
a/umbrello/codeimport/phpimport.cpp
-+++ b/umbrello/codeimport/phpimport.cpp
-@@ -39,18 +39,21 @@ QTextStream qout(stdout);
- QTextStream qerr(stderr);
- QTextStream qin(stdin);
-
--#include "parsesession.h"
--#include "phplexer.h"
--#include "phpparser.h"
--#include "phpdebugvisitor.h"
--#include "phpast.h"
--#include "tokenstream.h"
--#include "phptokentext.h"
--
-+// kdevphp
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+#include
-+
-+// kdevplatform
- #include
- #include
- #include
- #include
-+#include
- #include
-
- namespace Php {
---
-GitLab
-
diff --git a/kde-apps/umbrello/umbrello-20.08.3.ebuild
b/kde-apps/umbrello/umbrello-20.08.3.ebuild
deleted file mode 100644
index ac0fd86af5d..000
--- a/kde-apps/umbrello/umbrello-20.08.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_QTHELP="false" # TODO: figure out install error
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE UML Modeller"
-HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org";
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="
