From nobody Tue Sep 17 18:59:16 2024 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 4X7WKd1GVCz5Vf5q; Tue, 17 Sep 2024 18:59:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X7WKd01w4z40dD; Tue, 17 Sep 2024 18:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726599557; 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=zg0/yUeCjVWM2uoL6L6M7E5qn9Tz6KepNs8mQZV+lIQ=; b=JUOdKJ86UwPgxMqxw6YWz6y9xGCmx9EsmGZIv2SpKzMZSzVhiP/2dylkEEvTSwF2RWVTih PVnkT4imIqA9qAG2YrwRw6+z9eshvMsK+ZK2u4qpLwNDoF7tkCr7q1wRHGdnQ0xAXgMSC/ uyHQqXvoDBpMur0TSd/TkeX+7+aA55HWp16EQXtSwzMzOOQFDO6HHnyncSgSqVPtNuZIuz VSg8wsb9ouuC2MnlmGXrCFijmSuYKCNiNycMtDEfQ9+hY31yYBtUCal/DsAkYw4QuScn0y X78xGbBrh8xS5n799rm/piXfWKvp/bfjWBpO7sQLT6/C6zMTfprgArR3gBy92Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726599557; a=rsa-sha256; cv=none; b=sFGzbCHlBh0PTu6zMcbFFi0Kg5Y58zuEJZqQzCKXsGNtUmgZ3MPiup0vwL2Bm5XZMjTzuQ oVrde7FH9tKvPhw2bxDbhvKF0dfwSMkAiU+tyEwdsx7ak9GHkAZBo8NwdiD0CbnO7Sz/hz GbKHiq8WuhMesE1DLSz2G1zkzkrYI+00RUga3xApZ57h97GDeelkanzUe4WlYYT0phg9O7 tk56DXXg5umGJD2yv4tdctwCR+YG/Da27vCZrtvOkMVh3yZfIW5PDKfZ14I8Z/3BOQzjhv 8p2B+7RL/dVyf8IS6112hihHmKWJaLBtr5VLuL8ECxGW0fVomUOg5E5hwEAwhg== 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=1726599557; 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=zg0/yUeCjVWM2uoL6L6M7E5qn9Tz6KepNs8mQZV+lIQ=; b=AVNEs3KqHQMRW8m+TKnELB+8LfzXlCtVAPXfocjL6N/aC0ZuqFoLRm1bZcFirRMIWlQUOD fnOmIzfBKn5sYCmIHpc6XhYRCub3RFsL20OEf2jz3NrnqY0EaWw6mULd2jLT/K/c19aRqa 184TR0Y5jPnA6WnkT7RvRK7fYPGAX3MKMPaxOUMah97IlNKXIiUxszSwpW5CmRMOxKB6Xl ZUAMYrLJk/dfO3hgznDk71RCWobD2aJLOxnNis7ECiCqYxurh3aGsYXtSOUy+//+gyhwvP mvMqWMEKPExMOnlae/sqM+RjfqJNNqeVFBDIR96WYmsCi7YNEJWZUsFvUH87rQ== 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 4X7WKc6lyMzqQd; Tue, 17 Sep 2024 18:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48HIxGgE072015; Tue, 17 Sep 2024 18:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48HIxGB1072012; Tue, 17 Sep 2024 18:59:16 GMT (envelope-from git) Date: Tue, 17 Sep 2024 18:59:16 GMT Message-Id: <202409171859.48HIxGB1072012@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: bd21b799f5d2 - main - devel/upp: Fix build with freetype2 2.13.3 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd21b799f5d2ca90452b2c4279d2621968cb8b8f Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd21b799f5d2ca90452b2c4279d2621968cb8b8f commit bd21b799f5d2ca90452b2c4279d2621968cb8b8f Author: lightside AuthorDate: 2024-09-17 18:50:07 +0000 Commit: Daniel Engberg CommitDate: 2024-09-17 18:50:12 +0000 devel/upp: Fix build with freetype2 2.13.3 Based on upstream commit 68139e354876013046aac0d1699d7b61ce055d53 Reference: https://github.com/ultimatepp/ultimatepp/commit/68139e354876013046aac0d1699d7b61ce055d53 PR: 281326 Approved by: portmgr (blanket, build fix) --- devel/upp/Makefile | 2 +- devel/upp/files/patch-uppsrc_Draw_FontFc.cpp | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/devel/upp/Makefile b/devel/upp/Makefile index 7e36395f7521..2d2b854f9d94 100644 --- a/devel/upp/Makefile +++ b/devel/upp/Makefile @@ -1,6 +1,6 @@ PORTNAME= upp DISTVERSION= 15260 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel x11-toolkits MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2020.2/ DISTNAME= ${PORTNAME}-posix-${PORTVERSION} diff --git a/devel/upp/files/patch-uppsrc_Draw_FontFc.cpp b/devel/upp/files/patch-uppsrc_Draw_FontFc.cpp new file mode 100644 index 000000000000..a0d96a2e1110 --- /dev/null +++ b/devel/upp/files/patch-uppsrc_Draw_FontFc.cpp @@ -0,0 +1,28 @@ +# Draw: Workaround for backwards incompatibility of FT_Outline +# https://github.com/ultimatepp/ultimatepp/commit/68139e354876013046aac0d1699d7b61ce055d53 + +--- uppsrc/Draw/FontFc.cpp.orig 2020-10-16 9:28:02 UTC ++++ uppsrc/Draw/FontFc.cpp +@@ -290,10 +290,9 @@ + FT_Vector v_start; + FT_Vector* point; + FT_Vector* limit; +- char* tags; + int n; // index of contour in outline +- char tag; // current point's state + int first = 0; // index of first point in contour ++ + for(n = 0; n < outline.n_contours; n++) { + int last = outline.contours[n]; + limit = outline.points + last; +@@ -301,8 +300,8 @@ + v_last = outline.points[last]; + v_control = v_start; + point = outline.points + first; +- tags = outline.tags + first; +- tag = FT_CURVE_TAG(tags[0]); ++ const auto *tags = outline.tags + first; ++ auto tag = FT_CURVE_TAG(tags[0]); + if(tag == FT_CURVE_TAG_CUBIC) return false; + if(tag == FT_CURVE_TAG_CONIC) { + if(FT_CURVE_TAG(outline.tags[last]) == FT_CURVE_TAG_ON) {