From nobody Sat Jan 07 14:12:21 2023 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 4Nq2GF3Tshz2pSC4; Sat, 7 Jan 2023 14:12:21 +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 4Nq2GF2qN4z4HDv; Sat, 7 Jan 2023 14:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673100741; 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=I7qBqOQQapY5LsBS5840GWjg1b7MLmEs2Gxr6+umAv8=; b=dMdLV5HehbRBiS7cRUaerFWZT07VObjR/H+utkY6TcE9BQW/PkKD0LY3Ff0Emj86Jod2qG V4BYI+PWW71iDYKe8W5V7r9u5R0+tyVM+hXEdUCXuC590903Fb70zDTucLGfBpDoaWgtAZ kNUzOqAm/5G8UJC8nkdc4dDpUCL34mLYzLyLyg1YqyqXtbSOxLtwaSV2CEFEcL9pCRLPLH K+E/0BlTDDRjEmpaVLi+S29vlNOpJeYgJQgukDO18jotpYTdyMfNVqOOxSQYX9YPzMr0bE ncGz1KZSelygI9vx6YDv+lCb+wJ6XiQQ9Xxh6uzax8KuJE4h/dA3fMmuC9a1mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673100741; 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=I7qBqOQQapY5LsBS5840GWjg1b7MLmEs2Gxr6+umAv8=; b=O1O76MiZjuLVPC2uZ6XhevzlIzWxzKRzPNsW1VWlrLiTJ0xUYyiQiiRRlThxno0+7wpkNP cDqES8ZGuK+TO6/nYkI4wLtvgkKm6WMZxtf9ZXnHB2Q7VevMh01/dXQtlbdLGcWYDQ3xh1 0y8ezvWOdo/UIXInnV662Tq7wWj7PXE3rE5taHXxOhTqorH+hSAX535J9HtVnKKsBICtJL lBb8zddZZCd2gUIZ5jymWRQ/ogqN4e29emoueXshQtQXDuKcjPwUr5YzMq9BgQp3/2SEZn FQIq3cCdeNM3SSjE0JDG9c7a2eD5Xd8J6m1KwyMhpxjB0+9EQZeWlC7ZklZsKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673100741; a=rsa-sha256; cv=none; b=u/xl+0BMA7XfbJdt86Ge/I14pQ6LtlQ8e/zIHfdnTbnKk1zjBYSHNH78hne2vsYEQPCmGk XcWVjtLTakWuDxOVCWBA3PhW3sFlOLNddJq+bWH4ljrSolhOhFzVnFNR4yOsMgj5AsYfJi aQngelayVYBViSiVQysCU+dxVdcLbJOAMzOMjJAWQKInKcbaNHHrIMX//Lk27Um0Kv3V5T hdqlbskYF1MnzxwcONsBQcjX9Usv5MhNCDf2nI9zHABjSGEiM7g4gitoBbHaNa8bGWL85t NyfM5vbjunyl089Dawu1ihGLG55GiDOWkeDyhddECgpiiitJlTNvdFqRZ+wgQg== 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 4Nq2GF1tRGz1C3F; Sat, 7 Jan 2023 14:12:21 +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 307ECLVa038613; Sat, 7 Jan 2023 14:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 307ECLMW038604; Sat, 7 Jan 2023 14:12:21 GMT (envelope-from git) Date: Sat, 7 Jan 2023 14:12:21 GMT Message-Id: <202301071412.307ECLMW038604@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: 1b057efd8886 - main - graphics/gimp-app: fix build with clang 15 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 1b057efd888664e99dbe2a2ae548f2d2278483b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=1b057efd888664e99dbe2a2ae548f2d2278483b4 commit 1b057efd888664e99dbe2a2ae548f2d2278483b4 Author: Dimitry Andric AuthorDate: 2023-01-06 19:57:09 +0000 Commit: Dimitry Andric CommitDate: 2023-01-07 14:11:02 +0000 graphics/gimp-app: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that graphics/gimp-app failed to build with clang 15: file-dicom.c:605:26: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gint32' (aka 'int') [-Wint-conversion] return NULL; ^~~~ This is because the return statement is a function that should return an integer, not a pointer. Replace it with the error value -1, as used elsewhere in the function. PR: 268790 Approved by: fluffy (maintainer) MFH: 2023Q1 --- graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c b/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c new file mode 100644 index 000000000000..a95402dd819d --- /dev/null +++ b/graphics/gimp-app/files/patch-plug-ins_common_file-dicom.c @@ -0,0 +1,11 @@ +--- plug-ins/common/file-dicom.c.orig 2022-06-12 20:26:00 UTC ++++ plug-ins/common/file-dicom.c +@@ -602,7 +602,7 @@ load_image (const gchar *filename, + (gchar *) value, samples_per_pixel); + g_free (dicominfo); + fclose (DICOM); +- return NULL; ++ return -1; + } + + break;