From: Arkadiusz Miśkiewicz Date: Thu, 11 Nov 2021 14:11:13 +0000 (+0100) Subject: Up to 8.6.12. X-Git-Tag: auto/th/tk-8.6.12-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=b685a1e3d3779a3d2f7e5e5fe0ec841160fe1edc;p=packages%2Ftk.git Up to 8.6.12. --- diff --git a/tk-manlnk.patch b/tk-manlnk.patch index 2b54f65..09f94b6 100644 --- a/tk-manlnk.patch +++ b/tk-manlnk.patch @@ -1,11 +1,10 @@ -diff -urNp -x '*.orig' tk8.6.10.org/unix/installManPage tk8.6.10/unix/installManPage ---- tk8.6.10.org/unix/installManPage 2019-11-20 20:56:52.000000000 +0100 -+++ tk8.6.10/unix/installManPage 2021-11-11 14:54:22.146254062 +0100 +--- tk8.6.12/unix/installManPage~ 2021-11-04 16:06:24.000000000 +0100 ++++ tk8.6.12/unix/installManPage 2021-11-11 14:57:02.402920652 +0100 @@ -117,7 +117,7 @@ for Target in $Names; do - chmod 644 $Dir/$First - $Gzip $Dir/$First + chmod 644 "$Dir/$First" + $Gzip "$Dir/$First" else -- ln $SymOrLoc$First$Gz $Dir/$Target$Gz +- ln $SymOrLoc"$First$Gz" "$Dir/$Target$Gz" + echo ".so $First" > $Dir/$Target fi done diff --git a/tk-norpath.patch b/tk-norpath.patch index 716eff3..ab6173e 100644 --- a/tk-norpath.patch +++ b/tk-norpath.patch @@ -1,7 +1,6 @@ -diff -urNp -x '*.orig' tk8.6.10.org/unix/Makefile.in tk8.6.10/unix/Makefile.in ---- tk8.6.10.org/unix/Makefile.in 2019-11-20 20:56:52.000000000 +0100 -+++ tk8.6.10/unix/Makefile.in 2021-11-11 14:54:40.539587388 +0100 -@@ -280,8 +280,8 @@ TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS +--- tk8.6.12/unix/Makefile.in~ 2021-11-04 16:06:24.000000000 +0100 ++++ tk8.6.12/unix/Makefile.in 2021-11-11 15:09:46.142920245 +0100 +@@ -281,8 +281,8 @@ TK_SHLIB_LD_EXTRAS = @TK_SHLIB_LD_EXTRAS # Additional search flags needed to find the various shared libraries # at run-time. The first symbol is for use when creating a binary # with cc, and the second is for use when running ld directly. @@ -11,16 +10,15 @@ diff -urNp -x '*.orig' tk8.6.10.org/unix/Makefile.in tk8.6.10/unix/Makefile.in +LD_SEARCH_FLAGS = # support for embedded libraries on Darwin / Mac OS X - DYLIB_INSTALL_DIR = ${LIB_RUNTIME_DIR} -diff -urNp -x '*.orig' tk8.6.10.org/unix/tcl.m4 tk8.6.10/unix/tcl.m4 ---- tk8.6.10.org/unix/tcl.m4 2021-11-11 14:54:40.359587388 +0100 -+++ tk8.6.10/unix/tcl.m4 2021-11-11 14:54:40.539587388 +0100 -@@ -2030,7 +2030,7 @@ dnl # preprocessing tests use only CPPFL + DYLIB_INSTALL_DIR = $(libdir) +--- tk8.6.12/unix/tcl.m4~ 2021-11-11 15:08:12.000000000 +0100 ++++ tk8.6.12/unix/tcl.m4 2021-11-11 15:09:58.622920240 +0100 +@@ -1991,7 +1991,7 @@ dnl # preprocessing tests use only CPPFL AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ LIB_SUFFIX=${SHARED_LIB_SUFFIX} -- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' -+ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' +- MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' ++ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" diff --git a/tk-opt_flags_pass_fix.patch b/tk-opt_flags_pass_fix.patch index 60b04b0..08e0034 100644 --- a/tk-opt_flags_pass_fix.patch +++ b/tk-opt_flags_pass_fix.patch @@ -1,12 +1,12 @@ --- tcl8.6.1/unix/tcl.m4~ 2013-09-19 22:17:13.000000000 +0200 +++ tcl8.6.1/unix/tcl.m4 2014-05-31 19:44:20.670186134 +0200 -@@ -1114,7 +1114,7 @@ +@@ -1074,7 +1074,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ TCL_LIB_VERSIONS_OK=ok CFLAGS_DEBUG=-g AS_IF([test "$GCC" = yes], [ - CFLAGS_OPTIMIZE=-O2 + CFLAGS_OPTIMIZE=${OPTFLAGS} - CFLAGS_WARNING="-Wall" + CFLAGS_WARNING="-Wall -Wpointer-arith" ], [ CFLAGS_OPTIMIZE=-O @@ -1409,7 +1409,7 @@ diff --git a/tk.spec b/tk.spec index 47c38f5..9261e5d 100644 --- a/tk.spec +++ b/tk.spec @@ -6,16 +6,15 @@ Summary(ru.UTF-8): Tk GUI toolkit для Tcl Summary(tr.UTF-8): Tk, Tcl için grafik kullanıcı arabirimi araç takımıdır Summary(uk.UTF-8): Tk GUI toolkit для Tcl Name: tk -# note: 8.6.9 tarball was regenerated after df, there is also 8.6.9.1 - but both contain only OSX specific fixes %define major 8.6 -%define minor 10 +%define minor 12 %define tcl_ver %{version} Version: %{major}.%{minor} Release: 1 License: BSD Group: Development/Languages/Tcl Source0: http://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz -# Source0-md5: 602a47ad9ecac7bf655ada729d140a94 +# Source0-md5: 1d6dcf6120356e3d211e056dff5e462a Patch0: %{name}-manlnk.patch Patch1: %{name}-opt_flags_pass_fix.patch Patch2: %{name}-norpath.patch