From nobody Fri May 19 22:18:06 2023 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 4QNLnp3k6Bz4CRWr; Fri, 19 May 2023 22:18:06 +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 4QNLnp3GSPz3p1j; Fri, 19 May 2023 22:18:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684534686; 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=47S9lLm6DGUaZOdjoeeNQ7Dg5WrB+0SwJwt9z3RyHx8=; b=Pem3ZlCcMTHmq6f19yXAB+6m5W5eaa+WLaC3+MVKLYEYlhEVjjscxcD477cik+6CSBjICn UgzJna6yufFMwA9dGjRsM3xjSEu5Ezlt0fOlOUAEWcb/RReviSAojLCI7HtOvEvxsuR65d 45+YJF7BVyidCQCRqt0b01rquv7MUcRkhvzGbQB+e4us4mazzJ/I1j46akGmzEQEH5gnwb jcscsGpm758ZThJy+iEaVMMJWKfsWCGJMRi2Dx2ommABgZ7gNxGuf7IphIoCUrqb1p/Y7h 6EO39Fn4ZdxWnU0zAnYhHL0Y8rAANQ/5bYt5b6GN+EzS4toMvrhq4DkN+7mwKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684534686; 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=47S9lLm6DGUaZOdjoeeNQ7Dg5WrB+0SwJwt9z3RyHx8=; b=YXQGIa3fISglVkSKZKFKrj7ZSXT+HxKz+NMkz69I5RY0zol71khpCIUlr4YPX3tdVkbhMe 2opTBiR+rnhoa/ZwmISDuepZ2Rr1gAa6qm9mLbTYXKaq5Cbztsa7+1t+2DgK3Y4ZjENfVc JxXN9G++ThDAVhnSBxbEhIKsYO4g/6sa3/2aHAz/j6BkTPAJqh41jlxHM1OwMJ87F+KY5C IRlN9/Ve4hBXyXhJScFscajCOPaujBfCX9szXBjeXvgFlv8VnyhVOV8VoUILLqUAKm1tfx 1rizDjSX08otunJ6cIAeCcqZFQ4yoLzYj39XWdNdXXrQA2tq+y9jMxRl+opQDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684534686; a=rsa-sha256; cv=none; b=csv8hOm3T62qJOvGlFIv5HOftkPAl6CdX2H5Rt9jKERho2eW8KGWQhDxsOAOwt8aXCPlG8 rHKDlp7mTAmxIU0yYNJTlAG33WaRcj9PEMDF+D7tNr+q7z+Dn193W0eLdmwNTBWv4Q7CA6 n9DATsbRKsxT9zXOKNXLKwwrAv1cQHlco5ywPAu+vTFeiugw+Y430FFJeRE5+BE2GpEVOr rAc4HZqvoW8mSyMD7aZ5aWHPX5L6DcbSncZkmx+bPSARKJXqZa3I8s2Ro0re/USYOVWVSc MjXxl+hHMAhXkya5/kOLSJgUtEboTbaLkngtiMF4IZDCBbKJZugk5Emy0lbxlw== 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 4QNLnp2FC0zlQy; Fri, 19 May 2023 22:18:06 +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 34JMI6WA000585; Fri, 19 May 2023 22:18:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34JMI6kI000584; Fri, 19 May 2023 22:18:06 GMT (envelope-from git) Date: Fri, 19 May 2023 22:18:06 GMT Message-Id: <202305192218.34JMI6kI000584@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: ecedf2f3cd2c - main - x11-toolkits/p5-Tk: fix build with clang 16 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecedf2f3cd2c933fb5df179f174c704c89cf1f31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=ecedf2f3cd2c933fb5df179f174c704c89cf1f31 commit ecedf2f3cd2c933fb5df179f174c704c89cf1f31 Author: Dimitry Andric AuthorDate: 2023-05-19 20:32:01 +0000 Commit: Dimitry Andric CommitDate: 2023-05-19 22:16:54 +0000 x11-toolkits/p5-Tk: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building x11-toolkits/p5-Tk: ./Xlib.t:334:14: error: incompatible function pointer types initializing 'KeySym (*)(Display *, unsigned int, int)' (aka 'unsigned long (*)(struct _XDisplay *, unsigned int, int)') with an expression of type 'KeySym (Display *, KeyCode, int)' (aka 'unsigned long (struct _XDisplay *, unsigned char, int)') [-Wincompatible-function-pointer-types] VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int))) ^~~~~~~~~~~~~~~~ Indeed, the XKeycodeToKeysum function takes a 'KeyCode' as its second parameter. Patch Xlib.t to make it so. PR: 271521 Approved by: pi (maintainer) MFH: 2023Q2 --- x11-toolkits/p5-Tk/Makefile | 1 + x11-toolkits/p5-Tk/files/patch-pTk_Xlib.t | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index 0db4f25edb56..8464d25b39fa 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/x11-toolkits/p5-Tk/Makefile @@ -1,5 +1,6 @@ PORTNAME= Tk PORTVERSION= 804.035 +PORTREVISION= 1 CATEGORIES= x11-toolkits tk perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/x11-toolkits/p5-Tk/files/patch-pTk_Xlib.t b/x11-toolkits/p5-Tk/files/patch-pTk_Xlib.t new file mode 100644 index 000000000000..cb847e09a554 --- /dev/null +++ b/x11-toolkits/p5-Tk/files/patch-pTk_Xlib.t @@ -0,0 +1,11 @@ +--- pTk/Xlib.t.orig 2023-05-19 20:18:20 UTC ++++ pTk/Xlib.t +@@ -331,7 +331,7 @@ VFUNC(int,XIntersectRegion,V_XIntersectRegion,_ANSI_AR + #endif /* !DO_X_EXCLUDE */ + + #ifndef XKeycodeToKeysym +-VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, unsigned int, int))) ++VFUNC(KeySym,XKeycodeToKeysym,V_XKeycodeToKeysym,_ANSI_ARGS_((Display *, KeyCode, int))) + #endif /* #ifndef XKeycodeToKeysym */ + + #ifndef XKeysymToString