From nobody Tue Sep 24 19:04:59 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 4XCq6z4hGCz5Y9yS; Tue, 24 Sep 2024 19:04:59 +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 4XCq6z47Fnz4n1K; Tue, 24 Sep 2024 19:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727204699; 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=XeDNv3hxC4ccYcS+YbESh48XtuBueb4tRcJMLO8B/AM=; b=pv3W7RMGWNQIFZcV5jRSwdE3U6JPxyiqJrzdd90pbnQr/7nNzVZfJIei3mKBaupndabHjS Ew85cNKA5kZhAgAGQ+Uf7GQAVmPVPjYuBWJPEOxgqlX7kzcCKmTfYjNSZHXFxqvJ5GShIQ U2OvQ7FHDPHQJbsvjtK2TxxIKyri7ftCc4QAKlmomCqFLQ6xT74Mz+IqTkasu99LwuS4j+ xaQ5BrwiZPxI2rS6kbBUzjl94TjSYoyA843hGu811YCnNw4EQLltmXS3msO7+UO84qWYbX DIGN3FZW5BWu5PyianM5yibYohle6O+YA5j+NRBl0y8ZGPyqff6VqVaws/vWdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727204699; a=rsa-sha256; cv=none; b=R3t6UoslYQN24WDawyRZWDiH7Q/iWqZWdXbKZoWC/FpjNCVjvjBsb6LvIMtVVVHOSn/hIB 82ieqqnnX8FCan0mg/7+WDgxMCmzWjJjCk2Ul5NznfUm4DeiP6BfC2+UvQ2JJpF11ftHtZ hOoYuJTSUOtS8wOe/CaNNofDld7mtFv9EBEz4cbG4LmpUbX1m4ZA0fjlf02NCGs43VbnXT XyMEBDykcDGLPLbAGhobWevz7LkrN37m9iHRwo3amt7hbyy57zq86x/AYnMhomObwvRV+y D1OWJvYv3wJtWRrvWpskomHv8tBDobk/a82rbKNiHkCgn15xsosHHmMLwNI0OQ== 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=1727204699; 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=XeDNv3hxC4ccYcS+YbESh48XtuBueb4tRcJMLO8B/AM=; b=b9Eu1wWqRcI8z+IQUhT0LnmBjGbGg57zHeuNtNpAdWNtZd1LbHSrMoxAgEpJ2Wskrp8o/k wuVpikvQkoiqQVbVpz5g6iT/jlCgB+u7YkJtwZIdIlC3kp8axglXXo95Mx1k4yBh6azfh5 gGUXBB3ISfE+QBPh+o5SRONh0muv6XwZ5G3yvVoT5tA7V7zd7l4i5w2DpA5xyjJi1OnnKM S/pPlMP7gzaRQnQDBI9rsxsW+/wWNa7tlU6ojQGrd07+7wXdN/eXgwQvik4cyfECjeGKFo kYoS7UQODTF80cwUHIiXA+DuefgoG3YYvCrsPni6MTfJCVjdCOqVZjqMqaKUvA== 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 4XCq6z3kDszhJh; Tue, 24 Sep 2024 19:04:59 +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 48OJ4xNU081531; Tue, 24 Sep 2024 19:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48OJ4xA7081528; Tue, 24 Sep 2024 19:04:59 GMT (envelope-from git) Date: Tue, 24 Sep 2024 19:04:59 GMT Message-Id: <202409241904.48OJ4xA7081528@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: a0ddecafac49 - main - cad/opencascade740: Fix build with 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: a0ddecafac493cab9624656bd0ae18d3ca105854 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0ddecafac493cab9624656bd0ae18d3ca105854 commit a0ddecafac493cab9624656bd0ae18d3ca105854 Author: Daniel Engberg AuthorDate: 2024-09-24 19:02:34 +0000 Commit: Daniel Engberg CommitDate: 2024-09-24 19:04:41 +0000 cad/opencascade740: Fix build with with freetype2 2.13.3 Apply same fix as for cad/opencascade PR: 281316 Approved by: portmgr (blanket, build fix) --- cad/opencascade740/Makefile | 2 +- cad/opencascade740/files/patch-src_Font_Font__BRepFont.cxx | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cad/opencascade740/Makefile b/cad/opencascade740/Makefile index 1113b8b38be1..a5cf3b6e41d8 100644 --- a/cad/opencascade740/Makefile +++ b/cad/opencascade740/Makefile @@ -1,6 +1,6 @@ PORTNAME= opencascade PORTVERSION= 7.4.0 # resurrected because science/chrono only builds with opencascade-7.4.0, see https://github.com/projectchrono/chrono/issues/359#issuecomment-1023478083 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad science PKGNAMESUFFIX= 740 diff --git a/cad/opencascade740/files/patch-src_Font_Font__BRepFont.cxx b/cad/opencascade740/files/patch-src_Font_Font__BRepFont.cxx new file mode 100644 index 000000000000..8e6a7047eb8d --- /dev/null +++ b/cad/opencascade740/files/patch-src_Font_Font__BRepFont.cxx @@ -0,0 +1,11 @@ +--- src/Font/Font_BRepFont.cxx.orig 2024-09-24 18:34:32 UTC ++++ src/Font/Font_BRepFont.cxx +@@ -430,7 +430,7 @@ Standard_Boolean Font_BRepFont::renderGlyph (const Sta + for (short aContour = 0, aStartIndex = 0; aContour < anOutline.n_contours; ++aContour) + { + const FT_Vector* aPntList = &anOutline.points[aStartIndex]; +- const char* aTags = &anOutline.tags[aStartIndex]; ++ const auto* aTags = &anOutline.tags[aStartIndex]; + const short anEndIndex = anOutline.contours[aContour]; + const short aPntsNb = (anEndIndex - aStartIndex) + 1; + aStartIndex = anEndIndex + 1;