From 157a43d1ad255dece6ed324431d513aafb3c8143 Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com>
Date: Mon, 5 Aug 2019 22:53:46 -0700
Subject: [PATCH] libSavitar: update to 4.2.0.

---
 srcpkgs/libSavitar/patches/remove-rpath.patch | 16 -----
 .../libSavitar/patches/system-pugixml.patch   | 72 -------------------
 srcpkgs/libSavitar/template                   |  4 +-
 3 files changed, 2 insertions(+), 90 deletions(-)
 delete mode 100644 srcpkgs/libSavitar/patches/remove-rpath.patch
 delete mode 100644 srcpkgs/libSavitar/patches/system-pugixml.patch

diff --git a/srcpkgs/libSavitar/patches/remove-rpath.patch b/srcpkgs/libSavitar/patches/remove-rpath.patch
deleted file mode 100644
index 29433be8ce3..00000000000
--- a/srcpkgs/libSavitar/patches/remove-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Gregor Riepl <onitake@gmail.com>
-Description: Remove RPATH from build flags.
-  It's not needed on Linux and may cause maintenance problems.
-  See: https://wiki.debian.org/RpathIssue
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -59,8 +59,6 @@
- set(SAVITAR_VERSION 0.1.0)
- set(SAVITAR_SOVERSION 0)
- 
--set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR})
--
- if(BUILD_STATIC)
-     add_library(Savitar STATIC ${savitar_SRCS})
- else()
-
diff --git a/srcpkgs/libSavitar/patches/system-pugixml.patch b/srcpkgs/libSavitar/patches/system-pugixml.patch
deleted file mode 100644
index 2ededc2b082..00000000000
--- a/srcpkgs/libSavitar/patches/system-pugixml.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Author: Gregor Riepl <onitake@gmail.com>
-Description: Depend on system pugixml.
-  Upstream bundled their own version of pugixml.
-  On Debian, we have a maintained packages of this library,
-  so use that instead.
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -8,7 +8,9 @@
- option(BUILD_STATIC "Build as a static library" OFF)
- 
- 
--add_subdirectory(pugixml)
-+find_path(PUGIXML_INCLUDE_DIR "pugixml.hpp" REQUIRED)
-+find_library(PUGIXML_LIBRARY pugixml REQUIRED)
-+include_directories(${PUGIXML_INCLUDE_DIR} SYSTEM)
- 
- if(BUILD_PYTHON)
-     set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
-@@ -65,7 +67,7 @@
-     add_library(Savitar SHARED ${savitar_SRCS})
- endif()
- 
--target_link_libraries(Savitar PUBLIC pugixml)
-+target_link_libraries(Savitar PUBLIC ${PUGIXML_LIBRARY})
- 
- if(NOT WIN32 OR CMAKE_COMPILER_IS_GNUCXX)
-     set_target_properties(Savitar PROPERTIES COMPILE_FLAGS -fPIC)
---- src/MeshData.cpp
-+++ src/MeshData.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "MeshData.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- 
- using namespace Savitar;
---- src/Scene.cpp
-+++ src/Scene.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "Scene.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- #include <string>
- using namespace Savitar;
---- src/SceneNode.cpp
-+++ src/SceneNode.cpp
-@@ -17,7 +17,7 @@
-  */
- 
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- #include <iostream>
- using namespace Savitar;
- 
---- src/ThreeMFParser.h
-+++ src/ThreeMFParser.h
-@@ -21,7 +21,7 @@
- 
- #include "SavitarExport.h"
- #include "SceneNode.h"
--#include "../pugixml/src/pugixml.hpp"
-+#include <pugixml.hpp>
- 
- #include <string>
- namespace Savitar
-
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 53285687199..e93c00ce82d 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.0.0
+version=4.2.0
 revision=1
 build_style=cmake
 hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="maxice8 <thinkabit.ukim@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=c1d6807f55049b73d19e3395c6fc8598e3ab9079b804a77ad2ef0928d7a03f62
+checksum=6a77df183fef2ddaeb8de26f69315e1868ee722844f4c1fbb9cd5a054805d1a1
 nocross="can't find sip on cross environment"
 
 libSavitar-devel_package() {