From 58d363cef264fb6024f12377a8e6972b5c4fe8a6 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 23 Jun 2020 12:22:08 +0300 Subject: [PATCH] jsoncpp: Update to 1.9.3 --- jsoncpp/PKGBUILD | 12 ++++-------- jsoncpp/snprintf-newlib.patch | 11 ----------- 2 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 jsoncpp/snprintf-newlib.patch diff --git a/jsoncpp/PKGBUILD b/jsoncpp/PKGBUILD index 56c6d30b..39ea6ed3 100644 --- a/jsoncpp/PKGBUILD +++ b/jsoncpp/PKGBUILD @@ -2,8 +2,8 @@ pkgbase="jsoncpp" pkgname=("${pkgbase}" "${pkgbase}-devel") -pkgver=1.9.1 -pkgrel=2 +pkgver=1.9.3 +pkgrel=1 pkgdesc="A C++ library for interacting with JSON" arch=('any') url="https://github.com/open-source-parsers/jsoncpp" @@ -11,14 +11,10 @@ license=('MIT') depends=("gcc-libs") makedepends=("gcc" "cmake" - "python3") + "python") options=('staticlibs' '!strip' '!buildflags') source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/open-source-parsers/jsoncpp/archive/${pkgver}.tar.gz") -sha256sums=('c7b40f5605dd972108f503f031b20186f5e5bca2b65cd4b8bd6c3e4ba8126697') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" -} +sha256sums=('8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d') build() { declare -a extra_config diff --git a/jsoncpp/snprintf-newlib.patch b/jsoncpp/snprintf-newlib.patch deleted file mode 100644 index 776521bd..00000000 --- a/jsoncpp/snprintf-newlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jsoncpp-1.6.2/src/lib_json/json_writer.cpp.old 2015-04-11 20:45:33.000000000 +0100 -+++ jsoncpp-1.6.2/src/lib_json/json_writer.cpp 2015-06-05 00:14:09.610468200 +0100 -@@ -29,7 +29,7 @@ - - #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below - #define snprintf _snprintf --#elif __cplusplus >= 201103L -+#elif __cplusplus >= 201103L && !defined(__CYGWIN__) - #define snprintf std::snprintf - #endif -