From ebf9364cb67a76b01fbd4c44682cae7589dd65ce Mon Sep 17 00:00:00 2001 From: Konstantin Podsvirov Date: Thu, 1 Oct 2020 04:02:34 +0300 Subject: [PATCH] jsoncpp: Update to 1.9.4 --- mingw-w64-jsoncpp/001-library-name.patch | 23 ++++++++++++----------- mingw-w64-jsoncpp/PKGBUILD | 6 +++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mingw-w64-jsoncpp/001-library-name.patch b/mingw-w64-jsoncpp/001-library-name.patch index c5e20fd59e..89706dd410 100644 --- a/mingw-w64-jsoncpp/001-library-name.patch +++ b/mingw-w64-jsoncpp/001-library-name.patch @@ -1,11 +1,12 @@ ---- jsoncpp-1.9.0.orig/src/lib_json/CMakeLists.txt 2019-07-09 20:27:14.587965000 -0400 -+++ jsoncpp-1.9.0/src/lib_json/CMakeLists.txt 2019-07-09 20:30:37.073636200 -0400 -@@ -75,6 +75,8 @@ - add_library(jsoncpp_lib ${PUBLIC_HEADERS} ${jsoncpp_sources}) - set_target_properties( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_SOVERSION}) - set_target_properties( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp -+ RUNTIME_OUTPUT_NAME jsoncpp-${JSONCPP_SOVERSION} -+ ARCHIVE_OUTPUT_NAME jsoncpp - DEBUG_OUTPUT_NAME jsoncpp${DEBUG_LIBNAME_SUFFIX} ) - set_target_properties( jsoncpp_lib PROPERTIES POSITION_INDEPENDENT_CODE ON) - +diff -Naur jsoncpp-1.9.4.orig/src/lib_json/CMakeLists.txt jsoncpp-1.9.4/src/lib_json/CMakeLists.txt +--- jsoncpp-1.9.4.orig/src/lib_json/CMakeLists.txt 2020-09-26 05:19:16.000000000 +0300 ++++ jsoncpp-1.9.4/src/lib_json/CMakeLists.txt 2020-10-01 03:53:24.121074800 +0300 +@@ -127,6 +127,8 @@ + add_library(${SHARED_LIB} SHARED ${PUBLIC_HEADERS} ${JSONCPP_SOURCES}) + set_target_properties(${SHARED_LIB} PROPERTIES + OUTPUT_NAME jsoncpp ++ RUNTIME_OUTPUT_NAME jsoncpp-${PROJECT_SOVERSION} ++ ARCHIVE_OUTPUT_NAME jsoncpp + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_SOVERSION} + POSITION_INDEPENDENT_CODE ON diff --git a/mingw-w64-jsoncpp/PKGBUILD b/mingw-w64-jsoncpp/PKGBUILD index ce52b13a77..fa57933af3 100644 --- a/mingw-w64-jsoncpp/PKGBUILD +++ b/mingw-w64-jsoncpp/PKGBUILD @@ -3,7 +3,7 @@ _realname=jsoncpp pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.9.2 +pkgver=1.9.4 pkgrel=1 pkgdesc="A C++ library for interacting with JSON (mingw-w64)" arch=('any') @@ -15,8 +15,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" options=('staticlibs' '!strip' '!buildflags') source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/open-source-parsers/jsoncpp/archive/${pkgver}.tar.gz" 001-library-name.patch) -sha256sums=('77a402fb577b2e0e5d0bdc1cf9c65278915cdb25171e3452c68b6da8a561f8f0' - '6af9f06bb026aa9592123ad53004b9c3b2c94e9c9bbe5852790ce11f728afb57') +sha256sums=('e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999' + '72396ec75ec0013419c127fd0aef15149b150415658b8682fdedb91046c304b2') prepare() { cd "${srcdir}/${_realname}-${pkgver}"