Build against system-provided nlohmann-json3 library

diff --git a/debian/control b/debian/control
index 79ed018b2398acfbc5b355d471ea5cbea29cfb3d..46a7cc2aecc40210d360aaa6291270227acc2982 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends:
  libxext-dev,
  libxft2-dev,
  libxpm-dev,
+ nlohmann-json3-dev,
  xauth,
  xvfb,
 Standards-Version: 4.5.0

diff --git a/debian/patches/04-system-json.patch b/debian/patches/04-system-json.patch
new file mode 100644 (file)
index 0000000..074c3b0
--- /dev/null
+++ b/debian/patches/04-system-json.patch
@@ -0,0 +1,58 @@
+Description: Build against system-provided nlohmann/json
+Author: IOhannes m zmölnig
+Origin: Debian
+Forwarded: no
+Last-Update: 2020-04-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- giada.orig/src/core/midiMapConf.cpp
++++ giada/src/core/midiMapConf.cpp
+@@ -30,7 +30,7 @@
+ #include <string>
+ #include <cstring>
+ #include <dirent.h>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include "nlohmann/json.hpp"
+ #include "utils/string.h"
+ #include "utils/log.h"
+ #include "utils/fs.h"
+--- giada.orig/src/core/conf.cpp
++++ giada/src/core/conf.cpp
+@@ -29,7 +29,7 @@
+ #include <cassert>
+ #include <string>
+ #include <FL/Fl.H>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include "nlohmann/json.hpp"
+ #include "utils/fs.h"
+ #include "utils/log.h"
+ #include "core/const.h"
+@@ -314,4 +314,4 @@
+     ofs << j;
+       return true;
+ }
+-}}}; // giada::m::conf::
+\ No newline at end of file
++}}}; // giada::m::conf::
+--- giada.orig/src/core/init.cpp
++++ giada/src/core/init.cpp
+@@ -35,7 +35,7 @@
+       #include <X11/Xlib.h> // For XInitThreads
+ #endif
+ #include <FL/Fl.H>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include "nlohmann/json.hpp"
+ #include "gui/updater.h"
+ #include "utils/log.h"
+ #include "utils/fs.h"
+--- giada.orig/src/core/patch.cpp
++++ giada/src/core/patch.cpp
+@@ -26,7 +26,7 @@
+ 
+ 
+ #include <fstream>
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include "nlohmann/json.hpp"
+ #include "utils/math.h"
+ #include "utils/log.h"
+ #include "core/mixer.h"

diff --git a/debian/patches/series b/debian/patches/series
index ac3a33815b3dc6dcdbc4f547b47827f088293eee..ff9b4e0ec20ec60ef3293fb83d1403022018ba1b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 02-rtmidi-pkgconfig.patch
 03-JUCE544-compat.patch
+04-system-json.patch