From aa341b5dd44e66a5bc39b84905c85751e0bd7ab4 Mon Sep 17 00:00:00 2001 From: zhangguangzhi Date: Sat, 11 Jan 2020 15:56:40 +0800 Subject: [PATCH] del patch to be consistent with open source --- tcl-8.6.3-autopath.patch | 56 ---------------------------------------- tcl-8.6.8-conf.patch | 19 -------------- tcl-8.6.8-hidden.patch | 35 ------------------------- tcl.spec | 16 +++++++----- 4 files changed, 9 insertions(+), 117 deletions(-) delete mode 100644 tcl-8.6.3-autopath.patch delete mode 100644 tcl-8.6.8-conf.patch delete mode 100644 tcl-8.6.8-hidden.patch diff --git a/tcl-8.6.3-autopath.patch b/tcl-8.6.3-autopath.patch deleted file mode 100644 index 98e5a19..0000000 --- a/tcl-8.6.3-autopath.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/library/auto.tcl b/library/auto.tcl -index 02edcc4..cd3b587 100644 ---- a/library/auto.tcl -+++ b/library/auto.tcl -@@ -81,6 +81,13 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} { - lappend dirs [::${basename}::pkgconfig get scriptdir,runtime] - } - -+ # 2a. As a sibling of Tcl's script directory -+ if {[catch { -+ ::tcl::pkgconfig get scriptdir,runtime -+ } value] == 0} { -+ lappend dirs [file join [file dirname $value] $basename$version] -+ } -+ - # 3. Relative to auto_path directories. This checks relative to the - # Tcl library as well as allowing loading of libraries added to the - # auto_path that is not relative to the core library or binary paths. -diff --git a/library/init.tcl b/library/init.tcl -index f1f7704..03ede56 100644 ---- a/library/init.tcl -+++ b/library/init.tcl -@@ -47,16 +47,11 @@ if {![info exists auto_path]} { - } - namespace eval tcl { - variable Dir -- foreach Dir [list $::tcl_library [file dirname $::tcl_library]] { -+ foreach Dir [list $::tcl_library] { - if {$Dir ni $::auto_path} { - lappend ::auto_path $Dir - } - } -- set Dir [file join [file dirname [file dirname \ -- [info nameofexecutable]]] lib] -- if {$Dir ni $::auto_path} { -- lappend ::auto_path $Dir -- } - catch { - foreach Dir $::tcl_pkgPath { - if {$Dir ni $::auto_path} { -diff --git a/unix/configure.in b/unix/configure.in -index e44d554..c017eaa 100755 ---- a/unix/configure.in -+++ b/unix/configure.in -@@ -886,9 +886,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then - test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl" - elif test "$prefix/lib" != "$libdir"; then -- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" -+ TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" - else -- TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}" -+ TCL_PACKAGE_PATH="${libdir}/tcl8.6 ${prefix}/share/tcl8.6 ${libdir}/tk8.6 ${prefix}/share/tk8.6 ${TCL_PACKAGE_PATH}" - fi - - #-------------------------------------------------------------------- diff --git a/tcl-8.6.8-conf.patch b/tcl-8.6.8-conf.patch deleted file mode 100644 index 2ec2c90..0000000 --- a/tcl-8.6.8-conf.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/unix/tcl.m4 b/unix/tcl.m4 -index 8a802fb..0df92fd 100644 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -1402,12 +1402,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ - # get rid of the warnings. - #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" - -- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' -+ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -fPIC -Wl,-soname,${@}' - DL_OBJS="tclLoadDl.o" - DL_LIBS="-ldl" - LDFLAGS="$LDFLAGS -Wl,--export-dynamic" - AS_IF([test $doRpath = yes], [ -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -+ CC_SEARCH_FLAGS='']) - LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) - AS_IF([test $do64bit = yes], [ diff --git a/tcl-8.6.8-hidden.patch b/tcl-8.6.8-hidden.patch deleted file mode 100644 index 8a4e4a1..0000000 --- a/tcl-8.6.8-hidden.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/generic/tclInt.h b/generic/tclInt.h -index 91c8b96..623a598 100644 ---- a/generic/tclInt.h -+++ b/generic/tclInt.h -@@ -3215,7 +3215,7 @@ MODULE_SCOPE void TclClockInit(Tcl_Interp *interp); - MODULE_SCOPE int TclClockOldscanObjCmd( - ClientData clientData, Tcl_Interp *interp, - int objc, Tcl_Obj *const objv[]); --MODULE_SCOPE int Tcl_CloseObjCmd(ClientData clientData, -+extern int Tcl_CloseObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); - MODULE_SCOPE int Tcl_ConcatObjCmd(ClientData clientData, -@@ -3396,7 +3396,7 @@ MODULE_SCOPE int Tcl_RenameObjCmd(ClientData clientData, - MODULE_SCOPE int Tcl_RepresentationCmd(ClientData clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); --MODULE_SCOPE int Tcl_ReturnObjCmd(ClientData clientData, -+extern int Tcl_ReturnObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, - Tcl_Obj *const objv[]); - MODULE_SCOPE int Tcl_ScanObjCmd(ClientData clientData, -diff --git a/generic/tclPort.h b/generic/tclPort.h -index 12a60db..d817154 100644 ---- a/generic/tclPort.h -+++ b/generic/tclPort.h -@@ -20,7 +20,7 @@ - #if defined(_WIN32) - # include "tclWinPort.h" - #else --# include "tclUnixPort.h" -+# include "../unix/tclUnixPort.h" - #endif - #include "tcl.h" - diff --git a/tcl.spec b/tcl.spec index 0d2ffbd..a6d975f 100644 --- a/tcl.spec +++ b/tcl.spec @@ -2,7 +2,7 @@ Name: tcl Version: 8.6.8 -Release: 6 +Release: 7 Epoch: 1 Summary: The Tool Command Language implementation License: BSD @@ -14,12 +14,8 @@ Provides: tcl(abi) = %{MAJOR} Obsoletes: tcl-tcldict <= %{version} Provides: tcl-tcldict = %{version} -#patch0000~0002 come from fedora -Patch0000: tcl-8.6.3-autopath.patch -Patch0001: tcl-8.6.8-conf.patch -Patch0002: tcl-8.6.8-hidden.patch -#patch0003 backport from https://core.tcl.tk/tcl/tktview/7d0db7c388f52de81faf12da332bc97a24f7b9e5 -Patch0003: tcl-8.6.5-parallel-make-fix.patch +#patch0000 backport from https://core.tcl.tk/tcl/tktview/7d0db7c388f52de81faf12da332bc97a24f7b9e5 +Patch0000: tcl-8.6.5-parallel-make-fix.patch Patch6000: stay-out-of-internals-when-nice-interfaces-are-avail.patch Patch6001: oops.patch @@ -141,6 +137,12 @@ make test %{_mandir}/mann/* %changelog +* Sat Jan 11 2020 zhangguangzhi - 1:8.6.8.7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:del patch to be consistent with open source + * Wed Dec 25 2019 chengquan - 1:8.6.8.6 - Type:bugfix - ID:NA -- Gitee