[med-svn] [Git][med-team/orthanc][master] 2 commits: d/patches: Remove c++11 hardcoded value. Closes: #1000222

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch master at Debian Med / orthanc


Commits:
fa9b65bf by Mathieu Malaterre at 2021-11-22T15:22:48+01:00
d/patches: Remove c++11 hardcoded value. Closes: #1000222

- - - - -
51181f2c by Mathieu Malaterre at 2021-11-22T15:26:09+01:00
d/changelog: Upload 1.9.7+dfsg-2 to unstable

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/donotforcec++11.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+orthanc (1.9.7+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches: Remove c++11 hardcoded value. Closes: #1000222
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 22 Nov 2021 15:26:02 +0100
+
 orthanc (1.9.7+dfsg-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/patches/donotforcec++11.patch
=====================================
@@ -0,0 +1,27 @@
+Description: Remove hardcoded c++11
+Author: Mathieu Malaterre <malat at debian.org>
+Bug-Debian: https://bugs.debian.org/1000222
+Reviewed-by: Sébastien Jodogne <s.jodogne at orthanc-labs.com>
+Last-Update: 2021-11-22
+
+--- orthanc-1.9.7+dfsg.orig/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake
++++ orthanc-1.9.7+dfsg/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake
+@@ -98,11 +98,11 @@ if (JSONCPP_CXX11)
+   # https://gitlab.kitware.com/third-party/jsoncpp/commit/56df2068470241f9043b676bfae415ed62a0c172
+   add_definitions(-DJSONCPP_DEPRECATED_STACK_LIMIT=5000)
+ 
+-  if (CMAKE_COMPILER_IS_GNUCXX)
+-    message("Switching to C++11 standard in gcc, as version of JsonCpp is >= 1.0.0")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+-  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-    message("Switching to C++11 standard in clang, as version of JsonCpp is >= 1.0.0")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+-  endif()
++  #if (CMAKE_COMPILER_IS_GNUCXX)
++  #  message("Switching to C++11 standard in gcc, as version of JsonCpp is >= 1.0.0")
++  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
++  #elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
++  #  message("Switching to C++11 standard in clang, as version of JsonCpp is >= 1.0.0")
++  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
++  #endif()
+ endif()


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+donotforcec++11.patch



View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/2dc5f6c5d251bc0a456ce82ead1226ef67a2d7ea...51181f2c0c7411d0946fe761f714999dbb4382f9

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/2dc5f6c5d251bc0a456ce82ead1226ef67a2d7ea...51181f2c0c7411d0946fe761f714999dbb4382f9
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211122/62135173/attachment-0001.htm>