07/20: gnu: pugixml: Update to 1.10.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit bc134c77e0b4406f735047409d28b2455035b195
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Sun Dec 1 17:58:20 2019 +0100

    gnu: pugixml: Update to 1.10.
    
    * gnu/packages/xml.scm (pugixml): Update to 1.10.
    [source]: Remove obsolete patch.
    * gnu/packages/patches/pugixml-versioned-libdir.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 .../patches/pugixml-versioned-libdir.patch         | 61 ----------------------
 gnu/packages/xml.scm                               |  8 ++-
 3 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index e1518db..e2d9223 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1260,7 +1260,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/psm-disable-memory-stats.patch          \
   %D%/packages/patches/psm-ldflags.patch                       \
   %D%/packages/patches/psm-repro.patch                         \
-  %D%/packages/patches/pugixml-versioned-libdir.patch          \
   %D%/packages/patches/pulseaudio-fix-mult-test.patch          \
   %D%/packages/patches/pulseaudio-longer-test-timeout.patch    \
   %D%/packages/patches/pybugz-encode-error.patch               \
diff --git a/gnu/packages/patches/pugixml-versioned-libdir.patch 
b/gnu/packages/patches/pugixml-versioned-libdir.patch
deleted file mode 100644
index 7cd23b1..0000000
--- a/gnu/packages/patches/pugixml-versioned-libdir.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-This patch makes pugixml install its headers to a standard location when
-built as a shared library.
-
-Taken from this upstream commit:
-https://github.com/zeux/pugixml/commit/daeb8013b20f9c47e85730faaa4131064a1f9c2e
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90fa6793..d7bc1b20 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ project(pugixml)
- 
- option(BUILD_SHARED_LIBS "Build shared instead of static library" OFF)
- option(BUILD_TESTS "Build tests" OFF)
--option(BUILD_PKGCONFIG "Build in PKGCONFIG mode" OFF)
-+option(USE_VERSIONED_LIBDIR "Use a private subdirectory to install the 
headers and libs" OFF)
- 
- set(BUILD_DEFINES "" CACHE STRING "Build defines")
- 
-@@ -55,7 +55,7 @@ endif()
- set_target_properties(pugixml PROPERTIES VERSION 1.9 SOVERSION 1)
- get_target_property(PUGIXML_VERSION_STRING pugixml VERSION)
- 
--if(BUILD_PKGCONFIG)
-+if(USE_VERSIONED_LIBDIR)
-       # Install library into its own directory under LIBDIR
-       set(INSTALL_SUFFIX /pugixml-${PUGIXML_VERSION_STRING})
- endif()
-@@ -71,10 +71,8 @@ install(TARGETS pugixml EXPORT pugixml-config
- install(FILES ${HEADERS} DESTINATION 
${CMAKE_INSTALL_INCLUDEDIR}${INSTALL_SUFFIX})
- install(EXPORT pugixml-config DESTINATION 
${CMAKE_INSTALL_LIBDIR}/cmake/pugixml)
- 
--if(BUILD_PKGCONFIG)
--      configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc 
@ONLY)
--      install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
--endif()
-+configure_file(scripts/pugixml.pc.in ${PROJECT_BINARY_DIR}/pugixml.pc @ONLY)
-+install(FILES ${PROJECT_BINARY_DIR}/pugixml.pc DESTINATION 
${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
- 
- if(BUILD_TESTS)
-       file(GLOB TEST_SOURCES tests/*.cpp)
-diff --git a/scripts/pugixml.pc.in b/scripts/pugixml.pc.in
-index 3c97c28d..804c4d38 100644
---- a/scripts/pugixml.pc.in
-+++ b/scripts/pugixml.pc.in
-@@ -1,11 +1,11 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--includedir=${prefix}/include/pugixml-@PUGIXML_VERSION_STRING@
--libdir=${exec_prefix}/lib/pugixml-@PUGIXML_VERSION_STRING@
-+includedir=${prefix}/include@INSTALL_SUFFIX@
-+libdir=${exec_prefix}/lib@INSTALL_SUFFIX@
- 
- Name: pugixml
- Description: Light-weight, simple and fast XML parser for C++ with XPath 
support.
- URL: http://pugixml.org/
- Version: @PUGIXML_VERSION_STRING@
- Cflags: -I${includedir}
--Libs: -L${libdir} -lpugixml
-\ No newline at end of file
-+Libs: -L${libdir} -lpugixml
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index c2a4dda..fd49a9c 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -882,20 +882,18 @@ the form of functions.")
 (define-public pugixml
   (package
     (name "pugixml")
-    (version "1.9")
+    (version "1.10")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://github.com/zeux/pugixml/releases/download/v";
                           version "/pugixml-" version ".tar.gz"))
-      (patches (search-patches "pugixml-versioned-libdir.patch"))
       (sha256
-       (base32
-        "19nv3zhik3djp4blc4vrjwrl8dfhzmal8b21sq7y907nhddx6mni"))))
+       (base32 "02l7nllhydggf7s64d2x84kckbmwag4lsn28sc82953hnkxrkwsm"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")
-       #:tests? #f))                     ;no tests
+       #:tests? #f))                    ; no tests
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "https://pugixml.org";)