[arch-commits] Commit in libsavitar/repos/community-x86_64 (3 files)
Jelle van der Waa
jelle at archlinux.org
Fri Jun 14 20:07:46 UTC 2019
Date: Friday, June 14, 2019 @ 20:07:46
Author: jelle
Revision: 481498
archrelease: copy trunk to community-x86_64
Added:
libsavitar/repos/community-x86_64/PKGBUILD
(from rev 481497, libsavitar/trunk/PKGBUILD)
libsavitar/repos/community-x86_64/use_system_pugixml.patch
(from rev 481497, libsavitar/trunk/use_system_pugixml.patch)
Deleted:
libsavitar/repos/community-x86_64/PKGBUILD
--------------------------+
PKGBUILD | 83 ++++++++++++++++++++++-----------------------
use_system_pugixml.patch | 67 ++++++++++++++++++++++++++++++++++++
2 files changed, 108 insertions(+), 42 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-14 20:07:39 UTC (rev 481497)
+++ PKGBUILD 2019-06-14 20:07:46 UTC (rev 481498)
@@ -1,42 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-# Contributor: neodarz <neodarz at neodarz.net>
-
-pkgname=libsavitar
-pkgver=4.0.0
-pkgrel=1
-pkgdesc="C++ implementation of 3mf loading with SIP python bindings"
-arch=('x86_64')
-url="https://github.com/Ultimaker/libsavitar"
-license=('AGPL')
-depends=('python' 'pugixml')
-makedepends=('cmake' 'python-sip' 'sip')
-source=($pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libSavitar//archive/${pkgver}.tar.gz
- https://github.com/Ultimaker/libSavitar/pull/8/commits/91aa70c6320461ae65600dce954b5ffb905b7039.patch)
-
-prepare() {
- cd "libSavitar-${pkgver}"
- sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages,DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
- sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura),DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura),g' CMakeLists.txt
-
- # don't install a second system pugixml; WONTFIX upstream due to:
- # "It's been decided that an external dependency makes setting up your
- # development environment for Cura needlessly difficult."
- patch -Np1 -i "$srcdir"/91aa70c6320461ae65600dce954b5ffb905b7039.patch
-}
-
-build() {
- cd "libSavitar-${pkgver}"
- mkdir build && cd build
- cmake .. \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd "libSavitar-${pkgver}/build"
- make DESTDIR="${pkgdir}" install
-}
-md5sums=('b67fcd568570dca3e2c2be3a4d00769a'
- '8cb2ef4a8ff551114ac8520c6be42ec6')
Copied: libsavitar/repos/community-x86_64/PKGBUILD (from rev 481497, libsavitar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-14 20:07:46 UTC (rev 481498)
@@ -0,0 +1,41 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: neodarz <neodarz at neodarz.net>
+
+pkgname=libsavitar
+pkgver=4.1.0
+pkgrel=1
+pkgdesc="C++ implementation of 3mf loading with SIP python bindings"
+arch=('x86_64')
+url="https://github.com/Ultimaker/libsavitar"
+license=('AGPL')
+depends=('python' 'pugixml')
+makedepends=('cmake' 'python-sip' 'sip')
+source=($pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libSavitar//archive/${pkgver}.tar.gz use_system_pugixml.patch)
+sha512sums=('c25fcfa3abdb437d93932bf0be33a40bfdad2925a62631eb42fcb31ca7a452f2094cf794354c7ce5cd960e1051c958415fd6bc7dfddfc432fa459cf8ab02c8d2'
+ 'be333be1737e8b2483dcfbd5fc992165bdf47ccce22fb2cc88f8ecb24ce6b17451a15f58e3a11c3671305afec88983878c8b0e914662c813e3a7bbeff587b956')
+
+prepare() {
+ cd "libSavitar-${pkgver}"
+ sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages,DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+ sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura),DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura),g' CMakeLists.txt
+
+ # don't install a second system pugixml; WONTFIX upstream due to:
+ # "It's been decided that an external dependency makes setting up your
+ # development environment for Cura needlessly difficult."
+ patch -Np1 -i "$srcdir"/use_system_pugixml.patch
+}
+
+build() {
+ cd "libSavitar-${pkgver}"
+ mkdir build && cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "libSavitar-${pkgver}/build"
+ make DESTDIR="${pkgdir}" install
+}
Copied: libsavitar/repos/community-x86_64/use_system_pugixml.patch (from rev 481497, libsavitar/trunk/use_system_pugixml.patch)
===================================================================
--- use_system_pugixml.patch (rev 0)
+++ use_system_pugixml.patch 2019-06-14 20:07:46 UTC (rev 481498)
@@ -0,0 +1,67 @@
+diff -aur libSavitar-4.1.0.old/CMakeLists.txt libSavitar-4.1.0/CMakeLists.txt
+--- libSavitar-4.1.0.old/CMakeLists.txt 2019-06-14 21:54:00.101539146 +0200
++++ libSavitar-4.1.0/CMakeLists.txt 2019-06-14 21:54:34.518676200 +0200
+@@ -14,7 +14,7 @@
+ find_package(Threads QUIET)
+ endif()
+
+-add_subdirectory(pugixml)
++find_package(pugixml REQUIRED)
+
+ if(BUILD_PYTHON)
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+diff -aur libSavitar-4.1.0.old/src/MeshData.cpp libSavitar-4.1.0/src/MeshData.cpp
+--- libSavitar-4.1.0.old/src/MeshData.cpp 2019-06-14 21:54:00.101539146 +0200
++++ libSavitar-4.1.0/src/MeshData.cpp 2019-06-14 21:56:16.930076069 +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.
+diff -aur libSavitar-4.1.0.old/src/Scene.cpp libSavitar-4.1.0/src/Scene.cpp
+--- libSavitar-4.1.0.old/src/Scene.cpp 2019-06-14 21:54:00.101539146 +0200
++++ libSavitar-4.1.0/src/Scene.cpp 2019-06-14 21:56:09.553308560 +0200
+@@ -17,7 +17,7 @@
+ */
+
+ #include "Scene.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ #include <string>
+ using namespace Savitar;
+diff -aur libSavitar-4.1.0.old/src/SceneNode.cpp libSavitar-4.1.0/src/SceneNode.cpp
+--- libSavitar-4.1.0.old/src/SceneNode.cpp 2019-06-14 21:54:00.101539146 +0200
++++ libSavitar-4.1.0/src/SceneNode.cpp 2019-06-14 21:56:12.723351894 +0200
+@@ -17,7 +17,7 @@
+ */
+
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+ #include <iostream>
+ using namespace Savitar;
+
+diff -aur libSavitar-4.1.0.old/src/ThreeMFParser.h libSavitar-4.1.0/src/ThreeMFParser.h
+--- libSavitar-4.1.0.old/src/ThreeMFParser.h 2019-06-14 21:54:00.101539146 +0200
++++ libSavitar-4.1.0/src/ThreeMFParser.h 2019-06-14 21:55:32.532802504 +0200
+@@ -21,7 +21,7 @@
+
+ #include "SavitarExport.h"
+ #include "SceneNode.h"
+-#include "../pugixml/src/pugixml.hpp"
++#include <pugixml.hpp>
+
+ #include <string>
+ namespace Savitar
+@@ -44,4 +44,4 @@
+ std::string sceneToString(Scene scene);
+ };
+ }
+-#endif
+\ No newline at end of file
++#endif
More information about the arch-commits
mailing list