diff --git a/media-gfx/leocad/leocad-21.06.recipe b/media-gfx/leocad/leocad-23.03.recipe similarity index 93% rename from media-gfx/leocad/leocad-21.06.recipe rename to media-gfx/leocad/leocad-23.03.recipe index 7e7b4b2c8..4682ec694 100644 --- a/media-gfx/leocad/leocad-21.06.recipe +++ b/media-gfx/leocad/leocad-23.03.recipe @@ -11,12 +11,12 @@ and continues to receive updates." HOMEPAGE="https://www.leocad.org/" COPYRIGHT="LeoCAD Team" LICENSE="GNU GPL v2" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/leozide/leocad/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="bd28c47f920fa1bc458b6e5f476b93ccc1aa40e30158a3dd2397368cc3d79099" -libVersion="20.03" +CHECKSUM_SHA256="69a45c60898ed07d8cf7e714442b201b0da3adc073287170eb6f46901e4604ce" +libVersion="23.06" SOURCE_URI_2="https://github.com/leozide/leocad/releases/download/v$portVersion/Library-$libVersion.zip" -CHECKSUM_SHA256_2="88d6d28b3a494a15ae63e984c1e732e28362fabc2e145ffab828fed2eb5e3632" +CHECKSUM_SHA256_2="ef29c1e0fc989c9e9894072f43ae0030a5274c0cdcc831bc6c206bbe059f449b" PATCHES="leocad-$portVersion.patchset" ADDITIONAL_FILES=" leocad.rdef.in diff --git a/media-gfx/leocad/patches/leocad-21.06.patchset b/media-gfx/leocad/patches/leocad-23.03.patchset similarity index 68% rename from media-gfx/leocad/patches/leocad-21.06.patchset rename to media-gfx/leocad/patches/leocad-23.03.patchset index 6473e72cc..bed21a05c 100644 --- a/media-gfx/leocad/patches/leocad-21.06.patchset +++ b/media-gfx/leocad/patches/leocad-23.03.patchset @@ -1,14 +1,27 @@ -From 56e3d2007014c45e92c60b56466d40f2a6d9ba0f Mon Sep 17 00:00:00 2001 +From c4c7d6c4291d07498df6f9e370c4c525bacb1f54 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 31 Mar 2022 22:43:45 +1000 +Date: Sat, 16 Mar 2024 23:08:12 +1000 Subject: Add haiku fixes +diff --git a/common/lc_profile.cpp b/common/lc_profile.cpp +index e11473a..d9d628d 100644 +--- a/common/lc_profile.cpp ++++ b/common/lc_profile.cpp +@@ -101,7 +101,7 @@ static lcProfileEntry gProfileEntries[LC_NUM_PROFILE_KEYS] = + lcProfileEntry("Settings", "ControlPointFocusedColor", static_cast(LC_RGBA(102, 76, 229, 128))), // LC_PROFILE_CONTROL_POINT_FOCUSED_COLOR + + lcProfileEntry("Settings", "Language", ""), // LC_PROFILE_LANGUAGE +- lcProfileEntry("Settings", "ColorTheme", static_cast(lcColorTheme::Dark)), // LC_PROFILE_COLOR_THEME ++ lcProfileEntry("Settings", "ColorTheme", static_cast(lcColorTheme::System)), // LC_PROFILE_COLOR_THEME + lcProfileEntry("Settings", "CheckUpdates", 1), // LC_PROFILE_CHECK_UPDATES + lcProfileEntry("Settings", "ProjectsPath", ""), // LC_PROFILE_PROJECTS_PATH + lcProfileEntry("Settings", "PartsLibrary", ""), // LC_PROFILE_PARTS_LIBRARY diff --git a/qt/qtmain.cpp b/qt/qtmain.cpp -index a38dd01..7b3da32 100644 +index db9d884..6547163 100644 --- a/qt/qtmain.cpp +++ b/qt/qtmain.cpp -@@ -184,6 +184,10 @@ int main(int argc, char *argv[]) +@@ -189,6 +189,10 @@ int main(int argc, char *argv[]) LibraryPaths += qMakePair(QDir::cleanPath(QCoreApplication::applicationDirPath() + "/library.bin"), true); #endif @@ -20,28 +33,5 @@ index a38dd01..7b3da32 100644 LibraryPaths += qMakePair(QDir::cleanPath(QCoreApplication::applicationDirPath() + "/../share/leocad/library.bin"), true); #endif -- -2.30.2 - - -From 699bcb03415f257405161bfb4fd054eeec40195e Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 25 Apr 2022 20:12:07 +1000 -Subject: Use system color theme - - -diff --git a/common/lc_profile.cpp b/common/lc_profile.cpp -index 1975b58..c303fb9 100644 ---- a/common/lc_profile.cpp -+++ b/common/lc_profile.cpp -@@ -95,7 +95,7 @@ static lcProfileEntry gProfileEntries[LC_NUM_PROFILE_KEYS] = - lcProfileEntry("Settings", "ViewSphereHighlightColor", LC_RGBA(41, 128, 185, 255)), // LC_PROFILE_VIEW_SPHERE_HIGHLIGHT_COLOR - - lcProfileEntry("Settings", "Language", ""), // LC_PROFILE_LANGUAGE -- lcProfileEntry("Settings", "ColorTheme", static_cast(lcColorTheme::Dark)), // LC_PROFILE_COLOR_THEME -+ lcProfileEntry("Settings", "ColorTheme", static_cast(lcColorTheme::System)), // LC_PROFILE_COLOR_THEME - lcProfileEntry("Settings", "CheckUpdates", 1), // LC_PROFILE_CHECK_UPDATES - lcProfileEntry("Settings", "ProjectsPath", ""), // LC_PROFILE_PROJECTS_PATH - lcProfileEntry("Settings", "PartsLibrary", ""), // LC_PROFILE_PARTS_LIBRARY --- -2.30.2 +2.43.2