commit c79a5a61581bdfb7edda81aa9be66a0942eb0e02
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Nov 4 14:08:55 2018 +0100
- up to 2.7.0
PyQt5-sip.patch | 11 +++++++++++
lib-suffix.patch | 16 ----------------
libSavitar.spec | 21 +++++++++------------
3 files changed, 20 insertions(+), 28 deletions(-)
---
diff --git a/libSavitar.spec b/libSavitar.spec
index 2515ced..c385f20 100644
--- a/libSavitar.spec
+++ b/libSavitar.spec
@@ -1,19 +1,15 @@
-%define commit 1ad7ddb202ec36f6b486b1f70279329ec0b8cc48
-%define shortcommit %(c=%{commit}; echo ${c:0:7})
-%define datestamp 20170501
-%define relstring %{datestamp}git%{shortcommit}
-%define rel 2
Summary: C++ implementation of 3mf loading with SIP Python bindings
Name: libSavitar
-Version: 0
-Release: 0.%{rel}.%{relstring}
+Version: 2.7.0
+Release: 1
License: AGPLv3+
Group: Libraries
-Source0:
https://github.com/Ultimaker/libSavitar/archive/%{commit}/%{name}-%{version}-%{commit}.tar.gz
-# Source0-md5: c9da107ed1e4f954b080258b7811c85e
+Source0:
https://github.com/Ultimaker/libSavitar/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 584cd4f3dacdcdbe69edcd42b83a4c6c
Patch0: no-pugixml.patch
-Patch1: lib-suffix.patch
-Patch2: system-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
@@ -52,10 +48,11 @@ bindings. 3mf is a 3D printing file format.
The Python bindings.
%prep
-%setup -q -n %{name}-%{commit}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
mkdir build
diff --git a/PyQt5-sip.patch b/PyQt5-sip.patch
new file mode 100644
index 0000000..5cc929a
--- /dev/null
+++ b/PyQt5-sip.patch
@@ -0,0 +1,11 @@
+--- 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
index 8d9111a..a8b4753 100644
--- a/lib-suffix.patch
+++ b/lib-suffix.patch
@@ -12,19 +12,3 @@
endif()
include_directories(python/ src/ ${SIP_INCLUDE_DIR} ${PYTHON_INCLUDE_DIR})
endif()
-@@ -56,7 +56,7 @@
- set(SAVITAR_VERSION 0.1.0)
- set(SAVITAR_SOVERSION 0)
-
--set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-
- if(BUILD_STATIC)
- add_library(Savitar STATIC ${savitar_SRCS})
-@@ -116,4 +116,4 @@
- ${CMAKE_BINARY_DIR}/SavitarConfig.cmake
- ${CMAKE_BINARY_DIR}/SavitarConfigVersion.cmake
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Savitar
--)
-\ No newline at end of file
-+)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libSavitar.git/commitdiff/c79a5a61581bdfb7edda81aa9be66a0942eb0e02
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
