[packages/libSavitar] - updated to 4.13.2
qboosh
qboosh at pld-linux.org
Fri Sep 27 21:17:47 CEST 2024
commit 455869a69020ba6bb53e46da3153eb9ece2d8ef9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 27 21:20:46 2024 +0200
- updated to 4.13.2
PyQt5-sip.patch | 11 -----------
lib-suffix.patch | 14 --------------
libSavitar.spec | 52 ++++++++++++++++++++++++++++++++++++----------------
no-pugixml.patch | 13 +++++--------
system-pugixml.patch | 29 ++++++++++++++++-------------
5 files changed, 57 insertions(+), 62 deletions(-)
---
diff --git a/libSavitar.spec b/libSavitar.spec
index 06c85a5..cf96051 100644
--- a/libSavitar.spec
+++ b/libSavitar.spec
@@ -1,21 +1,24 @@
Summary: C++ implementation of 3mf loading with SIP Python bindings
+Summary(pl.UTF-8): Implementacja C++ ładowania 3mf w wiązaniami Pythona SIP
Name: libSavitar
-Version: 2.7.0
-Release: 5
-License: AGPLv3+
+# keep in sync with CuraEngine, cura, libArgus, python3-Uranium
+Version: 4.13.2
+Release: 1
+License: AGPL v3+
Group: Libraries
+#Source0Download: https://github.com/Ultimaker/libSavitar/tags
Source0: https://github.com/Ultimaker/libSavitar/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 584cd4f3dacdcdbe69edcd42b83a4c6c
+# Source0-md5: 25e943379dbe7f3fc0e6ca55318ab1b0
Patch0: no-pugixml.patch
Patch1: system-pugixml.patch
-Patch2: lib-suffix.patch
-Patch3: PyQt5-sip.patch
URL: https://github.com/Ultimaker/libSavitar
-BuildRequires: cmake
-BuildRequires: libstdc++-devel
+BuildRequires: cmake >= 3.8
+# C++17
+BuildRequires: libstdc++-devel >= 6:7
BuildRequires: pugixml-devel
-BuildRequires: python3-devel
+BuildRequires: python3-devel >= 1:3.4
BuildRequires: python3-sip-devel
+BuildRequires: rpmbuild(macros) >= 1.605
BuildRequires: sip
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,12 +26,18 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Savitar is a C++ implementation of 3mf loading with SIP Python
bindings. 3mf is a 3D printing file format.
+%description -l pl.UTF-8
+Savitar to zaimplementowane w C++ ładowanie formatu 3mf z wiązaniami
+Pythona SIP. 3mf to format plików do wydruków 3D.
+
%package devel
+Summary: Development files for libSavitar
+Summary(pl.UTF-8): Pliki programistyczne biblioteki libSavitar
# The cmake scripts are BSD
-Summary: Development files for libsavitar
-License: AGPLv3+ and BSD
+License: AGPL v3+ and BSD
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel >= 6:7
%description devel
Savitar is a C++ implementation of 3mf loading with SIP Python
@@ -36,8 +45,15 @@ bindings. 3mf is a 3D printing file format.
Development files.
+%description devel -l pl.UTF-8
+Savitar to zaimplementowane w C++ ładowanie formatu 3mf z wiązaniami
+Pythona SIP. 3mf to format plików do wydruków 3D.
+
+Ten pakiet zawiera pliki programistyczne.
+
%package -n python3-savitar
Summary: Python 3 libSavitar bindings
+Summary(pl.UTF-8): Wiązania Pythona 3 do biblioteki libSavitar
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
@@ -47,17 +63,21 @@ bindings. 3mf is a 3D printing file format.
The Python bindings.
+%description -n python3-savitar -l pl.UTF-8
+Savitar to zaimplementowane w C++ ładowanie formatu 3mf z wiązaniami
+Pythona SIP. 3mf to format plików do wydruków 3D.
+
+Ten pakiet zawiera wiązania Pythona.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
mkdir build
cd build
-%{cmake} .. \
+%cmake .. \
-DCMAKE_SKIP_RPATH:BOOL=ON
%{__make}
@@ -70,8 +90,8 @@ rm -rf $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
diff --git a/PyQt5-sip.patch b/PyQt5-sip.patch
deleted file mode 100644
index 5cc929a..0000000
--- a/PyQt5-sip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libSavitar-2.7.0/CMakeLists.txt~ 2018-11-04 13:56:10.000000000 +0100
-+++ libSavitar-2.7.0/CMakeLists.txt 2018-11-04 13:56:42.291239069 +0100
-@@ -72,7 +72,7 @@
- if(BUILD_PYTHON)
- set(SIP_EXTRA_FILES_DEPEND python/Types.sip python/MeshData.sip python/SceneNode.sip python/Scene.sip)
- #set(SIP_EXTRA_SOURCE_FILES python/Types.cpp)
-- set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods.
-+ set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods.
- add_sip_python_module(Savitar python/ThreeMFParser.sip Savitar)
- endif()
-
diff --git a/lib-suffix.patch b/lib-suffix.patch
deleted file mode 100644
index a8b4753..0000000
--- a/lib-suffix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/CMakeLists.txt~ 2017-05-01 22:26:43.000000000 +0200
-+++ libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/CMakeLists.txt 2017-05-14 14:51:34.791994861 +0200
-@@ -15,9 +15,9 @@
- find_package(SIP REQUIRED)
- if(EXISTS /etc/debian_version)
- # Running on a debian-based system, which requires special handling for python modules.
-- set(PYTHON_SITE_PACKAGES_DIR lib/python3/dist-packages CACHE STRING "Directory to install Python bindings to")
-+ set(PYTHON_SITE_PACKAGES_DIR lib${LIB_SUFFIX}/python3/dist-packages CACHE STRING "Directory to install Python bindings to")
- else()
-- set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE STRING "Directory to install Python bindings to")
-+ set(PYTHON_SITE_PACKAGES_DIR lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages CACHE STRING "Directory to install Python bindings to")
- endif()
- include_directories(python/ src/ ${SIP_INCLUDE_DIR} ${PYTHON_INCLUDE_DIR})
- endif()
diff --git a/no-pugixml.patch b/no-pugixml.patch
index 7f828aa..3e3b322 100644
--- a/no-pugixml.patch
+++ b/no-pugixml.patch
@@ -11,15 +11,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 040830c..a8f700d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -8,8 +8,6 @@ option(BUILD_PYTHON "Build " ON)
- option(BUILD_STATIC "Build as a static library" OFF)
-
+@@ -15,8 +15,6 @@ if(BUILD_TESTS)
+ find_package(Threads QUIET)
+ endif()
-add_subdirectory(pugixml)
-
if(BUILD_PYTHON)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- find_package(SIP REQUIRED)
---
-2.11.0
-
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
diff --git a/system-pugixml.patch b/system-pugixml.patch
index 735dc48..0f4ce4c 100644
--- a/system-pugixml.patch
+++ b/system-pugixml.patch
@@ -1,28 +1,31 @@
-diff -ur libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48.orig/src/MeshData.cpp libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/src/MeshData.cpp
---- libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48.orig/src/MeshData.cpp 2017-05-01 22:26:43.000000000 +0200
-+++ libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/src/MeshData.cpp 2017-05-14 14:54:16.549302144 +0200
-@@ -1,5 +1,5 @@
+--- libSavitar-4.13.2/src/MeshData.cpp.orig 2024-09-27 05:56:42.358265141 +0200
++++ libSavitar-4.13.2/src/MeshData.cpp 2024-09-27 17:48:09.030344921 +0200
+@@ -17,7 +17,7 @@
+ */
+
#include "MeshData.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
+ #include <cstring>
#include <iostream>
+ #include <stdexcept> //For std::runtime_error.
+--- libSavitar-4.13.2/src/Scene.cpp.orig 2024-09-27 05:56:42.361598457 +0200
++++ libSavitar-4.13.2/src/Scene.cpp 2024-09-27 17:48:48.246799134 +0200
+@@ -17,7 +17,7 @@
+ */
- using namespace Savitar;
-diff -ur libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48.orig/src/Scene.cpp libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/src/Scene.cpp
---- libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48.orig/src/Scene.cpp 2017-05-01 22:26:43.000000000 +0200
-+++ libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/src/Scene.cpp 2017-05-14 14:54:16.549302144 +0200
-@@ -1,5 +1,5 @@
#include "Scene.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
#include <iostream>
#include <string>
using namespace Savitar;
-diff -ur libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48.orig/src/SceneNode.cpp libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/src/SceneNode.cpp
---- libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48.orig/src/SceneNode.cpp 2017-05-01 22:26:43.000000000 +0200
-+++ libSavitar-1ad7ddb202ec36f6b486b1f70279329ec0b8cc48/src/SceneNode.cpp 2017-05-14 14:54:16.549302144 +0200
-@@ -1,5 +1,5 @@
+--- libSavitar-4.13.2/src/SceneNode.cpp.orig 2024-09-27 05:56:42.361598457 +0200
++++ libSavitar-4.13.2/src/SceneNode.cpp 2024-09-27 17:49:14.206658498 +0200
+@@ -18,7 +18,7 @@
+
#include "SceneNode.h"
+ #include "Namespace.h"
-#include "../pugixml/src/pugixml.hpp"
+#include <pugixml.hpp>
#include <iostream>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libSavitar.git/commitdiff/455869a69020ba6bb53e46da3153eb9ece2d8ef9
More information about the pld-cvs-commit
mailing list