# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1602763010 -7200
# Node ID 6784a119484ddf87d488aeaf3bee4c4dce162cfe
# Parent  fef260693d4e90fd3419665ce1f910a3b7377044
hotpatch to make Orthanc 0.8.6 compile on Ubuntu 16.04

diff -r fef260693d4e -r 6784a119484d Resources/CMake/BoostConfiguration.cmake
--- a/Resources/CMake/BoostConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -39,16 +39,22 @@
 
 
 if (BOOST_STATIC)
-  # Parameters for Boost 1.55.0
-  set(BOOST_NAME boost_1_55_0)
-  set(BOOST_BCP_SUFFIX bcpdigest-0.7.4)
-  set(BOOST_MD5 "409f7a0e4fb1f5659d07114f3133b67b")
+  ##
+  ## WARNING 2020-10-15: Contrarily to the official 0.8.6 release from
+  ## 2015-02-12 that uses Boost 1.55.0, this branch contains a
+  ## hotpatch to use Boost 1.58.0. This is necessary for static build
+  ## on Ubuntu 16.04.
+  ##
+  
+  set(BOOST_NAME boost_1_58_0)
+  set(BOOST_BCP_SUFFIX bcpdigest-0.9.2)
+  set(BOOST_MD5 "704b110917cbda903e07cb53934b47ac")
   set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src")
   
   set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
   DownloadPackage(
     "${BOOST_MD5}"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz"
     "${BOOST_SOURCES_DIR}"
     )
 
diff -r fef260693d4e -r 6784a119484d Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -17,7 +17,7 @@
   SET(DCMTK_SOURCES_DIR ${CMAKE_BINARY_DIR}/dcmtk-3.6.0)
   DownloadPackage(
     "219ad631b82031806147e4abbfba4fa4"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/dcmtk-3.6.0.zip" 
+    "http://www.orthanc-server.com/downloads/third-party/dcmtk-3.6.0.zip" 
     "${DCMTK_SOURCES_DIR}")
 
   IF(CMAKE_CROSSCOMPILING)
diff -r fef260693d4e -r 6784a119484d Resources/CMake/GoogleLogConfiguration.cmake
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/GoogleLogConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2)
   DownloadPackage(
     "897fbff90d91ea2b6d6e78c8cea641cc"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/glog-0.3.2.tar.gz"
     "${GOOGLE_LOG_SOURCES_DIR}")
 
 
@@ -13,7 +13,7 @@
   #SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.3)
   #DownloadPackage(
   #  "a6fd2c22f8996846e34c763422717c18"
-  #  "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.3.tar.gz"
+  #  "http://www.orthanc-server.com/downloads/third-party/glog-0.3.3.tar.gz"
   #  "${GOOGLE_LOG_SOURCES_DIR}")
 
 
