From nobody Sun Mar 05 17:13:25 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 4PV7Zs5dp8z3wj48; Sun, 5 Mar 2023 17:13:25 +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 4PV7Zs56jrz3L65; Sun, 5 Mar 2023 17:13:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678036405; 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=N7vKQd6Uvh9FL8sdjNWlDnm7jJuxLwQBFHDeNRFP8jA=; b=wK36g372ye3m9Ruz5vhSNkLwTltqj3fGw9yOXeRomcjefU/MPFffmqmhaoxD67u3d2er6E 6jprTCxwsU9aZSqp0slb76qFcAK/wHLgDD8vIYyKDLlo6d1Knsy9pKsdM0WGNVKWZWqXxz uslK3Hk7MH7kXkYc7O1mOf+Nd4UcX40zZX4ZMMy1QwaTc29T5x0lo0/p3m0XHYMRoFArBe OPsUwoqsN5E8HUn7LxTro7cBmv1LsB9kBvxm9uI/clOy5Y2vZ+b59gA5DIaEk190mBWibR udad19BgLYTtjjW/rrpfQbX1AGuEvTMwJGvDNqY3JbdlSUerD/KrLIJN4FIePg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678036405; 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=N7vKQd6Uvh9FL8sdjNWlDnm7jJuxLwQBFHDeNRFP8jA=; b=oMZ3OMi+0JSd3HBaR/xy5yrY1WhUGcB9ppmQFIvh1/avy0ZaG9aZdM5fX372cGlRLGm7d0 CP1M1F2o0ex0H7M9D248i4GDN8q/Yx34Oef8Fz9l0wGZzcn6N1v4l80h4mXWDVGACDsVlo AN7C8rJtD8JDwdLAVrsBLQd51EDVE3ZAGdOpp/liIZtgT+PmofU8srBfd0ZXOwmIkBiVz/ NeJJlj25lAM3DXwtyaUnIRRtx+DrTmk67ylDrBJ2taV6llVB+kG8lX9lAJftCi03fZJMcz zFWbive8DWJ8P4OyQH+zSeM/En/bLd3WIHnbdEHjtEdCZXEZkZCHepZS8w8glw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678036405; a=rsa-sha256; cv=none; b=U0eb26ghHAWVElwgunwiT2xenV5A4YJgqjwPeVPKL3wLSmgzTiU6Rdwhp2kzJwYll2xJzZ Yxq8GOvw5Z5j702UGFnAJMVqZxYQxWf3dHuel33VougNDBsZw38mIfVvF2Exb3K8kE0KI6 IWW18aETHO5Z4rYJ0pLlp9+NmV+0KuElVJ/41BVFkIaj7WN7ExoZovx7nOthDOrq0QCvVW c5LbfWYaxxeQU/Q3i5bQ245dOfSLz9Q8AU5zynudVm73XHA4Zrl7ib31HbyhBE4gmPjGiO TPx1QsCpQF54HEqA6+F2jxbcf5wBvVQpZylIjOboRxRzO8WfF+5SlEAAu3Xk0w== 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 4PV7Zs4BG9zTfK; Sun, 5 Mar 2023 17:13:25 +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 325HDPMB026973; Sun, 5 Mar 2023 17:13:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 325HDPbv026972; Sun, 5 Mar 2023 17:13:25 GMT (envelope-from git) Date: Sun, 5 Mar 2023 17:13:25 GMT Message-Id: <202303051713.325HDPbv026972@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 68c402ae8744 - main - print/gutenprint: fix build with LLVM 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: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68c402ae8744294ecb65d34960dea1fd233b9411 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=68c402ae8744294ecb65d34960dea1fd233b9411 commit 68c402ae8744294ecb65d34960dea1fd233b9411 Author: Christoph Moench-Tegeder AuthorDate: 2023-03-05 17:11:54 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-03-05 17:11:54 +0000 print/gutenprint: fix build with LLVM 15 as observed on -CURRENT as of now. PR: 269972 Reported by: ohartmann@walstatt.org --- print/gutenprint/files/patch-src_gimp2_print.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/print/gutenprint/files/patch-src_gimp2_print.c b/print/gutenprint/files/patch-src_gimp2_print.c new file mode 100644 index 000000000000..20f63594c0b6 --- /dev/null +++ b/print/gutenprint/files/patch-src_gimp2_print.c @@ -0,0 +1,13 @@ +--- src/gimp2/print.c.orig 2023-03-05 16:39:18.726997000 +0100 ++++ src/gimp2/print.c 2023-03-05 16:39:46.126948000 +0100 +@@ -114,8 +114,8 @@ + { + if (gimp_thumbnail_data) + g_free(gimp_thumbnail_data); +- gint x = gimp_image_width(image_ID); +- gint y = gimp_image_height(image_ID); ++ gint x = gimp_image_width(p2gint(image_ID)); ++ gint y = gimp_image_height(p2gint(image_ID)); + if (*width > x) + *width = x; + if (*height > y)