diff --git a/oops.patch b/oops.patch index 90eba642f54a8fddc735265df779a40024cfaaae..ea6285aec14056a23ddafac7f6b0a633bac23b78 100644 --- a/oops.patch +++ b/oops.patch @@ -5,8 +5,7 @@ Subject: [PATCH 0239/1800] oops --- generic/tclOOMethod.c | 4 +--- - generic/tclTest.c | 4 ++-- - 2 files changed, 3 insertions(+), 5 deletions(-) + 1 file changed, 1 insertions(+), 3 deletions(-) diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c index c65003f..0c7884a 100644 @@ -23,24 +22,6 @@ index c65003f..0c7884a 100644 return pmPtr->procPtr->bodyPtr; } return NULL; -diff --git a/generic/tclTest.c b/generic/tclTest.c -index d3eb3b3..ea07291 100644 ---- a/generic/tclTest.c -+++ b/generic/tclTest.c -@@ -7253,11 +7253,11 @@ TestconcatobjCmd( - - list1Ptr = Tcl_NewStringObj("foo bar sum", -1); - Tcl_ListObjLength(NULL, list1Ptr, &len); -- Tcl_InvalidateStringrep(list1Ptr); -+ Tcl_InvalidateStringRep(list1Ptr); - - list2Ptr = Tcl_NewStringObj("eeny meeny", -1); - Tcl_ListObjLength(NULL, list2Ptr, &len); -- Tcl_InvalidateStringrep(list2Ptr); -+ Tcl_InvalidateStringRep(list2Ptr); - - /* - * Verify that concat'ing a list obj with one or more empty strings does -- 2.27.0 diff --git a/stay-out-of-internals-when-nice-interfaces-are-avail.patch b/stay-out-of-internals-when-nice-interfaces-are-avail.patch index 558208385ed3b88482ae0faf4cadd134c50e3555..6ef9df44d068ab9d532801d1624705a1ce5ca1ac 100644 --- a/stay-out-of-internals-when-nice-interfaces-are-avail.patch +++ b/stay-out-of-internals-when-nice-interfaces-are-avail.patch @@ -20,7 +20,7 @@ index 7c30d36e7..5bfa8f7ca 100644 - ckfree(list1Ptr->bytes); - list1Ptr->bytes = NULL; - } -+ Tcl_InvalidateStringrep(list1Ptr); ++ Tcl_InvalidateStringRep(list1Ptr); list2Ptr = Tcl_NewStringObj("eeny meeny", -1); Tcl_ListObjLength(NULL, list2Ptr, &len); @@ -28,7 +28,7 @@ index 7c30d36e7..5bfa8f7ca 100644 - ckfree(list2Ptr->bytes); - list2Ptr->bytes = NULL; - } -+ Tcl_InvalidateStringrep(list2Ptr); ++ Tcl_InvalidateStringRep(list2Ptr); /* * Verify that concat'ing a list obj with one or more empty strings does diff --git a/tcl-8.6.12-autopath.patch b/tcl-8.6.15-autopath.patch similarity index 86% rename from tcl-8.6.12-autopath.patch rename to tcl-8.6.15-autopath.patch index 4a14dd30e3b92752c93a13431110e3b5fe8b596a..cf9f9c0417cf0cb57924f9096072b11e6b84e2d4 100644 --- a/tcl-8.6.12-autopath.patch +++ b/tcl-8.6.15-autopath.patch @@ -42,15 +42,15 @@ diff --git a/unix/configure.in b/unix/configure.in index c73f368..5c57692 100644 --- a/unix/configure.in +++ b/unix/configure.in -@@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then +@@ -869,9 +869,9 @@ test -z "$TCL_MODULE_PATH" && \ TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl" elif test "$prefix/lib" != "$libdir"; then -- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}" -+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" +- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}:${prefix}/lib" ++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6" else -- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}" -+ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" +- test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib" ++ test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6" fi #-------------------------------------------------------------------- diff --git a/tcl-8.6.12-conf.patch b/tcl-8.6.15-conf.patch similarity index 85% rename from tcl-8.6.12-conf.patch rename to tcl-8.6.15-conf.patch index 6e90fcb762c43ac5597b0e052bf610243c7e7980..451eded5f9693f83f43663aad9a68ae3228ea8f5 100644 --- a/tcl-8.6.12-conf.patch +++ b/tcl-8.6.15-conf.patch @@ -2,7 +2,7 @@ diff --git a/unix/tcl.m4 b/unix/tcl.m4 index f3d08ec..ed12cda 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -1382,7 +1382,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ +@@ -1378,7 +1378,7 @@ # get rid of the warnings. #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" @@ -11,8 +11,8 @@ index f3d08ec..ed12cda 100644 DL_OBJS="tclLoadDl.o" DL_LIBS="-ldl" LDFLAGS="$LDFLAGS -Wl,--export-dynamic" -@@ -1398,7 +1398,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - esac +@@ -1394,7 +1394,7 @@ + esac AS_IF([test $doRpath = yes], [ - CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"']) diff --git a/tcl-core8.6.14-src.tar.gz b/tcl-core8.6.15-src.tar.gz similarity index 48% rename from tcl-core8.6.14-src.tar.gz rename to tcl-core8.6.15-src.tar.gz index 9364df45b2116e42d6f3182ccbb35fee7dc927c7..f143e7f9cda5fffbca9d339c8d39abadc739a35e 100644 Binary files a/tcl-core8.6.14-src.tar.gz and b/tcl-core8.6.15-src.tar.gz differ diff --git a/tcl.spec b/tcl.spec index 4af27b9332af5cfd4a3e3d5e28956867dacc65c3..05d4d720aa8e50b2bce7c00374f3d6a49ff933f4 100644 --- a/tcl.spec +++ b/tcl.spec @@ -1,11 +1,11 @@ %define MAJOR 8.6 Name: tcl -Version: 8.6.14 +Version: 8.6.15 Release: 1 Epoch: 1 Summary: The Tool Command Language implementation -License: BSD +License: TCL AND GPL-3.0-or-later WITH bison-exception-2.2 AND BSD-3-Clause URL: https://sourceforge.net/projects/tcl/ Source0: http://downloads.sourceforge.net/sourceforge/tcl/tcl-core%{version}-src.tar.gz @@ -14,8 +14,8 @@ Provides: tcl(abi) = %{MAJOR} Obsoletes: tcl-tcldict <= %{version} Provides: tcl-tcldict = %{version} -Patch0: tcl-8.6.12-autopath.patch -Patch1: tcl-8.6.12-conf.patch +Patch0: tcl-8.6.15-autopath.patch +Patch1: tcl-8.6.15-conf.patch Patch2: tcl-8.6.10-hidden.patch Patch3: tcl-8.6.10-tcltests-path-fix.patch Patch4: stay-out-of-internals-when-nice-interfaces-are-avail.patch @@ -50,7 +50,7 @@ The development files for tcl. %autosetup -n %{name}%{version} -p1 %build -cd unix +pushd unix autoconf %configure --enable-threads --enable-symbols --enable-shared --enable-dtrace %ifnarch loongarch64 @@ -58,12 +58,13 @@ autoconf %else %make_build CFLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive" TCL_LIBRARY=%{_datadir}/%{name}%{MAJOR} %endif +popd %install -cd unix +pushd unix make INSTALL_ROOT=$RPM_BUILD_ROOT TCL_LIBRARY=%{_datadir}/%{name}%{MAJOR} install +popd -cd .. ln -s tclsh%{MAJOR} %{buildroot}%{_bindir}/tclsh ln -s lib%{name}%{MAJOR}.so $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so @@ -87,22 +88,13 @@ sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" %{bu rm -rf %{buildroot}/%{_datadir}/%{name}%{MAJOR}/ldAix %check -cd unix -make test - -%pre - -%preun - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig +pushd unix +%make_build test +popd %files -%defattr(-,root,root) -%doc README.md changes COPYING +%license COPYING +%doc README.md changes %{_bindir}/tclsh* %dir %{_libdir}/%{name}%{MAJOR} %{_datadir}/%{name}%{MAJOR} @@ -121,11 +113,12 @@ make test %{_datadir}/%{name}%{MAJOR}/tclAppInit.c %files help -%{_mandir}/man3/* -%{_mandir}/man1/* -%{_mandir}/mann/* +%{_mandir}/man?/* %changelog +* Tue Sep 17 2024 Funda Wang - 1:8.6.15-1 +- update to 8.6.15 + * Thu Feb 29 2024 wangqia - 1:8.6.13-1 - Update to version 8.6.14 diff --git a/tcl.yaml b/tcl.yaml index af2f65b90a2680c92a9a04ad698073850c2cae8a..ae7c818e6068ba02dedb80112a3b5d436bb59947 100644 --- a/tcl.yaml +++ b/tcl.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: tcltk/tcl tag_prefix: ^core- -seperator: "-" +separator: "-"