[PR PATCH] python: update to 2.7.18.6.

[PR PATCH] python: update to 2.7.18.6.

[sgn]

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages python-2.7.18.6
https://github.com/void-linux/void-packages/pull/41297

python: update to 2.7.18.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/41297.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-python-2.7.18.6-41297.patch --]
[-- Type: text/x-diff, Size: 9050 bytes --]

From 80005f6a067a5504f3a47f8befe58dbce594b5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 26 Dec 2022 19:30:16 +0700
Subject: [PATCH] python: update to 2.7.18.6.

---
 srcpkgs/idle-python                           |  2 +-
 srcpkgs/python-tkinter                        |  1 +
 srcpkgs/python-tkinter/files/cross.patch      |  1 -
 srcpkgs/python-tkinter/template               | 86 -------------------
 srcpkgs/python-tkinter/update                 |  1 -
 .../files/idle2.desktop                       |  0
 .../files/idle2.xpm                           |  0
 srcpkgs/python/template                       | 52 +++++++----
 8 files changed, 36 insertions(+), 107 deletions(-)
 create mode 120000 srcpkgs/python-tkinter
 delete mode 120000 srcpkgs/python-tkinter/files/cross.patch
 delete mode 100644 srcpkgs/python-tkinter/template
 delete mode 120000 srcpkgs/python-tkinter/update
 rename srcpkgs/{python-tkinter => python}/files/idle2.desktop (100%)
 rename srcpkgs/{python-tkinter => python}/files/idle2.xpm (100%)

