[med-svn] [Git][med-team/orthanc-dicomweb][master] 4 commits: fix issue #1054914
Sebastien Jodogne (@jodogne-guest)
gitlab at salsa.debian.org
Tue Oct 31 08:58:04 GMT 2023
Sebastien Jodogne pushed to branch master at Debian Med / orthanc-dicomweb
Commits:
a5315f98 by jodogne-guest at 2023-10-31T09:36:36+01:00
fix issue #1054914
- - - - -
2b551cc7 by jodogne-guest at 2023-10-31T09:45:36+01:00
fix build against orthanc framework 1.12.1
- - - - -
e3d1a734 by jodogne-guest at 2023-10-31T09:48:31+01:00
fix linking against zlib
- - - - -
c5f9d769 by jodogne-guest at 2023-10-31T09:57:19+01:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/patches/cmake
- debian/patches/series
- + debian/patches/toolbox
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-orthanc-dicomweb (1.15+dfsg-1) UNRELEASED; urgency=medium
+orthanc-dicomweb (1.15+dfsg-1) unstable; urgency=medium
+ [ Andreas Tille ]
* New upstream version
* debhelper-compat 13 (routine-update)
* Remove trailing whitespace in debian/copyright (routine-update)
@@ -8,7 +9,11 @@ orthanc-dicomweb (1.15+dfsg-1) UNRELEASED; urgency=medium
* watch file standard 4 (routine-update)
* Build-Depends: pybuild-plugin-pyproject
- -- Andreas Tille <tille at debian.org> Sun, 29 Oct 2023 20:52:03 +0100
+ [ Sebastien Jodogne ]
+ * Fix compatibility with older versions of the Orthanc framework.
+ Closes: #1054914
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Tue, 31 Oct 2023 09:31:37 +0100
orthanc-dicomweb (1.14+dfsg-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -16,7 +16,8 @@ Build-Depends: cmake,
orthanc-dev,
unzip,
uuid-dev,
- yui-compressor
+ yui-compressor,
+ zlib1g-dev
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/orthanc-dicomweb
Vcs-Git: https://salsa.debian.org/med-team/orthanc-dicomweb.git
=====================================
debian/patches/cmake
=====================================
@@ -1,16 +1,19 @@
-Description: Fix the inclusion of the JavaScript libraries
+Description: Fix the inclusion of the JavaScript libraries and of DefineSourceBasenameForTarget()
Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancDicomWeb-1.14/CMakeLists.txt
+Index: OrthancDicomWeb-1.15/CMakeLists.txt
===================================================================
---- OrthancDicomWeb-1.14.orig/CMakeLists.txt
-+++ OrthancDicomWeb-1.14/CMakeLists.txt
-@@ -91,7 +91,7 @@ else()
+--- OrthancDicomWeb-1.15.orig/CMakeLists.txt
++++ OrthancDicomWeb-1.15/CMakeLists.txt
+@@ -92,7 +92,10 @@ else()
endif()
-include(${CMAKE_SOURCE_DIR}/Resources/CMake/JavaScriptLibraries.cmake)
++function(DefineSourceBasenameForTarget targetname)
++endfunction()
++
+include(${CMAKE_SOURCE_DIR}/debian/ThirdPartyDownloads/JavaScriptLibraries.cmake)
include(${CMAKE_SOURCE_DIR}/Resources/Orthanc/Plugins/OrthancPluginsExports.cmake)
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
cmake
+toolbox
=====================================
debian/patches/toolbox
=====================================
@@ -0,0 +1,47 @@
+Description: Fix use of a new function introduced in Orthanc framework > 1.12.1
+Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancDicomWeb-1.15/Plugin/WadoRs.cpp
+===================================================================
+--- OrthancDicomWeb-1.15.orig/Plugin/WadoRs.cpp
++++ OrthancDicomWeb-1.15/Plugin/WadoRs.cpp
+@@ -70,6 +70,20 @@ static std::string GetResourceUri(Orthan
+ }
+
+
++// Hotfix: This function corresponds to a new signature introduced in Orthanc > 1.12.1
++static void ComputeMD5OfSet(std::string& result,
++ const std::set<std::string>& data)
++{
++ std::string s;
++
++ for (std::set<std::string>::const_iterator it = data.begin(); it != data.end(); ++it)
++ {
++ s += *it;
++ }
++
++ Orthanc::Toolbox::ComputeMD5(result, s);
++}
++
+
+ namespace
+ {
+@@ -1397,7 +1411,7 @@ void CacheSeriesMetadataInternal(std::st
+ // save in attachments for future use
+ Orthanc::IBufferCompressor::Compress(compressedSeriesMetadata, compressor, serializedSeriesMetadata);
+ std::string instancesMd5;
+- Orthanc::Toolbox::ComputeMD5(instancesMd5, instancesIds);
++ ComputeMD5OfSet(instancesMd5, instancesIds);
+
+ std::string cacheContent = "2;" + instancesMd5 + ";" + compressedSeriesMetadata;
+
+@@ -1520,7 +1534,7 @@ void RetrieveSeriesMetadataInternalWithC
+ std::set<std::string> currentInstancesIds;
+ Orthanc::SerializationToolbox::ReadSetOfStrings(currentInstancesIds, seriesInfo, "Instances");
+ std::string currentInstancesMd5;
+- Orthanc::Toolbox::ComputeMD5(currentInstancesMd5, currentInstancesIds);
++ ComputeMD5OfSet(currentInstancesMd5, currentInstancesIds);
+
+ if (currentInstancesMd5 == instancesMd5InCache)
+ {
=====================================
debian/rules
=====================================
@@ -21,7 +21,7 @@ CMAKE_EXTRA_FLAGS += \
-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 dcmjpeg dcmjpls ofstd dcmimage" \
+ "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid sqlite3 dcmdata dcmjpeg dcmjpls ofstd dcmimage z" \
-DCMAKE_BUILD_TYPE=None # The build type must be set to None, see #711515
# Automated generation of the "Built-Using" attribute in "d/control"
View it on GitLab: https://salsa.debian.org/med-team/orthanc-dicomweb/-/compare/c12b17a5c8a9e0487780923b586348b3c6a6b368...c5f9d769023eea24265a1600c0a05ba90e0b1f26
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc-dicomweb/-/compare/c12b17a5c8a9e0487780923b586348b3c6a6b368...c5f9d769023eea24265a1600c0a05ba90e0b1f26
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/20231031/8e86ec6b/attachment-0001.htm>
More information about the debian-med-commit
mailing list