[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch | 12 +++++++-----
 package/jsoncpp/jsoncpp.mk                                   |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch b/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
index 7935849..1178cc2 100644
--- a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
+++ b/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
@@ -16,6 +16,8 @@ Upstream status: sent upstream
 package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+(bumped patch to jsoncpp 1.6.5)
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 ---
 
  src/lib_json/json_writer.cpp | 2 --
@@ -25,15 +27,15 @@ diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
 index 83102fd2bb86..f7ad1e21bbc0 100644
 --- a/src/lib_json/json_writer.cpp
 +++ b/src/lib_json/json_writer.cpp
-@@ -29,8 +29,6 @@
- 
- #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
+@@ -31,8 +31,6 @@
  #define snprintf _snprintf
+ #elif defined(__ANDROID__)
+ #define snprintf snprintf
 -#elif __cplusplus >= 201103L
 -#define snprintf std::snprintf
  #endif
  
- #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
--- 
+ #if defined(__BORLANDC__)  
+---
 2.1.4
 
diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk
index 63b18e6..132e264 100644
--- a/package/jsoncpp/jsoncpp.mk
+++ b/package/jsoncpp/jsoncpp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JSONCPP_VERSION = 1.6.1
+JSONCPP_VERSION = 1.6.5
 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))
 JSONCPP_LICENSE = Public Domain or MIT
 JSONCPP_LICENSE_FILES = LICENSE
-- 
2.1.4

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Baruch Siach]

Hi Bernd,

On Sun, Aug 09, 2015 at 02:28:30PM +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  .../jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch | 12 +++++++-----
>  package/jsoncpp/jsoncpp.mk                                   |  2 +-
>  2 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch b/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
> index 7935849..1178cc2 100644
> --- a/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
> +++ b/package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
> @@ -16,6 +16,8 @@ Upstream status: sent upstream
>  package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
>  
>  Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> +(bumped patch to jsoncpp 1.6.5)
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

I think this patch is not needed anymore. See 
https://github.com/open-source-parsers/jsoncpp/pull/232. I haven't tested 
though.

baruch

>   src/lib_json/json_writer.cpp | 2 --
> @@ -25,15 +27,15 @@ diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
>  index 83102fd2bb86..f7ad1e21bbc0 100644
>  --- a/src/lib_json/json_writer.cpp
>  +++ b/src/lib_json/json_writer.cpp
> -@@ -29,8 +29,6 @@
> - 
> - #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
> +@@ -31,8 +31,6 @@
>   #define snprintf _snprintf
> + #elif defined(__ANDROID__)
> + #define snprintf snprintf
>  -#elif __cplusplus >= 201103L
>  -#define snprintf std::snprintf
>   #endif
>   
> - #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
> --- 
> + #if defined(__BORLANDC__)  
> +---
>  2.1.4
>  
> diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk
> index 63b18e6..132e264 100644
> --- a/package/jsoncpp/jsoncpp.mk
> +++ b/package/jsoncpp/jsoncpp.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -JSONCPP_VERSION = 1.6.1
> +JSONCPP_VERSION = 1.6.5
>  JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))
>  JSONCPP_LICENSE = Public Domain or MIT
>  JSONCPP_LICENSE_FILES = LICENSE

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Jörg Krause]

Hi Baruch, Bernd,

On So, 2015-08-09 at 17:54 +0300, Baruch Siach wrote:
> Hi Bernd,
> 
> On Sun, Aug 09, 2015 at 02:28:30PM +0200, Bernd Kuhls wrote:
> > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> > ---
> >  .../jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch | 12 
> > +++++++-----
> >  package/jsoncpp/jsoncpp.mk                                   |  2 
> > +-
> >  2 files changed, 8 insertions(+), 6 deletions(-)
> > 
> > diff --git a/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > -snprintf.patch b/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > -snprintf.patch
> > index 7935849..1178cc2 100644
> > --- a/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > -snprintf.patch
> > +++ b/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > -snprintf.patch
> > @@ -16,6 +16,8 @@ Upstream status: sent upstream
> >  package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
> >  
> >  Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > +(bumped patch to jsoncpp 1.6.5)
> > +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> 
> I think this patch is not needed anymore. See 
> https://github.com/open-source-parsers/jsoncpp/pull/232. I haven't 
> tested 
> though.
> 
> baruch
> 
> >   src/lib_json/json_writer.cpp | 2 --
> > @@ -25,15 +27,15 @@ diff --git a/src/lib_json/json_writer.cpp 
> > b/src/lib_json/json_writer.cpp
> >  index 83102fd2bb86..f7ad1e21bbc0 100644
> >  --- a/src/lib_json/json_writer.cpp
> >  +++ b/src/lib_json/json_writer.cpp
> > -@@ -29,8 +29,6 @@
> > - 
> > - #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
> > +@@ -31,8 +31,6 @@
> >   #define snprintf _snprintf
> > + #elif defined(__ANDROID__)
> > + #define snprintf snprintf
> >  -#elif __cplusplus >= 201103L
> >  -#define snprintf std::snprintf
> >   #endif
> >   
> > - #if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
> > --- 
> > + #if defined(__BORLANDC__)  
> > +---
> >  2.1.4
> >  
> > diff --git a/package/jsoncpp/jsoncpp.mk 
> > b/package/jsoncpp/jsoncpp.mk
> > index 63b18e6..132e264 100644
> > --- a/package/jsoncpp/jsoncpp.mk
> > +++ b/package/jsoncpp/jsoncpp.mk
> > @@ -4,7 +4,7 @@
> >  #
> >  ##################################################################
> > ##############
> >  
> > -JSONCPP_VERSION = 1.6.1
> > +JSONCPP_VERSION = 1.6.5
> >  JSONCPP_SITE = $(call github,open-source
> > -parsers,jsoncpp,$(JSONCPP_VERSION))
> >  JSONCPP_LICENSE = Public Domain or MIT
> >  JSONCPP_LICENSE_FILES = LICENSE
> 

