From nobody Thu Oct 03 10:27:29 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 4XK7Cj6RR4z5Y6gg; Thu, 03 Oct 2024 10:27:29 +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 4XK7Cj4pF2z4CpT; Thu, 3 Oct 2024 10:27:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951249; 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=wkFMx3MPyRVKcBJx78/DkTQ85D0Sjuc+yDKFr9iHEOI=; b=d5UkAuqtrk7ACGpKo88DR/Q6koyOaNwN/oxu6X964gQ0DBhLzOOAs6ghosksyMkjtb2dCT UmLPyJ98KHOfCX13xxKWj0VfvAgNQV/8xyrvQcCt28WHNZChLOzmjYxVXybKzN01h41hkT UFGScteJyXXUOOjaDMznlRJ/yeNcT8eprCyfcOKvmjZ+wwROW0aS0mlCrWV52vIeGlNLg5 bjuORPqV8EkRPLmzerLlTy1QJOWMh00IW9asclLRUpo+LOL6j/zEumuM0Abiyox0j3xfEq WebUdpIh1jSFvO23lqEVMJ2WTSdFDy97ItXs960o5U5TxOQWGoe+P/uMIKpSBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951249; 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=wkFMx3MPyRVKcBJx78/DkTQ85D0Sjuc+yDKFr9iHEOI=; b=s5ptgbJI/2i76GV8liRYxKelF+2grzJ2WOy2ltsd603ek6ExtirT/69T28j8dZXHdXD+3u q2ITmolvFG80hMdc83KhGmQIlTqLix2pkGieXrzX7Haj3qupXjeNi2TJDx48QTisuNxiB2 iu6MNxfr5vkarho7YOCa5CQen6FYTLDT0DG7aOjPMK2D9TFv+LZolFMIDaOpDGwoUMZRzm FXoa1Zra6m/rthaDQW1xBfxT4oJRD/3KfNS3sG3X0HeEOJ8Bels5WRYSGWftxjiXbOJoEV BTE3NSSl4hgICeaKCPzlGl8HojYtn0ulRTgDaYe4dCA7O+viE3UdFHF6lnFDRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951249; a=rsa-sha256; cv=none; b=UD5erPg6LHnjZ/6iStL2CrL8SIgwbZylR7Lj0+jjYYiMecN43jRGGsIY7ojXrvDRyvTTBl slYo1xza8QriwRx40AUfctTvEIeVusRgfMXrVHPx/htBCHuSmePEHjaVybCr2OjYtu+R30 3eCDG4i8TgxV0ewQhbQ9W/+jUXFF/w2pdmPTj3iDjjobhwxT2xWIuVqebV0TI8u/TZa2n6 oe8Tvg8BP4QkXFf2oCUdYOL0GUEoURgEl1DmwFr1QxoFvYBCO3oKQmqtYt/8Fg84B/DvSC ooEH+Udvlam5X6EVjaI7xUVMjQ0/sFb9ZwZRghBvBtKPbSNk7/JQh56qepEVtg== 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 4XK7Cj4NT9zmTR; Thu, 3 Oct 2024 10:27:29 +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 493ARTIx042104; Thu, 3 Oct 2024 10:27:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARTuP042101; Thu, 3 Oct 2024 10:27:29 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:29 GMT Message-Id: <202410031027.493ARTuP042101@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: 26f80525e462 - main - science/orthanc: 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: 26f80525e4624724fefbc22044dbf3b0687d9a0e Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=26f80525e4624724fefbc22044dbf3b0687d9a0e commit 26f80525e4624724fefbc22044dbf3b0687d9a0e Author: Dima Panov AuthorDate: 2024-10-02 23:41:12 +0000 Commit: Dima Panov 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")