[Pkg-tcltk-devel] Bug#1060702: tcl-itcl4-dev: incr Tcl programs do not compile with tcl8.7-dev

[Rafael Laboissière]

Package: tcl-itcl4-dev
Version: 4.2.3-1
Severity: important
Tags: upstream patch

With the versions of tcl-itcl4-dev (4.2.3-1) and tcl8.7-dev 
(8.7.0~a5+dfsg-3) currently in experimental, this simple example does 
not work:

    $ echo "#include <itcl/itcl.h>" > test.c
    $ gcc -c test.c -I/usr/include/tcl
    In file included from test.c:1:
    /usr/include/itcl/itcl.h:144:5: error: unknown type name 'Tcl_Size'
      144 |     Tcl_Size len;                  /* number of values on stack */
          |     ^~~~~~~~
    /usr/include/itcl/itcl.h:145:5: error: unknown type name 'Tcl_Size'
      145 |     Tcl_Size max;                  /* maximum size of stack */
          |     ^~~~~~~~
    /usr/include/itcl/itcl.h:164:5: error: unknown type name 'Tcl_Size'
      164 |     Tcl_Size num;                  /* number of elements */
          |     ^~~~~~~~

It does work in unstable.

Currently, in experimental, tcl-dev depends on tcl8.7-dev. If this 
packages migrate into unstable, then tcl-itcl4-dev will be broken in a 
serious way. Hence, I am am hereby setting the severity level to 
important.

The patch attached to this bug report seems to fix the problem.

Best,

Rafael

-- System Information: 
Debian Release: 12.0 
  APT prefers testing 
  APT policy: (650, 'testing'), (600, 'unstable') 
Architecture: amd64 (x86_64)

Kernel: Linux 4.18.0-2-amd64 (SMP w/1 CPU thread)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8), LANGUAGE=en_US.utf8
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages tcl-itcl4-dev depends on: 
pn  tcl-dev    <none> 
pn  tcl-itcl4  <none>

tcl-itcl4-dev recommends no packages.

Versions of packages tcl-itcl4-dev suggests: 
pn  tcl-itcl4-doc  <none>
-------------- next part --------------
diff -Nru itcl4-4.2.3/debian/changelog itcl4-4.2.3/debian/changelog
--- itcl4-4.2.3/debian/changelog	2022-11-27 08:34:33.000000000 -0300
+++ itcl4-4.2.3/debian/changelog	2024-01-13 04:53:27.000000000 -0300
@@ -1,3 +1,10 @@
+itcl4 (4.2.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * d/p/tcl-size-define.patch: New patch
+
+ -- Rafael Laboissière <rafael at debian.org>  Sat, 13 Jan 2024 04:53:27 -0300
+
 itcl4 (4.2.3-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru itcl4-4.2.3/debian/patches/series itcl4-4.2.3/debian/patches/series
--- itcl4-4.2.3/debian/patches/series	2022-11-27 08:34:33.000000000 -0300
+++ itcl4-4.2.3/debian/patches/series	2024-01-13 04:53:27.000000000 -0300
@@ -1 +1 @@
-# nothing here
+tcl-size-define.patch
diff -Nru itcl4-4.2.3/debian/patches/tcl-size-define.patch itcl4-4.2.3/debian/patches/tcl-size-define.patch
--- itcl4-4.2.3/debian/patches/tcl-size-define.patch	1969-12-31 21:00:00.000000000 -0300
+++ itcl4-4.2.3/debian/patches/tcl-size-define.patch	2024-01-13 04:41:42.000000000 -0300
@@ -0,0 +1,16 @@
+Description: Allow compilation with Tcl 8.7
+Author: Rafael Laboissière <rafaeln at debian.org>
+Forwarded: no
+Last-Update: 2024-01-13
+
+--- itcl4-4.2.3.orig/generic/itcl.h
++++ itcl4-4.2.3/generic/itcl.h
+@@ -132,7 +132,7 @@ ITCL_EXTERN int Itcl_SafeInit(Tcl_Interp
+ #define ITCL_PRIVATE          3
+ #define ITCL_DEFAULT_PROTECT  4
+ 
+-#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 7) && !defined(Tcl_Size)
++#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 8) && !defined(Tcl_Size)
+ #    define Tcl_Size int
+ #endif
+