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

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 384 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


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: 5473 bytes --]

From 445b0b1cc13e8f6765156d211a8494eb32553841 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/4] 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 0e55ffbd3c1351664a3314c249e3823e8b5dfb4b 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/4] libbytesize: drop python2 in checkdepends

---
 srcpkgs/libbytesize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index cb72e5b9fe4..1be6e8c2fc7 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -3,9 +3,9 @@ pkgname=libbytesize
 version=2.1
 revision=2
 build_style=gnu-configure
-hostmakedepends="python3"
+hostmakedepends="python3 gettext"
 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 b4627bf2c83a2db877a7738946f39ed404c74a6e 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 3/4] 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 f74fcf4001e9567478a5c59da7610332cf5339e9 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 4/4] =?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