mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
umbrello: bump version
This commit is contained in:
@@ -1,77 +0,0 @@
|
|||||||
From 91a5bfbac4944346ed7bcf34295e928932a62257 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
||||||
Date: Sat, 17 Aug 2019 17:12:45 +1000
|
|
||||||
Subject: Fix build for Haiku
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
||||||
index 4ee5f56..7adfd9c 100644
|
|
||||||
--- a/CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -159,7 +159,7 @@ if(NOT BUILD_KF5)
|
|
||||||
macro_display_feature_log()
|
|
||||||
KDE4_NO_ENABLE_FINAL(umbrello)
|
|
||||||
else()
|
|
||||||
- set(BUILD_UNITTESTS 1)
|
|
||||||
+# set(BUILD_UNITTESTS 1)
|
|
||||||
|
|
||||||
ki18n_install(po)
|
|
||||||
kdoctools_install(po)
|
|
||||||
@@ -299,7 +299,7 @@ endif()
|
|
||||||
|
|
||||||
if(LIBXSLT_FOUND AND LIBXML2_FOUND)
|
|
||||||
add_subdirectory(umbrello)
|
|
||||||
- add_subdirectory(doc)
|
|
||||||
+# add_subdirectory(doc)
|
|
||||||
add_subdirectory(tools)
|
|
||||||
endif(LIBXSLT_FOUND AND LIBXML2_FOUND)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.30.0
|
|
||||||
|
|
||||||
|
|
||||||
From c5ef86e5048fe6538c0582e302bb5a54ce85ef0b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
||||||
Date: Sat, 17 Aug 2019 18:31:45 +1000
|
|
||||||
Subject: Fix transparency for Bird's eye widget
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/umbrello/birdview.cpp b/umbrello/birdview.cpp
|
|
||||||
index f4bcfab..9bcbf52 100644
|
|
||||||
--- a/umbrello/birdview.cpp
|
|
||||||
+++ b/umbrello/birdview.cpp
|
|
||||||
@@ -60,7 +60,7 @@ BirdView::BirdView(QDockWidget *parent, UMLView* view)
|
|
||||||
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
|
|
||||||
setLineWidth(1);
|
|
||||||
setMidLineWidth(2);
|
|
||||||
- setFrameStyle(Box | Raised);
|
|
||||||
+ setFrameStyle(NoFrame | Raised);
|
|
||||||
setBackgroundColor(this, QColor(115, 205, 240, 100));
|
|
||||||
setFocusPolicy(Qt::StrongFocus); // enable key press event
|
|
||||||
|
|
||||||
--
|
|
||||||
2.30.0
|
|
||||||
|
|
||||||
|
|
||||||
From ffcb81359e56fa90d9ca5a4c58283a02dfd6ff5c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
||||||
Date: Fri, 8 Jan 2021 20:58:39 +1000
|
|
||||||
Subject: Use QApplication instead KApplication
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/umbrello/main.cpp b/umbrello/main.cpp
|
|
||||||
index 29f494d..118dfa1 100644
|
|
||||||
--- a/umbrello/main.cpp
|
|
||||||
+++ b/umbrello/main.cpp
|
|
||||||
@@ -165,7 +165,7 @@ int main(int argc, char *argv[])
|
|
||||||
options.add(optionString, i18n("set active language"));
|
|
||||||
}
|
|
||||||
KCmdLineArgs::addCmdLineOptions(options); // Add our own options.
|
|
||||||
- KApplication app;
|
|
||||||
+ QApplication app(argc, argv);
|
|
||||||
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
|
|
||||||
#if QT_VERSION > 0x050000
|
|
||||||
KCrash::initialize();
|
|
||||||
--
|
|
||||||
2.30.0
|
|
||||||
|
|
||||||
22
kde-apps/umbrello/patches/umbrello-23.08.5.patchset
Normal file
22
kde-apps/umbrello/patches/umbrello-23.08.5.patchset
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
From bc163ee9d9e105eefbe3bd29b73efa12255e1fb3 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
|
||||||
|
--- a/umbrello/birdview.cpp
|
||||||
|
+++ b/umbrello/birdview.cpp
|
||||||
|
@@ -47,7 +47,7 @@ BirdView::BirdView(QDockWidget *parent, UMLView* view)
|
||||||
|
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
|
||||||
|
setLineWidth(1);
|
||||||
|
setMidLineWidth(2);
|
||||||
|
- setFrameStyle(Box | Raised);
|
||||||
|
+ setFrameStyle(NoFrame | Raised);
|
||||||
|
setBackgroundColor(this, QColor(115, 205, 240, 100));
|
||||||
|
setFocusPolicy(Qt::StrongFocus); // enable key press event
|
||||||
|
|
||||||
|
--
|
||||||
|
2.43.2
|
||||||
|
|
||||||
@@ -4,12 +4,11 @@ diagram program based on KDE Technology.
|
|||||||
UML allows you to create diagrams of software and other systems in a \
|
UML allows you to create diagrams of software and other systems in a \
|
||||||
standard format to document or design the structure of your programs."
|
standard format to document or design the structure of your programs."
|
||||||
HOMEPAGE="https://umbrello.kde.org"
|
HOMEPAGE="https://umbrello.kde.org"
|
||||||
COPYRIGHT="2010-2022 KDE Organisation"
|
COPYRIGHT="2010-2024 KDE Organisation"
|
||||||
LICENSE="GNU GPL v2"
|
LICENSE="GNU GPL v2"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
SOURCE_URI="https://github.com/KDE/umbrello/archive/v$portVersion.tar.gz"
|
SOURCE_URI="https://download.kde.org/stable/release-service/$portVersion/src/umbrello-$portVersion.tar.xz"
|
||||||
CHECKSUM_SHA256="8282212bd6bf598b2a833716bf4c7a4c51542b04114c745cf464f830425fd7be"
|
CHECKSUM_SHA256="4c404222ee5a41976f2c561220c6f74867e9828a0d09a36a8166b9ee1b64c780"
|
||||||
SOURCE_DIR="umbrello-$portVersion"
|
|
||||||
PATCHES="umbrello-$portVersion.patchset"
|
PATCHES="umbrello-$portVersion.patchset"
|
||||||
ADDITIONAL_FILES="umbrello.rdef.in"
|
ADDITIONAL_FILES="umbrello.rdef.in"
|
||||||
|
|
||||||
@@ -69,7 +68,7 @@ REQUIRES="
|
|||||||
|
|
||||||
BUILD_REQUIRES="
|
BUILD_REQUIRES="
|
||||||
haiku${secondaryArchSuffix}_devel
|
haiku${secondaryArchSuffix}_devel
|
||||||
extra_cmake_modules$secondaryArchSuffix >= 5.93
|
extra_cmake_modules$secondaryArchSuffix
|
||||||
devel:libKF5Archive$secondaryArchSuffix
|
devel:libKF5Archive$secondaryArchSuffix
|
||||||
devel:libKF5Auth$secondaryArchSuffix
|
devel:libKF5Auth$secondaryArchSuffix
|
||||||
devel:libKF5Bookmarks$secondaryArchSuffix
|
devel:libKF5Bookmarks$secondaryArchSuffix
|
||||||
@@ -121,6 +120,10 @@ BUILD_PREREQUIRES="
|
|||||||
|
|
||||||
BUILD()
|
BUILD()
|
||||||
{
|
{
|
||||||
|
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
|
||||||
|
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
|
|
||||||
Reference in New Issue
Block a user