From nobody Tue Sep 17 18:59:17 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 4X7WKf3j7Lz5VfDV; Tue, 17 Sep 2024 18:59:18 +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 4X7WKf163Sz40Vc; Tue, 17 Sep 2024 18:59:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726599558; 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=QCbMCPB6mrSaPjOAk9K1cpwMOnZnD8TWQ/6RV9wuktE=; b=nwzxmGnNZFjOcJpFv8pfhJb7ZD+Sfu9zWpkvuVutU1R/cJX2eNK/1VthlNFF3FG5e2ls2g 9etFmbJyQCAXD9/qJ8A9bR2neIA+ml4CKMFBtr1iLxvy0EKBOhO5n2bIi1XSCoFRSgM5AK 9LO5XdTPKVzk2H/RYCicExMlWdP9+f3B02rpJYh56pc892NHQsAbgBgd3pBT/sl9oRAOoH CA11M4Q3dUHMZ/jZO3c677GwJfnnX6hNDHYIWyXddRLqXjQeI8BfsLnUjo+Z4zp2n3G2go 0Evf+57+yaKyDHWeGamdDIfR3Oj5v9YSW5Cbl1bsa6vSNQ4uYvS9U4hp7zwHpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726599558; a=rsa-sha256; cv=none; b=eSU/RVQz13MSwThx2rvexyKrv/FbObEz2IFEHkcO29Qg+8b6XncW+mBm5u51lyjYJWfaHx Z+JDBmMLcLVPnHSfGahtpBhvWkj3XcOzcjB6e8HKoKvuiLrO74QGe1xnHOKMJ4p4q3fF4K g9yVTT3ZnLyPQwgoYApwOK47ttlWWnAhxmrAsVAFdcYYqBqpgxv3tT8ubWRbLyg+pwGgg4 4d+VebQgenDmQ2CeogwLox3s8GCTRuYPgadvi+avfzancJtQpDcVe/CAvVE8R8Aw9FAfVI maJWkCWxAChagVZTYje95UVl5rZv/8qAMoQftiFZjLwGLaLtwHoyTDDQ0ymbkA== 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=1726599558; 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=QCbMCPB6mrSaPjOAk9K1cpwMOnZnD8TWQ/6RV9wuktE=; b=utcoQ3pljRQ0G/JX2T1Mwcu8aw17gsMmREBgp9bhRvJa3wB32LtEq6CYgb5wU1KnFXENLA DUfJEQg5qv148FXfonummmnAR7YxKaF3NM7eEOmzZLBDxH1610D7PHsxaMLhYfDcOpLv5f JOpjI6LBbAR331SIQ+nRSIZEZrUHZdtE++FEAQQ2gsU9tPJ7p4eeC54lKyHBSe8ZKU+02q ZeopAHw5AvLU4BDPvVJepzlBwNxB3+k9OzthSNooHyvvut75YOQX7nKkJ4TVCaj1kKv270 0/yjHmA9n5Xp1Eui2EVnVfWPmTI4GbK/o/mBxF6hQhNTp8JBqRiHnyttxuQt+w== 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 4X7WKf0RDczqVK; Tue, 17 Sep 2024 18:59:18 +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 48HIxHQR072062; Tue, 17 Sep 2024 18:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48HIxHoC072059; Tue, 17 Sep 2024 18:59:17 GMT (envelope-from git) Date: Tue, 17 Sep 2024 18:59:17 GMT Message-Id: <202409171859.48HIxHoC072059@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: d05315b279ff - main - graphics/ftgl: 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: d05315b279ff17d98f6a704c8689e8f64ca6e70b Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=d05315b279ff17d98f6a704c8689e8f64ca6e70b commit d05315b279ff17d98f6a704c8689e8f64ca6e70b Author: Dmitry Marakasov AuthorDate: 2024-09-17 18:54:15 +0000 Commit: Daniel Engberg CommitDate: 2024-09-17 18:54:51 +0000 graphics/ftgl: Fix build with freetype2 2.13.3 PR: 281320 --- graphics/ftgl/Makefile | 2 +- graphics/ftgl/files/patch-src_FTContour.cpp | 11 +++++++++++ graphics/ftgl/files/patch-src_FTContour.h | 11 +++++++++++ graphics/ftgl/files/patch-src_FTVectoriser.cpp | 11 +++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/graphics/ftgl/Makefile b/graphics/ftgl/Makefile index 05dd27b29722..68c882e75554 100644 --- a/graphics/ftgl/Makefile +++ b/graphics/ftgl/Makefile @@ -1,7 +1,7 @@ PORTNAME= ftgl DISTVERSIONPREFIX= v DISTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics diff --git a/graphics/ftgl/files/patch-src_FTContour.cpp b/graphics/ftgl/files/patch-src_FTContour.cpp new file mode 100644 index 000000000000..082720cd1ca7 --- /dev/null +++ b/graphics/ftgl/files/patch-src_FTContour.cpp @@ -0,0 +1,11 @@ +--- src/FTContour.cpp.orig 2019-02-07 21:39:58 UTC ++++ src/FTContour.cpp +@@ -174,7 +174,7 @@ void FTContour::SetParity(int parity) + } + + +-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n) ++FTContour::FTContour(FT_Vector* contour, unsigned char* tags, unsigned int n) + { + FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]); + double olddir, dir = atan2((next - cur).Y(), (next - cur).X()); diff --git a/graphics/ftgl/files/patch-src_FTContour.h b/graphics/ftgl/files/patch-src_FTContour.h new file mode 100644 index 000000000000..8b8423e7c1b7 --- /dev/null +++ b/graphics/ftgl/files/patch-src_FTContour.h @@ -0,0 +1,11 @@ +--- src/FTContour.h.orig 2019-02-07 21:39:58 UTC ++++ src/FTContour.h +@@ -52,7 +52,7 @@ class FTContour + * @param pointTags + * @param numberOfPoints + */ +- FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints); ++ FTContour(FT_Vector* contour, unsigned char* pointTags, unsigned int numberOfPoints); + + /** + * Destructor diff --git a/graphics/ftgl/files/patch-src_FTVectoriser.cpp b/graphics/ftgl/files/patch-src_FTVectoriser.cpp new file mode 100644 index 000000000000..373eb4c7bfa3 --- /dev/null +++ b/graphics/ftgl/files/patch-src_FTVectoriser.cpp @@ -0,0 +1,11 @@ +--- src/FTVectoriser.cpp.orig 2019-02-07 21:39:58 UTC ++++ src/FTVectoriser.cpp +@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours() + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ unsigned char* tagList = &outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1;