Re: [PR PATCH] [Updated] tcl, tk: update to 8.6.12

[4ricci <4ricci@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1536 bytes --]

There is an updated pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages tcl-tk
https://github.com/void-linux/void-packages/pull/34598

tcl, tk: update to 8.6.12
I didn't include `checkdepends` for database tests.
Failed tests do not cause `xbps-src` to exit with failure.
Except for `cmdAH-25.3 Tcl_FileObjCmd: owned`, which fails because in the chroot `/` is actually owned by the user, the only failure is `pkgconfig-1.1 query keys`. It doesn't fail when using built-in sqlite.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34598.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tcl-tk-34598.patch --]
[-- Type: text/x-diff, Size: 3022 bytes --]

From 526dc2b0ebcf0d75cfb99e80c8e466b8ef908f91 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 17 Dec 2021 12:23:27 +0100
Subject: [PATCH 1/2] tcl: update to 8.6.12.

- enable tests
- use vsed
---
 srcpkgs/tcl/patches/tcl-stat64.patch | 11 -----------
 srcpkgs/tcl/template                 | 12 +++++++++---
 2 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/tcl/patches/tcl-stat64.patch

diff --git a/srcpkgs/tcl/patches/tcl-stat64.patch b/srcpkgs/tcl/patches/tcl-stat64.patch
deleted file mode 100644
index b0133ec40cba..000000000000
--- a/srcpkgs/tcl/patches/tcl-stat64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/generic/tcl.h
-+++ b/generic/tcl.h
-@@ -17,6 +17,8 @@
- #ifndef _TCL
- #define _TCL
- 
-+#include <sys/stat.h>
-+
- /*
-  * For C++ compilers, use extern "C"
-  */
diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template
index d36663d8b1fa..f6044ec1af23 100644
--- a/srcpkgs/tcl/template
+++ b/srcpkgs/tcl/template
@@ -1,6 +1,6 @@
 # Template file for 'tcl'
 pkgname=tcl
-version=8.6.11
+version=8.6.12
 revision=1
 wrksrc="tcl${version}"
 build_wrksrc=unix
@@ -14,13 +14,19 @@ short_desc="TCL scripting language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="TCL"
 homepage="http://www.tcl.tk"
+changelog="https://core.tcl-lang.org/tcl/raw?ci=trunk&filename=changes&m=text/plain"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}${version}-src.tar.gz"
-checksum=8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
+checksum=26c995dd0f167e48b11961d891ee555f680c175f7173ff8cb829f4ebcde4c1a6
 
 shlib_provides="libtcl${version%.*}.so"
 
 post_extract() {
-	sed -i 's/-DSQLITE_API=MODULE_SCOPE//g' pkgs/sqlite*/Makefile.in
+	vsed -i pkgs/sqlite*/Makefile.in -e 's/-DSQLITE_API=MODULE_SCOPE//g'
+}
+
+do_check() {
+	# thread-4.5 and thread-5* are skipped because they test UB
+	make test TESTFLAGS="-skip 'thread-4.5 thread-5*'"
 }
 
 do_install() {

From 8c8c8ee8e216f15e109f32d74d25b21123c24f79 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 17 Dec 2021 12:23:32 +0100
Subject: [PATCH 2/2] tk: update to 8.6.12.

---
 srcpkgs/tk/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template
index d09a878d6256..e37432f7e413 100644
--- a/srcpkgs/tk/template
+++ b/srcpkgs/tk/template
@@ -1,6 +1,6 @@
 # Template file for 'tk'
 pkgname=tk
-version=8.6.11
+version=8.6.12
 revision=1
 wrksrc="tk${version}"
 build_wrksrc=unix
@@ -14,8 +14,9 @@ short_desc="TK graphical user interface toolkit for TCL"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:TCL"
 homepage="http://www.tcl.tk"
+changelog="https://core.tcl-lang.org/tk/raw?ci=trunk&filename=changes&m=text/plain"
 distfiles="${SOURCEFORGE_SITE}/tcl/${pkgname}${version}-src.tar.gz"
-checksum=5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282
+checksum=12395c1f3fcb6bed2938689f797ea3cdf41ed5cb6c4766eec8ac949560310630
 
 shlib_provides="libtk8.6.so"