git: 26f80525e462 - main - science/orthanc: unbreak build with boost-1.85
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Oct 2024 10:27:29 UTC
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=26f80525e4624724fefbc22044dbf3b0687d9a0e commit 26f80525e4624724fefbc22044dbf3b0687d9a0e Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2024-10-02 23:41:12 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2024-10-03 10:24:56 +0000 science/orthanc: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- science/orthanc/Makefile | 2 +- .../files/patch-OrthancFramework_Sources_SystemToolbox.cpp | 11 +++++++++++ .../patch-OrthancServer_Plugins_Engine_PluginsManager.cpp | 11 +++++++++++ ...OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp | 11 +++++++++++ .../patch-OrthancServer_Sources_OrthancConfiguration.cpp | 11 +++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/science/orthanc/Makefile b/science/orthanc/Makefile index 13dafc2b5e80..7bcfcfcc6b10 100644 --- a/science/orthanc/Makefile +++ b/science/orthanc/Makefile @@ -1,6 +1,6 @@ PORTNAME= orthanc DISTVERSION= 1.12.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc/ DISTNAME= Orthanc-${PORTVERSION} diff --git a/science/orthanc/files/patch-OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc/files/patch-OrthancFramework_Sources_SystemToolbox.cpp new file mode 100644 index 000000000000..3c60deb80e8b --- /dev/null +++ b/science/orthanc/files/patch-OrthancFramework_Sources_SystemToolbox.cpp @@ -0,0 +1,11 @@ +--- OrthancFramework/Sources/SystemToolbox.cpp.orig 2024-01-31 11:33:17 UTC ++++ OrthancFramework/Sources/SystemToolbox.cpp +@@ -774,7 +774,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/files/patch-OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc/files/patch-OrthancServer_Plugins_Engine_PluginsManager.cpp new file mode 100644 index 000000000000..0a4f4176580d --- /dev/null +++ b/science/orthanc/files/patch-OrthancServer_Plugins_Engine_PluginsManager.cpp @@ -0,0 +1,11 @@ +--- OrthancServer/Plugins/Engine/PluginsManager.cpp.orig 2024-01-31 11:33:17 UTC ++++ OrthancServer/Plugins/Engine/PluginsManager.cpp +@@ -295,7 +295,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/files/patch-OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc/files/patch-OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp new file mode 100644 index 000000000000..ef8920eeef39 --- /dev/null +++ b/science/orthanc/files/patch-OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp @@ -0,0 +1,11 @@ +--- OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig 2024-01-31 11:33:17 UTC ++++ OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp +@@ -164,7 +164,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/files/patch-OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc/files/patch-OrthancServer_Sources_OrthancConfiguration.cpp new file mode 100644 index 000000000000..54696a0f7885 --- /dev/null +++ b/science/orthanc/files/patch-OrthancServer_Sources_OrthancConfiguration.cpp @@ -0,0 +1,11 @@ +--- OrthancServer/Sources/OrthancConfiguration.cpp.orig 2024-01-31 11:33:17 UTC ++++ OrthancServer/Sources/OrthancConfiguration.cpp +@@ -114,7 +114,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")