control: tags -1 patch pending
Hello,
> But it may also be worth looking into whether the issue is still present
> when compiling with gcc 7.3, as it may have just been a bug in gcc 7.2.
I rebased the upstream cherry-pick and uploaded in unstable, because poedit got
in the meanwhile
removed from testing.
I don't think waiting for the json3 is a good reason for kick this one out (at
least until it will be ready)
diff attached!
G.
diff -Nru nlohmann-json-2.1.1/debian/changelog
nlohmann-json-2.1.1/debian/changelog
--- nlohmann-json-2.1.1/debian/changelog2017-07-12 21:00:07.0
+0200
+++ nlohmann-json-2.1.1/debian/changelog2018-04-23 11:07:57.0
+0200
@@ -1,3 +1,11 @@
+nlohmann-json (2.1.1-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/bea1665ac9a5e7aa4fa93668ff35723385a27bfd.patch:
+cherry-pick upstream fix for new gcc 7.2 (Closes: #892201)
+
+ -- Gianfranco Costamagna Mon, 23 Apr 2018
11:07:57 +0200
+
nlohmann-json (2.1.1-1) unstable; urgency=medium
* New upstream version 2.1.1 (Closes: #885540)
diff -Nru
nlohmann-json-2.1.1/debian/patches/bea1665ac9a5e7aa4fa93668ff35723385a27bfd.patch
nlohmann-json-2.1.1/debian/patches/bea1665ac9a5e7aa4fa93668ff35723385a27bfd.patch
---
nlohmann-json-2.1.1/debian/patches/bea1665ac9a5e7aa4fa93668ff35723385a27bfd.patch
1970-01-01 01:00:00.0 +0100
+++
nlohmann-json-2.1.1/debian/patches/bea1665ac9a5e7aa4fa93668ff35723385a27bfd.patch
2018-04-23 11:07:55.0 +0200
@@ -0,0 +1,25 @@
+Description: tweak upstream commit bea1665ac9a5e7aa4fa93668ff35723385a27bfd
and make
+ it apply on top of old version to make it build with new gcc
+From bea1665ac9a5e7aa4fa93668ff35723385a27bfd Mon Sep 17 00:00:00 2001
+From: moneroexamples
+Date: Mon, 5 Jun 2017 09:01:19 +0800
+Subject: [PATCH] modify json.hpp to compile with recent gcc
+
+https://github.com/nlohmann/json/issues/606
+---
+ src/json.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/json.hpp b/src/json.hpp
+index c2e1f20..48d797d 100644
+--- a/src/json.hpp
b/src/json.hpp
+@@ -6054,7 +6054,7 @@ class basic_json
+ {
+ case value_t::array:
+ {
+-return *lhs.m_value.array < *rhs.m_value.array;
++return (*lhs.m_value.array) < (*rhs.m_value.array);
+ }
+ case value_t::object:
+ {
diff -Nru nlohmann-json-2.1.1/debian/patches/series
nlohmann-json-2.1.1/debian/patches/series
--- nlohmann-json-2.1.1/debian/patches/series 2017-07-12 21:00:07.0
+0200
+++ nlohmann-json-2.1.1/debian/patches/series 2018-04-23 10:57:03.0
+0200
@@ -1,2 +1,3 @@
0001-fix-for-failing-test-suite.patch
0002-fix-path-for-cmake-files.patch
+bea1665ac9a5e7aa4fa93668ff35723385a27bfd.patch