CVS commit: pkgsrc/x11/p5-Tk

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Thu Jan  1 09:36:09 UTC 2026

Modified Files:
        pkgsrc/x11/p5-Tk: Makefile distinfo
Added Files:
        pkgsrc/x11/p5-Tk/patches: patch-config_pregcomp2.c patch-pTk_Xlib.t
            patch-pTk_mTk_generic_tkEvent.c patch-pTk_mTk_generic_tkImage.c

Log Message:
(x11/p5-Tk) Updated 804.035 to 804.036

(upstream)
Tk-804.036 release (2021-02-14)
------------------
This is basically the same like Tk-804.035_501.

Tk-804.035_501 release (2021-02-07)
----------------------
Fixes
 Compiles again with Strawberry Perl 5.32.x (RT #133260) (H.Merijn Brand)

 Fix double free in validatecommand (RT #102648) (fvogel)

 myConfig: add ability to define HAVE_INTTYPES_H (Christopher Chavez)

 Smaller build improvements and typo corrections (Ed J., Christopher Chavez)

 Prevent some compiler warnings (Christopher Chavez)

Documentation
 Several smaller Pod fixes (Christopher Chavez, asb-capfan)

Tests
 Introduce CI testing with github actions

(pkgsrc)
Fix build with gcc-14.3.0 (NetBSD 11.99.3).
This fix is experimental, not really sophisticated,
please improve, thanks


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/x11/p5-Tk/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/p5-Tk/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/p5-Tk/patches/patch-config_pregcomp2.c \
    pkgsrc/x11/p5-Tk/patches/patch-pTk_Xlib.t \
    pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkEvent.c \
    pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkImage.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/p5-Tk/Makefile
diff -u pkgsrc/x11/p5-Tk/Makefile:1.105 pkgsrc/x11/p5-Tk/Makefile:1.106
--- pkgsrc/x11/p5-Tk/Makefile:1.105     Fri Jul  4 08:49:38 2025
+++ pkgsrc/x11/p5-Tk/Makefile   Thu Jan  1 09:36:08 2026
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.105 2025/07/04 08:49:38 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2026/01/01 09:36:08 mef Exp $
 
-DISTNAME=      Tk-804.035
+DISTNAME=      Tk-804.036
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   6
 CATEGORIES=    x11 tk perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Tk/}
 
@@ -24,6 +23,8 @@ REPLACE_PERL+=                pTk/Tcl-pTk
 REPLACE_PERL+=         pTk/mkVFunc
 REPLACE_PERL+=         demos/widget
 
+CFLAGS+=       -Wno-incompatible-pointer-types
+
 pre-configure:
        ${FIND} ${WRKSRC} -name "*.orig" -type f | ${XARGS} ${RM} -f
 

Index: pkgsrc/x11/p5-Tk/distinfo
diff -u pkgsrc/x11/p5-Tk/distinfo:1.28 pkgsrc/x11/p5-Tk/distinfo:1.29
--- pkgsrc/x11/p5-Tk/distinfo:1.28      Tue Oct 26 11:34:18 2021
+++ pkgsrc/x11/p5-Tk/distinfo   Thu Jan  1 09:36:08 2026
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.28 2021/10/26 11:34:18 nia Exp $
+$NetBSD: distinfo,v 1.29 2026/01/01 09:36:08 mef Exp $
 
-BLAKE2s (Tk-804.035.tar.gz) = 9daf1ce5a2f443055e04be6cd5c553d9db64efdc81989a5c7564e733e9b7c0e9
-SHA512 (Tk-804.035.tar.gz) = ff6a236e7a2b25ff759a1bfdff517524ade337a03e6da8524f29b9ff958b4e01fe527e53fa7884179f3b1a15c0419a554eeedd471eb4c2f3a1baac5cc3ae1daa
-Size (Tk-804.035.tar.gz) = 7024487 bytes
+BLAKE2s (Tk-804.036.tar.gz) = 29e456ac1655ea46dea54cb080a9c90ed66ca7b3a6126105e71a9b32d1e1ba15
+SHA512 (Tk-804.036.tar.gz) = 7d8b82127a5fdbb2f0387f541af8844a09f1230f377b92d511ecb12e81bfd5ef56d4fe925cac064a798a96a003bb8465b6df37cff18a960f3631bb3a214cd812
+Size (Tk-804.036.tar.gz) = 7024993 bytes
 SHA1 (patch-aa) = 7f4a97b0f97e474ce6f0d0cfeb9d49e8eb703917
 SHA1 (patch-ac) = 8918f9a9dfd884ed8d7b76b0615e266ffa392a44
 SHA1 (patch-ad) = 09e322a0adf7c8abf98d2ed202c1f52e6bca97f6
 SHA1 (patch-ai) = f6ef20cb48f3ee08335a6410e873f3b5aa277b20
 SHA1 (patch-aj) = ba3dfe1e7b7a19af1240b37186ab69d857d925f4
+SHA1 (patch-config_pregcomp2.c) = 2ad3c3b806f3367e18908b3e3e123e645d7877d2
+SHA1 (patch-pTk_Xlib.t) = d44011e277f28c1893cb623c82a126ea43cc46f1
+SHA1 (patch-pTk_mTk_generic_tkEvent.c) = 67661b11776390a4bf293d1a9d965cdfd03c9d74
+SHA1 (patch-pTk_mTk_generic_tkImage.c) = 13e2342ad7753c27b00c3224830587a3c24728ca

Added files:

Index: pkgsrc/x11/p5-Tk/patches/patch-config_pregcomp2.c
diff -u /dev/null pkgsrc/x11/p5-Tk/patches/patch-config_pregcomp2.c:1.1
--- /dev/null   Thu Jan  1 09:36:09 2026
+++ pkgsrc/x11/p5-Tk/patches/patch-config_pregcomp2.c   Thu Jan  1 09:36:08 2026
@@ -0,0 +1,33 @@
+$NetBSD: patch-config_pregcomp2.c,v 1.1 2026/01/01 09:36:08 mef Exp $
+
+
+https://src.fedoraproject.org/rpms/perl-Tk/blob/rawhide/f/perl-Tk-pregcomp2.c-Avoid-using-incompatible-pointer-type.patch
+
+From: Christopher Chavez <chrischavez%gmx.us@localhost>
+Date: Mon, 19 Feb 2024 13:50:44 -0600
+Subject: [PATCH] pregcomp2.c: Avoid using incompatible pointer type
+
+See https://github.com/eserte/perl-tk/issues/98#issuecomment-1948125587
+
+
+gcc-14.3.0 flags as follows
+/export/WRKOBJDIR/x11/p5-Tk/work/.buildlink/lib/perl5/5.42.0/x86_64-netbsd-thread-multi/CORE/embed.h:511:10: note: macro "pregcomp" defined here
+  511 | # define pregcomp(a,b)                          Perl_pregcomp(aTHX_ a,b)
+      |          ^~~~~~~~
+tkGlue.c:5262:11: error: 'pregcomp' undeclared (first use in this function); did you mean 'regcomp_t'?
+ 5262 |  p->pat = pregcomp(string,string+len,p->flags);
+      |           ^~~~~~~~
+      |           regcomp_t
+tkGlue.c:5262:11: note: each undeclared identifier is reported only once for each function it appears in
+*** Error code 1
+
+
+--- config/pregcomp2.c
++++ config/pregcomp2.c
+@@ -4,5 +4,5 @@
+ 
+ int main() {
+     SV* sv = newSViv(0);
+-    regexp* rx = pregcomp(sv, 0);
++    void* rx = pregcomp(sv, 0);
+ }
Index: pkgsrc/x11/p5-Tk/patches/patch-pTk_Xlib.t
diff -u /dev/null pkgsrc/x11/p5-Tk/patches/patch-pTk_Xlib.t:1.1
--- /dev/null   Thu Jan  1 09:36:09 2026
+++ pkgsrc/x11/p5-Tk/patches/patch-pTk_Xlib.t   Thu Jan  1 09:36:08 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-pTk_Xlib.t,v 1.1 2026/01/01 09:36:08 mef Exp $
+
+https://bugs.gentoo.org/883391
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271521
+https://cgit.freebsd.org/ports/commit/?id=ecedf2f3cd2c933fb5df179f174c704c89cf1f31
+
+--- pTk/Xlib.t
++++ 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
Index: pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkEvent.c
diff -u /dev/null pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkEvent.c:1.1
--- /dev/null   Thu Jan  1 09:36:09 2026
+++ pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkEvent.c    Thu Jan  1 09:36:08 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-pTk_mTk_generic_tkEvent.c,v 1.1 2026/01/01 09:36:08 mef Exp $
+
+gcc-14.3.0 flags as following
+
+tkEvent.c: In function 'TkCurrentTime':
+tkEvent.c:1154:1: error: type of 'fallbackCurrent' defaults to 'int' [-Wimplicit-int]
+ 1154 | TkCurrentTime(dispPtr, fallbackCurrent)
+      | ^~~~~~~~~~~~~
+*** Error code 1
+
+--- pTk/mTk/generic/tkEvent.c.orig     2013-11-16 08:50:03.000000000 +0900
++++ pTk/mTk/generic/tkEvent.c  2026-01-01 17:49:38.242507990 +0900
+@@ -1153,6 +1153,7 @@ TkEventDeadWindow(winPtr)
+ Time
+ TkCurrentTime(dispPtr, fallbackCurrent)
+     TkDisplay *dispPtr;               /* Display for which the time is desired. */
++    int fallbackCurrent;
+ {
+     register XEvent *eventPtr;
+     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
Index: pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkImage.c
diff -u /dev/null pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkImage.c:1.1
--- /dev/null   Thu Jan  1 09:36:09 2026
+++ pkgsrc/x11/p5-Tk/patches/patch-pTk_mTk_generic_tkImage.c    Thu Jan  1 09:36:08 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-pTk_mTk_generic_tkImage.c,v 1.1 2026/01/01 09:36:08 mef Exp $
+
+gcd-14.3.9 flags as follows
+
+tkImage.c:1080:1: error: type of 'imgHeight' defaults to 'int' [-Wimplicit-int]
+tkImage.c:1086:5: error: declaration for parameter 'imgHeitht' but no such parameter
+ 1086 | int imgHeitht;
+      |     ^~~~~~~~~
+*** Error code 1
+
+--- pTk/mTk/generic/tkImage.c 2026-01-01 17:59:04.418755442 +0900
++++ pTk/mTk/generic/tkImage.c 2026-01-01 17:59:04.418755442 +0900
+@@ -1083,6 +1083,8 @@ int x;
+ int y;
+ int width;
+ int height;
++int imgHeight;
++int imgWidth;
+ {
+     Tk_Tile tile = (Tk_Tile) clientData;
+     Tk_TileChange *handler;