diff --git a/srcpkgs/idle-python b/srcpkgs/idle-python
index 0d091609e9667..d8654aa0e2f2f 120000
--- a/srcpkgs/idle-python
+++ b/srcpkgs/idle-python
@@ -1 +1 @@
-python-tkinter
\ No newline at end of file
+python
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter b/srcpkgs/python-tkinter
new file mode 120000
index 0000000000000..d8654aa0e2f2f
--- /dev/null
+++ b/srcpkgs/python-tkinter
@@ -0,0 +1 @@
+python
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/cross.patch b/srcpkgs/python-tkinter/files/cross.patch
deleted file mode 120000
index c27b8a16c1131..0000000000000
--- a/srcpkgs/python-tkinter/files/cross.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../python/files/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
deleted file mode 100644
index 833087c20c7b8..0000000000000
--- a/srcpkgs/python-tkinter/template
+++ /dev/null
@@ -1,86 +0,0 @@
-# Template file for 'python-tkinter'
-#
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python"; IT IS SPLITTED TO AVOID
-# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
-#
-
-_desc="Interpreted, interactive, object-oriented programming language"
-
-pkgname=python-tkinter
-version=2.7.18.5
-revision=1
-pycompile_dirs="usr/lib/python2.7/lib-tk"
-hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel tk-devel"
-short_desc="${_desc} - GUI toolkit for Python2"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Python-2.0"
-homepage="https://www.python.org"
-distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=3a829df9331f9b8d827553df92256533da51622aab013452b0b56731d17c53d6
-
-pre_configure() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -r Modules/expat
-	rm -r Modules/_ctypes/libffi*
-	rm -r Modules/zlib
-	# Enable loading sqlite extensions.
-	vsed -i '/SQLITE_OMIT_LOAD_EXTENSION/d' setup.py
-}
-
-do_configure() {
-	unset GCC CC CXX CPP LD AR AS RANLIB
-	if [ "$CROSS_BUILD" ]; then
-		mkdir -p host-build
-		cd host-build
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH ../configure
-		env -i PATH=$PATH XBPS_ARCH=$XBPS_ARCH make ${makejobs} python
-		mkdir -p ../hostpython
-		mv python ../hostpython
-		cd ..
-		patch -Np0 -i ${FILESDIR}/cross.patch
-	fi
-	./configure ${configure_args} \
-		--enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
-		--with-computed-gotos --with-wctype-functions --with-dbmliborder=gdbm:ndbm \
-		--with-system-expat --with-system-ffi --without-ensurepip
-}
-
-do_build() {
-	export PATH="$PATH:$wrksrc/hostpython"
-	make ${makejobs}
-}
-
-do_install() {
-	export PATH="$PATH:$wrksrc/hostpython"
-
-	mkdir -p ${wrksrc}/tmp-destdir/usr/lib
-	ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}
-
-	make DESTDIR=${wrksrc}/tmp-destdir altinstall
-
-	# We only care for the idle and tk modules.
-	vmkdir usr/bin
-	vmkdir usr/lib/python2.7/lib-dynload
-	mv ${wrksrc}/tmp-destdir/usr/bin/idle ${DESTDIR}/usr/bin/idle2.7
-	mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/idlelib \
-		${DESTDIR}/usr/lib/python2.7/
-	mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-tk \
-		${DESTDIR}/usr/lib/python2.7/
-	mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-dynload/_tkinter.so \
-		${DESTDIR}/usr/lib/python2.7/lib-dynload/
-	ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2
-}
-
-idle-python_package() {
-	short_desc="${_desc} - IDE for Python2 using Tkinter"
-	pycompile_dirs="usr/lib/python2.7/idlelib"
-	depends="${sourcepkg}-${version}_${revision}"
-	pkg_install() {
-		vmove usr/bin/idle2*
-		vmove usr/lib/python2.7/idlelib
-		vinstall ${FILESDIR}/idle2.xpm 644 usr/share/pixmaps
-		vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
-	}
-}
diff --git a/srcpkgs/python-tkinter/update b/srcpkgs/python-tkinter/update
deleted file mode 120000
index 468ac2c4f9c05..0000000000000
--- a/srcpkgs/python-tkinter/update
+++ /dev/null
@@ -1 +0,0 @@
-../python/update
\ No newline at end of file
diff --git a/srcpkgs/python-tkinter/files/idle2.desktop b/srcpkgs/python/files/idle2.desktop
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.desktop
rename to srcpkgs/python/files/idle2.desktop
diff --git a/srcpkgs/python-tkinter/files/idle2.xpm b/srcpkgs/python/files/idle2.xpm
similarity index 100%
rename from srcpkgs/python-tkinter/files/idle2.xpm
rename to srcpkgs/python/files/idle2.xpm
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 170067aad2ef1..8848dd584d954 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -1,21 +1,19 @@
 # Template file for 'python'
 #
-# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
-#
 pkgname=python
-version=2.7.18.5
+version=2.7.18.6
 revision=1
 pycompile_dirs="usr/lib/python2.7"
 hostmakedepends="pkg-config"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
- sqlite-devel bzip2-devel zlib-devel"
+ sqlite-devel bzip2-devel zlib-devel tk-devel"
 depends="ca-certificates"
 short_desc="Interpreted, interactive, object-oriented programming language"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Python-2.0"
 homepage="https://www.python.org"
 distfiles="https://github.com/ActiveState/cpython/archive/v${version}.tar.gz"
-checksum=e5e80ae00e20994150f2acfe4acfc541cbe6e4e77d334e1e7f9f33f303ab89ba
+checksum=be0b5104db52bfcde920e303fd881a5dc38c15eb8bdb96294d91951b150c926d
 
 alternatives="
  python:idle:/usr/bin/idle2.7