diff -r fef260693d4e -r 6784a119484d Resources/CMake/GoogleTestConfiguration.cmake
--- a/Resources/CMake/GoogleTestConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/GoogleTestConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -11,7 +11,7 @@
   set(GTEST_SOURCES_DIR ${CMAKE_BINARY_DIR}/gtest-1.7.0)
   DownloadPackage(
     "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/gtest-1.7.0.zip"
+    "http://www.orthanc-server.com/downloads/third-party/gtest-1.7.0.zip"
     "${GTEST_SOURCES_DIR}")
 
   include_directories(
diff -r fef260693d4e -r 6784a119484d Resources/CMake/JsonCppConfiguration.cmake
--- a/Resources/CMake/JsonCppConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.6.0-rc2)
   DownloadPackage(
     "363e2f4cbd3aeb63bf4e571f377400fb"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-src-0.6.0-rc2.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/jsoncpp-src-0.6.0-rc2.tar.gz"
     "${JSONCPP_SOURCES_DIR}")
 
   list(APPEND THIRD_PARTY_SOURCES
diff -r fef260693d4e -r 6784a119484d Resources/CMake/LibCurlConfiguration.cmake
--- a/Resources/CMake/LibCurlConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/LibCurlConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   SET(CURL_SOURCES_DIR ${CMAKE_BINARY_DIR}/curl-7.26.0)
   DownloadPackage(
     "3fa4d5236f2a36ca5c3af6715e837691"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/curl-7.26.0.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/curl-7.26.0.tar.gz"
     "${CURL_SOURCES_DIR}")
 
   include_directories(${CURL_SOURCES_DIR}/include)
diff -r fef260693d4e -r 6784a119484d Resources/CMake/LibIconvConfiguration.cmake
--- a/Resources/CMake/LibIconvConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/LibIconvConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -1,7 +1,7 @@
 set(LIBICONV_SOURCES_DIR ${CMAKE_BINARY_DIR}/libiconv-1.14)
 DownloadPackage(
   "e34509b1623cec449dfeb73d7ce9c6c6"
-  "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libiconv-1.14.tar.gz"
+  "http://www.orthanc-server.com/downloads/third-party/libiconv-1.14.tar.gz"
   "${LIBICONV_SOURCES_DIR}")
 
 # https://groups.google.com/d/msg/android-ndk/AS1nkxnk6m4/EQm09hD1tigJ
diff -r fef260693d4e -r 6784a119484d Resources/CMake/LibPngConfiguration.cmake
--- a/Resources/CMake/LibPngConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/LibPngConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   SET(LIBPNG_SOURCES_DIR ${CMAKE_BINARY_DIR}/libpng-1.5.12)
   DownloadPackage(
     "8ea7f60347a306c5faf70b977fa80e28"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/libpng-1.5.12.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/libpng-1.5.12.tar.gz"
     "${LIBPNG_SOURCES_DIR}")
 
   include_directories(
diff -r fef260693d4e -r 6784a119484d Resources/CMake/LuaConfiguration.cmake
--- a/Resources/CMake/LuaConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/LuaConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   SET(LUA_SOURCES_DIR ${CMAKE_BINARY_DIR}/lua-5.1.5)
   DownloadPackage(
     "2e115fe26e435e33b0d5c022e4490567"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/lua-5.1.5.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/lua-5.1.5.tar.gz"
     "${LUA_SOURCES_DIR}")
 
   add_definitions(
diff -r fef260693d4e -r 6784a119484d Resources/CMake/MongooseConfiguration.cmake
--- a/Resources/CMake/MongooseConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/MongooseConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -5,7 +5,7 @@
     # Use Mongoose 3.1
     DownloadPackage(
       "e718fc287b4eb1bd523be3fa00942bb0"
-      "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/mongoose-3.1.tgz"
+      "http://www.orthanc-server.com/downloads/third-party/mongoose-3.1.tgz"
       "${MONGOOSE_SOURCES_DIR}")
     
     add_definitions(-DMONGOOSE_USE_CALLBACKS=0)
@@ -15,7 +15,7 @@
     # Use Mongoose 3.8
     DownloadPackage(
       "7e3296295072792cdc3c633f9404e0c3"
-      "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/mongoose-3.8.tgz"
+      "http://www.orthanc-server.com/downloads/third-party/mongoose-3.8.tgz"
       "${MONGOOSE_SOURCES_DIR}")
     
     add_definitions(-DMONGOOSE_USE_CALLBACKS=1)
diff -r fef260693d4e -r 6784a119484d Resources/CMake/OpenSslConfiguration.cmake
--- a/Resources/CMake/OpenSslConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/OpenSslConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.1g)
   DownloadPackage(
     "de62b43dfcd858e66a74bee1c834e959"
-    "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.1g.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/openssl-1.0.1g.tar.gz"
     "${OPENSSL_SOURCES_DIR}")
 
   if (NOT EXISTS "${OPENSSL_SOURCES_DIR}/include/PATCHED")
diff -r fef260693d4e -r 6784a119484d Resources/CMake/PugixmlConfiguration.cmake
--- a/Resources/CMake/PugixmlConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/PugixmlConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -6,7 +6,7 @@
 
     DownloadPackage(
       "7c56c91cfe3ecdee248a8e4892ef5781"
-      "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/pugixml-1.4.tar.gz"
+      "http://www.orthanc-server.com/downloads/third-party/pugixml-1.4.tar.gz"
       "${PUGIXML_SOURCES_DIR}")
 
     include_directories(
diff -r fef260693d4e -r 6784a119484d Resources/CMake/SQLiteConfiguration.cmake
--- a/Resources/CMake/SQLiteConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/SQLiteConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -2,7 +2,7 @@
   SET(SQLITE_SOURCES_DIR ${CMAKE_BINARY_DIR}/sqlite-amalgamation-3071300)
   DownloadPackage(
     "5fbeff9645ab035a1f580e90b279a16d"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/sqlite-amalgamation-3071300.zip"
+    "http://www.orthanc-server.com/downloads/third-party/sqlite-amalgamation-3071300.zip"
     "${SQLITE_SOURCES_DIR}")
 
   list(APPEND THIRD_PARTY_SOURCES
diff -r fef260693d4e -r 6784a119484d Resources/CMake/ZlibConfiguration.cmake
--- a/Resources/CMake/ZlibConfiguration.cmake	Tue Jul 17 09:41:15 2018 +0200
+++ b/Resources/CMake/ZlibConfiguration.cmake	Thu Oct 15 13:56:50 2020 +0200
@@ -8,7 +8,7 @@
   SET(ZLIB_SOURCES_DIR ${CMAKE_BINARY_DIR}/zlib-1.2.7)
   DownloadPackage(
     "60df6a37c56e7c1366cca812414f7b85"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/zlib-1.2.7.tar.gz"
+    "http://www.orthanc-server.com/downloads/third-party/zlib-1.2.7.tar.gz"
     "${ZLIB_SOURCES_DIR}")
 
   include_directories(
diff -r fef260693d4e -r 6784a119484d UnitTestsSources/LuaTests.cpp
--- a/UnitTestsSources/LuaTests.cpp	Tue Jul 17 09:41:15 2018 +0200
+++ b/UnitTestsSources/LuaTests.cpp	Thu Oct 15 13:56:50 2020 +0200
@@ -243,8 +243,8 @@
   Orthanc::LuaContext lua;
 
 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1  
-  lua.Execute("JSON = loadstring(HttpGet('http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/JSON.lua')) ()");
-  const std::string url("http://orthanc.googlecode.com/hg/OrthancCppClient/SharedLibrary/Product.json");
+  lua.Execute("JSON = loadstring(HttpGet('http://www.orthanc-server.com/downloads/third-party/JSON.lua')) ()");
+  const std::string url("http://www.orthanc-server.com/downloads/third-party/Product.json");
 #endif
 
   std::string s;
diff -r fef260693d4e -r 6784a119484d UnitTestsSources/RestApiTests.cpp
--- a/UnitTestsSources/RestApiTests.cpp	Tue Jul 17 09:41:15 2018 +0200
+++ b/UnitTestsSources/RestApiTests.cpp	Thu Oct 15 13:56:50 2020 +0200
@@ -61,7 +61,7 @@
 
 #if UNIT_TESTS_WITH_HTTP_CONNEXIONS == 1
   Json::Value v;
-  c.SetUrl("http://orthanc.googlecode.com/hg/Resources/Configuration.json");
+  c.SetUrl("https://hg.orthanc-server.com/orthanc/raw-file/Orthanc-0.8.6/Resources/Configuration.json");
   c.Apply(v);
   ASSERT_TRUE(v.isMember("StorageDirectory"));
   //ASSERT_EQ(GetLastStatusText());
@@ -69,7 +69,7 @@
   v = Json::nullValue;
 
   HttpClient cc(c);
-  cc.SetUrl("https://orthanc.googlecode.com/hg/Resources/Configuration.json");
+  cc.SetUrl("https://hg.orthanc-server.com/orthanc/raw-file/Orthanc-0.8.6/Resources/Configuration.json");
   cc.Apply(v);
   ASSERT_TRUE(v.isMember("LuaScripts"));
 #endif
diff -r fef260693d4e -r 6784a119484d UnitTestsSources/VersionsTests.cpp
--- a/UnitTestsSources/VersionsTests.cpp	Tue Jul 17 09:41:15 2018 +0200
+++ b/UnitTestsSources/VersionsTests.cpp	Thu Oct 15 13:56:50 2020 +0200
@@ -91,7 +91,7 @@
 
 TEST(Versions, BoostStatic)
 {
-  ASSERT_STREQ("1_55", BOOST_LIB_VERSION);
+  ASSERT_STREQ("1_58", BOOST_LIB_VERSION);
 }
 
 TEST(Versions, CurlStatic)