summaryrefslogtreecommitdiff
path: root/user/umbrello
diff options
context:
space:
mode:
Diffstat (limited to 'user/umbrello')
-rw-r--r--user/umbrello/APKBUILD11
-rw-r--r--user/umbrello/assertion-fix.patch41
2 files changed, 4 insertions, 48 deletions
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
index 4d0afa0b8..76ee7e7d2 100644
--- a/user/umbrello/APKBUILD
+++ b/user/umbrello/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=umbrello
-pkgver=19.08.0
+pkgver=22.04.2
pkgrel=0
pkgdesc="Software modelling tool and code generator"
url="https://umbrello.kde.org/"
@@ -14,12 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kcrash-dev kdoctools-dev kiconthemes-dev kdelibs4support-dev kio-dev
ktexteditor-dev kwindowsystem-dev kwidgetsaddons-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/umbrello-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/umbrello-$pkgver.tar.xz
hax.patch
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -30,19 +29,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="46f95eba5b5880e1df7bbc952c35fbf93959a03aed4e9b2247e54b1cfcc65388a38c85e596a080c70f750f9ffeff17089e186ed7ea9a4dfb1248ba8118f9ecda umbrello-19.08.0.tar.xz
+sha512sums="67b3d573cccd0bdf4ec7accea53c5059e6b676525952ea4f66aa1eff0c8cfe3593587dc1e3302fc6a0e3ed9e5a08197bc4abf9d1138d7affbda9579913e4ac3b umbrello-22.04.2.tar.xz
fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch"
diff --git a/user/umbrello/assertion-fix.patch b/user/umbrello/assertion-fix.patch
deleted file mode 100644
index ef86e6546..000000000
--- a/user/umbrello/assertion-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From af72e059f728d70e43ac3ea03653865585818e66 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 2 Nov 2018 11:38:37 +0100
-Subject: Fix 'Umbrello fails to start due to ASSERT failure in QVector<T>::at
- "index out of range"'
-
-The backtrace shows that Qt wants to access tree view items that
-have already been deleted. To avoid this, graphical updates are
-disabled when creating the new document.
-
-BUG:400501
-FIXED-IN:2.26.3 (KDE Applications 18.08.3)
----
- umbrello/umldoc.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp
-index d4099bb..af5c889 100644
---- a/umbrello/umldoc.cpp
-+++ b/umbrello/umldoc.cpp
-@@ -442,6 +442,9 @@ void UMLDoc::closeDocument()
- */
- bool UMLDoc::newDocument()
- {
-+ bool state = UMLApp::app()->document()->loading();
-+ UMLApp::app()->document()->setLoading(false);
-+
- closeDocument();
- UMLApp::app()->setCurrentView(0);
- setUrlUntitled();
-@@ -465,6 +468,7 @@ bool UMLDoc::newDocument()
- UMLApp::app()->enableUndoAction(false);
- UMLApp::app()->clearUndoStack();
-
-+ UMLApp::app()->document()->setLoading(state);
- return true;
- }
-
---
-cgit v0.11.2
-