[med-svn] [Git][med-team/orthanc-webviewer][master] 3 commits: fix FTBFS due to recent updates to CMake

[Sebastien Jodogne (@jodogne-guest)]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc-webviewer


Commits:
011115dc by jodogne-guest at 2025-09-01T11:34:32+02:00
fix FTBFS due to recent updates to CMake

- - - - -
3da712ed by jodogne-guest at 2025-09-01T11:37:55+02:00
fix FTBFS with liborthancframework-dev >= 1.9.8

- - - - -
a3c60484 by jodogne-guest at 2025-09-01T11:49:36+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/cache-manager
- debian/patches/cmake
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+orthanc-webviewer (2.10+dfsg-2) unstable; urgency=medium
+
+  * Fix FTBFS due to recent updates to CMake. Closes: #1113377
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Mon, 01 Sep 2025 11:32:32 +0200
+
 orthanc-webviewer (2.10+dfsg-1) unstable; urgency=medium
 
   * New upstream version.


=====================================
debian/patches/cache-manager
=====================================
@@ -0,0 +1,26 @@
+Description: Fix FTBFS with liborthancframework-dev >= 1.9.8
+Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
+Forwarded: https://orthanc.uclouvain.be/hg/orthanc-webviewer/rev/d89da90a262b
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancWebViewer-2.10/Plugin/Cache/CacheManager.cpp
+===================================================================
+--- OrthancWebViewer-2.10.orig/Plugin/Cache/CacheManager.cpp
++++ OrthancWebViewer-2.10/Plugin/Cache/CacheManager.cpp
+@@ -467,8 +467,14 @@ namespace OrthancPlugins
+     try
+     {
+ #if defined(ORTHANC_FRAMEWORK_VERSION_IS_ABOVE) && ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 0) 
+-      std::unique_ptr<Orthanc::IMemoryBuffer> buffer(
+-        pimpl_->storage_.Read(uuid, Orthanc::FileContentType_Unknown));
++      std::unique_ptr<Orthanc::IMemoryBuffer> buffer;
++
++#  if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 8)
++      buffer.reset(pimpl_->storage_.ReadWhole(uuid, Orthanc::FileContentType_Unknown));
++#  else
++      buffer.reset(pimpl_->storage_.Read(uuid, Orthanc::FileContentType_Unknown));
++#  endif
++
+       buffer->MoveToString(content);
+ #else
+       pimpl_->storage_.Read(content, uuid, Orthanc::FileContentType_Unknown);


=====================================
debian/patches/cmake
=====================================
@@ -6,6 +6,15 @@ Index: OrthancWebViewer-2.10/CMakeLists.txt
 ===================================================================
 --- OrthancWebViewer-2.10.orig/CMakeLists.txt
 +++ OrthancWebViewer-2.10/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ 
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 2.8...4.0)
+ 
+ project(OrthancWebViewer)
+ 
 @@ -85,7 +85,7 @@ else()
  endif()
  


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
+cache-manager
 cmake



View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/36a55c69bf219149a6a320e6bcfb5733110e38e2...a3c60484264eb1583431bcdaf9377fe8e6e8f6e8

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/36a55c69bf219149a6a320e6bcfb5733110e38e2...a3c60484264eb1583431bcdaf9377fe8e6e8f6e8
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/20250901/0c993d3a/attachment-0001.htm>