[arch-commits] Commit in libsavitar/trunk (PKGBUILD use_system_pugixml.patch)

[Jelle van der Waa]

    Date: Sunday, July 26, 2020 @ 18:53:10
  Author: jelle
Revision: 665367

upgpkg: libsavitar 4.6.2-1

Modified:
  libsavitar/trunk/PKGBUILD
  libsavitar/trunk/use_system_pugixml.patch

--------------------------+
 PKGBUILD                 |    6 +--
 use_system_pugixml.patch |   75 +++++++++------------------------------------
 2 files changed, 18 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-26 18:53:03 UTC (rev 665366)
+++ PKGBUILD	2020-07-26 18:53:10 UTC (rev 665367)
@@ -2,7 +2,7 @@
 # Contributor: neodarz <neodarz at neodarz.net>
 
 pkgname=libsavitar
-pkgver=4.4.0
+pkgver=4.6.2
 pkgrel=1
 pkgdesc="C++ implementation of 3mf loading with SIP python bindings"
 arch=('x86_64')
@@ -11,8 +11,8 @@
 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')
+sha512sums=('1aa8915fe7e4870d74de55cdf4988eb416fa473a41a3ccbd3b3b88c6b1fc299afb257f7b1613eafd11a0c95cf9f3d3e0b2356b5b573a7b14c13f0017fbcb5200'
+            'b312dcf43bf334001da98da93388da99731eacf417fe3a9dff51831bdd1f0ab5487377925bebce05e227533be2680b1a45f3203b0a7b9de9a77280a206ec7b26')
 
 prepare() {
   cd "libSavitar-${pkgver}"

Modified: use_system_pugixml.patch
===================================================================
--- use_system_pugixml.patch	2020-07-26 18:53:03 UTC (rev 665366)
+++ use_system_pugixml.patch	2020-07-26 18:53:10 UTC (rev 665367)
@@ -1,67 +1,22 @@
-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 @@
+From b76fcd6da723cc725f2703d6c1b82b954a1bd03a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <feron.gabriel at gmail.com>
+Date: Tue, 18 Jun 2019 22:45:17 +0200
+Subject: [PATCH] Don't build pugixml
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eecd5e9..7ec2b2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,8 +15,6 @@ if(BUILD_TESTS)
      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
+-- 
+2.21.0
+