From 47caa87ee25ad971ee27d449545aacd4b911b478 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 16 Dec 2020 20:44:41 +1000 Subject: [PATCH] Umbrello: bump version --- .../patches/umbrello-20.04.0.patchset | 121 ------------------ .../patches/umbrello-20.12.0.patchset | 54 ++++++++ ...20.04.0.recipe => umbrello-20.12.0.recipe} | 6 +- 3 files changed, 57 insertions(+), 124 deletions(-) delete mode 100644 kde-apps/umbrello/patches/umbrello-20.04.0.patchset create mode 100644 kde-apps/umbrello/patches/umbrello-20.12.0.patchset rename kde-apps/umbrello/{umbrello-20.04.0.recipe => umbrello-20.12.0.recipe} (96%) diff --git a/kde-apps/umbrello/patches/umbrello-20.04.0.patchset b/kde-apps/umbrello/patches/umbrello-20.04.0.patchset deleted file mode 100644 index 2038dc5ba..000000000 --- a/kde-apps/umbrello/patches/umbrello-20.04.0.patchset +++ /dev/null @@ -1,121 +0,0 @@ -From d34c741419c7c7074b134b3f1eea4fb59f4328ab 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 158bbfe..c366c1c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -135,7 +135,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) -@@ -237,7 +237,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.21.0 - - -From 072bd0d6848262af06e04330eaf0a501afb6df24 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 17 Aug 2019 17:52:39 +1000 -Subject: Dbus autostart - - -diff --git a/umbrello/main.cpp b/umbrello/main.cpp -index 9d2acd8..04c4e69 100644 ---- a/umbrello/main.cpp -+++ b/umbrello/main.cpp -@@ -40,6 +40,10 @@ - - #include - -+#ifdef __HAIKU__ -+#include -+#endif -+ - void getFiles(QStringList& files, const QString& path, QStringList& filters); - - /** -@@ -116,6 +120,18 @@ void exportAllViews(KCmdLineArgs *args, const QStringList &exportOpt) - - int main(int argc, char *argv[]) - { -+#ifdef __HAIKU__ -+ int status=0; -+ QProcess dbusProcess; -+ QString exec = "/bin/dbus-launch"; -+ QStringList params; -+ dbusProcess.start(exec, params); -+ dbusProcess.waitForFinished(); -+ QString output(dbusProcess.readAllStandardOutput()); -+ QStringList list = output.split("\n", QString::SkipEmptyParts); -+ foreach (const QString &str, list) -+ putenv(str.toLatin1().data()); -+#endif - KAboutData aboutData("umbrello", - 0, - i18n("Umbrello UML Modeller"), --- -2.21.0 - - -From 98a67ecc7385a547321217d9777ca6355675946f 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.21.0 - - -From 69eea9def5198cfc903484eaa0b44fea8620a5f3 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 17 Aug 2019 18:32:44 +1000 -Subject: Kill dbus on exit - - -diff --git a/umbrello/main.cpp b/umbrello/main.cpp -index 04c4e69..8d646de 100644 ---- a/umbrello/main.cpp -+++ b/umbrello/main.cpp -@@ -255,5 +255,8 @@ int main(int argc, char *argv[]) - } - int result = app.exec(); - delete uml; -+#ifdef __HAIKU__ -+ system("kill -9 $DBUS_SESSION_BUS_PID"); -+#endif - return result; - } --- -2.21.0 - diff --git a/kde-apps/umbrello/patches/umbrello-20.12.0.patchset b/kde-apps/umbrello/patches/umbrello-20.12.0.patchset new file mode 100644 index 000000000..f63a59419 --- /dev/null +++ b/kde-apps/umbrello/patches/umbrello-20.12.0.patchset @@ -0,0 +1,54 @@ +From d34c741419c7c7074b134b3f1eea4fb59f4328ab 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 158bbfe..c366c1c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,7 +135,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) +@@ -237,7 +237,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.21.0 + + +From 98a67ecc7385a547321217d9777ca6355675946f 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.21.0 + diff --git a/kde-apps/umbrello/umbrello-20.04.0.recipe b/kde-apps/umbrello/umbrello-20.12.0.recipe similarity index 96% rename from kde-apps/umbrello/umbrello-20.04.0.recipe rename to kde-apps/umbrello/umbrello-20.12.0.recipe index f1d1225be..4d6867109 100644 --- a/kde-apps/umbrello/umbrello-20.04.0.recipe +++ b/kde-apps/umbrello/umbrello-20.12.0.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2020 KDE Organisation" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/KDE/umbrello/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="2cc2b6a0fdd70c9a8b430f7ec35b57c3f753c6bf6a7ad3793712176b817d284d" +CHECKSUM_SHA256="261b2f62f177f6670d03cae6261d58efa19530cfc28dc1335a19e8b648549bcd" SOURCE_DIR="umbrello-$portVersion" PATCHES="umbrello-$portVersion.patchset" ADDITIONAL_FILES="umbrello.rdef.in" @@ -68,7 +68,7 @@ REQUIRES=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - extra_cmake_modules$secondaryArchSuffix >= 5.65 + extra_cmake_modules$secondaryArchSuffix >= 5.77 devel:libKF5Archive$secondaryArchSuffix devel:libKF5Auth$secondaryArchSuffix devel:libKF5Bookmarks$secondaryArchSuffix @@ -103,7 +103,7 @@ BUILD_REQUIRES=" devel:libKF5WindowSystem$secondaryArchSuffix devel:libKF5XmlGui$secondaryArchSuffix devel:libkdeinit5_klauncher$secondaryArchSuffix - devel:libQt5Core$secondaryArchSuffix >= 5.14 + devel:libQt5Core$secondaryArchSuffix >= 5.15 devel:libQt5WebKit$secondaryArchSuffix devel:libQt5WebKitWidgets$secondaryArchSuffix devel:libxml2$secondaryArchSuffix