From nobody Thu Oct 03 10:27:34 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XK7Cp4wCxz5Y6lS; Thu, 03 Oct 2024 10:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK7Cp2Hhbz4Cm6; Thu, 3 Oct 2024 10:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwSac/wvy/tjeOaQNx/APWcI07DM1htFSHEsVMg9SGI=; b=IcdELuTlCA7FPghYZvwfIg3fwkn9zZ3BBPLlSq1B+O0nYdIlvCqVStwm5WJdeq+lMGz5qC ZvGIdGsXZs7Qo7Ac61DsYmipgQKGmTRzSwFnEaqvJH6LktQineooLyqapVp7a37X8bkeTx IX6xsrJfmBT+7TLJJQjbIB9SosGd0IanoGfXrQ5mXQgP1MunBVEQd7D2VcwMokF2B6ym+X AtAI7yXZCMkyK1eYHzTF8EFjnLno1GwqJzHT6XiTUNw6UDNE7Oyw9qD2/OiRY2LzkU2+Qw mTGt9/9wPCeGq3wUf968o9qsd96TG0CoY9k6fQvNYwWxyYklbli9gFKH4AtNnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zwSac/wvy/tjeOaQNx/APWcI07DM1htFSHEsVMg9SGI=; b=OsUKbjnMxH5WPp6XMTWMJvmd2DxwB36Vtb8FDexPaFhD5hf0eD9/mSQsLdnHgCn/fFo7fn jYe3xtumkBnIi339ISrSy6k6bbPGe/0jrpQz0RZnfhN31oFJnzgfSZB70LF5baN1dn/HF/ iKU36AMXTOi/Tcj4L8IoyslzJRA4UOZHEHYEnReHPXPPZzyVem52V5eRFlvgdGgCtzaJnm 8G8rrsWK9Zc9xSknPnqzxpDhB739WXX6CwW7VjCdjxA4MqRo9q87DZurGD3ocafc1YsM97 ev2fTKdAl7GRIPMXY/JB47Pdr4f9RvK6yYkFakDBeEOGNqbjywiA0JG3E8FSPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951254; a=rsa-sha256; cv=none; b=o+J050xR8CoEAwpdHKbQkoIZ6aRhP4SM+Un9otSHa4LKvddH/3Fzyun2L/HRufi5xHcROL Ud87cCeaYWBLSfLxMo1ShXGnLzc0svqpkYaecR1HDuCDNB9ZETirSko8rE6ilzpHLZKQjJ +Vh5Nf3dckps4kwzZFSuMxadVrfw6CjeVimIH3Wxa7NC76n9J8hGC9RdSnJ7qSQ8QWMjVo +5pesKc33bY+N3uEKYrKtWmInK2y1RNWuP7Y4hJyuqVTcga2MUw+8ReHd9apxO8zC7b2pE LhExBRsZ/44tBeNrWrWrSK2ppCo+ndSCWLUf7S703sGt8pdp9a85Vnv7gaHcFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XK7Cp1fPgzn2Z; Thu, 3 Oct 2024 10:27:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493ARYmE042272; Thu, 3 Oct 2024 10:27:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARYl0042269; Thu, 3 Oct 2024 10:27:34 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:34 GMT Message-Id: <202410031027.493ARYl0042269@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: edfa7f02f942 - main - science/orthanc-webviewer: unbreak build with boost-1.85 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edfa7f02f942b21ebfefc04eaa0eafc5d70406c9 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=edfa7f02f942b21ebfefc04eaa0eafc5d70406c9 commit edfa7f02f942b21ebfefc04eaa0eafc5d70406c9 Author: Dima Panov AuthorDate: 2024-10-02 23:46:01 +0000 Commit: Dima Panov 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 + ++#include ++ + 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")