Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (48c7b3b0d55f2b48c8d4222bccd014248a1db4ef)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (48c7b3b0d55f2b48c8d4222bccd014248a1db4ef)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (48c7b3b0d55f2b48c8d4222bccd014248a1db4ef)
  • Date: Sat, 12 Sep 2026 22:04:41 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

perl-cpan/perl-tk/BUILD | 2
perl-cpan/perl-tk/HISTORY | 6
perl-cpan/perl-tk/PRE_BUILD | 4
perl-cpan/perl-tk/pTk_mTk_generic_tkBind_c.patch | 13
perl-cpan/perl-tk/patches/0001-Fix-build-against-Perl-5.44.patch | 143
++++++++++
perl-cpan/perl-tk/patches/0001-Fix-build-againt-GCC-14-.patch | 57 +++
perl-cpan/perl-tk/patches/pTk_mTk_generic_tkBind_c.patch | 25 +
7 files changed, 235 insertions(+), 15 deletions(-)

New commits:
commit 48c7b3b0d55f2b48c8d4222bccd014248a1db4ef
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

perl-tk: Fix build against modern GCC & Perl

diff --git a/perl-cpan/perl-tk/BUILD b/perl-cpan/perl-tk/BUILD
new file mode 100755
index 0000000..ff2e6ec
--- /dev/null
+++ b/perl-cpan/perl-tk/BUILD
@@ -0,0 +1,2 @@
+force_dialect c17 &&
+default_build
diff --git a/perl-cpan/perl-tk/HISTORY b/perl-cpan/perl-tk/HISTORY
index ed2e9cb..f4461ca 100644
--- a/perl-cpan/perl-tk/HISTORY
+++ b/perl-cpan/perl-tk/HISTORY
@@ -1,3 +1,9 @@
+2026-09-12 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, patches/0001-Fix-build-against-Perl-5.44.patch,
+ patches/0001-Fix-build-againt-GCC-14-.patch:
+ fixed build against GCC 14+ & perl 5.44+
+ * patches/pTk_mTk_generic_tkBind_c.patch: normalized
+
2015-10-28 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 804.033

