openscad, revbump for libzip (#12895)

This commit is contained in:
Schrijvers Luc
2025-09-02 17:13:47 +02:00
committed by GitHub
parent 99a6749964
commit 71b1abcd72
2 changed files with 28 additions and 5 deletions

View File

@@ -72,7 +72,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:eigen$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix >= 1.83.0
devel:libboost_filesystem$secondaryArchSuffix >= 1.88.0
devel:libcairo$secondaryArchSuffix
devel:libcgal$secondaryArchSuffix
devel:libdouble_conversion$secondaryArchSuffix

View File

@@ -1,4 +1,4 @@
From a3963e0e69345f01ce95e249374cab439a7db982 Mon Sep 17 00:00:00 2001
From 6addb381b30720eda1d86a63d5f4b5e0d838ecce Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 22 Mar 2025 06:42:20 +0100
Subject: Use OffscreenContextNULL for Haiku
@@ -27,10 +27,10 @@ index b76ca76..f9ceb26
SOURCES += src/imageutils-macosx.cc
OBJECTIVE_SOURCES += src/OffscreenContextCGL.mm
--
2.48.1
2.50.1
From 1ecd3ada0ec2106536ad487c6f3939efc6732c47 Mon Sep 17 00:00:00 2001
From 9b7e218826be0e2841938ceb66367a8e89bf5b52 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sat, 22 Mar 2025 07:00:10 +0100
Subject: No GL/glxew.h on Haiku (yet)
@@ -59,5 +59,28 @@ index f1216c6..7ea3cdc 100644
#endif
}
--
2.48.1
2.50.1
From 50383d63afc4383f9f514afbca7c8696d33fdea6 Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Tue, 2 Sep 2025 17:09:56 +0200
Subject: Build fix
diff --git a/src/FileModule.cc b/src/FileModule.cc
index ce57b1f..71e343c 100644
--- a/src/FileModule.cc
+++ b/src/FileModule.cc
@@ -65,7 +65,7 @@ void FileModule::registerUse(const std::string path, const Location &loc)
auto ext = fs::path(path).extension().generic_string();
if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
- if (fs::is_regular(path)) {
+ if (fs::is_regular_file(path)) {
FontCache::instance()->register_font_file(path);
} else {
LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
--
2.50.1