From nobody Thu Oct 03 10:27:32 2024 X-Original-To: dev-commits-ports-all@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 4XK7Cn2PpBz5Y6gs; Thu, 03 Oct 2024 10:27:33 +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 4XK7Cn1LlKz4CwR; Thu, 3 Oct 2024 10:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951253; 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=zs3QsPEALhHnegmkHDUZTE04K7d/W88rdxoX3sspMeM=; b=cegakedxaWNxDZmJIuK2WMieyr7efSgStR/gmRIsuAi9zKoceKGAD5843XUW7lf1Wloodd MT7vuaIQOg8SnmGHuAbd+MPgfLBWz75e9dhIimR7p+KGJmNMBlE8bVm/2HrroG8fAthorh toribfds/9UCkdXxJaosX6i0VWRI5bcn94Cfi+u9AU9ZsT0QkmBSM/Sk77uEpDUdYWOWng IE54wYFjXtGiAuSYaS1jp0WQIo5MiB9dPzs9MMWFk3GYdaqlOkm7TbZ0iDBmenrTBeqe1D qO/hz5fn31B1r+PrVTGkp2dpQ9Wnk/D7Nu6v4GC1ZceVjwhjSankV0ddXI2BFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951253; 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=zs3QsPEALhHnegmkHDUZTE04K7d/W88rdxoX3sspMeM=; b=XfcutUo86DiAjt+Zd71dYhiDhjaWxJvEwFDMoY//Cbrg+OuH5EnJEvBUAHqmSK0zeYM+7P 4dFY6v7Q75892s4Z6NdPI6E7tTYGEq7tBO617A0ddB3HfawMjoxMWKznwAqjPf9hZTYGt5 BY3x9zpSXpCNKAbYnMyt6GjPJIxuzvSpOSVQ1cADBfvG55YoeyYOaLIro9fNjwWq2QRhSW 6NAJeiArrPv0iA4i5Cu04F50T/SZKa+vkRP7f1aYy9RNBUVpflinWDtvOE8Gra3wUyRjup q9ZOQfxgTGAs7BQA8JTeuVlfkqak/CwlsuOpz5mrC1+bbEutVREHHqmoT19p5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951253; a=rsa-sha256; cv=none; b=aXJ/998+lVIVtZgWoOaPpBzVrPWh0tvXfymTh6EEJ4bkVaU5GGnFOEI+DiFsVyYjzAtpJC 3eTMwLCBvjxg5fu5rWHLKX0eUL0Jievp4DPPdnl7HYd3LG4fg/9IKM5nhyDyJvaWs5JFcI UI1BBID3xwW/I7eTrETVGVtGJNbH6jpWKwa2jCXEC4j6/Iv7gATDlzvYw5Jr5wzSITSRFB XdwEYX5Fm55jPPvr/YmsuBr5zqTglmcmU82oMWffGSjVdxpH9qF07vdAtUMB2wqQx87xjr ePkHNOU/0pdQvo/pE52ClRhYEvZr+hnm71wA2uOkjsvloeD9t0nwxXVo90zftQ== 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 4XK7Cn0QDLzmTT; Thu, 3 Oct 2024 10:27:33 +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 493ARW8M042230; Thu, 3 Oct 2024 10:27:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARWS5042227; Thu, 3 Oct 2024 10:27:32 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:32 GMT Message-Id: <202410031027.493ARWS5042227@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: a0dd41749a59 - main - science/orthanc-postgresql: unbreak build with boost-1.85 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: a0dd41749a5924e50f868902d702ce093f1b8ea7 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0dd41749a5924e50f868902d702ce093f1b8ea7 commit a0dd41749a5924e50f868902d702ce093f1b8ea7 Author: Dima Panov AuthorDate: 2024-10-02 23:44:42 +0000 Commit: Dima Panov CommitDate: 2024-10-03 10:24:58 +0000 science/orthanc-postgresql: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- science/orthanc-postgresql/Makefile | 2 +- ...s_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp | 11 +++++++++++ ...hanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp | 11 +++++++++++ ...OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp | 11 +++++++++++ ...thanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp | 11 +++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/science/orthanc-postgresql/Makefile b/science/orthanc-postgresql/Makefile index aa60b313a934..5300ea9fef48 100644 --- a/science/orthanc-postgresql/Makefile +++ b/science/orthanc-postgresql/Makefile @@ -1,6 +1,6 @@ PORTNAME= orthanc-postgresql DISTVERSION= 4.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= science MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-postgresql/:main \ https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \ diff --git a/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp new file mode 100644 index 000000000000..b7291c206db2 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp +@@ -727,7 +727,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-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp new file mode 100644 index 000000000000..6211b49b37a1 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp +@@ -303,7 +303,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-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp new file mode 100644 index 000000000000..cd1e7aed264f --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp +@@ -162,7 +162,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-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp new file mode 100644 index 000000000000..d41857168ca7 --- /dev/null +++ b/science/orthanc-postgresql/files/patch-PostgreSQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp @@ -0,0 +1,11 @@ +--- PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp.orig 2021-05-07 07:22:38 UTC ++++ PostgreSQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp +@@ -123,7 +123,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")