[arch-commits] Commit in pugixml/trunk (LICENSE pkg-config.patch)

Bruno Pagani archange at archlinux.org
Mon Sep 16 20:59:36 UTC 2019


    Date: Monday, September 16, 2019 @ 20:59:36
  Author: archange
Revision: 510938

Remove old files

Deleted:
  pugixml/trunk/LICENSE
  pugixml/trunk/pkg-config.patch

------------------+
 LICENSE          |   24 -----------------
 pkg-config.patch |   71 -----------------------------------------------------
 2 files changed, 95 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2019-09-16 20:52:38 UTC (rev 510937)
+++ LICENSE	2019-09-16 20:59:36 UTC (rev 510938)
@@ -1,24 +0,0 @@
-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.

Deleted: pkg-config.patch
===================================================================
--- pkg-config.patch	2019-09-16 20:52:38 UTC (rev 510937)
+++ pkg-config.patch	2019-09-16 20:59:36 UTC (rev 510938)
@@ -1,71 +0,0 @@
-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