Re: [PR PATCH] [Updated] Xfce switch to python3

[voidlinux-github@inbox.vuxu.org]

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

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

https://github.com/sgn/void-packages xfce-switch-to-python3
https://github.com/void-linux/void-packages/pull/17766

Xfce switch to python3
- xfce: switch all python in its dependencies chain to Python 3
- notmuch: drop python 2 binding, it's not belong to this series, but I don't think it's worth to create sepatated PR for it.

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xfce-switch-to-python3-17766.patch --]
[-- Type: text/x-diff, Size: 8074 bytes --]

From 5afc60f6e9afdbba45fdbe899b6a6ebdd0d849a2 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 23:11:52 +0700
Subject: [PATCH 1/5] glade3: switch to python3

---
 srcpkgs/glade3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..f03bec62948 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,13 @@
 # Template file for 'glade3'
 pkgname=glade3
 version=3.22.1
-revision=3
+revision=4
 wrksrc="glade-${version}"
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config"
-makedepends="gtk+3-devel python-gobject-devel"
+makedepends="gtk+3-devel python3-gobject-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="User Interface Designer for GTK+3"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -27,7 +27,7 @@ do_check() {
 }
 
 libgladeui3_package() {
-	depends="python-gobject"
+	depends="python3-gobject"
 	short_desc="GTK+ User Interface Build core library"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"

From d1b76736afb099939f5eb964dceca0ad874de8b1 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 23:53:18 +0700
Subject: [PATCH 2/5] libbytesize: drop python2 in checkdepends

---
 srcpkgs/libbytesize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index cb72e5b9fe4..0753ca08d00 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
 build_style=gnu-configure
 hostmakedepends="python3"
 makedepends="mpfr-devel pcre2-devel"
-checkdepends="python3-six python-six"
+checkdepends="python3-six"
 short_desc="Library for operations with sizes in bytes"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 79b0d29a673461b05445809fece71b216abbe18a Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 20:05:20 +0700
Subject: [PATCH 3/5] notmuch: drop python 2 binding

No packages depends on notmuch-python, it's safe to drop.
---
 srcpkgs/notmuch-python   |  1 -
 srcpkgs/notmuch/template | 23 +++++------------------
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 120000 srcpkgs/notmuch-python

diff --git a/srcpkgs/notmuch-python b/srcpkgs/notmuch-python
deleted file mode 120000
index 67778b7eb37..00000000000
--- a/srcpkgs/notmuch-python
+++ /dev/null
@@ -1 +0,0 @@
-notmuch
\ No newline at end of file
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 976ceef17e4..394323d9b5a 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -2,7 +2,7 @@
 pkgname=notmuch
 version=0.29.3
 revision=2
-hostmakedepends="perl pkg-config python-devel python3-Sphinx python3-devel"
+hostmakedepends="perl pkg-config python3-Sphinx python3-devel"
 makedepends="bash-completion gmime3-devel talloc-devel xapian-core-devel"
 short_desc="Thread-based email index, search, and tagging"
 maintainer="Jan S. <jan.schreib@gmail.com>"
@@ -11,7 +11,7 @@ homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz"
 checksum=d5f704b9a72395e43303de9b1f4d8e14dd27bf3646fdbb374bb3dbb7d150dc35
 
-subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python notmuch-python3"
+subpackages="libnotmuch libnotmuch-devel notmuch-mutt notmuch-python3"
 patch_args=-Np1
 
 case "$XBPS_TARGET_MACHINE" in
@@ -40,16 +40,13 @@ do_build() {
 	make ${makejobs} V=1
 	make -C contrib/notmuch-mutt
 	cd bindings/python
-	python2 setup.py build --build-base=build-2
-	python3 setup.py build --build-base=build-3
+	python3 setup.py build
 }
 
 do_install() {
 	make DESTDIR=${DESTDIR} install
 	pushd bindings/python
-	python2 setup.py build --build-base=build-2 \
-		install --prefix=/usr --root=${DESTDIR}
-	python3 setup.py build --build-base=build-3 \
+	python3 setup.py build \
 		install --prefix=/usr --root=${DESTDIR}
 	popd
 	if [ ! "$CROSS_BUILD" ]; then
@@ -97,20 +94,10 @@ notmuch-mutt_package() {
 	}
 }
 
-notmuch-python_package() {
-	archs=noarch
-	depends="libnotmuch>=${version}_${revision}"
-	short_desc+=" - Python2 bindings"
-	pycompile_module="notmuch"
-	pkg_install() {
-		vmove ${py2_sitelib}
-	}
-}
-
 notmuch-python3_package() {
 	archs=noarch
 	depends="libnotmuch>=${version}_${revision}"
-	short_desc+=" - Python3 bindings"
+	short_desc+=" - Python 3 bindings"
 	pycompile_module="notmuch"
 	pkg_install() {
 		vmove ${py3_sitelib}

From 7d9823f7ac47ab7ad9cd4673ef3dc8e5969e2a1b Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Thu, 26 Dec 2019 19:50:36 +0700
Subject: [PATCH 4/5] libxml2-python: fetch distfiles from GNOME repository

www.xmlsoft.com is not reachable as of 2019-12-26
---
 srcpkgs/libxml2-python/template | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template
index cf78e1ef85f..04599d71a66 100644
--- a/srcpkgs/libxml2-python/template
+++ b/srcpkgs/libxml2-python/template
@@ -1,19 +1,35 @@
 # Template file for 'libxml2-python'
 pkgname=libxml2-python
 version=2.9.10
-revision=2
-wrksrc="${pkgname%-python}-${version}"
+revision=3
+wrksrc="${pkgname%-python}-v${version}"
 build_wrksrc=python
 build_style=python-module
-hostmakedepends="python-devel python3-devel"
+hostmakedepends="python-devel python3-devel autoconf automake libtool
+ pkg-config"
 makedepends="libxml2-devel python-devel python3-devel"
 depends="python python3"
 short_desc="Library providing XML and HTML support - Python2 bindings"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://www.xmlsoft.org/"
-distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz"
-checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+distfiles="https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${version}/libxml2-v${version}.tar.gz"
+checksum=f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501
+
+pre_configure() {
+	cd ..
+	NOCONFIGURE=1 autoreconf -fi
+	# don't run ./configure in do_configure,
+	# let python-module build-style have some freedom to change in future
+	./configure \
+		--prefix=/usr \
+		--disable-static \
+		--with-threads \
+		--with-history \
+		--with-icu \
+		--build=${XBPS_TRIPLET} \
+		--host=${XBPS_CROSS_TRIPLET}
+}
 
 pre_build() {
 	sed "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:" -i setup.py

From e25d0e958b027dc1bd7d9976eba3932ee7b2d6ee Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Thu, 26 Dec 2019 19:58:20 +0700
Subject: [PATCH 5/5] =?UTF-8?q?libxml2:=20fetch=20distfiles=20from=C2=A0GN?=
 =?UTF-8?q?OME=20repository?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 srcpkgs/libxml2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 2a421b78d38..3ea1753adf8 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,8 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=1
+revision=2
+wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--disable-static --with-threads --with-history --with-icu
  --without-python"
@@ -14,8 +15,8 @@ short_desc="Library providing XML and HTML support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="http://www.xmlsoft.org/"
-distfiles="http://xmlsoft.org/sources/${pkgname}-${version}.tar.gz"
-checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+distfiles="https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${version}/libxml2-v${version}.tar.gz"
+checksum=f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501
 
 pre_configure() {
 	autoreconf -fi