forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
craftos-pc: fix the build against poco-1.14
Upstream seems to have errors, where it doesn't include all the poco headers it requires for it to build. I've provided a patch and opened a pull request upstream to get it merged: MCJack123/craftos2#391
- Loading branch information
Showing
2 changed files
with
80 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
diff --git a/src/configuration.cpp b/src/configuration.cpp | ||
index 2196121..0c5cf27 100644 | ||
--- a/src/configuration.cpp | ||
+++ b/src/configuration.cpp | ||
@@ -11,6 +11,7 @@ | ||
#include <fstream> | ||
#include <unordered_map> | ||
#include <configuration.hpp> | ||
+#include <Poco/JSON/JSONException.h> | ||
#include "platform.hpp" | ||
#include "runtime.hpp" | ||
#include "terminal/SDLTerminal.hpp" | ||
diff --git a/src/main.cpp b/src/main.cpp | ||
index 9ab0814..38976a2 100644 | ||
--- a/src/main.cpp | ||
+++ b/src/main.cpp | ||
@@ -34,6 +34,7 @@ static void* releaseNotesThread(void* data); | ||
#include <Poco/URI.h> | ||
#include <Poco/Checksum.h> | ||
#include <Poco/JSON/Parser.h> | ||
+#include <Poco/JSON/JSONException.h> | ||
#ifndef __EMSCRIPTEN__ | ||
#include <Poco/Net/HTTPSClientSession.h> | ||
#include <Poco/Net/HTTPRequest.h> | ||
diff --git a/src/util.hpp b/src/util.hpp | ||
index b8ab2d1..c643b96 100644 | ||
--- a/src/util.hpp | ||
+++ b/src/util.hpp | ||
@@ -21,6 +21,8 @@ extern "C" { | ||
#include <string> | ||
#include <vector> | ||
#include <Poco/JSON/JSON.h> | ||
+#include <Poco/JSON/Object.h> | ||
+#include <Poco/JSON/Array.h> | ||
#include <Poco/JSON/Parser.h> | ||
#include <Poco/Net/HTTPResponse.h> | ||
#include <Computer.hpp> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters