[med-svn] [Git][med-team/orthanc-webviewer][master] 3 commits: use the shared liborthancframework instead of the static one

Tue Apr 28 17:33:13 BST 2026


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


Commits:
5d16eb8b by jodogne-guest at 2026-04-28T18:22:42+02:00
use the shared liborthancframework instead of the static one

- - - - -
0a1ed8d4 by jodogne-guest at 2026-04-28T18:24:43+02:00
fix FTBFS with recent versions of cmake

- - - - -
f7b87e57 by jodogne-guest at 2026-04-28T18:32:32+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/cmake
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+orthanc-webviewer (2.10+dfsg-3) unstable; urgency=medium
+
+  * Use the shared Orthanc Framework library instead of the static one,
+    which necessitates using liborthancframework-dev >= 1.12.11+dfsg-5
+    for proper versioning of the shared library
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Tue, 28 Apr 2026 18:20:48 +0200
+
 orthanc-webviewer (2.10+dfsg-2) unstable; urgency=medium
 
   * Fix FTBFS due to recent updates to CMake. Closes: #1113377


=====================================
debian/control
=====================================
@@ -5,21 +5,14 @@ Section: science
 Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               libboost-all-dev,
                libgtest-dev,
-               libjpeg-dev,
                libjs-jquery-ui,
                libjs-jquery-ui-theme-base,
-               libjsoncpp-dev,
-               liborthancframework-dev,
-               libpng-dev,
-               libsqlite3-dev,
+               liborthancframework-dev (>= 1.12.11+dfsg-5),
                orthanc-dev,
                unzip,
-               uuid-dev,
-               yui-compressor,
-               zlib1g-dev
-Standards-Version: 4.7.2
+               yui-compressor
+Standards-Version: 4.7.4
 Vcs-Browser: https://salsa.debian.org/med-team/orthanc-webviewer
 Vcs-Git: https://salsa.debian.org/med-team/orthanc-webviewer.git
 Homepage: https://orthanc.uclouvain.be/book/plugins/webviewer.html
@@ -30,7 +23,6 @@ Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          orthanc (>= 1.9.7+dfsg-6)
-Built-Using: ${orthancframework:Built-Using}
 Description: Web viewer of medical images for Orthanc
  Orthanc Web Viewer is a plugin to Orthanc, a lightweight, RESTful Vendor
  Neutral Archive for medical imaging. It extends Orthanc with an integrated


=====================================
debian/patches/cmake
=====================================
@@ -2,10 +2,10 @@ Description: Fix the inclusion of the JavaScript libraries
 Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancWebViewer-2.10/CMakeLists.txt
+Index: orthanc-webviewer-2.10+dfsg/CMakeLists.txt
 ===================================================================
---- OrthancWebViewer-2.10.orig/CMakeLists.txt
-+++ OrthancWebViewer-2.10/CMakeLists.txt
+--- orthanc-webviewer-2.10+dfsg.orig/CMakeLists.txt
++++ orthanc-webviewer-2.10+dfsg/CMakeLists.txt
 @@ -19,7 +19,7 @@
  # along with this program. If not, see <http://www.gnu.org/licenses/>.
  
@@ -15,7 +15,22 @@ Index: OrthancWebViewer-2.10/CMakeLists.txt
  
  project(OrthancWebViewer)
  
-@@ -85,7 +85,7 @@ else()
+@@ -55,7 +55,13 @@ include(${CMAKE_SOURCE_DIR}/Resources/Or
+ 
+ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
+   if (ORTHANC_FRAMEWORK_USE_SHARED)
+-    include(FindBoost)
++    # https://cmake.org/cmake/help/latest/policy/CMP0167.html
++    if (CMAKE_VERSION VERSION_GREATER "3.30")
++      find_package(Boost CONFIG)
++    else()
++      include(FindBoost)
++    endif()
++
+     find_package(Boost COMPONENTS filesystem regex thread)
+     
+     if (NOT Boost_FOUND)
+@@ -85,7 +91,7 @@ else()
  endif()
  
  


=====================================
debian/rules
=====================================
@@ -22,16 +22,9 @@ CMAKE_EXTRA_FLAGS += \
 	-DSTANDALONE_BUILD:BOOL=ON \
         -DORTHANC_FRAMEWORK_SOURCE:STRING=system \
         -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=ON \
-	-DORTHANC_FRAMEWORK_USE_SHARED:BOOL=OFF \
-	"-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid sqlite3 dcmdata ofstd dcmjpeg dcmjpls dcmimage" \
+	-DORTHANC_FRAMEWORK_USE_SHARED:BOOL=ON \
 	-DCMAKE_BUILD_TYPE=None   # The build type must be set to None, see #711515
 
-# Automated generation of the "Built-Using" attribute in "d/control"
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989127
-# Adapted from:
-# https://wiki.debian.org/SIMDEverywhere#Approach (Point 6)
-override_dh_gencontrol:
-	dh_gencontrol -- -Vorthancframework:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W liborthancframework-dev)"
 
 override_dh_auto_configure:
         # Place the third-party JavaScript libraries at the location



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

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/a3c60484264eb1583431bcdaf9377fe8e6e8f6e8...f7b87e571ae61cfca2c1fca56f303d52166f476a
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


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