Date: Sunday, December 15, 2019 @ 18:28:52 Author: lfleischer Revision: 537805
db-move: moved libsavitar from [community-testing] to [community] (x86_64) Added: libsavitar/repos/community-x86_64/PKGBUILD (from rev 537804, libsavitar/repos/community-testing-x86_64/PKGBUILD) libsavitar/repos/community-x86_64/use_system_pugixml.patch (from rev 537804, libsavitar/repos/community-testing-x86_64/use_system_pugixml.patch) Deleted: libsavitar/repos/community-testing-x86_64/ libsavitar/repos/community-x86_64/PKGBUILD libsavitar/repos/community-x86_64/use_system_pugixml.patch -------------------------------------------+ /PKGBUILD | 41 +++++++++++++++++ /use_system_pugixml.patch | 67 ++++++++++++++++++++++++++++ community-x86_64/PKGBUILD | 41 ----------------- community-x86_64/use_system_pugixml.patch | 67 ---------------------------- 4 files changed, 108 insertions(+), 108 deletions(-) Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2019-12-15 18:28:42 UTC (rev 537804) +++ community-x86_64/PKGBUILD 2019-12-15 18:28:52 UTC (rev 537805) @@ -1,41 +0,0 @@ -# Maintainer: Jelle van der Waa <je...@archlinux.org> -# Contributor: neodarz <neod...@neodarz.net> - -pkgname=libsavitar -pkgver=4.3.0 -pkgrel=3 -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=('4accce4a96deddfe148540c3abb3cba391178ffc34b88ea77e07053c36eb2c3d6aa7b040ec386ba5bb2eb9e6d9c371b5c35fae268f953694f6ccd9e6c82223d6' - '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/PKGBUILD (from rev 537804, libsavitar/repos/community-testing-x86_64/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2019-12-15 18:28:52 UTC (rev 537805) @@ -0,0 +1,41 @@ +# Maintainer: Jelle van der Waa <je...@archlinux.org> +# Contributor: neodarz <neod...@neodarz.net> + +pkgname=libsavitar +pkgver=4.4.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=('a8039fed9c0b00f3698f37e0b0653a43b8f5b0461fd734687461114f2df63a9781520f45d7b25f598b2f1dfa5c24585cb297a7408029cea4273df614c33a2e98' + '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 +} Deleted: community-x86_64/use_system_pugixml.patch =================================================================== --- community-x86_64/use_system_pugixml.patch 2019-12-15 18:28:42 UTC (rev 537804) +++ community-x86_64/use_system_pugixml.patch 2019-12-15 18:28:52 UTC (rev 537805) @@ -1,67 +0,0 @@ -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 Copied: libsavitar/repos/community-x86_64/use_system_pugixml.patch (from rev 537804, libsavitar/repos/community-testing-x86_64/use_system_pugixml.patch) =================================================================== --- community-x86_64/use_system_pugixml.patch (rev 0) +++ community-x86_64/use_system_pugixml.patch 2019-12-15 18:28:52 UTC (rev 537805) @@ -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