diff --git a/perl-cpan/perl-tk/PRE_BUILD b/perl-cpan/perl-tk/PRE_BUILD
index 3f85e30..8e896c4 100755
--- a/perl-cpan/perl-tk/PRE_BUILD
+++ b/perl-cpan/perl-tk/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
-patch $SOURCE_DIRECTORY/pTk/mTk/generic/tkBind.c \
- $SCRIPT_DIRECTORY/pTk_mTk_generic_tkBind_c.patch
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/perl-cpan/perl-tk/pTk_mTk_generic_tkBind_c.patch
b/perl-cpan/perl-tk/pTk_mTk_generic_tkBind_c.patch
deleted file mode 100644
index bc81db7..0000000
--- a/perl-cpan/perl-tk/pTk_mTk_generic_tkBind_c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur Tk-804.028.orig/pTk/mTk/generic/tkBind.c
Tk-804.028.new/pTk/mTk/generic/tkBind.c
---- Tk-804.028.orig/pTk/mTk/generic/tkBind.c 2007-09-16 13:08:48.000000000
-0700
-+++ Tk-804.028.new/pTk/mTk/generic/tkBind.c 2009-01-13 16:35:38.492005068
-0800
-@@ -629,6 +629,9 @@
- /* ColormapNotify */ COLORMAP,
- /* ClientMessage */ 0,
- /* MappingNotify */ 0,
-+#ifdef GenericEvent
-+ /* GenericEvent */ 0,
-+#endif
- /* VirtualEvent */ VIRTUAL,
- /* Activate */ ACTIVATE,
- /* Deactivate */ ACTIVATE,
diff --git a/perl-cpan/perl-tk/patches/0001-Fix-build-against-Perl-5.44.patch
b/perl-cpan/perl-tk/patches/0001-Fix-build-against-Perl-5.44.patch
new file mode 100644
index 0000000..cc3d944
--- /dev/null
+++ b/perl-cpan/perl-tk/patches/0001-Fix-build-against-Perl-5.44.patch
@@ -0,0 +1,143 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sat, 12 Sep 2026 20:50:53 +0200
+Subject: [PATCH] Fix build against Perl 5.44
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ Event/Event.xs | 2 +-
+ config/pregcomp2.c | 2 +-
+ encGlue.c | 29 +++++++++++------------------
+ objGlue.c | 5 ++++-
+ tkGlue.c | 6 +-----
+ 5 files changed, 20 insertions(+), 24 deletions(-)
+
+--- a/config/pregcomp2.c
++++ b/config/pregcomp2.c
+@@ -4,5 +4,5 @@
+
+ int main() {
+ SV* sv = newSViv(0);
+- regexp* rx = pregcomp(sv, 0);
++ REGEXP* rx = pregcomp(sv, 0);
+ }
+--- a/encGlue.c
++++ b/encGlue.c
+@@ -27,10 +27,6 @@
+
+ #ifdef SvUTF8
+
+-#ifndef utf8_to_uv
+-#define utf8_to_uv utf8_to_uvchr
+-#endif
+-
+ #ifndef UTF8_MAXBYTES_CASE
+ #define UTF8_MAXBYTES_CASE UTF8_MAXLEN_UCLC
+ #endif
+@@ -79,28 +75,28 @@
+ Tcl_UniCharIsAlpha(int ch)
+ {
+ dTHX;
+- return Perl_is_uni_alpha(aTHX_ ch);
++ return isALPHA_uvchr(ch);
+ }
+
+ int
+ Tcl_UniCharIsWordChar(int ch)
+ {
+ dTHX;
+- return Perl_is_uni_alnum(aTHX_ ch);
++ return isWORDCHAR_uvchr(ch);
+ }
+
+ int
+ Tcl_UniCharIsSpace(int ch)
+ {
+ dTHX;
+- return Perl_is_uni_space(aTHX_ ch);
++ return isSPACE_uvchr(ch);
+ }
+
+ int
+ Tcl_UniCharIsUpper(int ch)
+ {
+ dTHX;
+- return Perl_is_uni_upper(aTHX_ ch);
++ return isUPPER_uvchr(ch);
+ }
+
+ int
+@@ -152,13 +148,8 @@
+ Tcl_UtfToUniChar (CONST char * src,Tcl_UniChar * chPtr)
+ {
+ dTHX;
+-#if defined(utf8_to_uvchr)
+ STRLEN len;
+- *chPtr = utf8_to_uv((U8 *)src,&len);
+-#else
+- I32 len;
+- *chPtr = utf8_to_uv((U8 *)src,&len);
+-#endif
++ *chPtr = utf8_to_uvchr_buf((U8 *)src, (U8 *)src + UTF8_CHK_SKIP(src),
&len);
+ return len;
+ }
+
+@@ -273,7 +264,7 @@
+ while (*s)
+ {
+ STRLEN len;
+- Perl_to_utf8_lower(aTHX_ s, d, &len );
++ toLOWER_utf8_safe(s, s + UTF8_CHK_SKIP(s), d, &len );
+ d += len;
+ s += len;
+ }
+@@ -290,7 +281,7 @@
+ while (*s)
+ {
+ STRLEN len;
+- Perl_to_utf8_upper(aTHX_ s, d, &len );
++ toUPPER_utf8_safe(s, s + UTF8_CHK_SKIP(s), d, &len );
+ d += len;
+ s += len;
+ }
+--- a/objGlue.c
++++ b/objGlue.c
+@@ -627,7 +627,10 @@
+ sv_utf8_downgrade(objPtr, 0);
+ if (lengthPtr)
+ {
+- return (unsigned char *) SvPV(objPtr, *lengthPtr);
++ STRLEN len;
++ unsigned char *s = (unsigned char *) SvPV(objPtr, len);
++ *lengthPtr = (int) len;
++ return s;
+ }
+ else
+ {
+--- a/tkGlue.c
++++ b/tkGlue.c
+@@ -5543,11 +5543,7 @@
+ char *XEventMethods = "abcdfhkmopstvwxyABDEKNRSTWXY#";
+ char buf[128];
+ CV *cv;
+-#if PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 9)
+-#define COP_WARNINGS_TYPE STRLEN*
+-#else
+-#define COP_WARNINGS_TYPE SV*
+-#endif
++#define COP_WARNINGS_TYPE void*
+ #ifdef pWARN_NONE
+ COP_WARNINGS_TYPE old_warn = PL_curcop->cop_warnings;
+ PL_curcop->cop_warnings = pWARN_NONE;
+--- a/Event/Event.xs
++++ b/Event/Event.xs
+@@ -1532,7 +1532,7 @@
+ BOOT:
+ {
+ #ifdef pWARN_NONE
+- SV *old_warn = PL_curcop->cop_warnings;
++ void *old_warn = PL_curcop->cop_warnings;
+ PL_curcop->cop_warnings = pWARN_NONE;
+ #endif
+ newXS("Tk::Event::INIT", XS_Tk__Event_INIT, file);
diff --git a/perl-cpan/perl-tk/patches/0001-Fix-build-againt-GCC-14-.patch
b/perl-cpan/perl-tk/patches/0001-Fix-build-againt-GCC-14-.patch
new file mode 100644
index 0000000..fdea5cb
--- /dev/null
+++ b/perl-cpan/perl-tk/patches/0001-Fix-build-againt-GCC-14-.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Ismael Luceno <ismael AT sourcemage.org>
+Date: Sat, 12 Sep 2026 20:50:53 +0200
+Subject: [PATCH] Fix build againt GCC 14+
+
+Upstream-Status: Pending
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ pTk/Xlib.h | 2 +-
+ pTk/mTk/generic/tkCanvText.c | 2 +-
+ pTk/mTk/generic/tkEvent.c | 1 +
+ pTk/mTk/generic/tkImage.c | 2 ++
+ 4 files changed, 5 insertions(+), 2 deletions(-)
+
+--- a/pTk/Xlib.h
++++ b/pTk/Xlib.h
+@@ -20,7 +20,7 @@
+ extern Window XCreateWindow _ANSI_ARGS_((Display *, Window, int, int,
unsigned int, unsigned int, unsigned int, int, unsigned int, Visual *, long
unsigned int, XSetWindowAttributes *));
+ extern Atom *XListProperties _ANSI_ARGS_((Display *, Window, int *));
+ extern XHostAddress *XListHosts _ANSI_ARGS_((Display *, int *, int *));
+-extern KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *, unsigned int, int));
++extern KeySym XKeycodeToKeysym _ANSI_ARGS_((Display *, KeyCode, int));
+ extern KeySym XStringToKeysym _ANSI_ARGS_((const char *));
+ extern VisualID XVisualIDFromVisual _ANSI_ARGS_((Visual *));
+ extern Window XRootWindow _ANSI_ARGS_((Display *, int));
+--- a/pTk/mTk/generic/tkEvent.c
++++ b/pTk/mTk/generic/tkEvent.c
+@@ -1153,6 +1153,7 @@
+ Time
+ TkCurrentTime(dispPtr, fallbackCurrent)
+ TkDisplay *dispPtr; /* Display for which the time is
desired. */
++ int fallbackCurrent; /* 1 means use current time if no
event. */
+ {
+ register XEvent *eventPtr;
+ ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
+--- a/pTk/mTk/generic/tkImage.c
++++ b/pTk/mTk/generic/tkImage.c
+@@ -1083,6 +1083,8 @@
+ int y;
+ int width;
+ int height;
++int imgWidth;
++int imgHeight;
+ {
+ Tk_Tile tile = (Tk_Tile) clientData;
+ Tk_TileChange *handler;
+--- a/pTk/mTk/generic/tkCanvText.c
++++ b/pTk/mTk/generic/tkCanvText.c
+@@ -1234,7 +1234,7 @@
+ * index. */
+ {
+ TextItem *textPtr = (TextItem *) itemPtr;
+- size_t length;
++ int length;
+ int c;
+ TkCanvas *canvasPtr = (TkCanvas *) canvas;
+ Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
diff --git a/perl-cpan/perl-tk/patches/pTk_mTk_generic_tkBind_c.patch
b/perl-cpan/perl-tk/patches/pTk_mTk_generic_tkBind_c.patch
new file mode 100644
index 0000000..f1421dd
--- /dev/null
+++ b/perl-cpan/perl-tk/patches/pTk_mTk_generic_tkBind_c.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Eric Sandall <sandalle AT sourcemage.org>
+Date: Tue, 13 Jan 2009 16:53:49 -0800
+Subject: [PATCH] Fix missing events
+
+Ref: https://bugs.gentoo.org/238079
+Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=516201
+Upstream-Status: Pending
+---
+ pTk/mTk/generic/tkBind.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff -Naur Tk-804.028.orig/pTk/mTk/generic/tkBind.c
Tk-804.028.new/pTk/mTk/generic/tkBind.c
+--- Tk-804.028.orig/pTk/mTk/generic/tkBind.c 2007-09-16 13:08:48.000000000
-0700
++++ Tk-804.028.new/pTk/mTk/generic/tkBind.c 2009-01-13 16:35:38.492005068
-0800
+@@ -629,6 +629,9 @@
+ /* ColormapNotify */ COLORMAP,
+ /* ClientMessage */ 0,
+ /* MappingNotify */ 0,
++#ifdef GenericEvent
++ /* GenericEvent */ 0,
++#endif
+ /* VirtualEvent */ VIRTUAL,
+ /* Activate */ ACTIVATE,
+ /* Deactivate */ ACTIVATE,

  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (48c7b3b0d55f2b48c8d4222bccd014248a1db4ef), Ismael Luceno, 09/12/2026

Archive powered by MHonArc 2.6.24.

Top of Page