Accepting request 1321935 from graphics

OBS-URL: https://build.opensuse.org/request/show/1321935
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/orthanc-dicomweb?expand=0&rev=22

OrthancDicomWeb-1.20.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e8adcaffc97b891bb7030987c47ccd4c4d952ac43217c9813164e963bd3a9ac
-size 293070

OrthancDicomWeb-1.22.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c0fccf0b7d4abc983b1c2664a8fc267772cc1617c411d17c96f60fed54dafb7
+size 297593

framework2.diff

@@ -0,0 +1,46 @@
+--- a/Plugin/WadoRs.cpp	Tue Dec 02 17:17:12 2025 +0100
++++ b/Plugin/WadoRs.cpp	Tue Dec 09 07:57:08 2025 +0100
+@@ -32,9 +32,12 @@
+ #include <Toolbox.h>
+ #include <SerializationToolbox.h>
+ #include <MultiThreading/SharedMessageQueue.h>
+-#include <MultiThreading/BlockingSharedMessageQueue.h>
+ #include <Compression/GzipCompressor.h>
+ 
++#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11)
++#  include <MultiThreading/BlockingSharedMessageQueue.h>
++#endif
++
+ #include <memory>
+ #include <boost/thread/mutex.hpp>
+ #include <boost/thread.hpp>
+@@ -445,11 +448,16 @@
+ 
+ class ThreadedInstanceLoader : public InstanceLoader
+ {
++private:
+   std::vector<boost::thread*>         threads_;
+ 
+   Orthanc::SharedMessageQueue         instancesToPreload_;
+ 
++#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11)
+   Orthanc::BlockingSharedMessageQueue loadedInstances_;
++#else
++  Orthanc::SharedMessageQueue         loadedInstances_;
++#endif
+ 
+   bool                                loadersShouldStop_;
+ 
+@@ -457,7 +465,11 @@
+   ThreadedInstanceLoader(size_t threadCount, bool transcode, Orthanc::DicomTransferSyntax transferSyntax)
+   : InstanceLoader(transcode, transferSyntax),
+     instancesToPreload_(0),
+-    loadedInstances_(3*threadCount), // to limit the number of loaded instances in memory
++#if ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 12, 11)
++    loadedInstances_(3 * threadCount), // to limit the number of loaded instances in memory
++#else
++    loadedInstances_(0),  // don't limit the number of loaded instances, otherwise extra instances would be lost
++#endif
+     loadersShouldStop_(false)
+   {
+     for (size_t i = 0; i < threadCount; i++)

orthanc-dicomweb.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Tue Dec  9 10:00:46 UTC 2025 - Axel Braun <axel.braun@gmx.de>
+
+- version 1.22
+  * framework2.diff added for compatibilty with Orthanc framework <= 1.12.10
+  * Fixed a possible deadlock when using "WadoRsLoaderThreadsCount" > 1 when the HTTP
+    client disconnects while downloading the response.
+  * Fixed "Success: Success" errors when trying to send resources synchronously to a remote DICOMweb
+    server while the Orthanc job engine was busy with other tasks.
+
+-------------------------------------------------------------------
+Wed Sep 10 09:22:40 UTC 2025 - Axel Braun <axel.braun@gmx.de>
+
+- remove libboost_system-devel for TW (removed in boost 1.89) 
+
+-------------------------------------------------------------------
+Mon Aug 18 14:39:50 UTC 2025 - Axel Braun <axel.braun@gmx.de>
+
+- version 1.21
+  * New configuration "WadoRsLoaderThreadsCount" to configure how many threads are loading
+    files from the storage when answering to a WADO-RS query.  A value > 1 is meaningful 
+    only if the storage is a distributed network storage (e.g object storage plugin).
+    A value of 0 means reading and writing are performed in sequence (default behaviour).
+  * New configuration "EnablePerformanceLogs" to display performance logs.  Currently
+    only showing the time required to execute a WADO-RS query.  For example:
+    WADO-RS: elapsed: 26106623 us, rate: 14.86 instances/s, 155.23Mbps
+  * Fix false errors logs generated e.g when OHIF requests the /dicom-web/studies/../metadata route:
+    "dicom-web:/Configuration.cpp:643] Unsupported return MIME type: application/dicom+json, multipart/related; type=application/octet-stream; transfer-syntax=*, will return DICOM+JSON"
+
+
 -------------------------------------------------------------------
 Mon May 12 15:27:53 UTC 2025 - Axel Braun <axel.braun@gmx.de>
 

orthanc-dicomweb.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package orthanc-dicomweb
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 # Copyright (c) 2019-2025 Dr. Axel Braun
 #
 # All modifications and additions to the file contributed by third parties
@@ -21,7 +21,7 @@ Name:           orthanc-dicomweb
 Summary:        WebViewer plugin for Orthanc
 License:        AGPL-3.0-or-later
 Group:          Productivity/Graphics/Viewers
-Version:        1.20
+Version:        1.22
 Release:        0
 URL:            https://orthanc-server.com
 Source0:        https://orthanc.uclouvain.be/downloads/sources/%{name}/OrthancDicomWeb-%{version}.tar.gz
@@ -36,6 +36,7 @@ Source8:        babel-polyfill-6.26.0.min.js.gz
 Source9:        orthanc-dicomweb-readme.SUSE
 Source10:       dicomweb.json
 Patch0:         framework.diff
+Patch1:         framework2.diff
 
 BuildRequires:  cmake
 BuildRequires:  e2fsprogs-devel
@@ -44,6 +45,7 @@ BuildRequires:  gcc13-c++
 %else
 BuildRequires:  gcc-c++
 %endif
+BuildRequires:  bsdtar
 BuildRequires:  googletest-devel
 BuildRequires:  jsoncpp-devel
 BuildRequires:  libboost_date_time-devel >= 1.66
@@ -51,7 +53,9 @@ BuildRequires:  libboost_filesystem-devel >= 1.66
 BuildRequires:  libboost_iostreams-devel >= 1.66
 BuildRequires:  libboost_locale-devel >= 1.66
 BuildRequires:  libboost_regex-devel >= 1.66
+%if 0%{?suse_version} <= 1600
 BuildRequires:  libboost_system-devel >= 1.66
+%endif
 BuildRequires:  libboost_thread-devel >= 1.66
 BuildRequires:  openssl-devel
 BuildRequires:  orthanc-devel
@@ -74,10 +78,13 @@ WebViewer plugin for Orthanc
 #Putting them into this folder prevents download of sources from the web
 mkdir ThirdPartyDownloads
 cd ThirdPartyDownloads
-cp %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8}  .
+cp %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:8} .
 cd ..
 
 %build
+
+dir %{buildroot}
+
 %if 0%{?suse_version} == 1500 && 0%{?sle_version} > 150200
 export CC=gcc-13
 export CXX=g++-13