Sun Apr 28 08:09:07 2024 UTC (14d)
(cad/openscad) Fix build against boost 1.85.0, add one line patch

Confirmed on NetBSD/amd64 9.3 at least


(mef)
diff -r1.14 -r1.15 pkgsrc/cad/openscad/distinfo
diff -r0 -r1.1 pkgsrc/cad/openscad/patches/patch-src_FileModule.cc
cvs diff -r1.14 -r1.15 pkgsrc/cad/openscad/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/openscad/distinfo 2021/10/26 10:04:14 1.14
+++ pkgsrc/cad/openscad/distinfo 2024/04/28 08:09:07 1.15
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.14 2021/10/26 10:04:14 nia Exp $ 1$NetBSD: distinfo,v 1.15 2024/04/28 08:09:07 mef Exp $
2 2
3BLAKE2s (openscad-2021.01.tar.gz) = dc3d5a762d8b334fcdefc41d3c15a3b01023ce93ed4b2bae2f9d13c5100c7918 3BLAKE2s (openscad-2021.01.tar.gz) = dc3d5a762d8b334fcdefc41d3c15a3b01023ce93ed4b2bae2f9d13c5100c7918
4SHA512 (openscad-2021.01.tar.gz) = 2dac2d9c2fdbb720bc2e56f66849a75abe10ee646f918c53dadf33d57a30f3c605a536483bd97410d715309064ac99330ce15657440e4d66b426635dfab6a32b 4SHA512 (openscad-2021.01.tar.gz) = 2dac2d9c2fdbb720bc2e56f66849a75abe10ee646f918c53dadf33d57a30f3c605a536483bd97410d715309064ac99330ce15657440e4d66b426635dfab6a32b
5Size (openscad-2021.01.tar.gz) = 15656800 bytes 5Size (openscad-2021.01.tar.gz) = 15656800 bytes
6SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c 6SHA1 (patch-features_qscintilla2-priv.prf) = ca5d5735d091441d6daf7535802f5ba7362c808c
7SHA1 (patch-openscad.pro) = 55e97368d2fdd77c8a4773699cfffdaccd65d63f 7SHA1 (patch-openscad.pro) = 55e97368d2fdd77c8a4773699cfffdaccd65d63f
8SHA1 (patch-scripts_translation-update.sh) = 24929df617e450558934e46b1711f241945da7eb 8SHA1 (patch-scripts_translation-update.sh) = 24929df617e450558934e46b1711f241945da7eb
 9SHA1 (patch-src_FileModule.cc) = c3e2d7a711fe28eb701bc84a6413daa8bd8dfff6
9SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038 10SHA1 (patch-src_colormap.h) = d218a17ac71e0178d32b79723b532c9f098bc038
10SHA1 (patch-src_scintillaeditor.h) = 47d2cde8d7349a23770c549e5df9b219678825e9 11SHA1 (patch-src_scintillaeditor.h) = 47d2cde8d7349a23770c549e5df9b219678825e9
File Added: pkgsrc/cad/openscad/patches/patch-src_FileModule.cc
$NetBSD: patch-src_FileModule.cc,v 1.1 2024/04/28 08:09:07 mef Exp $


boost-1.85 deleted api

--- objects/src/FileModule.o ---
src/FileModule.cc: In member function 'void FileModule::registerUse(std::__cxx11::string, const Location&)':
src/FileModule.cc:68:11: error: 'is_regular' is not a member of 'fs'
   if (fs::is_regular(path)) {
           ^~~~~~~~~~
src/FileModule.cc:68:11: note: suggested alternative: 'is_regular_file'
   if (fs::is_regular(path)) {
           ^~~~~~~~~~
           is_regular_file

--- src/FileModule.cc.orig	2021-02-01 02:41:09.000000000 +0900
+++ src/FileModule.cc	2024-04-28 16:54:35.694333460 +0900
@@ -65,7 +65,7 @@ void FileModule::registerUse(const std::
 	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);