pool/umbrello
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KDE Gear 21.04 beta

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/umbrello?expand=0&rev=181
This commit is contained in:
Christophe Giboudeaux 2022-03-29 06:45:15 +00:00 committed by Git OBS Bridge
parent 9d83b53494
commit ae50c8cceb
7 changed files with 48 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch
View File

@ -1,148 +0,0 @@
From bc20a61b530b39a4a0dde9fd69a46fb4b3f27585 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 ++++++-
cmake/modules/ECMKDE4Macros.cmake | 7 ++++++-
umbrello/CMakeLists.txt | 8 ++++++--
umbrello/umlappprivate.h | 13 +++++++++++++
unittests/CMakeLists.txt | 1 -
5 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d98036c..59873cd 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/cmake/modules/ECMKDE4Macros.cmake b/cmake/modules/ECMKDE4Macros.cmake
index 3de4722..e1a31b4 100644
--- a/cmake/modules/ECMKDE4Macros.cmake
+++ b/cmake/modules/ECMKDE4Macros.cmake
@@ -106,7 +106,12 @@ macro(find_package package)
#message("-- ${ARGV} --")
if("${package}" MATCHES "^(Qt5)")
#message("-- replaced by finding Qt4 --")
- _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest QtWebKit)
+ _find_package(Qt4 4.4.3 REQUIRED QtCore QtGui QtXml QtTest)
+ _find_package(Qt4QtWebKit 4.4.3)
+ if(Qt4QtWebKit_FOUND)
+ add_definitions(-DWEBKIT_WELCOMEPAGE)
+ set(WEBKIT_WELCOMEPAGE 1)
+ endif()
elseif("${package}" MATCHES "^(KF5)$")
#message("-- replaced by finding KDE4 --")
_find_package(KDE4 REQUIRED)
diff --git a/umbrello/CMakeLists.txt b/umbrello/CMakeLists.txt
index 4a21685..56ae7d8 100644
--- a/umbrello/CMakeLists.txt
+++ b/umbrello/CMakeLists.txt
@@ -525,13 +525,15 @@ if(NOT BUILD_KF5)
Qt4::QtCore
Qt4::QtGui
Qt4::QtXml
- Qt4::QtWebKit
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${KDE4_KTEXTEDITOR_LIBS}
${KDE4_KFILE_LIBS}
codeimport
)
+ if(WEBKIT_WELCOMEPAGE)
+ target_link_libraries(libumbrello Qt4::QtWebKit)
+ endif()
kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/global/hi*-apps-umbrello.png")
kde4_add_executable(umbrello ${umbrello_SRCS})
@@ -549,7 +551,6 @@ else()
Qt5::Xml
Qt5::PrintSupport
Qt5::Svg
- Qt5::WebKitWidgets
KF5::Archive
KF5::Completion
KF5::CoreAddons
@@ -565,6 +566,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 a85de1f..a7212cc 100644
--- a/umbrello/umlappprivate.h
+++ b/umbrello/umlappprivate.h
@@ -42,7 +42,11 @@
#include <QFileInfo>
#include <QListWidget>
#include <QObject>
+#ifdef WEBKIT_WELCOMEPAGE
#include <QWebView>
+#else
+#include <QTextBrowser>
+#endif
class QWidget;
@@ -160,6 +164,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);
@@ -167,6 +172,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 08cd43a..e96659f 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -60,7 +60,6 @@ else()
Qt5::Xml
Qt5::Test
Qt5::Widgets
- Qt5::WebKitWidgets
KF5::I18n
KF5::Crash
${LIBXML2_LIBRARIES}
--
2.32.0

3
umbrello-21.12.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c6c5f6107870b397dcc60932cbdc1767cc2d6a2f5223dc5e0314226b61a124c5
size 5658416

16
umbrello-21.12.3.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmIdZUwACgkQu0YzUNbv
Me8OHQ//YuZozeS0qh3olJKB+EidaLM91YIQdo2wUdenrtIxMJD7k/oPcs9uiJGx
5pMuPPjo2wOPuElYgkXmy7xi9sW2JlbbmqenxpstwRmXo8qGMaq9/siYGWPnCgNL
WzT2AnFVLjrKHzlmlVftfBwJDqPMvqxmoskOUi1RCoQHjuRfjhFf9e9hWgoPQQzZ
FXoUxVTAAX5dNciUAsVt4wOSLJYNwhpsrHSbNJaXvwGo6XAuw8fRNX6AN4nvhi/5
Lap6R6AETgvQwEQK3Ky9vgmaxarrqWlHmcIkG8jOU3AxnL67k0ltkvZ0zY4Uolvl
osAxiM3zGgWgWUbizr+qTPFfd5NUp04p4k7toG4nYLog/MaQTrj6Kqs2UH8inLEW
9dTeAbdTQsgapm1mtBqWN7Xd4A3vuRO0VkEWRlmJfbVe30fF2EkjIEkPecXdw6zm
F2W3oH44OmaITVn7TuKdAmhN81+HRnNwNc5iYd59jtME1CA8Ice6LaPaDsHvtz1t
b3bWIro2GxpM9HrBnkJjm1tTrmYEPV77Z570jkyvKs0RHbgBRNK/DgUQSesj/KbS
PABqQWDbHABWlNT4sD5+Xgtw6Ia59FmVJAJhGI70FxmU4fx853olcdjV4G3qUl3B
hRllh+38gflDJnFaak7/iCsxyer0Y5Euv3aEZiUQuHjhytpKu9U=
=F2s9
-----END PGP SIGNATURE-----

