[arch-commits] Commit in yaml-cpp/trunk (3 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Feb 4 04:27:23 UTC 2018
Date: Sunday, February 4, 2018 @ 04:27:22
Author: svenstaro
Revision: 288873
upgpkg: yaml-cpp 0.6.1-1
Modified:
yaml-cpp/trunk/PKGBUILD
Deleted:
yaml-cpp/trunk/1f4b6d5c855b59e849b7228090981c520928c2a4.patch
yaml-cpp/trunk/500db60f899ae6845039d4eca503133d0db81dbd.patch
------------------------------------------------+
1f4b6d5c855b59e849b7228090981c520928c2a4.patch | 23 ------
500db60f899ae6845039d4eca503133d0db81dbd.patch | 79 -----------------------
PKGBUILD | 24 ++----
3 files changed, 7 insertions(+), 119 deletions(-)
Deleted: 1f4b6d5c855b59e849b7228090981c520928c2a4.patch
===================================================================
--- 1f4b6d5c855b59e849b7228090981c520928c2a4.patch 2018-02-04 04:04:58 UTC (rev 288872)
+++ 1f4b6d5c855b59e849b7228090981c520928c2a4.patch 2018-02-04 04:27:22 UTC (rev 288873)
@@ -1,23 +0,0 @@
-From 1f4b6d5c855b59e849b7228090981c520928c2a4 Mon Sep 17 00:00:00 2001
-From: Ovidiu-Florin BOGDAN <ovidiub13 at users.noreply.github.com>
-Date: Fri, 2 Dec 2016 16:51:07 +0200
-Subject: [PATCH] Remove prefix duplication in yaml-cpp.pc.cmake
-
----
- yaml-cpp.pc.cmake | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/yaml-cpp.pc.cmake b/yaml-cpp.pc.cmake
-index 04d343f..044ef78 100644
---- a/yaml-cpp.pc.cmake
-+++ b/yaml-cpp.pc.cmake
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=${prefix}/@LIB_INSTALL_DIR@
--includedir=${prefix}/@INCLUDE_INSTALL_ROOT_DIR@
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_ROOT_DIR@
-
- Name: Yaml-cpp
- Description: A YAML parser and emitter for C++
Deleted: 500db60f899ae6845039d4eca503133d0db81dbd.patch
===================================================================
--- 500db60f899ae6845039d4eca503133d0db81dbd.patch 2018-02-04 04:04:58 UTC (rev 288872)
+++ 500db60f899ae6845039d4eca503133d0db81dbd.patch 2018-02-04 04:27:22 UTC (rev 288873)
@@ -1,79 +0,0 @@
-From 500db60f899ae6845039d4eca503133d0db81dbd Mon Sep 17 00:00:00 2001
-From: Paul Novotny <paul at paulnovo.us>
-Date: Wed, 25 Nov 2015 11:33:36 -0500
-Subject: [PATCH] Include cmake files in install
-
-This adds yaml-cpp-config.cmake, yaml-cpp-config-version.cmake, and
-yaml-cpp-targets.cmake to the cmake install. As a result, cmake's
-find_package can easily find yaml-cpp for software that depends on
-yaml-cpp.
-
-Add code to install cmake files to $CMAKE_INSTALL_PREFIX/CMake on
-Windows, which is the de-facto standard.
-
-Closes jbeder/yaml-cpp#336 jbeder/yaml-cpp#127
----
- CMakeLists.txt | 28 +++++++++++++++++++++++-----
- 1 file changed, 23 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b326a3..cbaad07 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -256,15 +256,15 @@ else()
- set(_library_dir lib)
- endif()
-
--set(INCLUDE_INSTALL_ROOT_DIR include)
-+set(INCLUDE_INSTALL_ROOT_DIR ${CMAKE_INSTALL_PREFIX}/include)
-
- set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_ROOT_DIR}/yaml-cpp)
--set(LIB_INSTALL_DIR "${_library_dir}${LIB_SUFFIX}")
-+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${_library_dir}${LIB_SUFFIX}")
-
- set(_INSTALL_DESTINATIONS
-- RUNTIME DESTINATION bin
-+ RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
- LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-- ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
- )
-
-
-@@ -300,7 +300,7 @@ if(MSVC)
- endif()
- endif()
-
--install(TARGETS yaml-cpp ${_INSTALL_DESTINATIONS})
-+install(TARGETS yaml-cpp EXPORT yaml-cpp-targets ${_INSTALL_DESTINATIONS})
- install(
- DIRECTORY ${header_directory}
- DESTINATION ${INCLUDE_INSTALL_DIR}
-@@ -316,9 +316,27 @@ set(EXPORT_TARGETS yaml-cpp CACHE INTERNAL "export targets")
- set(CONFIG_INCLUDE_DIRS "${YAML_CPP_SOURCE_DIR}/include")
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY)
-+
-+if(WIN32 AND NOT CYGWIN)
-+ set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_PREFIX}/CMake)
-+else()
-+ set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp)
-+endif()
-+
-+file(RELATIVE_PATH REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INCLUDE_INSTALL_ROOT_DIR}")
-+set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}")
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in
-+ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY)
-+
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config-version.cmake.in
- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @ONLY)
-
-+install(FILES
-+ "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake"
-+ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake"
-+ DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
-+install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR})
-+
- if(UNIX)
- set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc)
- configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-04 04:04:58 UTC (rev 288872)
+++ PKGBUILD 2018-02-04 04:27:22 UTC (rev 288873)
@@ -3,29 +3,19 @@
# Contributor: Markus Martin <markus at archwyrm.net>
pkgname=yaml-cpp
-pkgver=0.5.3
-pkgrel=3
+pkgver=0.6.1
+pkgrel=1
pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
url="https://github.com/jbeder/yaml-cpp"
arch=('x86_64')
license=('MIT')
depends=('gcc-libs')
-makedepends=('boost' 'cmake')
-source=(https://github.com/jbeder/yaml-cpp/archive/release-${pkgver}.tar.gz
- 500db60f899ae6845039d4eca503133d0db81dbd.patch
- 1f4b6d5c855b59e849b7228090981c520928c2a4.patch)
-sha512sums=('5ed15fee3c6455c08e6bd8f74256b230f274ef18f8e144491e940640e41626517c7eaaf4a1f380c4179066a2a757c8a0f61878df9dc3caa15e37c4954be47fe0'
- '8ffd7dd7deaf3eef8ce5eefac73d4a453c86f852cd93579b0e3edcd3b174fd52b2a8a6ef37e5588a3d3f85dde3bdf53bc4b385e2b24c4e46a8cd00af75161ae0'
- 'e71948c84d3912c14484fc4dd4efa4f2402bb0fda98b4102fe8ce5af9cf1676ad1ccf49a33411559433f271610db4fa44f5cf3ed998cb0bcf330ee7f83ac335e')
+makedepends=('cmake')
+source=(https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-${pkgver}.tar.gz)
+sha512sums=('606482d1d38c6747e22604a24c119adb4b70287da7deadb94cc20d70df47122f1714ec9bfc8f566ecf075b94d48771df17430c50039cb984bdf1980f3b445791')
-prepare() {
- cd $srcdir/$pkgname-release-$pkgver
- patch -Np1 < $srcdir/500db60f899ae6845039d4eca503133d0db81dbd.patch
- patch -Np1 < $srcdir/1f4b6d5c855b59e849b7228090981c520928c2a4.patch
-}
-
build() {
- cd $srcdir/$pkgname-release-$pkgver
+ cd yaml-cpp-yaml-cpp-$pkgver
cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON
make
@@ -32,7 +22,7 @@
}
package() {
- cd $srcdir/$pkgname-release-$pkgver
+ cd yaml-cpp-yaml-cpp-$pkgver
make DESTDIR=$pkgdir install
More information about the arch-commits
mailing list