From nobody Sun Feb 16 21:02:40 2025 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 4Ywysr5r8Sz5nwXy; Sun, 16 Feb 2025 21:02:40 +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 4Ywysr5KFsz3H0l; Sun, 16 Feb 2025 21:02:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739739760; 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=iwAOAZp0y+oaPlKFCIimiQTXc8ItIsiNF7Yj33p8hI4=; b=vroZoN6k8iOAwGE+2tbkgfIXdsi67yBLJlP4wqKmhaxrHWr2B3sYFc3KLbEowWxfcZ3TRJ vYtVzb9ayZodhWbfokQwHT+KgkUnGpEqAR8t3QGjIGL5vm0ldlY5NRjDhKuQk9bqb/o/5f GBowM9F/InxUrr5xuup83jrFuTebpJEijqa6DThxGKOQzzloN6KuYiw7x5FY6wvTXV2DCH fmWv4SvKvshPC3Sgc5mMmS3sVhvJlxl/G+i7EsNBed+rsH/g7DJhdhINvdAck+GyiH3vfd 1zQEOg7zwGQJnhXwKmixKqYDgsAKMfqW484PGTb0Y4LeGPoi9M1rCqtEeTx75w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739739760; a=rsa-sha256; cv=none; b=LRWbjYWQ5ph4udy2LpFpUbputYrcaNVRZtrCgkvWggegww8IVzRTr/7TA8QnCETGn9HAdP In5QCZNpMoY8RBVUIbaxgzTZrcfW2zWpJrPa7Al905MK6o8KzzQ3y03HVdP2JcP0OCFwQK sr2Bpd9DeoYAKCz0ORK+Ytii6nyvbBvIB6X4cnd6CDL6OztqRo09baGmJ+LW7EldXv5ClF KtPuqDvwzKJGGXgx/Gz8uogx7Ikkn7T6hOsxfxO6s0jOR/s5c7w6RExi7XzcoDl/DIuPsV EoGeMPoCnygplCLUHCEqcBeHj1idLiahXeS1SQ1MmBPJcZtHjxrjOomfWCKZtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739739760; 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=iwAOAZp0y+oaPlKFCIimiQTXc8ItIsiNF7Yj33p8hI4=; b=xTT2b3EXSF7+Imj46DS3vxz4KhBk019ogxnXPtdlV8HNW8eFnx98ho8SQUYUnLLtaexxTo v0txm0l0X6dDYCjbiH+nY+zkTbt8R/F6aitGSMa+xzwnoxBY3MAracs/ruZ5bCHW9juhul mM6F0ZJuSvkpnq26M8FVcQHjH2TwLmGVFik1G291/+NUZyzxNsICFAZhptv0Jp8CEO3e8H I+PaN573LhXZrYWa7b3CXjW2k15UJoPZcrsTB36uhjxFpPr4yArgSrm8bySuN2r8gzXfG4 0H5kAstO0xI1CwpqyDhPPsRE6Ld9Db/z+v/7FnLC8voFqFioh67YXA9FAobxkw== 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 4Ywysr4YRGz13v0; Sun, 16 Feb 2025 21:02:40 +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 51GL2eLg057280; Sun, 16 Feb 2025 21:02:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51GL2eAS057277; Sun, 16 Feb 2025 21:02:40 GMT (envelope-from git) Date: Sun, 16 Feb 2025 21:02:40 GMT Message-Id: <202502162102.51GL2eAS057277@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: b07bcc203ed5 - main - science/orthanc-webviewer: update 2.8 -> 2.9 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: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b07bcc203ed5e3b4528cba3a4f7a2193b5e59a34 Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=b07bcc203ed5e3b4528cba3a4f7a2193b5e59a34 commit b07bcc203ed5e3b4528cba3a4f7a2193b5e59a34 Author: Matthew D. Fuller AuthorDate: 2025-02-16 21:00:25 +0000 Commit: Kurt Jaeger CommitDate: 2025-02-16 21:02:17 +0000 science/orthanc-webviewer: update 2.8 -> 2.9 PR: 284698 --- science/orthanc-webviewer/Makefile | 19 +++++++++---------- science/orthanc-webviewer/distinfo | 10 +++++----- science/orthanc-webviewer/files/patch-CMakeLists.txt | 11 +++++++++++ ...1.11.0_OrthancFramework_Sources_OrthancFramework.h | 10 ---------- ...-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp | 11 ----------- ....0_OrthancServer_Plugins_Engine_PluginsManager.cpp | 11 ----------- ...erver_Plugins_Samples_ModalityWorklists_Plugin.cpp | 11 ----------- ...1.0_OrthancServer_Sources_OrthancConfiguration.cpp | 11 ----------- 8 files changed, 25 insertions(+), 69 deletions(-) diff --git a/science/orthanc-webviewer/Makefile b/science/orthanc-webviewer/Makefile index 1d01a6028f8f..935acee20db1 100644 --- a/science/orthanc-webviewer/Makefile +++ b/science/orthanc-webviewer/Makefile @@ -1,9 +1,8 @@ PORTNAME= orthanc-webviewer -DISTVERSION= 2.8 -PORTREVISION= 13 +DISTVERSION= 2.9 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 \ +MASTER_SITES= https://orthanc.uclouvain.be/downloads/sources/orthanc-webviewer/:main \ + https://orthanc.uclouvain.be/downloads/sources/orthanc/:framework \ http://orthanc.osimis.io/ThirdPartyDownloads/WebViewer/:thirdpartywebviewer \ http://orthanc.osimis.io/ThirdPartyDownloads/:thirdparty DISTFILES= OrthancWebViewer-${PORTVERSION}.tar.gz:main \ @@ -12,7 +11,7 @@ DISTFILES= OrthancWebViewer-${PORTVERSION}.tar.gz:main \ jquery-ui-1.11.3.zip:thirdpartywebviewer \ pako-0.2.5.zip:thirdpartywebviewer \ js-url-1.8.6.zip:thirdpartywebviewer \ - Orthanc-1.11.0.tar.gz:framework \ + Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz:framework \ e2fsprogs-1.44.5.tar.gz:thirdparty DIST_SUBDIR= orthanc EXTRACT_ONLY= OrthancWebViewer-${PORTVERSION}.tar.gz @@ -24,8 +23,6 @@ WWW= https://www.orthanc-server.com/static.php?page=web-viewer LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to build with boost-1.86+ - BUILD_DEPENDS= ${LOCALBASE}/include/orthanc/OrthancCPlugin.h:science/orthanc LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ @@ -39,7 +36,7 @@ RUN_DEPENDS= Orthanc:science/orthanc USES= cmake localbase python:build USE_LDCONFIG= yes -CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources \ +CMAKE_ARGS= -DORTHANC_FRAMEWORK_ROOT=${WRKSRC}/ThirdPartyDownloads/Orthanc-${ORTHANC_FRAMEWORK_VERSION}/OrthancFramework/Sources \ -DORTHANC_FRAMEWORK_SOURCE=path CMAKE_OFF= USE_SYSTEM_UUID @@ -50,6 +47,8 @@ WRKSRC= ${WRKDIR}/OrthancWebViewer-${PORTVERSION} PLIST_SUB= DISTVERSION=${DISTVERSION} +ORTHANC_FRAMEWORK_VERSION= 1.12.6 + post-extract: ${MKDIR} ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/jsPanel-2.3.3-fixed.zip ${WRKSRC}/ThirdPartyDownloads @@ -58,8 +57,8 @@ post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/pako-0.2.5.zip ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/js-url-1.8.6.zip ${WRKSRC}/ThirdPartyDownloads ${CP} ${DISTDIR}/${DIST_SUBDIR}/e2fsprogs-1.44.5.tar.gz ${WRKSRC}/ThirdPartyDownloads - ${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-1.11.0.tar.gz ${WRKSRC}/ThirdPartyDownloads - ${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-1.11.0.tar.gz + ${CP} ${DISTDIR}/${DIST_SUBDIR}/Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz ${WRKSRC}/ThirdPartyDownloads + ${TAR} -C ${WRKSRC}/ThirdPartyDownloads -xf ${WRKSRC}/ThirdPartyDownloads/Orthanc-${ORTHANC_FRAMEWORK_VERSION}.tar.gz post-build: @cd ${BUILD_WRKSRC} && ./UnitTests diff --git a/science/orthanc-webviewer/distinfo b/science/orthanc-webviewer/distinfo index cf7e9f567da2..beff3cb36584 100644 --- a/science/orthanc-webviewer/distinfo +++ b/science/orthanc-webviewer/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1652274595 -SHA256 (orthanc/OrthancWebViewer-2.8.tar.gz) = 41e3a15040d74336044cc9304634246acee8d927ab85233074ff89dd4d00f30f -SIZE (orthanc/OrthancWebViewer-2.8.tar.gz) = 126872 +TIMESTAMP = 1739140790 +SHA256 (orthanc/OrthancWebViewer-2.9.tar.gz) = 2f2cee66f908f6c5a6f0ebd69341f42fa94aa6179904ea540adeb21ac69c05fe +SIZE (orthanc/OrthancWebViewer-2.9.tar.gz) = 132935 SHA256 (orthanc/jsPanel-2.3.3-fixed.zip) = 958a15c7009efbb865da62b5850a3a39661c62696e38b151c7f988f4ac445595 SIZE (orthanc/jsPanel-2.3.3-fixed.zip) = 826542 SHA256 (orthanc/cornerstone-0.11.0.zip) = 1bada9f1f2981968f72daa352e712abea5cac3e0417fe59176f70a23261f1da9 @@ -11,7 +11,7 @@ SHA256 (orthanc/pako-0.2.5.zip) = e493010e1b1af5c149631994365ed31e15722eed2d17cc SIZE (orthanc/pako-0.2.5.zip) = 704378 SHA256 (orthanc/js-url-1.8.6.zip) = ef2c7f50921ba64ac434eacf025669f1e6f39b5584100ffa8194a3edc08d43d3 SIZE (orthanc/js-url-1.8.6.zip) = 54717 -SHA256 (orthanc/Orthanc-1.11.0.tar.gz) = 23949a70562487fd6e79d6f3f13c71a0fc90aa25e492fb3a99575fee0722c5af -SIZE (orthanc/Orthanc-1.11.0.tar.gz) = 1899829 +SHA256 (orthanc/Orthanc-1.12.6.tar.gz) = aa5b6d6309965ed360625b5572e79068e6c501b603163e330629f2f0a56a0fe9 +SIZE (orthanc/Orthanc-1.12.6.tar.gz) = 2089779 SHA256 (orthanc/e2fsprogs-1.44.5.tar.gz) = 2e211fae27ef74d5af4a4e40b10b8df7f87c655933bd171aab4889bfc4e6d1cc SIZE (orthanc/e2fsprogs-1.44.5.tar.gz) = 7619237 diff --git a/science/orthanc-webviewer/files/patch-CMakeLists.txt b/science/orthanc-webviewer/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..5ac2ba18ecbc --- /dev/null +++ b/science/orthanc-webviewer/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2025-02-09 22:38:16 UTC ++++ CMakeLists.txt +@@ -28,7 +28,7 @@ else() + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") + else() +- set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.3") ++ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.6") + set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") + endif() + diff --git a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_OrthancFramework.h b/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_OrthancFramework.h deleted file mode 100644 index 7e2d22ba1503..000000000000 --- a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_OrthancFramework.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/OrthancFramework.h.orig 2022-05-09 09:19:44 UTC -+++ ThirdPartyDownloads/Orthanc-1.11.0/OrthancFramework/Sources/OrthancFramework.h -@@ -70,6 +70,7 @@ - - - #include -+#include - - namespace Orthanc - { 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 deleted file mode 100644 index be3a52257299..000000000000 --- a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancFramework_Sources_SystemToolbox.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 7e84c746faa1..000000000000 --- a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Engine_PluginsManager.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index dad50da54856..000000000000 --- a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Plugins_Samples_ModalityWorklists_Plugin.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 9df1a25a54a7..000000000000 --- a/science/orthanc-webviewer/files/patch-ThirdPartyDownloads_Orthanc-1.11.0_OrthancServer_Sources_OrthancConfiguration.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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")