diff options
| author | Matt Corallo <[email protected]> | 2011-10-25 16:48:36 -0400 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2011-11-08 11:57:05 -0500 |
| commit | 38f33ce4a318c8dbff648154ea4978d3ccaf8495 (patch) | |
| tree | 2e1d1602ec3520ec1437f0a27c7d60f6c656ccfc /contrib/debian/patches | |
| parent | Re-add bitcoin(32&80).xpm (diff) | |
| download | discoin-38f33ce4a318c8dbff648154ea4978d3ccaf8495.tar.xz discoin-38f33ce4a318c8dbff648154ea4978d3ccaf8495.zip | |
Add debian build folder
Diffstat (limited to 'contrib/debian/patches')
| -rw-r--r-- | contrib/debian/patches/1001_use_system_json-spirit.patch | 26 | ||||
| -rw-r--r-- | contrib/debian/patches/README | 3 | ||||
| -rw-r--r-- | contrib/debian/patches/series | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/contrib/debian/patches/1001_use_system_json-spirit.patch b/contrib/debian/patches/1001_use_system_json-spirit.patch new file mode 100644 index 000000000..56a20af38 --- /dev/null +++ b/contrib/debian/patches/1001_use_system_json-spirit.patch @@ -0,0 +1,26 @@ +Description: Use system JSON Spirit library +Author: Jonas Smedegaard <[email protected]> +Last-Update: 2011-05-17 +--- a/src/rpc.cpp ++++ b/src/rpc.cpp +@@ -12,9 +12,7 @@ + #include <boost/asio/ssl.hpp> + typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> SSLStream; + #endif +-#include "json/json_spirit_reader_template.h" +-#include "json/json_spirit_writer_template.h" +-#include "json/json_spirit_utils.h" ++#include <json_spirit.h> + #define printf OutputDebugStringF + // MinGW 3.4.5 gets "fatal error: had to relocate PCH" if the json headers are + // precompiled in headers.h. The problem might be when the pch file goes over +--- a/src/makefile.unix ++++ b/src/makefile.unix +@@ -23,6 +23,7 @@ + -l boost_thread \ + -l db_cxx \ + -l ssl \ ++ -l json_spirit \ + -l crypto + + ifdef USE_UPNP diff --git a/contrib/debian/patches/README b/contrib/debian/patches/README new file mode 100644 index 000000000..80c158437 --- /dev/null +++ b/contrib/debian/patches/README @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff --git a/contrib/debian/patches/series b/contrib/debian/patches/series new file mode 100644 index 000000000..bbe3685ac --- /dev/null +++ b/contrib/debian/patches/series @@ -0,0 +1 @@ +#1001_use_system_json-spirit.patch |