From dc27375f20a554785d6a23ca374e1a5087065f13 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 23 Jul 2015 18:38:24 -0400 Subject: [PATCH] jsoncpp: Update to 1.6.5 --- packages/jsoncpp/build.sh | 2 +- packages/jsoncpp/json_writer.cpp.patch | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 packages/jsoncpp/json_writer.cpp.patch diff --git a/packages/jsoncpp/build.sh b/packages/jsoncpp/build.sh index 4137dacea..f1a69f9ed 100644 --- a/packages/jsoncpp/build.sh +++ b/packages/jsoncpp/build.sh @@ -1,6 +1,6 @@ TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON" -TERMUX_PKG_VERSION=1.6.2 +TERMUX_PKG_VERSION=1.6.5 TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION} diff --git a/packages/jsoncpp/json_writer.cpp.patch b/packages/jsoncpp/json_writer.cpp.patch deleted file mode 100644 index 31df81e6e..000000000 --- a/packages/jsoncpp/json_writer.cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../jsoncpp-1.6.2/src/lib_json/json_writer.cpp ./src/lib_json/json_writer.cpp ---- ../jsoncpp-1.6.2/src/lib_json/json_writer.cpp 2015-04-11 15:45:33.000000000 -0400 -+++ ./src/lib_json/json_writer.cpp 2015-05-20 18:05:22.382255829 -0400 -@@ -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(__ANDROID__) - #define snprintf std::snprintf - #endif -