[packages/openscad] - fix detection of lib3mf 2.x

baggins baggins at pld-linux.org
Sat Mar 14 15:01:19 CET 2026


commit 0fa623392f7d7d8c5618358c6cf18c12c721845c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 14 16:01:05 2026 +0100

    - fix detection of lib3mf 2.x

 lib3mf2.patch | 20 ++++++++++++++++++++
 openscad.spec |  2 ++
 2 files changed, 22 insertions(+)
---
diff --git a/openscad.spec b/openscad.spec
index 1094e1c..91460fc 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -25,6 +25,7 @@ Source0:	https://github.com/openscad/openscad/archive/%{hash}/%{name}-%{version}
 Source1:	https://github.com/openscad/MCAD/archive/%{mcad_gitref}/MCAD-%{mcad_gitref}.tar.gz
 # Source1-md5:	a86572e744abff686ee146274eda87f4
 Patch1:		localedir.patch
+Patch2:		lib3mf2.patch
 URL:		https://openscad.org/
 BuildRequires:	CGAL-devel >= 6.1.1
 BuildRequires:	Clipper2-devel
@@ -217,6 +218,7 @@ zmian API, ale wiele rzeczy już działa.
 %prep
 %setup -q -n openscad-1e5d8ca4bb937582781a99b65cc0b3b5bd047ec8
 %patch -P1 -p1
+%patch -P2 -p1
 
 %{__tar} xf %{SOURCE1} -C libraries/MCAD --strip-components=1
 
diff --git a/lib3mf2.patch b/lib3mf2.patch
new file mode 100644
index 0000000..6480a2b
--- /dev/null
+++ b/lib3mf2.patch
@@ -0,0 +1,20 @@
+--- openscad-1e5d8ca4bb937582781a99b65cc0b3b5bd047ec8/CMakeLists.txt.orig	2026-03-08 00:48:23.000000000 +0100
++++ openscad-1e5d8ca4bb937582781a99b65cc0b3b5bd047ec8/CMakeLists.txt	2026-03-14 15:49:13.689999355 +0100
+@@ -722,12 +722,12 @@
+ find_package(BISON REQUIRED QUIET)
+ message(STATUS "Bison: ${BISON_VERSION}")
+ 
+-find_package(Lib3MF)
+-if (Lib3MF_FOUND)
+-  message(STATUS "lib3mf: ${Lib3MF_VERSION}")
+-  target_link_libraries(OpenSCADLibInternal PUBLIC Lib3MF::Lib3MF)
++find_package(lib3mf)
++if (lib3mf_FOUND)
++  message(STATUS "lib3mf: ${lib3mf_VERSION}")
++  target_link_libraries(OpenSCADLibInternal PUBLIC lib3mf::lib3mf)
+   target_compile_definitions(OpenSCADLibInternal PUBLIC ENABLE_LIB3MF)
+-  if (Lib3MF_VERSION VERSION_GREATER_EQUAL 2)
++  if (lib3mf_VERSION VERSION_GREATER_EQUAL 2)
+     set(LIB3MF_SOURCES src/io/export_3mf_v2.cc src/io/import_3mf_v2.cc)
+   else()
+     set(LIB3MF_SOURCES src/io/export_3mf_v1.cc src/io/import_3mf_v1.cc)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openscad.git/commitdiff/0fa623392f7d7d8c5618358c6cf18c12c721845c



More information about the pld-cvs-commit mailing list