From ec8a9cc5189d41cf751e872f5c13da3fdc9187ee Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 18 Sep 2023 21:45:19 +0200 Subject: [PATCH] package/tcl: fix package patch The commit 4e365d1768 "package/tcl: bump to version 8.6.13" did NOT refreshed the package patch, because the patch was still applying correctly and the package was working as expected. It was refreshed in the previous bump, in commit 9cf314745a "package/tcl: bump to version 8.6.12". This was part of 2022.02. Looking closer at the patch content, the -/+ lines are exactly the same. So this patch does not change anything. Since the file was kept and the commit log mention a patch refresh, the intent was more likely to carry over the old patch (which was declaring all libc functions as "unbroken". This commit actually refreshes this patch. It was regenerated with git format-patch. Since the patch is renamed due to git format-patch, the .checkpackageignore is updated accordingly. Note: This ancient patch will be removed soon, as an upstream commit [1], not yet in a release, cleaned up and removed those old parts. [1] https://github.com/tcltk/tcl/commit/04d66a25716cb7738dad3170cca4d0a4683db08a Cc: Fabrice Fontaine Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 2 +- ... 0001-Disable-tcl-compatibility-layers.patch} | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) rename package/tcl/{0001-dont-build-compat.patch => 0001-Disable-tcl-compatibility-layers.patch} (61%) diff --git a/.checkpackageignore b/.checkpackageignore index 8acd9558eb..f8aaf41af9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1388,7 +1388,7 @@ package/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch Upstr package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch Upstream package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch Upstream package/tcf-agent/S55tcf-agent Shellcheck Variables -package/tcl/0001-dont-build-compat.patch Upstream +package/tcl/0001-Disable-tcl-compatibility-layers.patch Upstream package/tesseract-ocr/0001-Check-if-platform-supports-feenableexcept.patch Upstream package/tesseract-ocr/0002-configure.ac-fix-build-on-aarch64_be.patch Upstream package/tftpd/0001-Use-extern-qualifier-to-fix-gcc-10.x-build.patch Upstream diff --git a/package/tcl/0001-dont-build-compat.patch b/package/tcl/0001-Disable-tcl-compatibility-layers.patch similarity index 61% rename from package/tcl/0001-dont-build-compat.patch rename to package/tcl/0001-Disable-tcl-compatibility-layers.patch index 7a7d959cd2..b7b776ad5d 100644 --- a/package/tcl/0001-dont-build-compat.patch +++ b/package/tcl/0001-Disable-tcl-compatibility-layers.patch @@ -1,4 +1,6 @@ +From c829552921f0c7c8e522f911135ee100742b441b Mon Sep 17 00:00:00 2001 From: Andrew Ruder +Date: Tue, 8 Apr 2014 15:54:04 -0500 Subject: [PATCH] Disable tcl compatibility layers Turn off building compatibility layers for old/broken versions of @@ -9,17 +11,25 @@ to not have broken behavior. Signed-off-by: Andrew Ruder [Fabrice: Update for 8.6.12] Signed-off-by: Fabrice Fontaine +[Julien: Update for 8.6.13] +Signed-off-by: Julien Olivain --- + unix/tcl.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/tcl.m4 b/unix/tcl.m4 +index ca94abd4ad..42eb58d384 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 -@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ +@@ -2646,7 +2646,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ #include #include int main() {]$2[}]]])],[tcl_cv_$1_unbroken=ok], - [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) -+ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=unknown])) - if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then ++ [tcl_cv_$1_unbroken=broken],[tcl_cv_$1_unbroken=ok])) + if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then tcl_ok=1 else +-- +2.41.0 +