From 9e67bfb0da97f1937e2b9d04fba3d9ac37373801 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Sat, 4 May 2024 12:01:42 +0200 Subject: openscad: rebuild --- manualPorts/openscad/.md5sum | 1 + manualPorts/openscad/.signature | 5 +++-- manualPorts/openscad/Pkgfile | 7 ++++--- manualPorts/openscad/fs.patch | 11 +++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 manualPorts/openscad/fs.patch diff --git a/manualPorts/openscad/.md5sum b/manualPorts/openscad/.md5sum index 5ef8705..1c6f06b 100644 --- a/manualPorts/openscad/.md5sum +++ b/manualPorts/openscad/.md5sum @@ -5,4 +5,5 @@ e20293c1622d7f92dcf3345d41932546 84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch 3ddcfeaadf03731f65e3567b59789919 9aa0d7e9f2914fe5f547bdde69202161d1c6064d.patch 3bec8ba891cb62751429ab9592c6d50e abfebc651343909b534ef337aacc7604c99cf0ea.patch 3534172852255788e283789d7ca33a0c c50837d597a17b5d4cd8c7ed8e09cb07edb98a6f.patch +5ff32ab59bbb642d3b6ceb0209e76990 fs.patch 79f8e3a42bcfeeb3ddde9e5bc2311f76 openscad-2021.01.src.tar.gz diff --git a/manualPorts/openscad/.signature b/manualPorts/openscad/.signature index dfeeb0e..aa3783b 100644 --- a/manualPorts/openscad/.signature +++ b/manualPorts/openscad/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/deepthought.pub -RWQxCptPusLGGsvlZpuuSVYvA+QJVwmVsW5/yDk6OQHULevlxU1wj0vuElsUm0Tc1mb5/vO16MsTjIcWIbjrO9BruNT7ViSonQY= -SHA256 (Pkgfile) = dcf168f391dff9381dfcc861b82595e53c4a56609dcc03f233270ba8b580e157 +RWQxCptPusLGGg/S7zxCwqGG50Tls6LSdt9gVpAFcXLqucvf1vmNoUZea8bhqBMTM+cSFrkKa4Ubh7F7H8sNUEyPsXvSUhO17g4= +SHA256 (Pkgfile) = 9254be5d19ac2215abec5af7895066b91fe3f53948db2c05054e350f506a556c SHA256 (.footprint) = 6648b58471a9ac51120b8c05f5ea13c153113c4607e28860332740e617f3a9a5 SHA256 (openscad-2021.01.src.tar.gz) = d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359 SHA256 (00a4692989c4e2f191525f73f24ad8727bacdf41.patch) = 0f5cc845bd1d5d9a5071790632e0c04443e88002226b83c293d3d7f8e4f5b41e @@ -10,3 +10,4 @@ SHA256 (9aa0d7e9f2914fe5f547bdde69202161d1c6064d.patch) = ea38e409a8fff9582684e4 SHA256 (c50837d597a17b5d4cd8c7ed8e09cb07edb98a6f.patch) = 694464532310c16c7c29900ca369860a6e52ee81b1561fb83f745a5ef5f3486d SHA256 (abfebc651343909b534ef337aacc7604c99cf0ea.patch) = 836626d08bd8dcce496bd2db0a73ae1911915388c412dc63d831d40ae1aa9206 SHA256 (08bf69b4115c989fc5671254e0d05735d01bcca5.patch) = 583783a6ecb2fe7d23b37bc5e29c6c705065748a6993908ff28ad61b10190ce7 +SHA256 (fs.patch) = 2a674a07c2577dcbcf81bfe75b953e43cf3458722c4f8fc35f659825df3fb141 diff --git a/manualPorts/openscad/Pkgfile b/manualPorts/openscad/Pkgfile index bcdf605..cf3b11a 100644 --- a/manualPorts/openscad/Pkgfile +++ b/manualPorts/openscad/Pkgfile @@ -6,15 +6,16 @@ name=openscad version=2021.01 -release=1 +release=2 source=(https://files.openscad.org/openscad-$version.src.tar.gz -https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41.patch + https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41.patch https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b.patch https://github.com/openscad/openscad/commit/4c5d19c302d7d440d1c11c3d02b3ce5eb2e548da.patch https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d.patch https://github.com/openscad/openscad/commit/c50837d597a17b5d4cd8c7ed8e09cb07edb98a6f.patch https://github.com/openscad/openscad/commit/abfebc651343909b534ef337aacc7604c99cf0ea.patch - https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5.patch) + https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5.patch + fs.patch) build () { cd $name-$version diff --git a/manualPorts/openscad/fs.patch b/manualPorts/openscad/fs.patch new file mode 100644 index 0000000..6e02b5e --- /dev/null +++ b/manualPorts/openscad/fs.patch @@ -0,0 +1,11 @@ +--- a/src/FileModule.cc 2021-01-31 21:17:41.000000000 +0100 ++++ b/src/FileModule.cc 2024-05-04 11:44:32.132784497 +0200 +@@ -65,7 +65,7 @@ + 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); -- cgit v1.2.3-70-g09d2