[packages/tk] Up to 9.0.3
arekm
arekm at pld-linux.org
Fri Apr 10 21:59:56 CEST 2026
commit 537c3d1a6947c7bc2647e46d7c054e77b80a4348
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Apr 10 21:59:45 2026 +0200
Up to 9.0.3
tk-no_tcl_stub.patch | 11 +++++------
tk-norpath.patch | 16 ++++++++--------
tk-opt_flags_pass_fix.patch | 17 ++++++++---------
tk-soname_fix.patch | 29 -----------------------------
tk.spec | 26 +++++++++-----------------
5 files changed, 30 insertions(+), 69 deletions(-)
---
diff --git a/tk.spec b/tk.spec
index 76aa246..618a207 100644
--- a/tk.spec
+++ b/tk.spec
@@ -6,20 +6,19 @@ 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
-%define major 8.6
-%define minor 16
+%define major 9.0
+%define minor 3
%define tcl_ver %{version}
Version: %{major}.%{minor}
Release: 1
License: BSD
Group: Development/Languages/Tcl
Source0: https://downloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-# Source0-md5: a7aad6cf52aa4687506a377a9a885a83
+# Source0-md5: 72f9c4005eaaf3b9c994bda74324c28e
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: https://www.tcl-lang.org/
BuildRequires: autoconf >= 2.59
BuildRequires: pkgconfig
@@ -122,20 +121,17 @@ Narzędzia Tk GUI - programy demonstracyjne.
%patch -P1 -p1
%patch -P2 -p1
%patch -P3 -p1
-%patch -P4 -p1
%build
cd unix
%{__autoconf}
TCL_BIN_DIR=%{_libdir}
%configure \
-%if "%{_lib}" == "lib64"
+ OPTFLAGS="%{rpmcflags} %{rpmcppflags}" \
--enable-64bit \
-%endif
--disable-rpath \
--enable-shared \
- --disable-symbols \
- --disable-threads \
+ --disable-zipfs \
--enable-xft
%{__make}
@@ -162,9 +158,7 @@ for h in $RPM_BUILD_ROOT%{_includedir}/*.h; do
fi
done
-ln -sf libtk%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtk.so
-ln -sf libtk%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtk%{major}.so
-ln -sf libtk%{major}.so.0.0 $RPM_BUILD_ROOT%{_libdir}/libtk%{major}.so.0
+ln -sf libtcl9tk%{major}.so $RPM_BUILD_ROOT%{_libdir}/libtk.so
%{__mv} $RPM_BUILD_ROOT%{_bindir}/wish%{major} $RPM_BUILD_ROOT%{_bindir}/wish
if [ "%{_libdir}" != "%{_ulibdir}" ] ; then
@@ -183,8 +177,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/wish
-%attr(755,root,root) %{_libdir}/libtk%{major}.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtk%{major}.so.0
+%attr(755,root,root) %{_libdir}/libtcl9tk%{major}.so
%dir %{_ulibdir}/tk%{major}
%{_ulibdir}/tk%{major}/*.tcl
%{_ulibdir}/tk%{major}/tclIndex
@@ -215,9 +208,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_ulibdir}/tkConfig.sh
-%attr(755,root,root) %{_libdir}/libtk%{major}.so
-%attr(755,root,root) %{_libdir}/libtk.so
-%{_libdir}/libtkstub%{major}.a
+%{_libdir}/libtk.so
+%{_libdir}/libtkstub.a
%{_pkgconfigdir}/tk.pc
%{_includedir}/tk*.h
%{_includedir}/tk-private
diff --git a/tk-no_tcl_stub.patch b/tk-no_tcl_stub.patch
index 5f49f11..be23003 100644
--- a/tk-no_tcl_stub.patch
+++ b/tk-no_tcl_stub.patch
@@ -1,14 +1,13 @@
-diff -urNp -x '*.orig' tk8.6.10.org/unix/configure.in tk8.6.10/unix/configure.in
---- tk8.6.10.org/unix/configure.in 2019-11-20 20:56:52.000000000 +0100
-+++ tk8.6.10/unix/configure.in 2021-11-11 14:54:56.832920714 +0100
-@@ -659,8 +659,8 @@ eval "TK_LIB_FILE=libtk${LIB_SUFFIX}"
+--- tk9.0.3/unix/configure.ac.orig 2025-11-11 17:22:57.000000000 +0100
++++ tk9.0.3/unix/configure.ac 2025-11-11 17:23:00.000000000 +0100
+@@ -555,8 +555,8 @@
eval "TK_LIB_FILE=${TK_LIB_FILE}"
-
+
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_STUB_LIB_SPEC}"
- TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_LIB_SPEC}"
+ TCL_STUB_FLAGS=""
fi
-
+
test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
diff --git a/tk-norpath.patch b/tk-norpath.patch
index 5117aa7..991db63 100644
--- a/tk-norpath.patch
+++ b/tk-norpath.patch
@@ -1,6 +1,6 @@
---- 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
+--- tk9.0.3/unix/Makefile.in.orig 2025-11-11 17:22:57.000000000 +0100
++++ tk9.0.3/unix/Makefile.in 2025-11-11 17:23:00.000000000 +0100
+@@ -283,8 +283,8 @@
# 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.
@@ -8,13 +8,13 @@
-LD_SEARCH_FLAGS = @LD_SEARCH_FLAGS@
+CC_SEARCH_FLAGS =
+LD_SEARCH_FLAGS =
-
+
# support for embedded libraries on Darwin / Mac OS X
DYLIB_INSTALL_DIR = $(libdir)
---- 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
-
+--- tk9.0.3/unix/tcl.m4.orig 2025-11-11 17:22:57.000000000 +0100
++++ tk9.0.3/unix/tcl.m4 2025-11-11 17:23:00.000000000 +0100
+@@ -1790,7 +1790,7 @@
+
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}'
diff --git a/tk-opt_flags_pass_fix.patch b/tk-opt_flags_pass_fix.patch
index 3f5dfba..193abd1 100644
--- a/tk-opt_flags_pass_fix.patch
+++ b/tk-opt_flags_pass_fix.patch
@@ -1,20 +1,19 @@
---- 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], [
+--- tk9.0.3/unix/tcl.m4.orig 2025-11-11 17:22:57.000000000 +0100
++++ tk9.0.3/unix/tcl.m4 2025-11-11 17:23:00.000000000 +0100
+@@ -959,7 +959,7 @@
TCL_LIB_VERSIONS_OK=ok
CFLAGS_DEBUG=-g
AS_IF([test "$GCC" = yes], [
- CFLAGS_OPTIMIZE=-O2
+ CFLAGS_OPTIMIZE="${OPTFLAGS}"
- CFLAGS_WARNING="-Wall -Wpointer-arith"
- ], [
- CFLAGS_OPTIMIZE=-O
-@@ -1372,7 +1372,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ CFLAGS_WARNING="-Wall -Wextra -Wshadow -Wundef -Wwrite-strings -Wpointer-arith"
+ case "${CC}" in
+ *++|*++-*)
+@@ -1263,7 +1263,6 @@
SHLIB_CFLAGS="-fPIC -fno-common"
SHLIB_SUFFIX=".so"
-
+
- CFLAGS_OPTIMIZE="-O2"
-+ CFLAGS_OPTIMIZE="${OPTFLAGS}"
# 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.
diff --git a/tk-soname_fix.patch b/tk-soname_fix.patch
deleted file mode 100644
index 13246b5..0000000
--- a/tk-soname_fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urNp -x '*.orig' tk8.6.10.org/unix/Makefile.in tk8.6.10/unix/Makefile.in
---- tk8.6.10.org/unix/Makefile.in 2021-11-11 14:55:11.069587375 +0100
-+++ tk8.6.10/unix/Makefile.in 2021-11-11 14:55:11.256254042 +0100
-@@ -588,7 +588,8 @@ doc: $(TOP_DIR)/doc/man.macros
- # a shared library or non-shared library for Tk.
- ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
- rm -f $@
-- @MAKE_LIB@
-+ @MAKE_LIB@ -Wl,-soname, at TK_LIB_SONAME@
-+ -ln -sf ${TK_LIB_FILE} libtk${VERSION}@SHLIB_SUFFIX@
-
- ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
-diff -urNp -x '*.orig' tk8.6.10.org/unix/configure.in tk8.6.10/unix/configure.in
---- tk8.6.10.org/unix/configure.in 2021-11-11 14:55:11.069587375 +0100
-+++ tk8.6.10/unix/configure.in 2021-11-11 14:55:11.256254042 +0100
-@@ -656,7 +656,11 @@ eval "TK_LIB_FILE=libtk${LIB_SUFFIX}"
- # tkConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
- # since on some platforms TK_LIB_FILE contains shell escapes.
-
--eval "TK_LIB_FILE=${TK_LIB_FILE}"
-+TK_SOMAJOR=".0"
-+TK_SOVERSION="${TK_SOMAJOR}.0"
-+eval "TK_LIB_SONAME=${TK_LIB_FILE}${TK_SOMAJOR}"
-+eval "TK_LIB_FILE=${TK_LIB_FILE}${TK_SOVERSION}"
-+AC_SUBST(TK_LIB_SONAME)
-
- if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
- SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_LIB_SPEC}"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tk.git/commitdiff/537c3d1a6947c7bc2647e46d7c054e77b80a4348
More information about the pld-cvs-commit
mailing list