Source: tkrat
Version: 2.2cvs20100105-true-dfsg-6.1
Severity: important
Tags: patch

Dear Maintainer,

We plan to remove Tcl/Tk 8.5 from Debian as it's reached its end of life.
So please, switch to a more modern Tcl/Tk version for the tkrat package.

If you don't mind I'll do a NMU with the attached changes, which switch
to Tcl/Tk 8.6. There's a bit more than just replacing 8.5 by 8.6 as tkrat
redefines a few internal Tk functions, which prototypes has been changes
in 8.6.

-- System Information:
Debian Release: 9.3
  APT prefers stable-debug
  APT policy: (500, 'stable-debug'), (500, 'proposed-updates'), (500, 
'stable'), (1, 'unstable'), (1, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.14.0-0.bpo.3-amd64 (SMP w/12 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- no debconf information
diff -Nru tkrat-2.2cvs20100105-true-dfsg/debian/changelog 
tkrat-2.2cvs20100105-true-dfsg/debian/changelog
--- tkrat-2.2cvs20100105-true-dfsg/debian/changelog     2017-01-13 
02:50:31.000000000 +0300
+++ tkrat-2.2cvs20100105-true-dfsg/debian/changelog     2018-01-21 
15:33:40.000000000 +0300
@@ -1,3 +1,10 @@
+tkrat (1:2.2cvs20100105-true-dfsg-6.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Switch to Tcl/Tk 8.6 from Tcl/Tk 8.5 which is to be removed from Debian.
+
+ -- Sergei Golovan <[email protected]>  Sun, 21 Jan 2018 15:33:40 +0300
+
 tkrat (1:2.2cvs20100105-true-dfsg-6.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru tkrat-2.2cvs20100105-true-dfsg/debian/control 
tkrat-2.2cvs20100105-true-dfsg/debian/control
--- tkrat-2.2cvs20100105-true-dfsg/debian/control       2017-01-13 
02:50:31.000000000 +0300
+++ tkrat-2.2cvs20100105-true-dfsg/debian/control       2018-01-21 
15:33:40.000000000 +0300
@@ -11,10 +11,11 @@
  autotools-dev,
  libssl1.0-dev,
  libpam-dev,
- tk8.5-dev,
+ tk8.6-dev,
 Build-Conflicts:
  autoconf2.13,
- tk8.6-dev,
+ tk8.5-dev,
+ tk8.7-dev
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/collab-maint/tkrat.git
 Vcs-browser: http://git.debian.org/?p=collab-maint/tkrat.git
@@ -22,7 +23,7 @@
 
 Package: tkrat
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.5
+Depends: ${shlibs:Depends}, ${misc:Depends}, tk8.6
 Provides: imap-client, mail-reader
 Suggests: exim4 | mail-transport-agent
 Description: Mail user agent with POP, IMAP, mh support using Tk
diff -Nru tkrat-2.2cvs20100105-true-dfsg/debian/patches/series 
tkrat-2.2cvs20100105-true-dfsg/debian/patches/series
--- tkrat-2.2cvs20100105-true-dfsg/debian/patches/series        2017-01-13 
02:39:23.000000000 +0300
+++ tkrat-2.2cvs20100105-true-dfsg/debian/patches/series        2018-01-21 
15:33:40.000000000 +0300
@@ -4,3 +4,4 @@
 change_auths_order.patch
 color_flags.patch
 reproducible.patch
+tcltk8.6.patch
diff -Nru tkrat-2.2cvs20100105-true-dfsg/debian/patches/tcltk8.6.patch 
tkrat-2.2cvs20100105-true-dfsg/debian/patches/tcltk8.6.patch
--- tkrat-2.2cvs20100105-true-dfsg/debian/patches/tcltk8.6.patch        
1970-01-01 03:00:00.000000000 +0300
+++ tkrat-2.2cvs20100105-true-dfsg/debian/patches/tcltk8.6.patch        
2018-01-21 15:33:40.000000000 +0300
@@ -0,0 +1,99 @@
+--- a/lib/ratDummy.c
++++ b/lib/ratDummy.c
+@@ -22,11 +22,15 @@
+ #   define CONST85
+ #endif
+ 
++#ifndef CONST86
++#   define CONST86
++#endif
++
+ void
+ Tk_UnmapWindow(Tk_Window tkwin) {}
+ 
+ int
+-Tk_ConfigureValue(Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs,
++Tk_ConfigureValue(Tcl_Interp * interp, Tk_Window tkwin, CONST86 Tk_ConfigSpec 
* specs,
+                 char * widgRec, CONST84 char * argvName, int flags)
+ {
+     return 0;
+@@ -63,14 +67,14 @@
+     return 0;
+ }
+ int
+-Tk_ConfigureInfo (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs,
++Tk_ConfigureInfo (Tcl_Interp * interp, Tk_Window tkwin, CONST86 Tk_ConfigSpec 
* specs,
+                 char * widgRec, CONST84 char * argvName, int flags)
+ {
+     return 0;
+ }
+ 
+ int
+-Tk_ConfigureWidget (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec 
*specs,
++Tk_ConfigureWidget (Tcl_Interp * interp, Tk_Window tkwin, CONST86 
Tk_ConfigSpec *specs,
+                   int argc, CONST84 char ** argv, char * widgRec, int flags)
+ {
+     return 0;
+@@ -87,7 +91,7 @@
+ Tk_DestroyWindow (Tk_Window tkwin) {}
+ 
+ void
+-Tk_FreeOptions (Tk_ConfigSpec * specs, char * widgRec, Display * display,
++Tk_FreeOptions (CONST86 Tk_ConfigSpec * specs, char * widgRec, Display * 
display,
+               int needFlags) {}
+ 
+ void
+--- a/util/rat_dummy.c
++++ b/util/rat_dummy.c
+@@ -24,12 +24,16 @@
+ #   define CONST85
+ #endif
+ 
++#ifndef CONST86
++#   define CONST86
++#endif
++
+ void
+ Tk_UnmapWindow(Tk_Window tkwin) {}
+ 
+ int
+ Tk_ConfigureValue(Tcl_Interp * interp, Tk_Window tkwin,
+-      Tk_ConfigSpec * specs, char * widgRec, CONST84 char * argvName, int 
flags)
++      CONST86 Tk_ConfigSpec * specs, char * widgRec, CONST84 char * argvName, 
int flags)
+ {
+     return 0;
+ }
+@@ -66,7 +70,7 @@
+ }
+ 
+ int
+-Tk_ConfigureInfo (Tcl_Interp * interp, Tk_Window tkwin, Tk_ConfigSpec * specs,
++Tk_ConfigureInfo (Tcl_Interp * interp, Tk_Window tkwin, CONST86 Tk_ConfigSpec 
* specs,
+                 char * widgRec, CONST84 char * argvName, int flags)
+ {
+     return 0;
+@@ -74,7 +78,7 @@
+ 
+ int
+ Tk_ConfigureWidget (Tcl_Interp * interp, Tk_Window tkwin,
+-                  Tk_ConfigSpec * specs, int argc, CONST84 char ** argv,
++                  CONST86 Tk_ConfigSpec * specs, int argc, CONST84 char ** 
argv,
+                   char * widgRec, int flags)
+ {
+     return 0;
+@@ -91,7 +95,7 @@
+ Tk_DestroyWindow (Tk_Window tkwin) {}
+ 
+ void
+-Tk_FreeOptions (Tk_ConfigSpec * specs, char * widgRec, Display * display,
++Tk_FreeOptions (CONST86 Tk_ConfigSpec * specs, char * widgRec, Display * 
display,
+               int needFlags) {}
+ 
+ void
+@@ -172,5 +176,5 @@
+ }
+ 
+ void
+-Tk_SetClassProcs(Tk_Window tkwin, Tk_ClassProcs *procs,
++Tk_SetClassProcs(Tk_Window tkwin, CONST86 Tk_ClassProcs *procs,
+               ClientData instanceData) {}

Reply via email to