From patchwork Wed Sep 21 20:33:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 673045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sfWYn5TVPz9syB for ; Thu, 22 Sep 2016 06:34:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b=rzxXyck6; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E349B31B2D; Wed, 21 Sep 2016 20:34:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wHTmjC9ll0A6; Wed, 21 Sep 2016 20:34:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 84ABD31AE5; Wed, 21 Sep 2016 20:34:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 303971CF865 for ; Wed, 21 Sep 2016 20:34:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2810331AE5 for ; Wed, 21 Sep 2016 20:34:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YpBzkrbb78YT for ; Wed, 21 Sep 2016 20:33:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout02.posteo.de (mout02.posteo.de [185.67.36.142]) by silver.osuosl.org (Postfix) with ESMTPS id A12A031A00 for ; Wed, 21 Sep 2016 20:33:58 +0000 (UTC) Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 3sfWYb1fGbz105g for ; Wed, 21 Sep 2016 22:33:54 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1474490033; x=1475094834; bh=GZxFW7HMe8x28Wxv+KYPzXLdHMnCOtbWt0BzhmBN12A=; b=rzxXyck6rpvb NqwrpUoIuerXMJCl3j9BJ86zU37eKu6Ua1FsH2LtGDh6yVvGo/CetMOrxS8/EdVs KHmbbjc8cTkk9aaee5cYgxRSvQl8xwqdj8DHK7QSUGW5KZyn2b6OuDuLPkvAQOHY oHwPqhZHF3LtIojvE0H9Q0mVk9ycV43eyEBBin2bOgOFrHiWCoXKC2Cjb0/l0hh9 SVCqa13vk1Zm+uMfQ/jvL9X620guT2iMeRJ8n6nrVISWEwlXZUq2qgVTJkatrHiG NjgtJjRMVBLe0Qi6aF6l2wZJDUhYVEEZUKmQiq2D7x3YSJx/CuOcRAQ/LssdaF3Y HQYufaBxkA== Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 8TTlrG02Z9cj; Wed, 21 Sep 2016 22:33:53 +0200 (CEST) Received: from nzxt.fritz.box (x2f76d87.dyn.telefonica.de [2.247.109.135]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Wed, 21 Sep 2016 22:33:53 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Wed, 21 Sep 2016 22:33:51 +0200 Message-Id: <20160921203351.5434-1-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.10.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/jsoncpp: bump to version 1.7.5 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove patch applied upstream in commit d4a49cf511a9ef5ee52af83f8aed4437eaa160e1. Signed-off-by: Jörg Krause --- ...txt-Treat-conversion-warning-as-error-onl.patch | 37 ---------------------- package/jsoncpp/jsoncpp.hash | 2 +- package/jsoncpp/jsoncpp.mk | 2 +- 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 package/jsoncpp/0001-CMakeLists.txt-Treat-conversion-warning-as-error-onl.patch diff --git a/package/jsoncpp/0001-CMakeLists.txt-Treat-conversion-warning-as-error-onl.patch b/package/jsoncpp/0001-CMakeLists.txt-Treat-conversion-warning-as-error-onl.patch deleted file mode 100644 index 3e009b9..0000000 --- a/package/jsoncpp/0001-CMakeLists.txt-Treat-conversion-warning-as-error-onl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 98a7f56ed41071240274063b2d4e39e4e1c9589f Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 25 Apr 2016 19:41:28 +0200 -Subject: [PATCH 1/1] CMakeLists.txt: Treat conversion warning as error only - with JSONCPP_WITH_WARNING_AS_ERROR=On - -Fixes errors when building with buildroot: -http://autobuild.buildroot.net/?reason=jsoncpp-1.7.2 - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: - https://github.com/open-source-parsers/jsoncpp/pull/466) ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7787850..637fc34 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,11 +107,11 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Werror=conversion -Werror=sign-compare") - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - # using GCC -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra -Werror=conversion") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wconversion -Wshadow -Wextra") - # not yet ready for -Wsign-conversion - - if (JSONCPP_WITH_STRICT_ISO AND NOT JSONCPP_WITH_WARNING_AS_ERROR) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=conversion -pedantic") - endif () - endif() - --- -2.8.0.rc3 - diff --git a/package/jsoncpp/jsoncpp.hash b/package/jsoncpp/jsoncpp.hash index 5b4bbcf..e1768ed 100644 --- a/package/jsoncpp/jsoncpp.hash +++ b/package/jsoncpp/jsoncpp.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 2179a7df19c1c6dc87e02c65b847efc914625a9b87df3e443d9610fc70c0f557 jsoncpp-1.7.2.tar.gz +sha256 4338c6cab8af8dee6cdfd54e6218bd0533785f552c6162bb083f8dd28bf8fbbe jsoncpp-1.7.5.tar.gz diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 34da14c..83ce0a7 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -JSONCPP_VERSION = 1.7.2 +JSONCPP_VERSION = 1.7.5 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) JSONCPP_LICENSE = Public Domain or MIT JSONCPP_LICENSE_FILES = LICENSE