From nobody Sun Sep 17 21:23: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 4Rpgs14rCJz4sqLv; Sun, 17 Sep 2023 21:23: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 4Rpgs14NHsz3M1W; Sun, 17 Sep 2023 21:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694985813; 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=nvu7y/Gu1D1dn+8d0BieMJdcQM/Jk57XP2FIrXgfSXY=; b=x2zHtOL+2sDdT8Sdng4J56qVF78TcGAFrLOnF0V6OvNPJZLAtGIY8yzxnqXHH/ksZFv2/X xbr44V/OT7SyvrQKvOQXgIMSESJJGcDvZuLVR7zkWPDlraZ23yB4wtl/360MAoRiWjIYe6 +yXSALNKg6hk2DW0k2MDu72Q+26dlTsBUEKEz14cUZHRFgyjCfcPgyxehZmPUI1p5yQJcb 5wo9BEaqfJTA03sZzYVBc0nSlzEDkDdUPQnVA36iWQtUoRhcHDgkE5yHOaPZGoW58WeDoK YL82qofWGSyBoVj0/0LrhhryiUVYhEo+XgP6h8ab4cT0my4jmjfztS19IkSy0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694985813; a=rsa-sha256; cv=none; b=VO3clNqtInRSpdbXvqV6f7FAjBp2e9F/jeWpHbp5GPhNd5kk9RuqYHr2yIIzdpG8dZbZ7R QzGIVfJHdIJ0Yy+b6eYlqoyD+vPS7Y9zfb14BrkXyy5SbAXnvlqn3fPs76y3/ujNGRD97Z ovKrbHEy89hP4ngevuUX4CvWn5EJC8qXZW8BtO7m7gYaiy9DG+sAE+oKCK3WhF4f5F7z3u 9/cMBMCzQes9tPgWtx3ulylVH0IKguNDmmrxfBOz15GeY17f838+n7/Z352O5UGl1AXpCN kUXn0Ffcrgeznpl3/JAuLhEj9isM1RPqN8hqEP10uSN+vb2bgZfO5yBARlU1PQ== 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=1694985813; 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=nvu7y/Gu1D1dn+8d0BieMJdcQM/Jk57XP2FIrXgfSXY=; b=Ukx5SLuZ2mP9lLJ150rw3twDuz8pYSSHzM/H5N0mGU9yxcjCnQUL2eUiNKubfqyuKSs9Q+ YRUKjWflBYtUppFP628owbY2YV4vMa46Tkz1nT4cLxZTKEvXtpSCxgxuZ/ganXuLe+1EuS 3n3L23zprOTgvsU56yE2TRRBzTYDaNAoeiYTCIXpEcjFO/5+nYJ7T8xiY5ByuZZ+DhMVNV 9sJQ+Rzc+KvlIUdatvwayCGMJ+yL0CiP9gxbYks3UXvEND3BJY9FNEuh6VLo5UP7Lcqswr 9U4LQdC49LcgySWW3FBQEjtru00DN4O4RLPgq7eleeGFo40D0ANt5+MsBE3gEg== 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 4Rpgs137r0z14SZ; Sun, 17 Sep 2023 21:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38HLNXmv004070; Sun, 17 Sep 2023 21:23:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38HLNXXS004068; Sun, 17 Sep 2023 21:23:33 GMT (envelope-from git) Date: Sun, 17 Sep 2023 21:23:33 GMT Message-Id: <202309172123.38HLNXXS004068@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 9c77ef5e7bc3 - main - graphics/inkscape: update upstream patch 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c77ef5e7bc3d595fa9acee59059c9f948fc8ff8 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c77ef5e7bc3d595fa9acee59059c9f948fc8ff8 commit 9c77ef5e7bc3d595fa9acee59059c9f948fc8ff8 Author: Charlie Li AuthorDate: 2023-09-17 21:22:52 +0000 Commit: Charlie Li CommitDate: 2023-09-17 21:22:52 +0000 graphics/inkscape: update upstream patch --- graphics/inkscape/Makefile | 2 +- graphics/inkscape/distinfo | 6 +++--- graphics/inkscape/files/patch-src_helper_geom.h | 11 ----------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 5a8fc572d682..72bc51dcdb42 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -5,7 +5,7 @@ MASTER_SITES= https://media.inkscape.org/dl/resources/file/ PATCH_SITES= https://gitlab.com/${PORTNAME}/${PORTNAME}/-/commit/ PATCHFILES+= 3db96bfbac475022a32b70473b767b21a8d70c7f.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/issues/4427 -PATCHFILES+= 00851fede7f9162cbcacf81258d1dda823b88a5c.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/5650 +PATCHFILES+= 5183d14d331e4f2022b9ab0f83d45e4e17951013.patch:-p1 # https://gitlab.com/inkscape/inkscape/-/merge_requests/5650 MAINTAINER= gnome@FreeBSD.org COMMENT= Full featured open source SVG editor diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 5ba7f41d16ee..cef2325763ed 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1692891317 +TIMESTAMP = 1694983728 SHA256 (inkscape-1.3.tar.xz) = bf4f286b025e0169b8948cc14d5199a9b4c204d761c894c4b48496571ec76307 SIZE (inkscape-1.3.tar.xz) = 85764028 SHA256 (3db96bfbac475022a32b70473b767b21a8d70c7f.patch) = fb572fa3b566149293b0ffeae468ff6025d0e54a090d928eb8c2037afe2d3f8d SIZE (3db96bfbac475022a32b70473b767b21a8d70c7f.patch) = 2003 -SHA256 (00851fede7f9162cbcacf81258d1dda823b88a5c.patch) = d0ebfcb85682345d7e10d97931894acd171881a8467b70a777f37a293d255a59 -SIZE (00851fede7f9162cbcacf81258d1dda823b88a5c.patch) = 5207 +SHA256 (5183d14d331e4f2022b9ab0f83d45e4e17951013.patch) = f62186b0655ea0aae5802b464c71e107155a4c93b6e0c9bae7c870dad956f4fa +SIZE (5183d14d331e4f2022b9ab0f83d45e4e17951013.patch) = 7711 diff --git a/graphics/inkscape/files/patch-src_helper_geom.h b/graphics/inkscape/files/patch-src_helper_geom.h deleted file mode 100644 index 6c6a70977402..000000000000 --- a/graphics/inkscape/files/patch-src_helper_geom.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/helper/geom.h.orig 2023-08-24 15:45:30 UTC -+++ src/helper/geom.h -@@ -55,7 +55,7 @@ inline Geom::Coord triangle_area(Geom::Point const &p1 - return p1[X] * p2[Y] + p1[Y] * p3[X] + p2[X] * p3[Y] - p2[Y] * p3[X] - p1[Y] * p2[X] - p1[X] * p3[Y]; - } - --inline auto rounddown(Geom::IntPoint const &a, Geom::IntPoint const &b) -+inline auto round_down(Geom::IntPoint const &a, Geom::IntPoint const &b) - { - using namespace Inkscape::Util; - return Geom::IntPoint(round_down(a.x(), b.x()), round_down(a.y(), b.y()));