I already submitted a patch for jsoncpp version bump and removing the
snprintf-patch:
http://patchwork.ozlabs.org/patch/502324/

Best regards
J?rg Krause

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Bernd Kuhls]

Am Sun, 09 Aug 2015 20:05:11 +0200 schrieb J?rg Krause:

> I already submitted a patch for jsoncpp version bump and removing the
> snprintf-patch:
> http://patchwork.ozlabs.org/patch/502324/

Hi J?rg,

sorry, I did not notice. I think your patch is better because it takes 
care of the non-c11 toolchains but, as discussed, could you please keep 
the snprintf patch? Therefore I marked my patch as superseded ;)

Regards, Bernd

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Baruch Siach]

Hi J?rg,

On Sun, Aug 09, 2015 at 08:05:11PM +0200, J?rg Krause wrote:
> On So, 2015-08-09 at 17:54 +0300, Baruch Siach wrote:
> > On Sun, Aug 09, 2015 at 02:28:30PM +0200, Bernd Kuhls wrote:
> > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> > > ---
> > >  .../jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch | 12 
> > > +++++++-----
> > >  package/jsoncpp/jsoncpp.mk                                   |  2 
> > > +-
> > >  2 files changed, 8 insertions(+), 6 deletions(-)
> > > 
> > > diff --git a/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > > -snprintf.patch b/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > > -snprintf.patch
> > > index 7935849..1178cc2 100644
> > > --- a/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > > -snprintf.patch
> > > +++ b/package/jsoncpp/0001-Revert-Use-std-namespace-for
> > > -snprintf.patch
> > > @@ -16,6 +16,8 @@ Upstream status: sent upstream
> > >  package/jsoncpp/0001-Revert-Use-std-namespace-for-snprintf.patch
> > >  
> > >  Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > > +(bumped patch to jsoncpp 1.6.5)
> > > +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> > 
> > I think this patch is not needed anymore. See 
> > https://github.com/open-source-parsers/jsoncpp/pull/232. I haven't 
> > tested though.
> 
> I already submitted a patch for jsoncpp version bump and removing the
> snprintf-patch: http://patchwork.ozlabs.org/patch/502324/

Right. Except that your pull request (#323) has been merged since then. Care 
to send an updated patch with current -Werror removal patch status?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Baruch Siach]

Hi Bernd,

On Sun, Aug 09, 2015 at 10:01:49PM +0200, Bernd Kuhls wrote:
> Am Sun, 09 Aug 2015 20:05:11 +0200 schrieb J?rg Krause:
> > I already submitted a patch for jsoncpp version bump and removing the
> > snprintf-patch:
> > http://patchwork.ozlabs.org/patch/502324/
> 
> sorry, I did not notice. I think your patch is better because it takes 
> care of the non-c11 toolchains but, as discussed, could you please keep 
> the snprintf patch? Therefore I marked my patch as superseded ;)

Where has this been discussed? I must have missed something.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Bernd Kuhls]

Am Sun, 09 Aug 2015 23:13:27 +0300 schrieb Baruch Siach:

> Hi Bernd,
> 
> On Sun, Aug 09, 2015 at 10:01:49PM +0200, Bernd Kuhls wrote:
>> Am Sun, 09 Aug 2015 20:05:11 +0200 schrieb J?rg Krause:
>> > I already submitted a patch for jsoncpp version bump and removing the
>> > snprintf-patch:
>> > http://patchwork.ozlabs.org/patch/502324/
>> 
>> sorry, I did not notice. I think your patch is better because it takes
>> care of the non-c11 toolchains but, as discussed, could you please keep
>> the snprintf patch? Therefore I marked my patch as superseded ;)
> 
> Where has this been discussed? I must have missed something.

Hi Baruch,

http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/124666

jsoncpp 1.6.5 still fails to compile on x86 without the snprintf patch 
using this defconfig:

BR2_TOOLCHAIN_BUILDROOT_MUSL=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_JSONCPP=y

Regards, Bernd

[Buildroot] [PATCH/next 1/1] package/jsoncpp: bump version to 1.6.5

[Baruch Siach]

Hi Bernd,

On Sun, Aug 09, 2015 at 10:35:10PM +0200, Bernd Kuhls wrote:
> Am Sun, 09 Aug 2015 23:13:27 +0300 schrieb Baruch Siach:
> > On Sun, Aug 09, 2015 at 10:01:49PM +0200, Bernd Kuhls wrote:
> >> Am Sun, 09 Aug 2015 20:05:11 +0200 schrieb J?rg Krause:
> >> > I already submitted a patch for jsoncpp version bump and removing the
> >> > snprintf-patch:
> >> > http://patchwork.ozlabs.org/patch/502324/
> >> 
> >> sorry, I did not notice. I think your patch is better because it takes
> >> care of the non-c11 toolchains but, as discussed, could you please keep
> >> the snprintf patch? Therefore I marked my patch as superseded ;)
> > 
> > Where has this been discussed? I must have missed something.
> 
> http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/124666

I only see posix_memalign mentioned. Is the snprintf issue also related 
somehow?

> jsoncpp 1.6.5 still fails to compile on x86 without the snprintf patch using 
> this defconfig:
> 
> BR2_TOOLCHAIN_BUILDROOT_MUSL=y
> BR2_TOOLCHAIN_BUILDROOT_CXX=y
> BR2_PACKAGE_JSONCPP=y

What is the build error message?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -