rpm/openscad
SHA256
1
0
Fork 0
forked from pool/openscad
Code Pull Requests Activity

Accepting request 1177116 from home:george82:branches:graphics

Browse Source 
Add patch to fix is_regular is not a member of fs

OBS-URL: https://build.opensuse.org/request/show/1177116
OBS-URL: https://build.opensuse.org/package/show/graphics/openscad?expand=0&rev=48
This commit is contained in:
Samu Voutilainen 2024-05-31 03:56:04 +00:00 committed by Git OBS Bridge
parent 408786492d
commit 0f1c090bc7
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fix_fs_error.patch Normal file
View File

@ -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);

6
openscad.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon May 27 11:42:51 UTC 2024 - George <georgewoodall82@gmail.com>
- 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 <christophe@krop.fr>

3
openscad.spec
View File

@ -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