diff options
| author | Térence Clastres | 2021-05-18 12:16:43 +0200 |
|---|---|---|
| committer | Térence Clastres | 2021-05-18 12:16:43 +0200 |
| commit | c2088660f8328095e5dbcff634f568cad878cb4b (patch) | |
| tree | ec32876d30389fc02b66dbf3f32cde6ceefc1eb1 /giada-git-devendor_nlohmann_json.patch | |
| parent | ff5cbce9f6490fe54734945e302cc99a1ef6651b (diff) | |
| download | aur-c2088660f8328095e5dbcff634f568cad878cb4b.tar.gz | |
Sync to community package, add missing submodules
Diffstat (limited to 'giada-git-devendor_nlohmann_json.patch')
| -rw-r--r-- | giada-git-devendor_nlohmann_json.patch | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/giada-git-devendor_nlohmann_json.patch b/giada-git-devendor_nlohmann_json.patch index 3cc1c1248a2a..45ea07e5fa05 100644 --- a/giada-git-devendor_nlohmann_json.patch +++ b/giada-git-devendor_nlohmann_json.patch @@ -1,55 +1,55 @@ diff -ruN a/src/core/conf.cpp b/src/core/conf.cpp ---- a/src/core/conf.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/conf.cpp 2020-11-20 17:28:36.176616521 +0100 -@@ -29,7 +29,7 @@ - #include <cassert> - #include <string> - #include <FL/Fl.H> +--- a/src/core/conf.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/conf.cpp 2021-04-24 16:18:22.530287443 +0200 +@@ -27,7 +27,7 @@ + #include "conf.h" + #include "core/const.h" + #include "core/types.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" + #include <FL/Fl.H> @@ -315,4 +315,4 @@ - ofs << j; + ofs << j; return true; } --}}} // giada::m::conf:: +-} // namespace giada::m::conf \ No newline at end of file -+}}} // giada::m::conf:: ++} // namespace giada::m::conf diff -ruN a/src/core/init.cpp b/src/core/init.cpp ---- a/src/core/init.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/init.cpp 2020-11-20 17:29:53.759248660 +0100 -@@ -35,7 +35,7 @@ - #include <X11/Xlib.h> // For XInitThreads - #endif - #include <FL/Fl.H> +--- a/src/core/init.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/init.cpp 2021-04-24 16:19:01.257069455 +0200 +@@ -54,7 +54,7 @@ + #include "core/sequencer.h" + #include "core/wave.h" + #include "core/waveManager.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" + #include "glue/main.h" + #include "gui/dialogs/mainWindow.h" + #include "gui/dialogs/warnings.h" diff -ruN a/src/core/midiMapConf.cpp b/src/core/midiMapConf.cpp ---- a/src/core/midiMapConf.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/midiMapConf.cpp 2020-11-20 17:28:01.216937457 +0100 -@@ -30,7 +30,7 @@ - #include <string> - #include <cstring> - #include <filesystem> +--- a/src/core/midiMapConf.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/midiMapConf.cpp 2021-04-24 16:17:56.890211073 +0200 +@@ -26,7 +26,7 @@ + + #include "midiMapConf.h" + #include "const.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" + #include "utils/log.h" + #include "utils/string.h" diff -ruN a/src/core/patch.cpp b/src/core/patch.cpp ---- a/src/core/patch.cpp 2020-11-15 21:26:40.000000000 +0100 -+++ b/src/core/patch.cpp 2020-11-20 17:30:12.475748254 +0100 +--- a/src/core/patch.cpp 2021-03-31 18:44:48.000000000 +0200 ++++ b/src/core/patch.cpp 2021-04-24 16:19:23.867136797 +0200 @@ -26,7 +26,7 @@ - - #include <fstream> + #include "patch.h" + #include "core/mixer.h" -#include "deps/json/single_include/nlohmann/json.hpp" +#include <nlohmann/json.hpp> - #include "utils/math.h" #include "utils/log.h" - #include "core/mixer.h" + #include "utils/math.h" + #include <fstream> |