git: edfa7f02f942 - main - science/orthanc-webviewer: unbreak build with boost-1.85
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Oct 2024 10:27:34 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=edfa7f02f942b21ebfefc04eaa0eafc5d70406c9
commit edfa7f02f942b21ebfefc04eaa0eafc5d70406c9
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-10-02 23:46:01 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-10-03 10:24:59 +0000
science/orthanc-webviewer: unbreak build with boost-1.85
With hat: office
Sponsored by: Future Crew, LLC
---
science/orthanc-webviewer/Makefile | 2 +-
.../orthanc-webviewer/files/patch-Plugin_Cache_CacheManager.h | 11 +++++++++++
..._Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp | 11 +++++++++++
...anc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp | 11 +++++++++++
...OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp | 11 +++++++++++
...hanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp | 11 +++++++++++
6 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/science/orthanc-webviewer/Makefile b/science/orthanc-webviewer/Makefile
index 2c17c776977f..f24a2979d0f4 100644
--- a/science/orthanc-webviewer/Makefile
+++ b/science/orthanc-webviewer/Makefile
@@ -1,6 +1,6 @@
PORTNAME= orthanc-webviewer
DISTVERSION= 2.8
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= science
MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-webviewer/:main \
https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \
diff --git a/science/orthanc-webviewer/files/patch-Plugin_Cache_CacheManager.h b/science/orthanc-webviewer/files/patch-Plugin_Cache_CacheManager.h
new file mode 100644
index 000000000000..32c8b562e02b
--- /dev/null
+++ b/science/orthanc-webviewer/files/patch-Plugin_Cache_CacheManager.h
@@ -0,0 +1,11 @@
+--- Plugin/Cache/CacheManager.h.orig 2022-02-22 07:33:59 UTC
++++ Plugin/Cache/CacheManager.h
+@@ -29,6 +29,8 @@
+
+ #include <boost/shared_ptr.hpp>
+
++#include <list>
++
+ namespace OrthancPlugins
+ {
+ enum CacheProperty
diff --git a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp
new file mode 100644
index 000000000000..be3a52257299
--- /dev/null
+++ b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/SystemToolbox.cpp.orig 2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/SystemToolbox.cpp
+@@ -728,7 +728,7 @@ namespace Orthanc
+
+ MimeType SystemToolbox::AutodetectMimeType(const std::string& path)
+ {
+- std::string extension = boost::filesystem::extension(path);
++ std::string extension = boost::filesystem::path(path).extension().string();
+ Toolbox::ToLowerCase(extension);
+
+ // http://en.wikipedia.org/wiki/Mime_types
diff --git a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp
new file mode 100644
index 000000000000..7e84c746faa1
--- /dev/null
+++ b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig 2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Engine/PluginsManager.cpp
+@@ -292,7 +292,7 @@ namespace Orthanc
+ }
+ else
+ {
+- std::string extension = boost::filesystem::extension(it->path());
++ std::string extension = it->path().extension().string();
+ Toolbox::ToLowerCase(extension);
+
+ if (extension == PLUGIN_EXTENSION)
diff --git a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
new file mode 100644
index 000000000000..dad50da54856
--- /dev/null
+++ b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig 2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp
+@@ -163,7 +163,7 @@ OrthancPluginErrorCode Callback(OrthancPluginWorklistA
+ if (type == fs::regular_file ||
+ type == fs::reparse_file) // cf. BitBucket issue #11
+ {
+- std::string extension = fs::extension(it->path());
++ std::string extension = it->path().extension().string();
+ std::transform(extension.begin(), extension.end(), extension.begin(), tolower); // Convert to lowercase
+
+ if (extension == ".wl")
diff --git a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp
new file mode 100644
index 000000000000..9df1a25a54a7
--- /dev/null
+++ b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp
@@ -0,0 +1,11 @@
+--- ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Sources/OrthancConfiguration.cpp.orig 2022-05-09 09:19:44 UTC
++++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancServer/Sources/OrthancConfiguration.cpp
+@@ -113,7 +113,7 @@ namespace Orthanc
+ {
+ if (!is_directory(it->status()))
+ {
+- std::string extension = boost::filesystem::extension(it->path());
++ std::string extension = it->path().extension().string();
+ Toolbox::ToLowerCase(extension);
+
+ if (extension == ".json")