Update openscad to version 2021.01 / rev 14 via SR 1238079

https://build.opensuse.org/request/show/1238079 by user Smar + anag+factory
bmwiedemann · Jan 15, 2025 · 3480cd9 · 3480cd9
1 parent dbf3185
commit 3480cd9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/packages/o/openscad/.files b/packages/o/openscad/.files
diff --git a/packages/o/openscad/.rev b/packages/o/openscad/.rev
@@ -107,4 +107,12 @@
     <comment></comment>
     <requestid>1177828</requestid>
   </revision>
+  <revision rev="14" vrev="7">
+    <srcmd5>108a177d4e633df4ff12bb2e306e417e</srcmd5>
+    <version>2021.01</version>
+    <time>1736959564</time>
+    <user>anag+factory</user>
+    <comment></comment>
+    <requestid>1238079</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/o/openscad/openscad.changes b/packages/o/openscad/openscad.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 30 15:59:12 UTC 2024 - Torsten Gruner <[email protected]>
+
+- build with C++17 version. Needed by cgal 6.
+
 -------------------------------------------------------------------
 Mon May 27 11:42:51 UTC 2024 - George <[email protected]>
 

diff --git a/packages/o/openscad/openscad.spec b/packages/o/openscad/openscad.spec
@@ -15,7 +15,9 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
+%if 0%{suse_version} < 1600
+%define gccver 13
+%endif
 Name:           openscad
 Version:        2021.01
 Release:        0
@@ -33,7 +35,7 @@ Patch5:         fix_fs_error.patch
 BuildRequires:  bison
 BuildRequires:  double-conversion-devel
 BuildRequires:  flex
-BuildRequires:  gcc-c++
+BuildRequires:  gcc%{?gccver}-c++
 BuildRequires:  libboost_filesystem-devel
 BuildRequires:  libboost_program_options-devel
 BuildRequires:  libboost_regex-devel
@@ -74,9 +76,14 @@ aspects, e.g. modelling of machine parts.
 
 %prep
 %autosetup -p1
+# build with C++17
+sed -i "s|c++14 strict_c++|c++17 strict_c++|g" c++std.pri
+sed -i "s|Using C++14|Using C++17|g" c++std.pri
+sed -i "s|set(CMAKE_CXX_STANDARD 14)|set(CMAKE_CXX_STANDARD 17)|g" CMakeLists.txt
 
 %build
-%qmake5 PREFIX=%{_prefix} CONFIG+=qopenglwidget
+%qmake5 %{?gccver:QMAKE_CC=gcc-%{gccver} QMAKE_CXX=g++-%{gccver}} \
+        PREFIX=%{_prefix} CONFIG+=qopenglwidget
 
 # As of 08.05.2021, memoryperjob constraint is not working correctly,
 # so limit memory per job here.