[Pkg-tcltk-commits] r1842 - in tclreadline/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2016-10-08 09:12:46 +0000 (Sat, 08 Oct 2016)
New Revision: 1842

Added:
   tclreadline/trunk/debian/patches/ding.patch
   tclreadline/trunk/debian/patches/stubs.patch
Modified:
   tclreadline/trunk/debian/changelog
   tclreadline/trunk/debian/control
   tclreadline/trunk/debian/patches/series
   tclreadline/trunk/debian/rules
Log:
[tclreadline]
  * Fixed implicit function declararion warning (replaced the deprecated
    ding() by rl_ding()).
  * Added a hack to enable Tcl stubs which fixed a bunch of undefined symbols
    from the Tcl library in the resulting libtclreadline.so.
  * Bumped standards version to 3.9.8.


Modified: tclreadline/trunk/debian/changelog
===================================================================
--- tclreadline/trunk/debian/changelog	2016-08-18 12:21:29 UTC (rev 1841)
+++ tclreadline/trunk/debian/changelog	2016-10-08 09:12:46 UTC (rev 1842)
@@ -1,8 +1,12 @@
-tclreadline (2.1.0-15) UNRELEASED; urgency=low
+tclreadline (2.1.0-15) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Fixed implicit function declararion warning (replaced the deprecated
+    ding() by rl_ding()).
+  * Added a hack to enable Tcl stubs which fixed a bunch of undefined symbols
+    from the Tcl library in the resulting libtclreadline.so.
+  * Bumped standards version to 3.9.8.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 21 Mar 2014 11:55:36 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 08 Oct 2016 12:04:28 +0300
 
 tclreadline (2.1.0-14) unstable; urgency=low
 

Modified: tclreadline/trunk/debian/control
===================================================================
--- tclreadline/trunk/debian/control	2016-08-18 12:21:29 UTC (rev 1841)
+++ tclreadline/trunk/debian/control	2016-10-08 09:12:46 UTC (rev 1842)
@@ -4,7 +4,7 @@
 Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), tcl-dev (>= 8.6.0+2), libreadline-dev, autotools-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
 Homepage: http://tclreadline.sourceforge.net/
 
 Package: tcl-tclreadline

Added: tclreadline/trunk/debian/patches/ding.patch
===================================================================
--- tclreadline/trunk/debian/patches/ding.patch	                        (rev 0)
+++ tclreadline/trunk/debian/patches/ding.patch	2016-10-08 09:12:46 UTC (rev 1842)
@@ -0,0 +1,15 @@
+Author: Sergei Golovan
+Description: Patch replaces the deprecated ding() call by rl_ding().
+Last-Modified: Sat, 08 Oct 2016 11:17:43 +0300
+
+--- a/tclreadline.c
++++ b/tclreadline.c
+@@ -419,7 +419,7 @@
+ 	     * settings -- audible or visible.
+ 	     */
+ 
+-	    ding();
++	    rl_ding();
+ 	    break;
+ 
+         case TCLRL_UPDATE:

Modified: tclreadline/trunk/debian/patches/series
===================================================================
--- tclreadline/trunk/debian/patches/series	2016-08-18 12:21:29 UTC (rev 1841)
+++ tclreadline/trunk/debian/patches/series	2016-10-08 09:12:46 UTC (rev 1842)
@@ -10,3 +10,5 @@
 tinfo.patch
 link.patch
 functions.patch
+ding.patch
+stubs.patch

Added: tclreadline/trunk/debian/patches/stubs.patch
===================================================================
--- tclreadline/trunk/debian/patches/stubs.patch	                        (rev 0)
+++ tclreadline/trunk/debian/patches/stubs.patch	2016-10-08 09:12:46 UTC (rev 1842)
@@ -0,0 +1,23 @@
+Author: Sergei Golovan
+Description: Patch initializes the Tcl stub table. So, the tclreadline
+ library doesn't have undefined symbols anymore. The patch is incomplete,
+ it should be accompanied by a patch to configure.in amd Makefile.in.
+ For now, I've just added a few lines to debian/rules to overcome that.
+Last-Modified: Sat, 08 Oct 2016 12:08:16 +0300
+
+--- a/tclreadline.c
++++ b/tclreadline.c
+@@ -559,6 +559,13 @@
+ Tclreadline_Init(Tcl_Interp *interp)
+ {
+     int status;
++
++#ifdef USE_TCL_STUBS
++   if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
++       return TCL_ERROR;
++   }
++#endif
++
+     Tcl_CreateObjCommand(interp, "::tclreadline::readline", TclReadlineCmd,
+ 	(ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
+     tclrl_interp = interp;

Modified: tclreadline/trunk/debian/rules
===================================================================
--- tclreadline/trunk/debian/rules	2016-08-18 12:21:29 UTC (rev 1841)
+++ tclreadline/trunk/debian/rules	2016-10-08 09:12:46 UTC (rev 1842)
@@ -9,6 +9,12 @@
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 export LDFLAGS
 
+CFLAGS += -DUSE_TCL_STUBS
+export CFLAGS
+
+LIBS += -ltclstub
+export LIBS
+
 %:
 	dh $@