update to 8.6.13

This commit is contained in:
zhangruifang2020 2023-01-29 15:10:29 +08:00
parent 68663a6e26
commit 524099e119
4 changed files with 20 additions and 8 deletions

View File

@ -9,12 +9,12 @@ Subject: [PATCH 0239/1800] oops
2 files changed, 3 insertions(+), 5 deletions(-) 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index 34fa10893..6c9a2eb8d 100644 index c65003f..0c7884a 100644
--- a/generic/tclOOMethod.c --- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c +++ b/generic/tclOOMethod.c
@@ -1540,9 +1540,7 @@ TclOOGetMethodBody( @@ -1548,9 +1548,7 @@ TclOOGetMethodBody(
if (mPtr->typePtr == &procMethodType) { if (mPtr->typePtr == &procMethodType) {
ProcedureMethod *pmPtr = mPtr->clientData; ProcedureMethod *pmPtr = (ProcedureMethod *)mPtr->clientData;
- if (pmPtr->procPtr->bodyPtr->bytes == NULL) { - if (pmPtr->procPtr->bodyPtr->bytes == NULL) {
- (void) Tcl_GetString(pmPtr->procPtr->bodyPtr); - (void) Tcl_GetString(pmPtr->procPtr->bodyPtr);
@ -24,10 +24,10 @@ index 34fa10893..6c9a2eb8d 100644
} }
return NULL; return NULL;
diff --git a/generic/tclTest.c b/generic/tclTest.c diff --git a/generic/tclTest.c b/generic/tclTest.c
index 5bfa8f7ca..d96e35641 100644 index d3eb3b3..ea07291 100644
--- a/generic/tclTest.c --- a/generic/tclTest.c
+++ b/generic/tclTest.c +++ b/generic/tclTest.c
@@ -7012,11 +7012,11 @@ TestconcatobjCmd( @@ -7253,11 +7253,11 @@ TestconcatobjCmd(
list1Ptr = Tcl_NewStringObj("foo bar sum", -1); list1Ptr = Tcl_NewStringObj("foo bar sum", -1);
Tcl_ListObjLength(NULL, list1Ptr, &len); Tcl_ListObjLength(NULL, list1Ptr, &len);
@ -42,5 +42,5 @@ index 5bfa8f7ca..d96e35641 100644
/* /*
* Verify that concat'ing a list obj with one or more empty strings does * Verify that concat'ing a list obj with one or more empty strings does
-- --
2.19.1 2.27.0

Binary file not shown.

BIN
tcl-core8.6.13-src.tar.gz Normal file

Binary file not shown.

View File

@ -1,8 +1,8 @@
%define MAJOR 8.6 %define MAJOR 8.6
Name: tcl Name: tcl
Version: 8.6.12 Version: 8.6.13
Release: 2 Release: 1
Epoch: 1 Epoch: 1
Summary: The Tool Command Language implementation Summary: The Tool Command Language implementation
License: BSD License: BSD
@ -14,6 +14,9 @@ Provides: tcl(abi) = %{MAJOR}
Obsoletes: tcl-tcldict <= %{version} Obsoletes: tcl-tcldict <= %{version}
Provides: tcl-tcldict = %{version} Provides: tcl-tcldict = %{version}
#drop this symbol after tk upgrade to 8.6.13
Provides: tcl = 1:8.6.12
Patch0: tcl-8.6.12-autopath.patch Patch0: tcl-8.6.12-autopath.patch
Patch1: tcl-8.6.12-conf.patch Patch1: tcl-8.6.12-conf.patch
Patch2: tcl-8.6.10-hidden.patch Patch2: tcl-8.6.10-hidden.patch
@ -43,6 +46,9 @@ Help document for tcl.
Summary: The development files for tcl Summary: The development files for tcl
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
#drop this symbol after tk upgrade to 8.6.13
Provides: tcl-devel = 1:8.6.12
%description devel %description devel
The development files for tcl. The development files for tcl.
@ -126,6 +132,12 @@ make test
%{_mandir}/mann/* %{_mandir}/mann/*
%changelog %changelog
* Sun Jan 29 2023 zhangruifang2020 <zhangruifang1@h-partners.com> - 1:8.6.13-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:update to 8.6.13
* Tue Nov 15 2022 huajingyun <huajingyun@loongson.cn> - 1:8.6.12-2 * Tue Nov 15 2022 huajingyun <huajingyun@loongson.cn> - 1:8.6.12-2
- add build flags for weak symbols on loongarch64 - add build flags for weak symbols on loongarch64