Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Aug 2024 15:44:51 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 5ee80b92e654 - 2024Q3 - graphics/dcmtk: fix build with clang 19
Message-ID:  <202408161544.47GFipbt096102@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by dim:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ee80b92e6545b1a7c3e329c93f2205b3088bfc7

commit 5ee80b92e6545b1a7c3e329c93f2205b3088bfc7
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-08-16 15:17:33 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-08-16 15:44:27 +0000

    graphics/dcmtk: fix build with clang 19
    
    Clang 19 now diagnoses incorrect member accesses, which causes
    graphics/dcmtk to fail with a errors similar to:
    
        /wrkdirs/usr/ports/graphics/dcmtk/work/dcmtk-DCMTK-3.6.8/ofstd/include/dcmtk/ofstd/ofutil.h:79:18: error: no member named 'pt' in 'OFrvalue_storage<T, >'
           79 |         : t( rhs.pt ) {}
              |              ~~~ ^
    
    Upstream dcmtk fixed this by changing the affected copy constructor in
    https://github.com/DCMTK/dcmtk/commit/c29bebcd1, so pull this in as a
    patch and apply it.
    
    PR:             280865
    Approved by:    yuri (maintainer)
    MFH:            2024Q3
    
    (cherry picked from commit e7c6b0ec720fbd79c019f0743a9de46a6df93683)
---
 graphics/dcmtk/Makefile | 3 +++
 graphics/dcmtk/distinfo | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/graphics/dcmtk/Makefile b/graphics/dcmtk/Makefile
index dfeeb824de2a..d401b7985ec0 100644
--- a/graphics/dcmtk/Makefile
+++ b/graphics/dcmtk/Makefile
@@ -3,6 +3,9 @@ DISTVERSIONPREFIX=	${PORTNAME:tu}-
 DISTVERSION=	3.6.8
 CATEGORIES=	graphics devel
 
+PATCH_SITES=	https://github.com/DCMTK/${PORTNAME}/commit/
+PATCHFILES+=	c29bebcd19bb963d72dcd00ca8745f60f6b9a39e.patch:-p1 # fix compilation with clang 19, gcc 15
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DICOM ToolKit, libraries and applications for DICOM/MEDICOM standard
 WWW=		https://dcmtk.org
diff --git a/graphics/dcmtk/distinfo b/graphics/dcmtk/distinfo
index 738b7d2d3521..cf124b306980 100644
--- a/graphics/dcmtk/distinfo
+++ b/graphics/dcmtk/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1714942515
+TIMESTAMP = 1723820540
 SHA256 (DCMTK-dcmtk-DCMTK-3.6.8_GH0.tar.gz) = fca429a215739702fe8d96178964036246a35e2ea8adb12da33851e2be8e9a07
 SIZE (DCMTK-dcmtk-DCMTK-3.6.8_GH0.tar.gz) = 9670224
+SHA256 (c29bebcd19bb963d72dcd00ca8745f60f6b9a39e.patch) = fc876f47d44b582f0ac56a1390fd7bf1eb8767444f591fb80a367dd6f84ec015
+SIZE (c29bebcd19bb963d72dcd00ca8745f60f6b9a39e.patch) = 1413



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408161544.47GFipbt096102>