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

From 13ff691f71517268dabbb4e2c750f52d8f1d07a4 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 e91b325e82b587e5fdd6507237f49c0e27a1140a 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 fed25b082e1714b455b067b27c964f3ed49c4435 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Tue, 24 Dec 2019 23:55:17 +0700
Subject: [PATCH 3/5] libcap-ng: drop python 2 binding

---
 srcpkgs/libcap-ng-python   |  1 -
 srcpkgs/libcap-ng/template | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/libcap-ng-python

diff --git a/srcpkgs/libcap-ng-python b/srcpkgs/libcap-ng-python
deleted file mode 120000
index 414bbce7c7f..00000000000
--- a/srcpkgs/libcap-ng-python
+++ /dev/null
@@ -1 +0,0 @@
-libcap-ng
\ No newline at end of file
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index c6ec4f0a216..99b6dab4a55 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -14,9 +14,9 @@ checksum=a84ca7b4e0444283ed269b7a29f5b6187f647c82e2b876636b49b9a744f0ffbf
 subpackages="libcap-ng-devel libcap-ng-progs"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libcap-ng-python libcap-ng-python3"
-	hostmakedepends="python-devel python3-devel swig"
-	configure_args+=" --with-python --with-python3"
+	subpackages+=" libcap-ng-python3"
+	hostmakedepends="python3-devel swig"
+	configure_args+=" --with-python3"
 fi
 
 libcap-ng-devel_package() {
@@ -38,6 +38,7 @@ libcap-ng-progs_package() {
 		vmove usr/share
 	}
 }
+
 libcap-ng-python3_package() {
 	lib32disabled=yes
 	short_desc+=" - Python3 bindings"
@@ -47,12 +48,3 @@ libcap-ng-python3_package() {
 		vmove ${py3_sitelib}
 	}
 }
-libcap-ng-python_package() {
-	lib32disabled=yes
-	short_desc+=" - Python2 bindings"
-	depends="python"
-	pycompile_module="capng.py"
-	pkg_install() {
-		vmove ${py2_sitelib}
-	}
-}

From ac6df8f9b4c99b648b19736779457e105936f846 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 4/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 c137d82f4752269954f1fcbc8f248e1dbed9261a Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Wed, 25 Dec 2019 09:30:47 +0700
Subject: [PATCH 5/5] libimobiledevice: switch to python 3

---
 srcpkgs/libimobiledevice/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 2737579f278..605deb8111e 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
 # Template file for 'libimobiledevice'
 pkgname=libimobiledevice
 version=1.2.0
-revision=14
+revision=15
 build_style=gnu-configure
-hostmakedepends="automake libtool pkgconf python-Cython"
-makedepends="python-devel libglib-devel libressl-devel libusb-devel
+hostmakedepends="automake libtool pkgconf python3-Cython"
+makedepends="python3-devel libglib-devel libressl-devel libusb-devel
  libplist-devel libusbmuxd-devel"
 short_desc="Library to communicate with Apple devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,7 +13,7 @@ homepage="https://github.com/libimobiledevice/libimobiledevice"
 distfiles="https://github.com/libimobiledevice/libimobiledevice/archive/${version}.tar.gz"
 checksum=8ba1ea817691b3548b83371f8ec22d73d1e37f8fda7c899ac9c7121d924ca830
 
-CFLAGS="-I/usr/include/python3.6"
+CFLAGS="-I/usr/include/python${py3_ver}"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args="ac_cv_sys_file_offset_bits=yes ac_cv_sys_large_file=yes"
@@ -22,8 +22,8 @@ fi
 pre_configure() {
 	sed -i 's,SSLv3_,SSLv23_,g' src/idevice.c
 	sed -i 's,-L$(libdir),,g' cython/Makefile.am
-	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7"
-	export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython2.7"
+	export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}"
+	export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}"
 	autoreconf -fi
 }