From nobody Tue May 02 16:27:36 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 4Q9lqD4h5nz497T4; Tue, 2 May 2023 16:27:36 +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 4Q9lqD2cPfz4Pmk; Tue, 2 May 2023 16:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683044856; 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=Ai855rFQvRHyn+xNoEqtyuQUtKKxOlQcGrVbym9weVE=; b=llHiSksvzG8Bt2N0tMmG0sWrsyk9+obLgvdBbqKboY7WVjFUL9o1Pcz85OSonpLlwzkrg4 gKIfI4UJrXqFHdr8AQcy5FpC5wlY69uiokMIhsbpfx3rN9PJN72BvL76tpHoffOSEgvy4V weiZjrz3z53g90cpH9N5AEmAH1ENM5C/D5kaQcvEPcHi9VXk/1GXZVTk0Hs6ZB1LHMAKrZ TM6Y8aVXcxIpeD93sdXzLSPplgdu8YXyQ6tRl0I84mbSjfYVxYOklPsEMAFUHMJ6DkA+Xm wZk96EY2wKnDSFwtliKImP4RhtbW1GBdVXAAkTXmR+WCLdk6Olg6Sl0jbw9rKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683044856; 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=Ai855rFQvRHyn+xNoEqtyuQUtKKxOlQcGrVbym9weVE=; b=DDUy0aOIWxWb7tEe3tCwcCaFfHE4O0NNIMzeSwqTBu3JLyb5dNZq9HzdfKc2eokXQPxhiF 114VLko1YNBCckgTVALIolKgEtV9dQGxrM3OsMijhDy88VE2M9BJInbpLbc0448+RyT8hl /MT1qlv46SLm2xTEL4z/+GGvtm3xy7u7nmdHjRMRSm42B28jMzlmxNvv7YjdvIVoJJEqPl skF1Tmal0UnKD2qdWqYM1mV4XR3Raa7WV4VHSi99ygZsTNI94RX3MEl8ahbYV8W01C+cNV 8Zcx4Tn0ELVevU8cMTeYxN4CBqraf9qivFIwxRqa2+ceUuMTC4yH7JrTK08WQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683044856; a=rsa-sha256; cv=none; b=Nyg9+DSU41raiI89W6358WzJCF1M8VVmbT9ZdRWvex3bhzYGgWSJx69v/jkoMwMyWyFA/l wCxFjRdc4ZEn3gBSBsQmvVrtCjj9woCOOpsuxE3B/2TFk02/YdrAcNcNvt4U1oXI5SV7yL GOd7YnIex+uqPg/4jUVgAudxYd26BMfxVUV6b+vTEyR4exdQqdWiUwXQKB7RpApaZjQw8l liqBayn7ssP9oQgy8fZYI5AaaeRZrvLDHdgP/mpDpC0eNYkY0LB38qdI8G+/Kqi2F0FTnp p81HN8N6QBBgbBeWy6/uxybX/402uIHjYExGJ4LM/gZDQH2iufF7+lgX3Pk8oA== 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 4Q9lqD1kVKzvpb; Tue, 2 May 2023 16:27:36 +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 342GRaVv073942; Tue, 2 May 2023 16:27:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 342GRa3f073941; Tue, 2 May 2023 16:27:36 GMT (envelope-from git) Date: Tue, 2 May 2023 16:27:36 GMT Message-Id: <202305021627.342GRa3f073941@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 11c6a4616164 - main - x11-fonts/afdko: Fix build on 14-CURRENT 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11c6a4616164755520ea5b3a93679b28bd10cfdf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=11c6a4616164755520ea5b3a93679b28bd10cfdf commit 11c6a4616164755520ea5b3a93679b28bd10cfdf Author: Po-Chuan Hsieh AuthorDate: 2023-05-02 16:19:47 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-05-02 16:19:47 +0000 x11-fonts/afdko: Fix build on 14-CURRENT /wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:1246:20: error: incompatible integer to pointer conversion passing 'int' to parameter of type 'char *' [-Wint-conversion] message(h, ufoErrParse, "Encountered glyph reference %s in alternate layer's contents.plist with an empty file path. ", glyphName); ^~~~~~~~~~~ /wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:396:47: note: passing argument to parameter 'fmt' here static void CTL_CDECL message(ufoCtx h, char* fmt, ...) { ^ /wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:2012:16: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'long' [-Wint-conversion] return NULL; ^~~~ /usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ /wrkdirs/usr/ports/x11-fonts/afdko/work/afdko-3.9.5/c/shared/source/uforead/uforead.c:2027:16: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'unsigned long' [-Wint-conversion] return NULL; ^~~~ /usr/include/sys/_null.h:34:14: note: expanded from macro 'NULL' #define NULL ((void *)0) ^~~~~~~~~~~ 3 errors generated. Reference: https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/pdf5b273c8e36_s83d5725005/logs/afdko-3.9.5.log --- .../files/patch-c-shared-source-uforead-uforead.c | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c b/x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c new file mode 100644 index 000000000000..0d5adae31404 --- /dev/null +++ b/x11-fonts/afdko/files/patch-c-shared-source-uforead-uforead.c @@ -0,0 +1,29 @@ +--- c/shared/source/uforead/uforead.c.orig 2023-04-24 14:46:56 UTC ++++ c/shared/source/uforead/uforead.c +@@ -1243,7 +1243,7 @@ static void updateGLIFRec(ufoCtx h, char* glyphName, x + if (fileName == NULL) { + /* this is basically muted for now, as the previous check will return and skip if not parseable. + We'll add this back once we add verbosity flag */ +- message(h, ufoErrParse, "Encountered glyph reference %s in alternate layer's contents.plist with an empty file path. ", glyphName); ++ message(h, "Encountered glyph reference %s in alternate layer's contents.plist with an empty file path. ", glyphName); + return; + } + +@@ -2009,7 +2009,7 @@ static long strtolCheck(ufoCtx h, char* keyValue, bool + fatal(h, ufoErrParse, msg); + else if (msg) + message(h, msg); +- return NULL; ++ return 0; + } + } + +@@ -2024,7 +2024,7 @@ static unsigned long strtoulCheck(ufoCtx h, char* keyV + fatal(h, ufoErrParse, msg); + else if (msg) + message(h, msg); +- return NULL; ++ return 0; + } + } +