[packages/lib3mf] - use system fast_float and libuuid; require system libs in at least bundled versions
qboosh
qboosh at pld-linux.org
Sun Oct 11 12:40:18 CEST 2026
commit 9858a75131daee1cb1c0193a1a058aea3f2d1120
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 11 12:40:32 2026 +0200
- use system fast_float and libuuid; require system libs in at least bundled versions
fast-float-include-path.patch | 11 -----------
lib3mf.spec | 28 +++++++++++++++++-----------
2 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/lib3mf.spec b/lib3mf.spec
index 8f4fa18..b6d9d90 100644
--- a/lib3mf.spec
+++ b/lib3mf.spec
@@ -1,4 +1,4 @@
-# TODO: system cpp-base64, fast_float?
+# TODO: system cpp-base64?
#
# Conditional build:
%bcond_with tests # test suite
@@ -13,19 +13,21 @@ Group: Libraries
#Source0Download: https://github.com/3MFConsortium/lib3mf/releases
Source0: https://github.com/3MFConsortium/lib3mf/archive/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 43da209fe1b28464ea6f93fb7697d187
-Patch0: fast-float-include-path.patch
Patch1: cmake.patch
Patch2: pkgconfig.patch
URL: https://3mf.io/
BuildRequires: cmake >= 3.10
+BuildRequires: fast_float-devel >= 6.0.0
BuildRequires: libstdc++-devel >= 6:7
-BuildRequires: libzip-devel
-BuildRequires: ossp-uuid-devel
-BuildRequires: openssl-devel
+BuildRequires: libzip-devel >= 1.10.1
+BuildRequires: libuuid-devel
+%{?with_tests:BuildRequires: openssl-devel}
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 2.047
-BuildRequires: zlib-devel
-%{?with_tests:BuildRequires: googletest}
+BuildRequires: zlib-devel >= 1.3.1
+%{?with_tests:BuildRequires: googletest >= 1.14.0}
+Requires: libzip >= 1.10.1
+Requires: zlib >= 1.3.1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -59,9 +61,10 @@ Summary: Header files for %{name} library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: fast_float-devel >= 6.0.0
Requires: libstdc++-devel >= 6:7
-Requires: libzip-devel
-Requires: zlib-devel
+Requires: libzip-devel >= 1.10.1
+Requires: zlib-devel >= 1.3.1
%description devel
Header files for %{name} library.
@@ -71,10 +74,11 @@ Pliki nagłówkowe biblioteki %{name}.
%prep
%setup -q
-%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
+%{__rm} -r Libraries/{fast_float,googletest,libressl,libzip,zlib}
+
%build
mkdir -p build
cd build
@@ -82,9 +86,11 @@ cd build
-DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir}/lib3MF \
-DLIB3MF_TESTS=%{__ON_OFF tests} \
-DSTRIP_BINARIES=OFF \
+ -DUSE_INCLUDED_FASTFLOAT=OFF \
-DUSE_INCLUDED_LIBZIP=OFF \
-DUSE_INCLUDED_SSL=OFF \
- -DUSE_INCLUDED_ZLIB=OFF
+ -DUSE_INCLUDED_ZLIB=OFF \
+ -DUSE_PLATFORM_UUID=ON
%{__make}
diff --git a/fast-float-include-path.patch b/fast-float-include-path.patch
deleted file mode 100644
index 7154a86..0000000
--- a/fast-float-include-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib3mf-2.5.0/Include/Common/NMR_StringUtils.h 2026-02-24 17:31:26.000000000 +0000
-+++ lib3mf-2.5.0/Include/Common/NMR_StringUtils.h 2026-03-09 00:00:00.000000000 +0000
-@@ -37,7 +37,7 @@
- #include "Common/NMR_Types.h"
- #include "Common/NMR_Local.h"
-
--#include <fast_float/fast_float.h>
-+#include <fast_float.h>
-
- #include <string>
- #include <string.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lib3mf.git/commitdiff/8b3881c2393c7b7cb63bc10f07136ff7d8c02094
More information about the pld-cvs-commit
mailing list