From nobody Thu Oct 03 10:27:31 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 4XK7Cm38NNz5Y6k6; Thu, 03 Oct 2024 10:27:32 +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 4XK7Cm0PgRz4CwG; Thu, 3 Oct 2024 10:27:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951252; 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=xjagXr+iKeeG25S4jEs6VxmarV7uhOmcsFEQSyUAPho=; b=j7xz5YykQLSudnywOzFStmGouMLj477waMPq/u8aT8Qihvs/a9HFzRPSupGYLlu9n5x11h zgK2EIrXNwBLc5THzlDdEUhXnLlkVOeSe4Q0tk52uy+TdhEj4prOX9XX/Drzm+CsujbWXI G5eh1FU84+YB+vpFbFVDp3GcIgZsQTXArOj+qYHyQ7S79/mu6xr8QfedYbV5larCKqDC0c En3TaU3O9ohshpwWIhhEbsZwbiI0KoCe1Z4yKroa6VssXnpoYhZgP5gQwSdlyS09N1FPhd byqwqppTEC2cvvT2+G2UEgr+jjGzFtNHAIE2yTzsMcTdDfdjFagYWIDh1N0FkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951252; 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=xjagXr+iKeeG25S4jEs6VxmarV7uhOmcsFEQSyUAPho=; b=fPfo77hMnaRX0VV5BLq2JM8WICpEEZqTsjw1+w80prrogRa0OeAHhuc8IbsiDwlgkUELbg TNtalZe5hkTEHISA8Xfc5KhYylVuQHq2UEEk2+zerXr7NNykfuPbsf3jtLTS8JeU7gLqnc o4rL4XKH/FYn8paadEo3dparUB2vAEogKWwk23YJUE4r1nZ8YO07U90ry2jXZSp1Ybtlqi VS+Z/Bah/aUtPZXSVvgQsP8w5zuVBXEGu+qV9URlC6yhjegCrEYBgNOT7JXNg+MD8FebXL S9m6nHgmgVOvSE5T49F6CeUKnZiNOFryUnpLY7GKi6axAlatJg+GT3z+jZwgxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951252; a=rsa-sha256; cv=none; b=S9ZELi5Q47NTOP8MKCpgn5fcBcog7CbQN437R6/RHBJez874kcDc2KCZgPpL4mA4yzWFNq BOlIOzYCT4SylSc7N+AchmJndkFnble/7ciWLOR81piiHpv9WFpt1K0s+8q4S7KrALuIuh L1FLr2HD4PPYKnY79WyvgfsHKUdncLKCj7fVkl2rO8iluVv/GIbWoezEirJdmBCoBP/17T fcFhjvUe/JovtjzJ7U39lV+z8yZiY9dcT/XsH+aVIABglubX3JO6Ix692sWXkaqhyDoN71 6/UlZ8eERZhZLTPe0SnHD+5x2wKXLpUuuWffoL7aBBi7FBMJSnLdc8mWXF33Jw== 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 4XK7Cl6kYHzmlV; Thu, 3 Oct 2024 10:27:31 +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 493ARVi1042188; Thu, 3 Oct 2024 10:27:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARVRh042185; Thu, 3 Oct 2024 10:27:31 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:31 GMT Message-Id: <202410031027.493ARVRh042185@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: 7e9cadbb1684 - main - science/orthanc-mysql: 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: 7e9cadbb16848b1cf91144008494dbbc4e7e3d05 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e9cadbb16848b1cf91144008494dbbc4e7e3d05 commit 7e9cadbb16848b1cf91144008494dbbc4e7e3d05 Author: Dima Panov AuthorDate: 2024-10-02 23:43:43 +0000 Commit: Dima Panov CommitDate: 2024-10-03 10:24:58 +0000 science/orthanc-mysql: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- science/orthanc-mysql/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-mysql/Makefile b/science/orthanc-mysql/Makefile index 60fb30c89935..b65050ff9894 100644 --- a/science/orthanc-mysql/Makefile +++ b/science/orthanc-mysql/Makefile @@ -1,6 +1,6 @@ PORTNAME= orthanc-mysql DISTVERSION= 4.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= science MASTER_SITES= https://www.orthanc-server.com/downloads/get.php?path=/plugin-mysql/:main \ https://www.orthanc-server.com/downloads/get.php?path=/orthanc/:framework \ diff --git a/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp new file mode 100644 index 000000000000..338388756a00 --- /dev/null +++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancFramework_Sources_SystemToolbox.cpp @@ -0,0 +1,11 @@ +--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancFramework/Sources/SystemToolbox.cpp.orig 2021-05-07 07:22:38 UTC ++++ MySQL/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-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp new file mode 100644 index 000000000000..c739fd182701 --- /dev/null +++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Engine_PluginsManager.cpp @@ -0,0 +1,11 @@ +--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Engine/PluginsManager.cpp.orig 2021-05-07 07:22:38 UTC ++++ MySQL/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-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp new file mode 100644 index 000000000000..2c45326a9e12 --- /dev/null +++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp @@ -0,0 +1,11 @@ +--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Plugins/Samples/ModalityWorklists/Plugin.cpp.orig 2021-05-07 07:22:38 UTC ++++ MySQL/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-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp new file mode 100644 index 000000000000..6ed1b2fd66f7 --- /dev/null +++ b/science/orthanc-mysql/files/patch-MySQL_ThirdPartyDownloads_Orthanc-1.9.3_OrthancServer_Sources_OrthancConfiguration.cpp @@ -0,0 +1,11 @@ +--- MySQL/ThirdPartyDownloads/Orthanc-1.9.3/OrthancServer/Sources/OrthancConfiguration.cpp.orig 2021-05-07 07:22:38 UTC ++++ MySQL/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")