diff --git a/fix_fs_error.patch b/fix_fs_error.patch new file mode 100644 index 0000000..f6f4f26 --- /dev/null +++ b/fix_fs_error.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -Naur openscad-2021.01.orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc +--- openscad-2021.01.orig/src/FileModule.cc 2024-05-27 11:57:04.154249159 +0100 ++++ openscad-2021.01/src/FileModule.cc 2024-05-27 11:52:36.324609857 +0100 +@@ -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); diff --git a/openscad.changes b/openscad.changes index 01b5afa..124803a 100644 --- a/openscad.changes +++ b/openscad.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 27 11:42:51 UTC 2024 - George + +- Add patch to fix is_regular is not a member of fs + + fix_fs_error.patch + ------------------------------------------------------------------- Mon Jul 4 10:02:04 UTC 2022 - Christophe Giboudeaux diff --git a/openscad.spec b/openscad.spec index d552303..0fd841f 100644 --- a/openscad.spec +++ b/openscad.spec @@ -1,7 +1,7 @@ # # spec file for package openscad # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Patch1: CVE-2022-0496.patch Patch2: CVE-2022-0497.patch Patch3: fix_build_with_cgal-5.4.patch Patch4: fix_build_issue_with_overloaded_join.patch +Patch5: fix_fs_error.patch BuildRequires: bison BuildRequires: double-conversion-devel BuildRequires: flex