Attachment 242288 Details for Bug 271521 – x11-toolkits/p5-Tk: fix build with clang 16

[patch] x11-toolkits/p5-Tk: fix build with clang 16

x11-toolkits__p5-Tk-fix-clang16-build-1.diff (text/plain), 1.56 KB, created by Dimitry Andric on 2023-05-19 20:35:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2023-05-19 20:35:35 UTC

Size: 1.56 KB

patch

obsolete

>commit 3a45aae4f08284e34004cef47292fd0494cff52d
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   2023-05-19 22:32:01 +0200
>
>    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.
>
>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

Actions: View | Diff

Attachments on bug 271521: 242288