diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-12-28 21:35:15 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-12-29 10:46:54 +0100 |
| commit | 7e3b81f7c786c2af5701672129f87c6012786dff (patch) | |
| tree | 665b73d164a1134ef1fd27031c228246bcf95122 /main/jsoncpp | |
| parent | cee310f5c81bd638647da523df8eae1b9df1d704 (diff) | |
| download | aports-7e3b81f7c786c2af5701672129f87c6012786dff.zip | |
main/jsoncpp: upgrade to 1.8.4
Diffstat (limited to 'main/jsoncpp')
| -rw-r--r-- | main/jsoncpp/APKBUILD | 9 | ||||
| -rw-r--r-- | main/jsoncpp/secure_memory.patch | 21 |
2 files changed, 3 insertions, 27 deletions
diff --git a/main/jsoncpp/APKBUILD b/main/jsoncpp/APKBUILD index ec555cbc190..c85fc71b8f2 100644 --- a/main/jsoncpp/APKBUILD +++ b/main/jsoncpp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=jsoncpp -pkgver=1.8.3 +pkgver=1.8.4 pkgrel=0 pkgdesc="JSON C++ library" url="https://github.com/open-source-parsers/jsoncpp" @@ -9,9 +9,7 @@ arch="all" license="PublicDomain" makedepends="meson" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz - secure_memory.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/open-source-parsers/jsoncpp/archive/$pkgver.tar.gz" builddir="$srcdir"/$pkgname-$pkgver build() { @@ -32,5 +30,4 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="a5170ccbc440c1bd2b365e34f7367a55731d4fa86b2d323d11431cead771127364bad9d8e2e59dcbe41bc111d11a5da94988dec5e40b9119f793f43e487d7429 jsoncpp-1.8.3.tar.gz -65aefb90d9df23c44600cfa483d3eb4eb9c7d657650facff61aef11030361fd386003306e7d2e7ffbd0bea00dfda0ef4be10ce6396b6bf858ee1b65157331beb secure_memory.patch" +sha512sums="f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1 jsoncpp-1.8.4.tar.gz" diff --git a/main/jsoncpp/secure_memory.patch b/main/jsoncpp/secure_memory.patch deleted file mode 100644 index baee14a1787..00000000000 --- a/main/jsoncpp/secure_memory.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 49da91c786855228158cb8937c972cd741bd4c79 Mon Sep 17 00:00:00 2001 -From: Martin Dagarin <SloCompTech@users.noreply.github.com> -Date: Mon, 4 Sep 2017 21:10:15 +0200 -Subject: [PATCH] Fixed compile bug - ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index f2a6800f..f193fec5 100644 ---- a/meson.build -+++ b/meson.build -@@ -18,6 +18,7 @@ jsoncpp_cdata.set('JSONCPP_VERSION', meson.project_version()) - jsoncpp_cdata.set('JSONCPP_VERSION_MAJOR', jsoncpp_major_version) - jsoncpp_cdata.set('JSONCPP_VERSION_MINOR', jsoncpp_minor_version) - jsoncpp_cdata.set('JSONCPP_VERSION_PATCH', jsoncpp_patch_version) -+jsoncpp_cdata.set('JSONCPP_USE_SECURE_MEMORY',0) - - jsoncpp_gen_sources = configure_file( - input : 'src/lib_json/version.h.in', |