From nobody Sun Jun 11 16:17:33 2023 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 4QfKj938Ssz4cVdp; Sun, 11 Jun 2023 16:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QfKj92jCHz3str; Sun, 11 Jun 2023 16:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686500253; 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=+eCTEyqGZZw+ewVoENMv0KG/PSRfI/NN84TwOyF5xzI=; b=QG6XmcpU8UJJZQE6klkuykPI7T9D5JUDumK+MbVfwhdW3bfvUjgpJ0Agd5H7Q0pYhO2Vdo o5+4cQ7PQn/B1hYOXrFmx3WhVHKvOrSelCFzaSQDCGxZqM2VukCVEs0L+yxtT+Bm1Y+b7+ GDNja2h84qePdyuUgtzDoqVjELbKct/MGkcuik8jL9xGfS3OEqvDLW5gJ71SRAmpNjXTmU AM80cPW9ko4NY+mlEtR8TG6EndvcTc32oX1Mpb2RjRtPVXtQZ0ysU+uBFXAt/QtuvgFpDm hNd2/9v1CJnTwsy6IGBnpQrnYhwtafnCDEJxoPBPGMUiAz1BB59El56MaAJ/9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686500253; 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=+eCTEyqGZZw+ewVoENMv0KG/PSRfI/NN84TwOyF5xzI=; b=ax7qe3AahyUOdhVHODk+hWWLrGwp3JbwN3WT5PX4/wOeB3RhEo47RdUrbvlR1qML+aBFlN a9DZHe1lh/YZB7FU3CJ58qLpotph5USRSlejGY52cE7P005n8FeU/W6w0zmbUOKcEztbuH fHb3oa8FWsuqDESV26LJVExhGA31z4cROHJFrUDdtENqJiiCHirgwGiLZmM1i0ab9LbHb3 /4KMC2qV6pIqo5BM2U8VjE7ZkQwOEJXXbA4BfilfqrqvShQbwie+ldjRTMLoKg7wUEND9M HbPk49W6gUH4rqND4N5VIex5qRZAUJVFhV/aVor7PrEmbq2wXLniBriMEkX9Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686500253; a=rsa-sha256; cv=none; b=VXLyVGWLc6NKVXVFXbSaL3T5rMVHM9hJVycCK3Y4CZAjUTbJ1YAweCJNEj4wNnpBjV1KPr 9esZsGUj5GKxBurYR8rcWmntanxURLRL93fyxbtk2mWd19MY/OTXz5nJY2Ynko+a2rpVNB qdhzHVoMsf7MoIiO6DFmyMHgTWj6oZdK7Jgubjpu+4xs0Xs06wtkAJgH4XQGI1l5EDG7Rz l3467q5MKnHSTCDSrQrW9Y0d1fjompjeypNR62xcOR0XRzd/8ehCVjLjZKrPpPzPSB/TbV gnazZPeY0em8MxkkpyG+ScKmDg7B8y+hgrI0JjDUQCiYPYzOcndZ0b2ZeQuhtw== 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 4QfKj91mbPz14wq; Sun, 11 Jun 2023 16:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35BGHXMh056292; Sun, 11 Jun 2023 16:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35BGHXvI056291; Sun, 11 Jun 2023 16:17:33 GMT (envelope-from git) Date: Sun, 11 Jun 2023 16:17:33 GMT Message-Id: <202306111617.35BGHXvI056291@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 7393af6f4fba - main - graphics/qt5-imageformats: fix build with clang 16 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7393af6f4fbab56776eac34830eb81dd7d391f07 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7393af6f4fbab56776eac34830eb81dd7d391f07 commit 7393af6f4fbab56776eac34830eb81dd7d391f07 Author: Dimitry Andric AuthorDate: 2023-06-08 17:48:04 +0000 Commit: Dimitry Andric CommitDate: 2023-06-11 16:15:58 +0000 graphics/qt5-imageformats: fix build with clang 16 Since clang 16 (and gcc 11) the default C++ standard is now gnu++17. Because graphics/qt5-imageformats 's build infrastructure does not explicitly set its C++ standard, this leads to an issue detecting libmng in the configure stage: Configure summary: Further Image Formats: JasPer ................................. yes MNG .................................... no TIFF ................................... yes Using system libtiff ................. yes WEBP ................................... yes Using system libwebp ................. yes This is because the small configure test program for libmng includes libmng.h, which transitively includes lcms.h, and the latter fails due to 'register' keywords in the header. With lcms2.h there is a special define CMS_NO_REGISTER_KEYWORD to avoid usage of the register keyword, but lcms.h is very old and does not support that. As a workaround, define the register keyword away via a "head" object in src/imageformats/configure.json, and via CXXFLAGS for the rest of the build. PR: 271914 Approved by: tcberner (maintainer) MFH: 2023Q2 --- graphics/qt5-imageformats/Makefile | 4 +++- .../files/patch-src_imageformats_configure.json | 12 +++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/graphics/qt5-imageformats/Makefile b/graphics/qt5-imageformats/Makefile index 9ed2948a12a9..1b4c57bca0d8 100644 --- a/graphics/qt5-imageformats/Makefile +++ b/graphics/qt5-imageformats/Makefile @@ -1,6 +1,6 @@ PORTNAME= imageformats PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -15,4 +15,6 @@ LIB_DEPENDS= libjasper.so:graphics/jasper \ USES= compiler:c++11-lang localbase qmake qt-dist:5,imageformats USE_QT= core gui buildtools:build +CXXFLAGS+= -Dregister= + .include diff --git a/graphics/qt5-imageformats/files/patch-src_imageformats_configure.json b/graphics/qt5-imageformats/files/patch-src_imageformats_configure.json index d88962cfe129..3617b167d5b4 100644 --- a/graphics/qt5-imageformats/files/patch-src_imageformats_configure.json +++ b/graphics/qt5-imageformats/files/patch-src_imageformats_configure.json @@ -1,4 +1,4 @@ ---- src/imageformats/configure.json.orig 2022-03-02 19:21:52 UTC +--- src/imageformats/configure.json.orig 2023-01-03 22:24:44 UTC +++ src/imageformats/configure.json @@ -19,6 +19,7 @@ "headers": "jasper/jasper.h", @@ -8,3 +8,13 @@ "string.h", "jasper/jasper.h" ], +@@ -41,6 +42,9 @@ + "mng": { + "headers": "libmng.h", + "test": { ++ "head": [ ++ "#define register" ++ ], + "include": [ + "stdio.h", + "libmng.h"