[Pkg-tcltk-commits] r1358 - in tk8.4/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Mon Jun 24 12:21:00 UTC 2013
Author: sgolovan
Date: 2013-06-24 12:20:59 +0000 (Mon, 24 Jun 2013)
New Revision: 1358
Removed:
tk8.4/trunk/debian/patches/tk-lastevent.diff
Modified:
tk8.4/trunk/debian/changelog
tk8.4/trunk/debian/control
tk8.4/trunk/debian/patches/manpages.diff
tk8.4/trunk/debian/patches/non-linux.diff
tk8.4/trunk/debian/patches/rpath.diff
tk8.4/trunk/debian/patches/scalable-fonts.diff
tk8.4/trunk/debian/patches/series
tk8.4/trunk/debian/patches/tkinc.diff
tk8.4/trunk/debian/patches/tklibrary.diff
tk8.4/trunk/debian/rules
Log:
[tk8.4]
* New upstream release.
* Refreshed patches.
* Removed patch which fixes Tk events because it's included into upstream
tarball already.
* Pass CC to compiler and set ac_cv variables, to allow cross builds.
* Bumped standards version to 3.9.4.
Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/changelog 2013-06-24 12:20:59 UTC (rev 1358)
@@ -1,8 +1,13 @@
-tk8.4 (8.4.19-6) UNRELEASED; urgency=low
+tk8.4 (8.4.20-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Refreshed patches.
+ * Removed patch which fixes Tk events because it's included into upstream
+ tarball already.
+ * Pass CC to compiler and set ac_cv variables, to allow cross builds.
+ * Bumped standards version to 3.9.4.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 29 May 2012 19:42:07 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 24 Jun 2013 16:10:13 +0400
tk8.4 (8.4.19-5) unstable; urgency=low
Modified: tk8.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/control 2013-06-24 12:20:59 UTC (rev 1358)
@@ -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 (>= 8.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Homepage: http://www.tcl.tk/
Package: tk8.4
Modified: tk8.4/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.4/trunk/debian/patches/manpages.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/manpages.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -2,8 +2,8 @@
aren't installed by upstream script but are referenced inside other
manual pages.
---- tk8.4-8.4.19.orig/unix/installManPage
-+++ tk8.4-8.4.19/unix/installManPage
+--- tk8.4-8.4.20.orig/unix/installManPage
++++ tk8.4-8.4.20/unix/installManPage
@@ -49,7 +49,16 @@
}' $MANPAGE`
Modified: tk8.4/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.4/trunk/debian/patches/non-linux.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/non-linux.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -1,9 +1,9 @@
Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
building on non-linux Debian architectures.
---- tk8.4-8.4.19.orig/unix/configure
-+++ tk8.4-8.4.19/unix/configure
-@@ -2002,6 +2002,9 @@
+--- tk8.4-8.4.20.orig/unix/configure
++++ tk8.4-8.4.20/unix/configure
+@@ -2025,6 +2025,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -13,18 +13,9 @@
fi
fi
-@@ -2557,7 +2560,7 @@
- fi
- fi
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
---- tk8.4-8.4.19.orig/unix/tcl.m4
-+++ tk8.4-8.4.19/unix/tcl.m4
-@@ -898,6 +898,9 @@
+--- tk8.4-8.4.20.orig/unix/tcl.m4
++++ tk8.4-8.4.20/unix/tcl.m4
+@@ -916,6 +916,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -34,12 +25,3 @@
fi
fi
])
-@@ -1335,7 +1338,7 @@
- fi
- fi
- ;;
-- Linux*)
-+ Linux*|GNU*|NetBSD-Debian)
- SHLIB_CFLAGS="-fPIC"
- SHLIB_LD_LIBS='${LIBS}'
- SHLIB_SUFFIX=".so"
Modified: tk8.4/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.4/trunk/debian/patches/rpath.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/rpath.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -1,11 +1,11 @@
-Patch by Chris Waters removes -rpath from search flags and adds -soname
-to library build options.
+Author: Chris Waters
+Description: Patch adds -soname to library build options. Also, it fixes
+ Makefile.in to put correct Tk library filename to pkgIndex.tcl
+Last-Modified: Mon, 24 Jun 2013 15:50:51 +0400
-Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
-
---- tk8.4-8.4.19.orig/unix/configure
-+++ tk8.4-8.4.19/unix/configure
-@@ -2568,12 +2568,15 @@
+--- tk8.4-8.4.20.orig/unix/configure
++++ tk8.4-8.4.20/unix/configure
+@@ -2685,6 +2685,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -15,27 +15,20 @@
if test "$have_dl" = yes; then
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+ CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- else
- ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
---- tk8.4-8.4.19.orig/unix/Makefile.in
-+++ tk8.4-8.4.19/unix/Makefile.in
-@@ -635,7 +635,7 @@
+--- tk8.4-8.4.20.orig/unix/Makefile.in
++++ tk8.4-8.4.20/unix/Makefile.in
+@@ -663,7 +663,7 @@
relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
- echo "if {[package vcompare [package provide Tcl] $(TCLVERSION)] != 0} { return }";\
- echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)\
-- [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
-+ [list load [file join $(LIB_RUNTIME_DIR) $(TK_LIB_FILE).0] Tk]";\
- ) > $(PKG_INDEX); \
- fi
- @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.4-8.4.19.orig/unix/tcl.m4
-+++ tk8.4-8.4.19/unix/tcl.m4
-@@ -1346,20 +1346,23 @@
+ echo "if {[package vcompare [package provide Tcl] 8.4] != 0} return";\
+ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
+- echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\
++ echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE).0]] Tk]";\
+ else \
+ echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
+ echo " || ([info exists ::argv] && [lsearch -exact \$$::argv -display] > -1))} {";\
+--- tk8.4-8.4.20.orig/unix/tcl.m4
++++ tk8.4-8.4.20/unix/tcl.m4
+@@ -1405,6 +1405,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -45,20 +38,3 @@
if test "$have_dl" = yes; then
SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
- LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-+ CC_SEARCH_FLAGS=""
-+ LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"
- else
- AC_CHECK_HEADER(dld.h, [
- SHLIB_LD="ld -shared"
- DL_OBJS="tclLoadDld.o"
- DL_LIBS="-ldld"
- CC_SEARCH_FLAGS=""
-- LD_SEARCH_FLAGS=""])
-+ LD_SEARCH_FLAGS="${CC_SEARCH_FLAGS}"])
- fi
- if test "`uname -m`" = "alpha" ; then
- CFLAGS="$CFLAGS -mieee"
Modified: tk8.4/trunk/debian/patches/scalable-fonts.diff
===================================================================
--- tk8.4/trunk/debian/patches/scalable-fonts.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/scalable-fonts.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -9,9 +9,9 @@
when no non-scalable fonts are returned and chosen fixed font is infeasible
(this case was never triggered without tkFont.c patch).
---- tk8.4-8.4.19.orig/generic/tkFont.c
-+++ tk8.4-8.4.19/generic/tkFont.c
-@@ -3454,8 +3454,15 @@
+--- tk8.4-8.4.20.orig/generic/tkFont.c
++++ tk8.4-8.4.20/generic/tkFont.c
+@@ -3452,8 +3452,15 @@
/* XLFD_SPACING ignored. */
@@ -29,9 +29,9 @@
if (FieldSpecified(field[XLFD_CHARSET])) {
xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]);
} else {
---- tk8.4-8.4.19.orig/unix/tkUnixFont.c
-+++ tk8.4-8.4.19/unix/tkUnixFont.c
-@@ -2660,6 +2660,9 @@
+--- tk8.4-8.4.20.orig/unix/tkUnixFont.c
++++ tk8.4-8.4.20/unix/tkUnixFont.c
+@@ -2658,6 +2658,9 @@
bestScore[1] = INT_MAX;
}
if (fontStructPtr == NULL) {
Modified: tk8.4/trunk/debian/patches/series
===================================================================
--- tk8.4/trunk/debian/patches/series 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/series 2013-06-24 12:20:59 UTC (rev 1358)
@@ -1,5 +1,4 @@
scalable-fonts.diff
-tk-lastevent.diff
tklibrary.diff
tkinc.diff
rpath.diff
Deleted: tk8.4/trunk/debian/patches/tk-lastevent.diff
===================================================================
--- tk8.4/trunk/debian/patches/tk-lastevent.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/tk-lastevent.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -1,29 +0,0 @@
-Date: Sat Jul 12 09:40:30 PDT 2008
-Files: generic/tk.h
-Bugid: 2010422
-
---- tk8.4-8.4.19.orig/generic/tk.h
-+++ tk8.4-8.4.19/generic/tk.h
-@@ -635,17 +635,15 @@
- *
- *---------------------------------------------------------------------------
- */
--#define VirtualEvent (LASTEvent)
--#define ActivateNotify (LASTEvent + 1)
--#define DeactivateNotify (LASTEvent + 2)
--#define MouseWheelEvent (LASTEvent + 3)
--#define TK_LASTEVENT (LASTEvent + 4)
-+#define VirtualEvent (MappingNotify + 1)
-+#define ActivateNotify (MappingNotify + 2)
-+#define DeactivateNotify (MappingNotify + 3)
-+#define MouseWheelEvent (MappingNotify + 4)
-+#define TK_LASTEVENT (MappingNotify + 5)
-
- #define MouseWheelMask (1L << 28)
--
- #define ActivateMask (1L << 29)
- #define VirtualEventMask (1L << 30)
--#define TK_LASTEVENT (LASTEvent + 4)
-
-
- /*
Modified: tk8.4/trunk/debian/patches/tkinc.diff
===================================================================
--- tk8.4/trunk/debian/patches/tkinc.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/tkinc.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -7,19 +7,19 @@
Also, it allows to find tclConfig.sh in /usr/share/tcltk/tcl8.4 and tkConfig.sh
in /usr/share/tcltk/tk8.4 where they are located in Debian installation.
---- tk8.4-8.4.19.orig/unix/configure
-+++ tk8.4-8.4.19/unix/configure
-@@ -640,6 +640,7 @@
+--- tk8.4-8.4.20.orig/unix/configure
++++ tk8.4-8.4.20/unix/configure
+@@ -649,6 +649,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tcl8.4 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
- if test -f "$i/tclConfig.sh" ; then
---- tk8.4-8.4.19.orig/unix/tkConfig.sh.in
-+++ tk8.4-8.4.19/unix/tkConfig.sh.in
-@@ -53,7 +53,7 @@
+--- tk8.4-8.4.20.orig/unix/tkConfig.sh.in
++++ tk8.4-8.4.20/unix/tkConfig.sh.in
+@@ -51,7 +51,7 @@
# String to pass to linker to pick up the Tk library from its
# build directory.
@@ -28,7 +28,7 @@
# String to pass to linker to pick up the Tk library from its
# installed directory.
-@@ -69,7 +69,7 @@
+@@ -67,7 +67,7 @@
# different place than the directory containing the source files, this
# points to the location of the sources, not the location where Tk was
# compiled.
@@ -37,7 +37,7 @@
# Needed if you want to make a 'fat' shared library library
# containing tk objects or link a different wish.
-@@ -84,14 +84,14 @@
+@@ -82,14 +82,14 @@
# String to pass to linker to pick up the Tk stub library from its
# build directory.
@@ -54,21 +54,21 @@
# Path to the Tk stub library in the install directory.
TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
---- tk8.4-8.4.19.orig/unix/tcl.m4
-+++ tk8.4-8.4.19/unix/tcl.m4
-@@ -83,6 +83,7 @@
+--- tk8.4-8.4.20.orig/unix/tcl.m4
++++ tk8.4-8.4.20/unix/tcl.m4
+@@ -90,6 +90,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tcl8.4 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
- if test -f "$i/tclConfig.sh" ; then
-@@ -203,6 +204,7 @@
+@@ -217,6 +218,7 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tk8.4 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
- if test -f "$i/tkConfig.sh" ; then
Modified: tk8.4/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.4/trunk/debian/patches/tklibrary.diff 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/patches/tklibrary.diff 2013-06-24 12:20:59 UTC (rev 1358)
@@ -1,6 +1,6 @@
---- tk8.4-8.4.19.orig/unix/configure
-+++ tk8.4-8.4.19/unix/configure
-@@ -5901,7 +5901,7 @@
+--- tk8.4-8.4.20.orig/unix/configure
++++ tk8.4-8.4.20/unix/configure
+@@ -5943,7 +5943,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)$(TK_DBGX)'
---- tk8.4-8.4.19.orig/unix/configure.in
-+++ tk8.4-8.4.19/unix/configure.in
-@@ -421,7 +421,7 @@
+--- tk8.4-8.4.20.orig/unix/configure.in
++++ tk8.4-8.4.20/unix/configure.in
+@@ -419,7 +419,7 @@
TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
fi
Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules 2013-06-24 12:13:20 UTC (rev 1357)
+++ tk8.4/trunk/debian/rules 2013-06-24 12:20:59 UTC (rev 1358)
@@ -15,14 +15,18 @@
dh $@
override_dh_auto_configure:
+ CC=$(DEB_HOST_GNU_TYPE)-gcc \
+ ac_cv_func_strtod=yes \
+ tcl_cv_strtod_buggy=1 \
TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
dh_auto_configure -Dunix -- \
- --includedir=/usr/include/tcl$(v) \
- --with-tcl=/usr/lib/tcl$(v) \
- --enable-shared \
- --enable-threads \
- --enable-man-symlinks
+ --includedir=/usr/include/tcl$(v) \
+ --with-tcl=/usr/lib/tcl$(v) \
+ --enable-shared \
+ --enable-threads \
+ --disable-rpath \
+ --enable-man-symlinks
override_dh_auto_build:
$(MAKE) -C unix
@@ -93,14 +97,14 @@
dh_compress -Xusr/share/doc/tk$(v)/examples/
override_dh_makeshlibs:
- dh_makeshlibs -V 'tk$(v) (>= 8.4.16)'
+ dh_makeshlibs -V 'tk$(v) (>= $(v).16)'
override_dh_shlibdeps:
dh_shlibdeps -ldebian/tk$(v)/usr/lib
get-orig-source:
- wget -O tk8.4_8.4.19.orig.tar.gz \
- http://prdownloads.sourceforge.net/tcl/tk8.4.19-src.tar.gz
+ wget -O tk$(v)_$(v).20.orig.tar.gz \
+ http://prdownloads.sourceforge.net/tcl/tk$(v).20-src.tar.gz
.PHONY: override_dh_auto_configure override_dh_auto_configure override_dh_auto_build override_dh_auto_install override_dh_compress override_dh_makeshlibs override_dh_shlibdeps get-orig-source
More information about the Pkg-tcltk-commits
mailing list