[packages/tk] - updated to 8.6.16

Sun Mar 16 13:48:47 CET 2025

commit 972b14b4b10d9b45c342ccf482c1ee8bce0bc24c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 16 13:00:48 2025 +0100

    - updated to 8.6.16

 tk-manlnk.patch             |  8 ++++----
 tk-norpath.patch            | 18 +++++++++---------
 tk-opt_flags_pass_fix.patch | 13 ++++++-------
 tk.spec                     | 22 ++++++++++++----------
 4 files changed, 31 insertions(+), 30 deletions(-)
---

diff --git a/tk.spec b/tk.spec
index bf9f3dc..76aa246 100644
--- a/tk.spec
+++ b/tk.spec
@@ -7,20 +7,20 @@ 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
 %define		major	8.6
-%define		minor	13
+%define		minor	16
 %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:	95adc33d55a133ee29bc9f81efdf31b2
+Source0:	https://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
+# Source0-md5:	a7aad6cf52aa4687506a377a9a885a83
 Patch0:		%{name}-manlnk.patch
 Patch1:		%{name}-opt_flags_pass_fix.patch
 Patch2:		%{name}-norpath.patch
 Patch3:		%{name}-no_tcl_stub.patch
 Patch4:		%{name}-soname_fix.patch
-URL:		http://www.tcl.tk/
+URL:		https://www.tcl-lang.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	pkgconfig
 BuildRequires:	tcl-devel >= %{tcl_ver}
@@ -129,19 +129,21 @@ cd unix
 %{__autoconf}
 TCL_BIN_DIR=%{_libdir}
 %configure \
-%ifarch x32
-	tcl_cv_cc_m64=no \
+%if "%{_lib}" == "lib64"
+	--enable-64bit \
 %endif
+	--disable-rpath \
+	--enable-shared \
 	--disable-symbols \
 	--disable-threads \
-	--enable-64bit \
-	--enable-shared \
 	--enable-xft
 
 %{__make}
 
-sed -i -e "s#%{_builddir}/%{name}%{version}/unix#%{_libdir}#; \
-	s#%{_builddir}/%{name}%{version}#%{_includedir}/%{name}-private#" tkConfig.sh
+%{__sed} -i \
+	-e 's#%{_builddir}/%{name}%{version}/unix#%{_libdir}#' \
+	-e 's#%{_builddir}/%{name}%{version}#%{_includedir}/%{name}-private#' \
+	tkConfig.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/tk-manlnk.patch b/tk-manlnk.patch
index 09f94b6..22ad37c 100644
--- a/tk-manlnk.patch
+++ b/tk-manlnk.patch
@@ -1,10 +1,10 @@
---- 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
+--- tk8.6.16/unix/installManPage.orig	2025-03-16 12:43:48.919596964 +0100
++++ tk8.6.16/unix/installManPage	2025-03-16 12:49:54.304284172 +0100
+@@ -118,7 +118,7 @@ for Target in $Names; do
  	chmod 644 "$Dir/$First"
  	$Gzip "$Dir/$First"
      else
--	ln $SymOrLoc"$First$Gz" "$Dir/$Target$Gz"
+-	ln $Sym"$Loc$First$Gz" "$Dir/$Target$Gz"
 +	echo ".so $First" > $Dir/$Target
      fi
  done
diff --git a/tk-norpath.patch b/tk-norpath.patch
index ab6173e..5117aa7 100644
--- a/tk-norpath.patch
+++ b/tk-norpath.patch
@@ -11,14 +11,14 @@
  
  # support for embedded libraries on Darwin / Mac OS X
  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
+--- tk8.6.16/unix/tcl.m4.orig	2025-03-16 12:51:19.983820006 +0100
++++ tk8.6.16/unix/tcl.m4	2025-03-16 12:52:49.456668623 +0100
+@@ -2000,7 +2000,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} ${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)"
+ 	LIB_SUFFIX=${SHARED_LIB_SUFFIX}
+-	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)"'
+ 	    DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
diff --git a/tk-opt_flags_pass_fix.patch b/tk-opt_flags_pass_fix.patch
index 08e0034..3f5dfba 100644
--- a/tk-opt_flags_pass_fix.patch
+++ b/tk-opt_flags_pass_fix.patch
@@ -1,16 +1,16 @@
---- 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
-@@ -1074,7 +1074,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+--- tk8.6.16/unix/tcl.m4.orig	2024-12-10 18:31:03.000000000 +0100
++++ tk8.6.16/unix/tcl.m4	2025-03-16 12:51:00.217260424 +0100
+@@ -1073,7 +1073,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_OPTIMIZE="${OPTFLAGS}"
  	CFLAGS_WARNING="-Wall -Wpointer-arith"
      ], [
  	CFLAGS_OPTIMIZE=-O
-@@ -1409,7 +1409,7 @@
- 	    SHLIB_CFLAGS="-fPIC"
+@@ -1372,7 +1372,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ 	    SHLIB_CFLAGS="-fPIC -fno-common"
  	    SHLIB_SUFFIX=".so"
  
 -	    CFLAGS_OPTIMIZE="-O2"
@@ -18,4 +18,3 @@
  	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
  	    # when you inline the string and math operations.  Turn this off to
  	    # get rid of the warnings.
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tk.git/commitdiff/972b14b4b10d9b45c342ccf482c1ee8bce0bc24c

