[arch-commits] Commit in pugixml/trunk (LICENSE PKGBUILD pkg-config.patch)
Bruno Pagani
archange at archlinux.org
Mon Apr 9 16:24:14 UTC 2018
Date: Monday, April 9, 2018 @ 16:24:13
Author: archange
Revision: 315441
upgpkg: pugixml 1.9-1
Also provides pkg-config file. As well as the LICENSE.
Added:
pugixml/trunk/LICENSE
pugixml/trunk/pkg-config.patch
Modified:
pugixml/trunk/PKGBUILD
------------------+
LICENSE | 24 +++++++++++++++++
PKGBUILD | 39 +++++++++++++++++------------
pkg-config.patch | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 15 deletions(-)
Added: LICENSE
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2018-04-09 16:24:13 UTC (rev 315441)
@@ -0,0 +1,24 @@
+This library is available to anybody free of charge, under the terms of MIT License:
+
+Copyright (c) 2006-2018 Arseny Kapoulkine
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-09 14:42:09 UTC (rev 315440)
+++ PKGBUILD 2018-04-09 16:24:13 UTC (rev 315441)
@@ -1,32 +1,41 @@
# $Id: PKGBUILD 149592 2015-12-07 05:31:05Z bpiotrowski $
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Old maintainer: Gustavo Alvarez <sl1pkn07 at gmail.com>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
pkgname=pugixml
-pkgver=1.8
+pkgver=1.9
pkgrel=1
pkgdesc="Light-weight, simple and fast XML parser for C++ with XPath support"
-url='http://pugixml.org'
arch=('x86_64')
+url="https://pugixml.org"
license=('MIT')
+depends=('gcc-libs')
makedepends=('cmake')
-source=("http://github.com/zeux/pugixml/releases/download/v${pkgver}/pugixml-${pkgver}.tar.gz")
-sha1sums=('d836d73bef28d99b21de809dcd220737de78b9a8')
+source=("http://github.com/zeux/pugixml/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ 'pkg-config.patch'
+ 'LICENSE')
+sha256sums=('d156d35b83f680e40fd6412c4455fdd03544339779134617b9b28d19e11fdba6'
+ 'a0e47aed9f28c061b889d05b34d30c29cb06eeb262f5c306ef3f80c81412ee43'
+ 'bb5e0eca3fdd4f841ae7e06d867a0f4883ae1b9f6f37be201cf0b152a98c818e')
prepare() {
- mkdir -p build
+ mkdir -p build
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i ../pkg-config.patch
}
build() {
- cd build
- cmake "$srcdir/pugixml-${pkgver}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED_LIBS=ON
- make
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=ON
+ make
}
package() {
- make -C build DESTDIR="${pkgdir}" install
+ make -C build DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}/
}
Added: pkg-config.patch
===================================================================
--- pkg-config.patch (rev 0)
+++ pkg-config.patch 2018-04-09 16:24:13 UTC (rev 315441)
@@ -0,0 +1,71 @@
+From 314dc6a95baaca90294a8ea957d9810e3bee0f62 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93 at gmail.com>
+Date: Mon, 9 Apr 2018 01:46:30 -0400
+Subject: [PATCH] cmake: always install the pkg-config file
+
+There's really never a reason to *not* want this installed. If an option
+is needed to specify installing in a versioned subdirectory, this option
+should be explicitly described rather than hidden in something else.
+
+As an added bonus, this makes the CMake install code slightly *less*
+complicated.
+---
+ CMakeLists.txt | 10 ++++------
+ scripts/pugixml.pc.in | 6 +++---
+ 2 files changed, 7 insertions(+), 9 deletions(-)
+
+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- at PUGIXML_VERSION_STRING@
+-libdir=${exec_prefix}/lib/pugixml- at PUGIXML_VERSION_STRING@
++includedir=${prefix}/include at INSTALL_SUFFIX@
++libdir=${exec_prefix}/lib at 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
More information about the arch-commits
mailing list