From 8ef2b2a33e05c5f13a66747129e9ccb6130d0155 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 21 Oct 2015 18:49:28 +0200 Subject: [PATCH] pugixml: update to 1.7. --- .../patches/patch-scripts_CMakeLists.patch | 26 ------------------- srcpkgs/pugixml/template | 8 +++--- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/pugixml/patches/patch-scripts_CMakeLists.patch diff --git a/srcpkgs/pugixml/patches/patch-scripts_CMakeLists.patch b/srcpkgs/pugixml/patches/patch-scripts_CMakeLists.patch deleted file mode 100644 index 9d1f7d2a3db..00000000000 --- a/srcpkgs/pugixml/patches/patch-scripts_CMakeLists.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2015-03-25 03:19:09 UTC -+++ scripts/CMakeLists.txt -@@ -16,19 +16,16 @@ if(DEFINED BUILD_DEFINES) - add_definitions(${BUILD_DEFINES}) - endif() - --if(BUILD_SHARED_LIBS) -- add_library(pugixml SHARED ${SOURCES}) --else() -- add_library(pugixml STATIC ${SOURCES}) --endif() -+add_library(pugixml SHARED ${SOURCES}) -+add_library(pugixml_static STATIC ${SOURCES}) - - set_target_properties(pugixml PROPERTIES VERSION 1.6 SOVERSION 1) -+set_target_properties(pugixml_static PROPERTIES OUTPUT_NAME pugixml) - --install(TARGETS pugixml EXPORT pugixml-config -+install(TARGETS pugixml pugixml_static - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) - - install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(EXPORT pugixml-config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pugixml) diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template index bda43056949..265fe086046 100644 --- a/srcpkgs/pugixml/template +++ b/srcpkgs/pugixml/template @@ -1,7 +1,7 @@ # Template file for 'pugixml' pkgname=pugixml -version=1.6 -revision=2 +version=1.7 +revision=1 build_style=cmake hostmakedepends="cmake" short_desc="Light-weight, simple and fast XML parser for C++ with XPath support" @@ -9,7 +9,8 @@ maintainer="Enno Boland " license="MIT" homepage="http://pugixml.org/" distfiles="http://github.com/zeux/pugixml/releases/download/v1.6/pugixml-$version.tar.gz" -checksum=473705c496d45ee6a74f73622b175dfb5dde0de372c4dc61a5acb964516cd9de +checksum=fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca +configure_args="-DBUILD_SHARED_LIBS=On" build_wrksrc="scripts" pugixml-devel_package() { @@ -17,7 +18,6 @@ pugixml-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" } }