@@ -67,30 +65,26 @@ do_install() {
 	ln -sf python2.7-config ${DESTDIR}/usr/bin/python2-config
 	ln -sf python2.7.1 ${DESTDIR}/usr/share/man/man1/python2.1
 	ln -sf python-2.7.pc ${DESTDIR}/usr/lib/pkgconfig/python2.pc
-}
-
-post_install() {
 	chmod 755 ${DESTDIR}/usr/lib/libpython*.so*
 	vlicense LICENSE
 	rm -f ${DESTDIR}/usr/bin/smtpd.py
 	mv ${DESTDIR}/usr/bin/2to3{,-2.7}
 	mv ${DESTDIR}/usr/bin/pydoc{,2.7}
-	# Remove files that belong to python-tkinter and idle-python
-	rm ${DESTDIR}/usr/bin/idle
-	rm -r ${DESTDIR}/usr/lib/python2.7/idlelib
-	rm -r ${DESTDIR}/usr/lib/python2.7/lib-tk
+	# tkinter
+	mv ${DESTDIR}/usr/bin/idle ${DESTDIR}/usr/bin/idle${py2_ver}
+	ln -sf idle${py2_ver} ${DESTDIR}/usr/bin/idle2
 	# Remove test module and tests that fail to be byte-compiled.
-	rm -r ${DESTDIR}/usr/lib/python2.7/test
-	rm -r ${DESTDIR}/usr/lib/python2.7/lib2to3/tests
+	rm -r ${DESTDIR}/usr/lib/python${py2_ver}/test
+	rm -r ${DESTDIR}/usr/lib/python${py2_ver}/lib2to3/tests
 	# Remove references to the install(1) wrapper.
 	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
-		${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
-		${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+		${DESTDIR}/usr/lib/python${py2_ver}/_sysconfigdata.py \
+		${DESTDIR}/usr/lib/python${py2_ver}/config/Makefile
 	if [ "$CROSS_BUILD" ]; then
 		# Remove references to cross toolchain.
 		vsed -i "s/$XBPS_CROSS_TRIPLET-//g" \
-			${DESTDIR}/usr/lib/python${version%.*.*}/_sysconfigdata.py \
-			${DESTDIR}/usr/lib/python${version%.*.*}/config/Makefile
+			${DESTDIR}/usr/lib/python${py2_ver}/_sysconfigdata.py \
+			${DESTDIR}/usr/lib/python${py2_ver}/config/Makefile
 	fi
 }
 
@@ -107,3 +101,25 @@ python-devel_package() {
 			${DESTDIR}/usr/include/python2.7
 	}
 }
+
+python-tkinter_package() {
+	short_desc+=" - GUI toolkit by Tk"
+	pycompile_dirs="${py2_lib}/lib-tk"
+	depends="python-${version}_${revision}"
+	pkg_install() {
+		vmove ${py2_lib}/lib-tk
+		vmove ${py2_lib}/lib-dynload/_tkinter.so
+	}
+}
+
+idle-python_package() {
+	short_desc+=" - IDE for Python 2 using Tkinter"
+	pycompile_dirs="${py2_lib}/idlelib"
+	depends="python-tkinter-${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/idle2*
+		vmove ${py2_lib}/idlelib
+		vinstall ${FILESDIR}/idle2.xpm 644 usr/share/pixmaps
+		vinstall ${FILESDIR}/idle2.desktop 644 usr/share/applications
+	}
+}

Re: python: update to 2.7.18.6.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41297#issuecomment-1365556204

Comment:
Cycle: binutils -> elfutils -> libmicrohttpd -> gnutls -> libidn2 -> gtk-doc -> python3-anytree -> python-six -> python -> tk -> libXft -> fontconfig -> freetype -> brotli -> cmake -> gcc ->
 binutils

Re: python: update to 2.7.18.6.

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/41297#issuecomment-1365556204

Comment:
Cycle: binutils -> elfutils -> libmicrohttpd -> gnutls -> libidn2 -> gtk-doc -> python3-anytree -> python-six -> python -> tk -> libXft -> fontconfig -> freetype -> brotli -> cmake -> gcc -> binutils

Re: [PR PATCH] [Closed]: python: update to 2.7.18.6.

[sgn]

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

There's a closed pull request on the void-packages repository

python: update to 2.7.18.6.
https://github.com/void-linux/void-packages/pull/41297

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

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->