git: e40868a34df2 - main - science/orthanc-dicomweb: unbreak build with boost-1.85
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Oct 2024 10:27:30 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e40868a34df2cefac8a549f04774216995eae957 commit e40868a34df2cefac8a549f04774216995eae957 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2024-10-02 23:42:18 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-10-03 10:24:57 +0000 science/orthanc-dicomweb: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- science/orthanc-dicomweb/Makefile | 2 +- ..._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 +++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/science/orthanc-dicomweb/Makefile b/science/orthanc-dicomweb/Makefile index a3da463d7be8..ba4dd496d175 100644 --- a/science/orthanc-dicomweb/Makefile +++ b/science/orthanc-dicomweb/Makefile @@ -1,6 +1,6 @@ PORTNAME= orthanc-dicomweb DISTVERSION= 1.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= science MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-dicom-web/:main \ https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \ diff --git a/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp new file mode 100644 index 000000000000..be3a52257299 --- /dev/null +++ b/science/orthanc-dicomweb/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-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp new file mode 100644 index 000000000000..7e84c746faa1 --- /dev/null +++ b/science/orthanc-dicomweb/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-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-dicomweb/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-dicomweb/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-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-dicomweb/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp new file mode 100644 index 000000000000..9df1a25a54a7 --- /dev/null +++ b/science/orthanc-dicomweb/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")