3
umbrello-22.03.80.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24a530a5e45d5d24f14f9fa2816ec46f1a0a5763ba1899a1603b6c85df654676
size 5675656

16
umbrello-22.03.80.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmI0jgMACgkQOmpNuDnq
pteOmBAAop8hpu0TJnZNwwKRK0vuVtBEQdYMquBEeec3LD0sk/TedwYlgb89sy3Y
rwXT2z2zlztIwiqLbGZfmabSRZHgJRjihPhGtBWSwMBBvhxDkk75lZ8jlI4zgWRJ
JHW5kwLJytn1+YM7whTJFONLFLYXg7CKDSnrRCyKjEcrxviqa4HD+0Y/MyNAlQHQ
RYuj+AhD7Luo3XXLqszNzPdUN2PdqnEN15UKLyDjlyEa4/fjdcZsqdk+F1QPN/2O
xsE/LXrS6ECpykNFkrbA7HcvxOrvNBRZt1Xj4JaeESHbRRwpLNNcoHEdecAAwXRR
FHFjeoUzj8wzmSQOQF38oPeqEOSwRW0s5wbhki0MF6JZDWDfdjRiW/UBj02yACgN
DZpZ4FFB5aCjArSaqBcUkVpBR6SGf/FnWuFxv3hCEMp722X3zUoDqDqq+ZqvcDA7
J5362jLSk3EBRtnN+9jM/+EVux7GjhJ1lbvkHOey3N7ScMljtBJysqPYrwdawqC1
QzPxv3igvA+LTjx3/rKM88jWD1++gSgi5U5yvnc0SErGhmcvtzsczrNcXzcxkIFw
a5q2PjQ6l+5W/3uL5O+5frS2L8wZyPszaGM/XYT85Kr03dItw2vURfz6mz1irMFS
CKUJobkYceGw30Ol3wWFOTNf1T6Lpw5xdNVvYQ505HI04BeFRq4=
=7ou2
-----END PGP SIGNATURE-----

26
umbrello.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Wed Mar 23 08:15:15 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 22.03.80
* New feature release
- Too many changes since 21.12.3, only listing bugfixes:
* Fix "Data type with modifiers are space sensitive" (kde#369464)
* Fix "request: restore undo/redo buttons missing in KF5 build" (kde#449662)
* Fix "User Interface: Text / line / fill color are reset to hard coded values" (kde#450472)
* Improve predictability/reliability of saving to the resource file" (kde#450470)
* Fix "C++ importer does not recognize 'final' keyword" (kde#397666)
* Fix "[C++ import] Type std::string is created multiple times" (kde#450196)
* Fix for "request: GUI improvement diagram toolbar" (kde#449629)
* Finalize "C#: Windows Forms classes are not imported" and fix "C# importer
doesn't support properties" (kde#449268)
* Fix 'Crashes on cancelling the creation of a new class with the "Creation"
tool in sequence diagram' (kde#443580)
* umlwidgets/associationwidget.{h,cpp}: Fix line attachments. (kde#449463)
* Fix "Python class functions return value wrong in class widget" (kde#449462)
* Fix "Code import wizard: python wrong function return" (kde#449297)
* Fix crash importing Pascal code via import wizard: (kde#449129)
* Completion of fix for "Diagram objects moved to inside enclosing
package become invisible" (kde#447661)
- Drop patch, now upstream
* 0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch
-------------------------------------------------------------------
Tue Mar 1 09:58:20 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

8
umbrello.spec
View File

@ -23,19 +23,17 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without released
Name: umbrello
Version: 21.12.3
Version: 22.03.80
Release: 0
Summary: UML Modeller
License: GPL-2.0-only AND GFDL-1.2-only AND GPL-3.0-or-later
Group: Development/Tools/Other
URL: https://apps.kde.org/umbrello
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: 0001-Make-QtWebKit-usage-in-WelcomePage-optional-with-QTe.patch
BuildRequires: extra-cmake-modules
%if %{with kdevelop}
BuildRequires: kdevelop5-pg-qt