umbrello, bump to version 24.12.3 (#12079)

This commit is contained in:
Schrijvers Luc
2025-03-25 16:25:52 +00:00
committed by GitHub
parent a7a07d35e9
commit 09a31d306e
2 changed files with 37 additions and 24 deletions

View File

@@ -1,11 +1,11 @@
From ff8c82eea55d2a444dc31eb78fd900d41a608d87 Mon Sep 17 00:00:00 2001
From 3f5a274f53f98245c4a7cff8a4750ef78e55e6cd Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 3 Mar 2024 21:13:22 +1000
Subject: Fix for Haiku
diff --git a/umbrello/birdview.cpp b/umbrello/birdview.cpp
index 7da2b9b..a40642e 100644
index fdccd77..26e88b3 100644
--- a/umbrello/birdview.cpp
+++ b/umbrello/birdview.cpp
@@ -47,7 +47,7 @@ BirdView::BirdView(QDockWidget *parent, UMLView* view)
@@ -18,5 +18,5 @@ index 7da2b9b..a40642e 100644
setFocusPolicy(Qt::StrongFocus); // enable key press event
--
2.43.2
2.48.1

View File

@@ -4,11 +4,11 @@ diagram program based on KDE Technology.
UML allows you to create diagrams of software and other systems in a \
standard format to document or design the structure of your programs."
HOMEPAGE="https://umbrello.kde.org"
COPYRIGHT="2010-2024 KDE Organisation"
COPYRIGHT="2010-2025 KDE Organisation"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/umbrello-$portVersion.tar.xz"
CHECKSUM_SHA256="892d0bbf62a4a43dd22d61f8207aac012bbeb20d8301b7e70516b0d95617542c"
CHECKSUM_SHA256="861759606654658fff943af1a6e34d98f9a6da7bfa92cd4739b12c5c763f4580"
PATCHES="umbrello-$portVersion.patchset"
ADDITIONAL_FILES="umbrello.rdef.in"
@@ -17,6 +17,8 @@ SECONDARY_ARCHITECTURES="x86"
PROVIDES="
umbrello$secondaryArchSuffix = $portVersion
cmd:po2xmi5$secondaryArchSuffix = $portVersion
cmd:xmi2pot5$secondaryArchSuffix = $portVersion
app:Umbrello$secondaryArchSuffix = $portVersion
"
REQUIRES="
@@ -118,46 +120,57 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
BUILD()
PATCH()
{
# disable docs generation
sed -e '/ add_subdirectory(doc)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/kdoctools_install(po)/ s/^#*/#/' -i CMakeLists.txt
sed -e '/set(BUILD_UNITTESTS 1)/ s/^#*/#/' -i CMakeLists.txt
# disable unittests
sed -e '/set(BUILD_UNITTESTS 1)/ s/^#*/#/' -i CMakeLists.txt
}
mkdir -p build
cd build
TEST_REQUIRES="
qthaikuplugins$secondaryArchSuffix
"
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$appsDir/Umbrello \
-DCMAKE_INSTALL_DATADIR=$appsDir/Umbrello \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake
BUILD()
{
cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
$cmakeDirArgs \
-DECM_DIR=/system/data/cmake/Modules/ECM/cmake \
-DBUILD_TESTING=OFF
make $jobArgs
make -C build $jobArgs
}
INSTALL()
{
cd build
make install
make -C build install
mv $appsDir/Umbrello/bin/umbrello5 $appsDir/Umbrello/Umbrello
mv $appsDir/Umbrello/bin/* $appsDir/Umbrello
rm -rf $appsDir/Umbrello/{bin,share}
# cleanup
rm -rf $dataDir/{applications,icons,metainfo}
mkdir $appsDir
mv $binDir/umbrello5 $appsDir/Umbrello
local APP_SIGNATURE="application/x-vnd.kde-umbrello"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"
local LONG_INFO="$SUMMARY"
local APP_SIGNATURE="application/x-vnd.kde-umbrello"
sed \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
-e "s|@MAJOR@|$MAJOR|" \
-e "s|@MIDDLE@|$MIDDLE|" \
-e "s|@MINOR@|$MINOR|" \
-e "s|@LONG_INFO@|$LONG_INFO|" \
-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
$portDir/additional-files/umbrello.rdef.in > umbrello.rdef
addResourcesToBinaries umbrello.rdef $appsDir/Umbrello/Umbrello
addAppDeskbarSymlink $appsDir/Umbrello/Umbrello
addResourcesToBinaries umbrello.rdef $appsDir/Umbrello
addAppDeskbarSymlink $appsDir/Umbrello
}
TEST()
{
ctest --test-dir build --output-on-failure
}