[Pkg-tcltk-commits] r1321 - tk8.6/trunk/debian/patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Dec 20 17:34:38 UTC 2012 

Author: sgolovan
Date: 2012-12-20 17:34:38 +0000 (Thu, 20 Dec 2012)
New Revision: 1321

Modified:
   tk8.6/trunk/debian/patches/confsearch.diff
   tk8.6/trunk/debian/patches/manpages.diff
   tk8.6/trunk/debian/patches/non-linux.diff
   tk8.6/trunk/debian/patches/rpath.diff
   tk8.6/trunk/debian/patches/tklibrary.diff
   tk8.6/trunk/debian/patches/tkport.diff
   tk8.6/trunk/debian/patches/tkprivate.diff
   tk8.6/trunk/debian/patches/xft.diff
Log:
[tk8.6]
  * Refreshed patches.


Modified: tk8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.6/trunk/debian/patches/confsearch.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/confsearch.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.6b2.orig/unix/configure
-+++ tk8.6b2/unix/configure
+--- tk8.6-8.6.0.orig/unix/configure
++++ tk8.6-8.6.0/unix/configure
 @@ -1432,6 +1432,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/lib64 2>/dev/null` \
  			; do
---- tk8.6b2.orig/unix/tcl.m4
-+++ tk8.6b2/unix/tcl.m4
+--- tk8.6-8.6.0.orig/unix/tcl.m4
++++ tk8.6-8.6.0/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tk8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.6/trunk/debian/patches/manpages.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/manpages.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.6-8.6.0~b3.orig/unix/installManPage
-+++ tk8.6-8.6.0~b3/unix/installManPage
+--- tk8.6-8.6.0.orig/unix/installManPage
++++ tk8.6-8.6.0/unix/installManPage
 @@ -92,12 +92,20 @@
  	exit 2 ;;
  esac

Modified: tk8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/non-linux.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.6-8.6.0~b3.orig/unix/configure
-+++ tk8.6-8.6.0~b3/unix/configure
+--- tk8.6-8.6.0.orig/unix/configure
++++ tk8.6-8.6.0/unix/configure
 @@ -4512,6 +4512,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_SUFFIX=".so"
  
---- tk8.6-8.6.0~b3.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~b3/unix/tcl.m4
+--- tk8.6-8.6.0.orig/unix/tcl.m4
++++ tk8.6-8.6.0/unix/tcl.m4
 @@ -924,6 +924,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tk8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.6/trunk/debian/patches/rpath.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/rpath.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -3,8 +3,8 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.6-8.6.0~b3.orig/unix/configure
-+++ tk8.6-8.6.0~b3/unix/configure
+--- tk8.6-8.6.0.orig/unix/configure
++++ tk8.6-8.6.0/unix/configure
 @@ -5434,6 +5434,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,8 +15,8 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.6-8.6.0~b3.orig/unix/Makefile.in
-+++ tk8.6-8.6.0~b3/unix/Makefile.in
+--- tk8.6-8.6.0.orig/unix/Makefile.in
++++ tk8.6-8.6.0/unix/Makefile.in
 @@ -731,7 +731,7 @@
  	    echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
@@ -26,8 +26,8 @@
  	    else \
  	    echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
  	    echo "	|| ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
---- tk8.6-8.6.0~b3.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~b3/unix/tcl.m4
+--- tk8.6-8.6.0.orig/unix/tcl.m4
++++ tk8.6-8.6.0/unix/tcl.m4
 @@ -1410,6 +1410,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

Modified: tk8.6/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/trunk/debian/patches/tklibrary.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/tklibrary.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -1,6 +1,6 @@
---- tk8.6b2.orig/unix/configure
-+++ tk8.6b2/unix/configure
-@@ -10956,7 +10956,7 @@
+--- tk8.6-8.6.0.orig/unix/configure
++++ tk8.6-8.6.0/unix/configure
+@@ -11115,7 +11115,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
---- tk8.6b2.orig/unix/configure.in
-+++ tk8.6b2/unix/configure.in
-@@ -625,7 +625,7 @@
+--- tk8.6-8.6.0.orig/unix/configure.in
++++ tk8.6-8.6.0/unix/configure.in
+@@ -634,7 +634,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.6/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkport.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/tkport.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -1,8 +1,8 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
 
---- tk8.6b2.orig/generic/tkPort.h
-+++ tk8.6b2/generic/tkPort.h
+--- tk8.6-8.6.0.orig/generic/tkPort.h
++++ tk8.6-8.6.0/generic/tkPort.h
 @@ -24,7 +24,7 @@
  #   if defined(MAC_OSX_TK)
  #	include "tkMacOSXPort.h"

Modified: tk8.6/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkprivate.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/tkprivate.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -2,8 +2,8 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
---- tk8.6b2.orig/unix/tkConfig.sh.in
-+++ tk8.6b2/unix/tkConfig.sh.in
+--- tk8.6-8.6.0.orig/unix/tkConfig.sh.in
++++ tk8.6-8.6.0/unix/tkConfig.sh.in
 @@ -53,7 +53,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.6/trunk/debian/patches/xft.diff
===================================================================
--- tk8.6/trunk/debian/patches/xft.diff	2012-12-20 17:32:46 UTC (rev 1320)
+++ tk8.6/trunk/debian/patches/xft.diff	2012-12-20 17:34:38 UTC (rev 1321)
@@ -4,8 +4,8 @@
 Bug: https://sourceforge.net/tracker/?func=detail&aid=3184834&group_id=12997&atid=112997
 Last-updated: Wed, 20 Jul 2011 16:11:14 +0400
 
---- tk8.6-8.6.0~b3.orig/unix/configure.in
-+++ tk8.6-8.6.0~b3/unix/configure.in
+--- tk8.6-8.6.0.orig/unix/configure.in
++++ tk8.6-8.6.0/unix/configure.in
 @@ -557,8 +557,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then
@@ -17,8 +17,8 @@
  	fi
  	AC_MSG_RESULT([$found_xft])
  	dnl make sure that compiling against Xft header file doesn't bomb
---- tk8.6-8.6.0~b3.orig/unix/configure
-+++ tk8.6-8.6.0~b3/unix/configure
+--- tk8.6-8.6.0.orig/unix/configure
++++ tk8.6-8.6.0/unix/configure
 @@ -10851,8 +10851,8 @@
  	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
  	if test "$found_xft" = "no" ; then

More information about the Pkg-tcltk-commits mailing list