[Pkg-tcltk-commits] r1622 - in blt/trunk/debian: . patches

Fri Jul 4 05:38:55 UTC 2014

Author: sgolovan
Date: 2014-07-04 05:38:55 +0000 (Fri, 04 Jul 2014)
New Revision: 1622

Modified:
   blt/trunk/debian/changelog
   blt/trunk/debian/patches/02-debian-all.patch
   blt/trunk/debian/patches/install.patch
   blt/trunk/debian/patches/ldflags.patch
   blt/trunk/debian/patches/pkgindex.patch
   blt/trunk/debian/patches/table.patch
   blt/trunk/debian/patches/tcl8.6.patch
   blt/trunk/debian/patches/tk8.6.patch
   blt/trunk/debian/patches/usetkint.patch
Log:
[blt]
  * Annotated patches.
  * A few fixes in pkgindex and install patches.


Modified: blt/trunk/debian/changelog
===================================================================

--- blt/trunk/debian/changelog	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/changelog	2014-07-04 05:38:55 UTC (rev 1622)
@@ -3,11 +3,11 @@
   * New maintainer Sergei Golovan (closes: #664092).
   * New upstream and new upstream release.
   * Reviewed and refreshed patches.
-  * Added patch from a FreeBSD port. It allows BLT to work when it's
+  * Added a patch from the FreeBSD BLT port. It allows BLT to work when it's
     built with Tcl/Tk 8.6 (closes: #753476).
   * Moved HTML documentation from blt to blt-dev.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 03 Jul 2014 23:33:13 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Fri, 04 Jul 2014 09:35:12 +0400
 
 blt (2.4z-9) unstable; urgency=high
 

Modified: blt/trunk/debian/patches/02-debian-all.patch
===================================================================
--- blt/trunk/debian/patches/02-debian-all.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/02-debian-all.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,7 +1,6 @@
 Description: Remaining unsplit changes from previous packager
  Includes the rest of the changes that were applied to the source code by
- previous packager. Almost all of the changes are corrections in spelling
- in the blt examples, or build system fixes.
+ previous packager.
 Author: Paul E. Johnson (Debian Packaging) <pauljohn32 at freefaculty.org>
 
 --- a/configure.in

Modified: blt/trunk/debian/patches/install.patch
===================================================================
--- blt/trunk/debian/patches/install.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/install.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,9 @@
+Description: Patch fixes installing directories and copying files under
+    INSTALL_ROOT. Also, it adds bltOldConfig.h to the installable headers
+    list and fixes it to include tk.h.
+Author: Chris Waters and Sergei Golovan
+Last-Modified: Fri, 04 Jul 2014 09:32:58 +0400
+
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -47,9 +47,9 @@
@@ -40,7 +46,15 @@
  	$(RM) $(GENERATED_FILES)
 --- a/generic/Makefile.in
 +++ b/generic/Makefile.in
-@@ -230,7 +230,7 @@
+@@ -152,6 +152,7 @@
+ 		$(srcdir)/bltChain.h \
+ 		bltHash.h \
+ 		$(srcdir)/bltList.h \
++		$(srcdir)/bltOldConfig.h \
+ 		$(srcdir)/bltPool.h \
+ 		$(srcdir)/bltTree.h \
+ 		$(srcdir)/bltDecls.h \
+@@ -230,7 +231,7 @@
              : ; \
            else \
              echo " mkdir $(INSTALL_ROOT)$$i" ; \
@@ -49,7 +63,7 @@
            fi ; \
          done
  
-@@ -262,7 +262,8 @@
+@@ -262,7 +263,8 @@
  
  distclean: clean
  	$(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"*  Makefile
@@ -135,3 +149,13 @@
            fi ; \
          done
  
+--- a/generic/bltOldConfig.h
++++ b/generic/bltOldConfig.h
+@@ -1,5 +1,7 @@
+ /* Old config headers. */
+ 
++#include <tk.h>
++
+ EXTERN int		Blt_ConfigureInfo _ANSI_ARGS_((Tcl_Interp * interp, 
+ 				Tk_Window tkwin, Tk_ConfigSpec * specs, 
+ 				char * widgRec, CONST char * argvName, 

Modified: blt/trunk/debian/patches/ldflags.patch
===================================================================
--- blt/trunk/debian/patches/ldflags.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/ldflags.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,9 @@
+Description: Patch adds support for externally set LDFLAGS. It lets
+    passing hardening flags from debian/rules. Also, the rpath
+    definition is removed.
+Author: Sergei Golovan
+Last-Modified: Fri, 04 Jul 2014 09:29:39 +0400
+
 --- a/configure
 +++ b/configure
 @@ -3858,7 +3858,7 @@

Modified: blt/trunk/debian/patches/pkgindex.patch
===================================================================
--- blt/trunk/debian/patches/pkgindex.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/pkgindex.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,12 @@
+Description: Patch fixes loading the libBLT library from
+    [package require BLT]. Specifically, it provides correct version
+    BLT_PATCH_LEVEL and prevents loading the library twice (once
+    by its real name and onr more time by a symlink if the blt-dev
+    package is installed). Also, it skips initializing widget bindings
+    if Tk isn't present.
+Author: Sergei Golovan
+Last-Modified: Fri, 04 Jul 2014 09:27:54 +0400
+
 --- a/configure
 +++ b/configure
 @@ -3756,6 +3756,22 @@
@@ -51,7 +60,12 @@
  
 --- a/library/pkgIndex.tcl.in
 +++ b/library/pkgIndex.tcl.in
-@@ -53,7 +53,8 @@
+@@ -49,11 +49,13 @@
+         }
+ 	if { ![file exists $library] } continue
+         load $library BLT
++	break
+     }
  }
  
  set version "%VERSION%"
@@ -61,3 +75,16 @@
 +package ifneeded BLT $patchlevel [list LoadBLT25 $version $dir]
  
  # End of package index file
+--- a/library/init.tcl
++++ b/library/init.tcl
+@@ -8,7 +8,9 @@
+         }
+     }
+ 
+-   initializeLibrary
++    if {[info commands tk] == "tk"} {
++	initializeLibrary
++    }
+     
+ }
+ 

Modified: blt/trunk/debian/patches/table.patch
===================================================================
--- blt/trunk/debian/patches/table.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/table.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,9 @@
+Description: Patch restores blt::table command which was renamed to
+    blt::blttable in 2.5.3.
+    TODO: Make the blttable alias if necessary.
+Author: Sergei Golovan
+Last-Modified: Fri, 04 Jul 2014 09:22:10 +0400
+
 --- a/demos/tour.tcl
 +++ b/demos/tour.tcl
 @@ -22,7 +22,7 @@

Modified: blt/trunk/debian/patches/tcl8.6.patch
===================================================================
--- blt/trunk/debian/patches/tcl8.6.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/tcl8.6.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,8 @@
+Description: Patch replaces the direct usage of deprecated interp->result
+    by Tcl_SetResult() and Tcl_GetStringResult() calls making it possible
+    to build using Tcl/Tk 8.6.
+Last-Modified: Fri, 04 Jul 2014 09:20:48 +0400
+
 --- a/generic/bltScrollbar.c
 +++ b/generic/bltScrollbar.c
 @@ -588,7 +588,7 @@

Modified: blt/trunk/debian/patches/tk8.6.patch
===================================================================
--- blt/trunk/debian/patches/tk8.6.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/tk8.6.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,7 @@
+Description: Patch replaces call to TkCopyAndGlobalEval by a call to
+    Tcl_EvalObjEx because the former function has been dropped in Tk 8.6.
+Last-Modified: Fri, 04 Jul 2014 09:18:32 +0400
+
 --- a/generic/tkButton.c
 +++ b/generic/tkButton.c
 @@ -864,8 +864,6 @@

Modified: blt/trunk/debian/patches/usetkint.patch
===================================================================
--- blt/trunk/debian/patches/usetkint.patch	2014-07-03 19:34:11 UTC (rev 1621)
+++ blt/trunk/debian/patches/usetkint.patch	2014-07-04 05:38:55 UTC (rev 1622)
@@ -1,3 +1,10 @@
+Description: Patch removes internal definitions of the main Tk structures.
+    Since they have been changed since Tcl/Tk 8.4 it's much better to
+    include tkInt.h and other few headers. They are internal Tk headers,
+    so the BLT library built with Tcl/Tk 8.6 won't work with Tcl/Tk 8.5.
+Author: FreeBSD BLT port maintainers
+Last-Modified: Fri, 04 Jul 2014 09:13:24 +0400
+
 --- a/generic/bltTkInt.h
 +++ b/generic/bltTkInt.h
 @@ -27,214 +27,8 @@


