This is an automated email from the git hooks/post-receive script. jodogne-guest pushed a commit to branch master in repository orthanc.
commit f7c58356bf275b26db7fd01f28eddbf465803ff5 Author: jodogne-guest <s.jodo...@gmail.com> Date: Mon Jun 27 15:58:20 2016 +0200 removal of old patches --- debian/patches/cmake-dcmtk | 30 ------- debian/patches/jsoncpp-cxx11 | 16 ---- debian/patches/linux-detection | 193 ----------------------------------------- debian/patches/series | 3 - 4 files changed, 242 deletions(-) diff --git a/debian/patches/cmake-dcmtk b/debian/patches/cmake-dcmtk deleted file mode 100644 index 92de30d..0000000 --- a/debian/patches/cmake-dcmtk +++ /dev/null @@ -1,30 +0,0 @@ -Description: Fix bug #818512 ("FTBFS: Please install libdcmtk*-dev") -Author: Sebastien Jodogne <s.jodo...@gmail.com> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake -=================================================================== ---- Orthanc-1.0.0.orig/Resources/CMake/DcmtkConfiguration.cmake 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Resources/CMake/DcmtkConfiguration.cmake 2016-04-04 14:12:12.761016221 +0200 -@@ -180,16 +180,16 @@ - include(FindDCMTK) - list(APPEND DCMTK_LIBRARIES "${tmp}") - -- include_directories(${DCMTK_INCLUDE_DIR}) -+ include_directories(${DCMTK_INCLUDE_DIRS}) - - add_definitions( - -DHAVE_CONFIG_H=1 - ) - -- if (EXISTS "${DCMTK_DIR}/config/cfunix.h") -- set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h") -- elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h") # This is for Arch Linux -- set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h") -+ if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h") -+ set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h") -+ elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux -+ set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h") - else() - message(FATAL_ERROR "Please install libdcmtk*-dev") - endif() diff --git a/debian/patches/jsoncpp-cxx11 b/debian/patches/jsoncpp-cxx11 deleted file mode 100644 index 1be0516..0000000 --- a/debian/patches/jsoncpp-cxx11 +++ /dev/null @@ -1,16 +0,0 @@ -Description: Use 2011 ISO C++ standard as JsonCpp version >= 1.x.y -Author: Sebastien Jodogne <s.jodo...@gmail.com> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: Orthanc-1.0.0/Resources/CMake/Compiler.cmake -=================================================================== ---- Orthanc-1.0.0.orig/Resources/CMake/Compiler.cmake 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Resources/CMake/Compiler.cmake 2016-04-07 15:29:08.565628959 +0200 -@@ -11,6 +11,7 @@ - # --std=c99 makes libcurl not to compile - # -pedantic gives a lot of warnings on OpenSSL - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wno-long-long -Wno-variadic-macros") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-deprecated-declarations") - - if (CMAKE_CROSSCOMPILING) - # http://stackoverflow.com/a/3543845/881731 diff --git a/debian/patches/linux-detection b/debian/patches/linux-detection deleted file mode 100644 index 090504b..0000000 --- a/debian/patches/linux-detection +++ /dev/null @@ -1,193 +0,0 @@ -Description: Replace macro "__linux" (now obsolete) with "__linux__" -Author: Sebastien Jodogne <s.jodo...@gmail.com> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: Orthanc-1.0.0/Core/MultiThreading/Mutex.cpp -=================================================================== ---- Orthanc-1.0.0.orig/Core/MultiThreading/Mutex.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Core/MultiThreading/Mutex.cpp 2016-04-14 18:10:03.702461024 +0200 -@@ -37,7 +37,7 @@ - - #if defined(_WIN32) - #include <windows.h> --#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__FreeBSD__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__FreeBSD__) - #include <pthread.h> - #else - #error Support your platform here -@@ -75,7 +75,7 @@ - } - - --#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__FreeBSD__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__FreeBSD__) - - struct Mutex::PImpl - { -Index: Orthanc-1.0.0/Core/Toolbox.cpp -=================================================================== ---- Orthanc-1.0.0.orig/Core/Toolbox.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Core/Toolbox.cpp 2016-04-14 18:10:19.070461648 +0200 -@@ -67,7 +67,7 @@ - #include <limits.h> /* PATH_MAX */ - #endif - --#if defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - #include <limits.h> /* PATH_MAX */ - #include <signal.h> - #include <unistd.h> -@@ -131,7 +131,7 @@ - { - #if defined(_WIN32) - ::Sleep(static_cast<DWORD>(microSeconds / static_cast<uint64_t>(1000))); --#elif defined(__linux) || defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - usleep(microSeconds); - #else - #error Support your platform here -@@ -576,7 +576,7 @@ - return std::string(&buffer[0]); - } - --#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - static std::string GetPathToExecutableInternal() - { - std::vector<char> buffer(PATH_MAX + 1); -Index: Orthanc-1.0.0/OrthancServer/DicomProtocol/DicomServer.cpp -=================================================================== ---- Orthanc-1.0.0.orig/OrthancServer/DicomProtocol/DicomServer.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/OrthancServer/DicomProtocol/DicomServer.cpp 2016-04-14 18:10:05.646461103 +0200 -@@ -44,7 +44,7 @@ - - #include <boost/thread.hpp> - --#if defined(__linux) -+#if defined(__linux__) - #include <cstdlib> - #endif - -Index: Orthanc-1.0.0/OrthancServer/FromDcmtkBridge.cpp -=================================================================== ---- Orthanc-1.0.0.orig/OrthancServer/FromDcmtkBridge.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/OrthancServer/FromDcmtkBridge.cpp 2016-04-14 18:09:53.798460621 +0200 -@@ -208,7 +208,7 @@ - LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_DICOM); - LoadEmbeddedDictionary(*locker, EmbeddedResources::DICTIONARY_PRIVATE); - --#elif defined(__linux) || defined(__FreeBSD_kernel__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) - std::string path = DCMTK_DICTIONARY_DIR; - - const char* env = std::getenv(DCM_DICT_ENVIRONMENT_VARIABLE); -Index: Orthanc-1.0.0/Plugins/Engine/PluginsManager.cpp -=================================================================== ---- Orthanc-1.0.0.orig/Plugins/Engine/PluginsManager.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Plugins/Engine/PluginsManager.cpp 2016-04-14 18:10:07.934461196 +0200 -@@ -48,7 +48,7 @@ - - #ifdef WIN32 - #define PLUGIN_EXTENSION ".dll" --#elif defined(__linux) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - #define PLUGIN_EXTENSION ".so" - #elif defined(__APPLE__) && defined(__MACH__) - #define PLUGIN_EXTENSION ".dylib" -Index: Orthanc-1.0.0/Plugins/Engine/SharedLibrary.cpp -=================================================================== ---- Orthanc-1.0.0.orig/Plugins/Engine/SharedLibrary.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Plugins/Engine/SharedLibrary.cpp 2016-04-14 18:09:57.666460778 +0200 -@@ -45,7 +45,7 @@ - - #if defined(_WIN32) - #include <windows.h> --#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - #include <dlfcn.h> - #else - #error Support your platform here -@@ -65,7 +65,7 @@ - throw OrthancException(ErrorCode_SharedLibrary); - } - --#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - handle_ = ::dlopen(path_.c_str(), RTLD_NOW); - if (handle_ == NULL) - { -@@ -91,7 +91,7 @@ - { - #if defined(_WIN32) - ::FreeLibrary((HMODULE)handle_); --#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - ::dlclose(handle_); - #else - #error Support your platform here -@@ -109,7 +109,7 @@ - - #if defined(_WIN32) - return ::GetProcAddress((HMODULE)handle_, name.c_str()); --#elif defined(__linux) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) -+#elif defined(__linux__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) - return ::dlsym(handle_, name.c_str()); - #else - #error Support your platform here -Index: Orthanc-1.0.0/Resources/Patches/mongoose-3.1-patch.diff -=================================================================== ---- Orthanc-1.0.0.orig/Resources/Patches/mongoose-3.1-patch.diff 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/Resources/Patches/mongoose-3.1-patch.diff 2016-04-14 18:10:01.286460925 +0200 -@@ -42,7 +42,7 @@ - - // Wait until mg_fini() stops - while (ctx->stop_flag != 2) { --+#if defined(__linux) -++#if defined(__linux__) - + usleep(100000); - +#elif defined(_WIN32) - + Sleep(100); -Index: Orthanc-1.0.0/UnitTestsSources/PluginsTests.cpp -=================================================================== ---- Orthanc-1.0.0.orig/UnitTestsSources/PluginsTests.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/UnitTestsSources/PluginsTests.cpp 2016-04-14 18:09:59.746460863 +0200 -@@ -57,7 +57,7 @@ - ASSERT_TRUE(l.HasFunction("GetVersionExW")); - ASSERT_FALSE(l.HasFunction("world")); - --#elif defined(__linux) || defined(__FreeBSD_kernel__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) - SharedLibrary l("libdl.so"); - ASSERT_THROW(l.GetFunction("world"), OrthancException); - ASSERT_TRUE(l.GetFunction("dlopen") != NULL); -Index: Orthanc-1.0.0/UnitTestsSources/UnitTestsMain.cpp -=================================================================== ---- Orthanc-1.0.0.orig/UnitTestsSources/UnitTestsMain.cpp 2015-12-15 17:49:02.000000000 +0100 -+++ Orthanc-1.0.0/UnitTestsSources/UnitTestsMain.cpp 2016-04-14 18:10:12.014461361 +0200 -@@ -458,7 +458,7 @@ - } - - --#if defined(__linux) -+#if defined(__linux__) - TEST(OrthancInitialization, AbsoluteDirectory) - { - ASSERT_EQ("/tmp/hello", Configuration::InterpretRelativePath("/tmp", "hello")); -@@ -622,7 +622,7 @@ - - - --#if defined(__linux) -+#if defined(__linux__) - #include <endian.h> - #elif defined(__FreeBSD__) - #include <machine/endian.h> -@@ -647,7 +647,7 @@ - * Linux. - **/ - --#elif defined(__linux) || defined(__FreeBSD_kernel__) -+#elif defined(__linux__) || defined(__FreeBSD_kernel__) - - #if !defined(__BYTE_ORDER) - # error Support your platform here diff --git a/debian/patches/series b/debian/patches/series index 299d7f2..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +0,0 @@ -cmake-dcmtk -jsoncpp-cxx11 -linux-detection -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit