* [PR PATCH] Xfce switch to python3
@ 2019-12-25 2:36 voidlinux-github
2019-12-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
` (65 more replies)
0 siblings, 66 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-25 2:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
There is a new 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 fd50209883169d74acff23a7e20339df315249ed 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 ccbb3684eb5314b1d1e1197c5a500149d720b95a 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 a79d504df5fb7ab8666cf2a89995886ec5d4ad13 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 6f2f6ff122507d41ffe15614d1c52ff6f7a9e4a4 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 a16f3ca5a2bea4bd8c8afb218fcd99dfd40caed7 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
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
@ 2019-12-25 8:02 ` voidlinux-github
2019-12-25 16:01 ` voidlinux-github
` (64 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-25 8:02 UTC (permalink / raw)
To: ml
[-- 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
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
2019-12-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-12-25 16:01 ` voidlinux-github
2019-12-25 21:18 ` voidlinux-github
` (63 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-25 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by PaperMountainStudio on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-568911413
Comment:
glade3 depends on gnome-doc-utils which depends on python2, you might want to fix it :wink:
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
2019-12-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-25 16:01 ` voidlinux-github
@ 2019-12-25 21:18 ` voidlinux-github
2019-12-26 13:27 ` voidlinux-github
` (62 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-25 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-568932327
Comment:
On December 25, 2019 4:01:33 PM UTC, Paper Mountain Studio <notifications@github.com> wrote:
>glade3 depends on gnome-doc-utils which depends on python2, you might
>want to fix it :wink:
Ah, I didn't notice it.
Since I tried to removed Python 2 from xfce4, xfce4 depends on libglade3ui, which doesn't depend on gnome-doc-utils.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (2 preceding siblings ...)
2019-12-25 21:18 ` voidlinux-github
@ 2019-12-26 13:27 ` voidlinux-github
2019-12-26 13:27 ` [PR PATCH] [Updated] " voidlinux-github
` (61 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-26 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-569058466
Comment:
> glade3 depends on gnome-doc-utils which depends on python2, you might want to fix it wink
glade3 doesn't depend on gnome-doc-utils
It requires gnome-doc-utils to build documentation only
It doesn't require it for runtime.
Gnome-doc-utils doesn't support python3.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (3 preceding siblings ...)
2019-12-26 13:27 ` voidlinux-github
@ 2019-12-26 13:27 ` voidlinux-github
2019-12-26 14:23 ` voidlinux-github
` (60 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-26 13:27 UTC (permalink / raw)
To: ml
[-- 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: 11431 bytes --]
From 7c662f3e6bf6862190ac9b2d4cb861c693f4a99b 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/7] 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 079fc61c2726f67178cfa01ec4a331b4cf54cec2 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/7] 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 503c1d75fa7367e9e372680cb1f501b9057add29 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/7] 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 7446e7c6d106ca89b2656f5783a98760836f18b2 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/7] 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 1208cd2da5d32ae83bcaaa72e109bd1635222c50 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/7] 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
}
From 3f0768a49a6b3404f36357441badda7409081144 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 6/7] libxml2-python: fetch distfiles from GNOME repository
www.xmlsoft.com is not reachable as of 2019-12-26
---
srcpkgs/libxml2-python/template | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template
index cf78e1ef85f..b2e6a3cb88d 100644
--- a/srcpkgs/libxml2-python/template
+++ b/srcpkgs/libxml2-python/template
@@ -1,19 +1,26 @@
# 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 ..
+ autoreconf -fi
+ ./configure ${configure_args}
+}
pre_build() {
sed "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:" -i setup.py
From 0e3cf32f46bdb9b48a7674a6b74847fbda8a687a 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 7/7] =?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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (4 preceding siblings ...)
2019-12-26 13:27 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-12-26 14:23 ` voidlinux-github
2019-12-26 14:40 ` voidlinux-github
` (59 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-26 14:23 UTC (permalink / raw)
To: ml
[-- 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: 11711 bytes --]
From 7c662f3e6bf6862190ac9b2d4cb861c693f4a99b 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/7] 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 079fc61c2726f67178cfa01ec4a331b4cf54cec2 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/7] 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 503c1d75fa7367e9e372680cb1f501b9057add29 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/7] 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 7446e7c6d106ca89b2656f5783a98760836f18b2 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/7] 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 1208cd2da5d32ae83bcaaa72e109bd1635222c50 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/7] 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
}
From 4702dad62a6201971574fa0b4bb48684530e763d 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 6/7] 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 a048b474737252e15afc8411a2490328e2a1da56 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 7/7] =?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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (5 preceding siblings ...)
2019-12-26 14:23 ` voidlinux-github
@ 2019-12-26 14:40 ` voidlinux-github
2019-12-26 14:42 ` voidlinux-github
` (58 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-26 14:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-569069416
Comment:
Cross CI is failing because of some host dependencies haven't been built
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (6 preceding siblings ...)
2019-12-26 14:40 ` voidlinux-github
@ 2019-12-26 14:42 ` voidlinux-github
2019-12-27 13:01 ` [PR PATCH] [Updated] " voidlinux-github
` (57 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-26 14:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-569069601
Comment:
Yeah, the aarch64 and arm builders are still in staging state, due to obsolete pkgs that need to be removed...
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (7 preceding siblings ...)
2019-12-26 14:42 ` voidlinux-github
@ 2019-12-27 13:01 ` voidlinux-github
2020-01-01 6:59 ` voidlinux-github
` (56 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2019-12-27 13:01 UTC (permalink / raw)
To: ml
[-- 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: 11711 bytes --]
From f85170836ee2176fa7164e1730bf62568646da61 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/7] 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 c1f570910aa3372ec965d22836828308607a5598 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/7] 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 79a8fa3328015feadbe24dfebf757f7dc4bc7e55 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/7] 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 eb236567a265fc3e17ec9ec9b21facb17cba2367 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/7] 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 10c66862ada5140d1e30aa9a0fe124b6acd3f522 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/7] 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
}
From de8edc138262b5d161c33466eb37f52fc7c411d5 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 6/7] 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 0368502bae5fc4ad89f1fef215f587a038c218c0 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 7/7] =?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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (8 preceding siblings ...)
2019-12-27 13:01 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-01 6:59 ` voidlinux-github
2020-01-02 12:50 ` voidlinux-github
` (55 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-01 6:59 UTC (permalink / raw)
To: ml
[-- 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: 10020 bytes --]
From 126aa92b8d3e6792835fe7660ca0ac2d175d33fc 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/6] 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 de2f9ba27b174f2fed3885cbde94afec3ac35d54 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/6] 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 bc69044ba6fbe8796dfa551bc47eebddef674868 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/6] 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 ce255ef0b4fc3c00cfc7c167a697c3dec5bc6d68 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 4/6] 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
}
From ed623dae0dc75684fa0efee114a60760336c930f 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 5/6] 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 905e7493f353cfc54623c183bfb7e71f076a6ed3 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 6/6] =?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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (9 preceding siblings ...)
2020-01-01 6:59 ` voidlinux-github
@ 2020-01-02 12:50 ` voidlinux-github
2020-01-06 23:53 ` voidlinux-github
` (54 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-02 12:50 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (10 preceding siblings ...)
2020-01-02 12:50 ` voidlinux-github
@ 2020-01-06 23:53 ` voidlinux-github
2020-01-07 0:06 ` voidlinux-github
` (53 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-06 23:53 UTC (permalink / raw)
To: ml
[-- 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 a6ce53442501cb315ad8a713223d6e9326c2a787 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 2efc944d755c5958cce7c904382849a3b54ad75b 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 afd38a31a3ef51ac4a97990c709279f6d9ab6f6e 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 494e3bd8c74d3084b8cc835d908c4e20aabde3a4 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 922f9da85f7b5e978b03f4ed3f777d3f93a555a3 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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (11 preceding siblings ...)
2020-01-06 23:53 ` voidlinux-github
@ 2020-01-07 0:06 ` voidlinux-github
2020-01-07 14:04 ` voidlinux-github
` (52 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-07 0:06 UTC (permalink / raw)
To: ml
[-- 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: 5400 bytes --]
From 4d23de959e257227137d74dd302a20071e26dc93 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 1c99bde807a9d34203bb775cd785480c1461c92e 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 | 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 32d2081c07462c20822bcca438f8ed463566d1bf 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 b140d0e6490d379fd499ec0272040093233c2fc8 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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (12 preceding siblings ...)
2020-01-07 0:06 ` voidlinux-github
@ 2020-01-07 14:04 ` voidlinux-github
2020-01-11 2:41 ` voidlinux-github
` (51 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-07 14:04 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (13 preceding siblings ...)
2020-01-07 14:04 ` voidlinux-github
@ 2020-01-11 2:41 ` voidlinux-github
2020-01-18 10:07 ` voidlinux-github
` (50 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-11 2:41 UTC (permalink / raw)
To: ml
[-- 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: 5408 bytes --]
From 5e7f6749b9ba77c47a53ea22844967e75735d11c 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 a2ba79947b8afba2d2e52636279040f5c7be6dc2 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4f3e9e920f8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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 7726c871a75cd04acb49e79a86954888c8e3ecaf 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 741ade47c776b0eaf219075c0aefb33e926a1dec 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
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (14 preceding siblings ...)
2020-01-11 2:41 ` voidlinux-github
@ 2020-01-18 10:07 ` voidlinux-github
2020-01-18 10:40 ` voidlinux-github
` (49 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 10:07 UTC (permalink / raw)
To: ml
[-- 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: 2337 bytes --]
From 601c2ca25161b725487d7c9788efa5c7adbb9b83 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From ad5887542842893a9a13a4a347d54f76599ec09b 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 2/2] 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.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (15 preceding siblings ...)
2020-01-18 10:07 ` voidlinux-github
@ 2020-01-18 10:40 ` voidlinux-github
2020-01-18 11:16 ` voidlinux-github
` (48 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 10:40 UTC (permalink / raw)
To: ml
[-- 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: 2650 bytes --]
From 601c2ca25161b725487d7c9788efa5c7adbb9b83 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 545802b568d0a972900e5aa556b44fab9fe97f13 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3
---
srcpkgs/glade3/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..752bcd5eaa4 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>"
@@ -21,13 +21,20 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+if [ -n "$CROSS_BUILD" ]; then
+ case "$XBPS_TARGET_MACHINE" in
+ armv*-musl)
+ broken="https://api.travis-ci.org/v3/job/638781717/log.txt";;
+ esac
+fi
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
+ depends="python3-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (16 preceding siblings ...)
2020-01-18 10:40 ` voidlinux-github
@ 2020-01-18 11:16 ` voidlinux-github
2020-01-18 14:03 ` voidlinux-github
` (47 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 11:16 UTC (permalink / raw)
To: ml
[-- 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: 7777 bytes --]
From 601c2ca25161b725487d7c9788efa5c7adbb9b83 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 1b3a61fe96917a39f39c1d688f36e487c452868f 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 13 ++-
3 files changed, 147 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..18efe5ec330 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,14 @@
# 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"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake libtool gettext-devel gtk-doc autoconf-archive yelp-tools"
+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>"
@@ -21,13 +22,17 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
+ depends="python3-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (17 preceding siblings ...)
2020-01-18 11:16 ` voidlinux-github
@ 2020-01-18 14:03 ` voidlinux-github
2020-01-18 23:47 ` [PR PATCH] [Updated] " voidlinux-github
` (46 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-575901030
Comment:
The python-gobject dependency in libgladeui is wrong, and was always wrong - imo this should be on glade3 itself as that's what ships the python plugin
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (18 preceding siblings ...)
2020-01-18 14:03 ` voidlinux-github
@ 2020-01-18 23:47 ` voidlinux-github
2020-01-18 23:48 ` voidlinux-github
` (45 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 23:47 UTC (permalink / raw)
To: ml
[-- 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: 7861 bytes --]
From 67d3b00d3a1924fc74a1b58b85d5759c52ce427c 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From d693a9c5659e50e6334cbf333de5fce9003f1c14 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
3 files changed, 147 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..2536b2c20f8 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,14 +1,15 @@
# 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"
-depends="desktop-file-utils hicolor-icon-theme"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake libtool gettext-devel gtk-doc autoconf-archive yelp-tools"
+makedepends="gtk+3-devel python3-gobject-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-gobject"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -21,13 +22,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (19 preceding siblings ...)
2020-01-18 23:47 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-18 23:48 ` voidlinux-github
2020-01-18 23:58 ` [PR PATCH] [Updated] " voidlinux-github
` (44 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 23:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-575948991
Comment:
On 2020-01-18 06:03:05-0800, Daniel Kolesa <notifications@github.com> wrote:
> The python-gobject dependency in libgladeui is wrong, and was always
> wrong - imo this should be on glade3 itself as that's what ships the
> python plugin
You're correct, tested with my x86_64 setup.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (20 preceding siblings ...)
2020-01-18 23:48 ` voidlinux-github
@ 2020-01-18 23:58 ` voidlinux-github
2020-01-19 15:00 ` voidlinux-github
` (43 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-18 23:58 UTC (permalink / raw)
To: ml
[-- 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: 7926 bytes --]
From 67d3b00d3a1924fc74a1b58b85d5759c52ce427c 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 1f1ff1eec10313e0be8661750dc4b4425ca5cfd3 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
3 files changed, 147 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..2536b2c20f8 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,14 +1,15 @@
# 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"
-depends="desktop-file-utils hicolor-icon-theme"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake libtool gettext-devel gtk-doc autoconf-archive yelp-tools"
+makedepends="gtk+3-devel python3-gobject-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-gobject"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -21,13 +22,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (21 preceding siblings ...)
2020-01-18 23:58 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-19 15:00 ` voidlinux-github
2020-01-19 15:00 ` voidlinux-github
` (42 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-19 15:00 UTC (permalink / raw)
To: ml
[-- 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: 8041 bytes --]
From 67d3b00d3a1924fc74a1b58b85d5759c52ce427c 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 27d57c0efe50d102d83c31f98bbbc41ea6f26cda 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 17 ++--
3 files changed, 149 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..74a86833340 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,14 +1,16 @@
# 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"
-depends="desktop-file-utils hicolor-icon-theme"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-gobject"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -21,13 +23,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (22 preceding siblings ...)
2020-01-19 15:00 ` voidlinux-github
@ 2020-01-19 15:00 ` voidlinux-github
2020-01-20 3:06 ` voidlinux-github
` (41 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-19 15:00 UTC (permalink / raw)
To: ml
[-- 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: 8041 bytes --]
From ba5fa300e412c5e5438986d4e400db1e534102dc 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From f866ffaad96c6b6314a88698087991b132368ba8 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 17 ++--
3 files changed, 149 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..74a86833340 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,14 +1,16 @@
# 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"
-depends="desktop-file-utils hicolor-icon-theme"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel"
+depends="desktop-file-utils hicolor-icon-theme python3-gobject"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
@@ -21,13 +23,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (23 preceding siblings ...)
2020-01-19 15:00 ` voidlinux-github
@ 2020-01-20 3:06 ` voidlinux-github
2020-01-20 3:09 ` voidlinux-github
` (40 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 3:06 UTC (permalink / raw)
To: ml
[-- 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: 10033 bytes --]
From ba5fa300e412c5e5438986d4e400db1e534102dc 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 5fe02ff3d9a51ec2af3a6731bd18c9dc20e8e916 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3, add webkit module
- also split python and webkit module out
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3-python3 | 1 +
srcpkgs/glade3-webkit2gtk | 1 +
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 31 +++++-
6 files changed, 177 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/glade3-python3
create mode 120000 srcpkgs/glade3-webkit2gtk
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3-python3 b/srcpkgs/glade3-python3
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-python3
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3-webkit2gtk b/srcpkgs/glade3-webkit2gtk
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-webkit2gtk
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..fbf62cf60d0
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2020-01-20 09:30:53.496303801 +0700
++++ configure.ac 2020-01-20 09:31:07.815258081 +0700
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..e1da3f3d216 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,13 +23,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -50,3 +55,19 @@ glade3-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+glade3-python3_package() {
+ depends="glade3>=${version}_${revision} python3-gobject"
+ short_desc+=" - Python 3 module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladepython.so"
+ }
+}
+
+glade3-webkit2gtk_package() {
+ depends="glade3>=${version}_${revision}"
+ short_desc+=" - Webkit2GTK module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladewebkit2gtk.so"
+ }
+}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (24 preceding siblings ...)
2020-01-20 3:06 ` voidlinux-github
@ 2020-01-20 3:09 ` voidlinux-github
2020-01-20 13:26 ` voidlinux-github
` (39 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 3:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 203 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576088478
Comment:
I split the python binding out, and added webkit2gtk sub-packages.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (25 preceding siblings ...)
2020-01-20 3:09 ` voidlinux-github
@ 2020-01-20 13:26 ` voidlinux-github
2020-01-20 13:36 ` voidlinux-github
` (38 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 13:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576273611
Comment:
Hm, actually, this may be wrong. I'm looking at how other distributions do it, and they pretty much all put the modules in `libgladeui`; seems like these modules may be used at runtime by GLADE-using applications.
Which means, the right way would be to move the modules into the `libgladeui` package, as well as the python dependencies.
Interestingly, none of them seem to split the modules into subpackages...
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (26 preceding siblings ...)
2020-01-20 13:26 ` voidlinux-github
@ 2020-01-20 13:36 ` voidlinux-github
2020-01-20 14:14 ` voidlinux-github
` (37 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 13:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576277637
Comment:
Here's the Fedora list:
https://src.fedoraproject.org/rpms/glade3/blob/master/f/glade3.spec#_162
So the library should go in there, as well as the modules, and `/usr/share/glade3/{pixmaps,catalogs}`.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (27 preceding siblings ...)
2020-01-20 13:36 ` voidlinux-github
@ 2020-01-20 14:14 ` voidlinux-github
2020-01-20 14:26 ` voidlinux-github
` (36 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 14:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1265 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576292678
Comment:
On 2020-01-20 05:26:08-0800, Daniel Kolesa <notifications@github.com> wrote:
> Hm, actually, this may be wrong. I'm looking at how other
> distributions do it, and they pretty much all put the modules in
> `libgladeui`; seems like these modules may be used at runtime by
> GLADE-using applications.
Hm, I'm not a heavy user of xfce to conform this.
I mostly set it up for my sister.
From my limited time with xfce, libgladeui works fine without those
modules.
However, Arch disagree with your assertment.
They ship all those modules with glade, see:
https://www.archlinux.org/packages/extra/x86_64/glade/files/
and, the usr/lib/libglade-2.0.so with libgladeui, see:
https://www.archlinux.org/packages/extra/x86_64/libglade/files/
> Which means, the right way would be to move the modules into the
> `libgladeui` package, as well as the python dependencies.
>
> Interestingly, none of them seem to split the modules into subpackages...
I splited those submodules since webkit2gtk dependencies looks too big
to be installed.
However, consider glade is mostly a development package,
I think we can merge it back.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (28 preceding siblings ...)
2020-01-20 14:14 ` voidlinux-github
@ 2020-01-20 14:26 ` voidlinux-github
2020-01-20 14:39 ` [PR PATCH] [Updated] " voidlinux-github
` (35 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576297790
Comment:
On 2020-01-20 05:26:08-0800, Daniel Kolesa <notifications@github.com> wrote:
> Interestingly, none of them seem to split the modules into subpackages...
More interesting, Debian and Arch's XFCE doesn't depends on libglade.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (29 preceding siblings ...)
2020-01-20 14:26 ` voidlinux-github
@ 2020-01-20 14:39 ` voidlinux-github
2020-01-20 14:45 ` voidlinux-github
` (34 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 14:39 UTC (permalink / raw)
To: ml
[-- 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: 10050 bytes --]
From 4092df44ece36aa5cd8fc228bd8128f3136d9eb4 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/2] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From c8bc3d2a9a7e8b231d3f9a54b320a63561e4e9e5 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/2] glade3: switch to python3, add webkit module
- also split python and webkit module out
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3-python3 | 1 +
srcpkgs/glade3-webkit2gtk | 1 +
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 31 +++++-
6 files changed, 177 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/glade3-python3
create mode 120000 srcpkgs/glade3-webkit2gtk
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3-python3 b/srcpkgs/glade3-python3
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-python3
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3-webkit2gtk b/srcpkgs/glade3-webkit2gtk
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-webkit2gtk
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..fbf62cf60d0
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2020-01-20 09:30:53.496303801 +0700
++++ configure.ac 2020-01-20 09:31:07.815258081 +0700
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..436e1f059ce 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,13 +23,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -50,3 +55,19 @@ glade3-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+glade3-python3_package() {
+ depends="glade3>=${version}_${revision} python3-gobject"
+ short_desc+=" - Python 3 module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladepython.so"
+ }
+}
+
+glade3-webkit2gtk_package() {
+ depends="glade3>=${version}_${revision}"
+ short_desc+=" - Webkit2GTK module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladewebkit2gtk.so"
+ }
+}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (30 preceding siblings ...)
2020-01-20 14:39 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-20 14:45 ` voidlinux-github
2020-01-20 14:45 ` voidlinux-github
` (33 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 826 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576305583
Comment:
Debian:
https://packages.debian.org/sid/alpha/libgladeui-2-6/filelist
https://packages.debian.org/sid/libgladeui-2-6
all the modules are in `libgladeui` and it depends on both Python and Webkit.
The data files are then present in `libgladeui-common`, I don't think we need to split as much as that.
Since both the python and webkit modules appear to be optional, here is what we could do:
1) Move the modules and appropriate data in `libgladeui3`
2) Create `libgladeui3-python` and `libgladeui3-webkit`, each depending on `libgladeui3`; afterwards, the applications that require those modules could depend on them explicitly (there doesn't seem to be any of those, though)
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (31 preceding siblings ...)
2020-01-20 14:45 ` voidlinux-github
@ 2020-01-20 14:45 ` voidlinux-github
2020-01-20 14:55 ` voidlinux-github
` (32 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 919 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576305583
Comment:
Debian:
https://packages.debian.org/sid/alpha/libgladeui-2-6/filelist
https://packages.debian.org/sid/libgladeui-2-6
all the modules are in `libgladeui` and it depends on both Python and Webkit.
The data files are then present in `libgladeui-common`, I don't think we need to split as much as that.
Since both the python and webkit modules appear to be optional, here is what we could do:
1) Move the modules and appropriate data in `libgladeui3`
2) Create `libgladeui3-python` and `libgladeui3-webkit`, each depending on `libgladeui3`; afterwards, the applications that require those modules could depend on them explicitly (there doesn't seem to be any of those, though)
I'd disregard whatever Arch does, they always do things strange and not always correctly.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (32 preceding siblings ...)
2020-01-20 14:45 ` voidlinux-github
@ 2020-01-20 14:55 ` voidlinux-github
2020-01-20 15:04 ` voidlinux-github
` (31 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 14:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 998 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576305583
Comment:
Debian:
https://packages.debian.org/sid/alpha/libgladeui-2-6/filelist
https://packages.debian.org/sid/libgladeui-2-6
all the modules are in `libgladeui` and it depends on both Python and Webkit.
The data files are then present in `libgladeui-common`, I don't think we need to split as much as that.
Since both the python and webkit modules appear to be optional, here is what we could do:
1) Move the modules and appropriate data in `libgladeui3`
2) Create `libgladeui3-python` and `libgladeui3-webkit`, each depending on `libgladeui3`; afterwards, the applications that require those modules could depend on them explicitly (there doesn't seem to be any of those, though)
I'd disregard whatever Arch does, they always do things strange and not always correctly.
Also, Debian's does not depend on it because they pass `--disable-gladeui2`
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (33 preceding siblings ...)
2020-01-20 14:55 ` voidlinux-github
@ 2020-01-20 15:04 ` voidlinux-github
2020-01-20 15:04 ` voidlinux-github
` (30 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2030 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576313504
Comment:
I think those modules are plugins to glade's designed tools.
Our libxfce4ui is depended on libglade3ui because we're shipping a glade3's plugin with xfce:
```
$ xbps-query -Rf libxfce4ui | grep glade
/usr/lib/glade/modules/libxfce4uiglade2.so
/usr/share/glade/catalogs/libxfce4ui-2.xml
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png
/usr/share/glade/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png
```
From libxfce4ui's configure:
```
$ ./configure --help
--with-gladeui-catalogdir=PATH
Specify where to install glade designer catalog
files (default=autodetect)
--with-gladeui-moduledir=PATH
Specify where to install glade designer modules
(default=autodetect)
--with-gladeui-pixmapdir=PATH
Specify where to install glade designer pixmaps
(default=autodetect)
--with-gladeui2-catalogdir=PATH
Specify where to install glade 3.0 designer catalog
files (default=autodetect)
--with-gladeui2-moduledir=PATH
Specify where to install glade 3.0 designer modules
(default=autodetect)
--with-gladeui2-pixmapdir=PATH
Specify where to install glade 3.0 designer pixmaps
(default=autodetect)
```
and configure.ac
```
dnl *********************************************************
dnl *** Optional support for the Glade Interface Designer ***
dnl *********************************************************
dnl Do not try to build gladeui when gtk2 is disabled
```
I think all modules are optional plugins to glade,
and we should split those plugins out of our libxfce4ui
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (34 preceding siblings ...)
2020-01-20 15:04 ` voidlinux-github
@ 2020-01-20 15:04 ` voidlinux-github
2020-01-20 15:06 ` voidlinux-github
` (29 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2030 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576313504
Comment:
I think those modules are plugins to glade's designer tools.
Our libxfce4ui is depended on libglade3ui because we're shipping a glade3's plugin with xfce:
```
$ xbps-query -Rf libxfce4ui | grep glade
/usr/lib/glade/modules/libxfce4uiglade2.so
/usr/share/glade/catalogs/libxfce4ui-2.xml
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png
/usr/share/glade/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png
```
From libxfce4ui's configure:
```
$ ./configure --help
--with-gladeui-catalogdir=PATH
Specify where to install glade designer catalog
files (default=autodetect)
--with-gladeui-moduledir=PATH
Specify where to install glade designer modules
(default=autodetect)
--with-gladeui-pixmapdir=PATH
Specify where to install glade designer pixmaps
(default=autodetect)
--with-gladeui2-catalogdir=PATH
Specify where to install glade 3.0 designer catalog
files (default=autodetect)
--with-gladeui2-moduledir=PATH
Specify where to install glade 3.0 designer modules
(default=autodetect)
--with-gladeui2-pixmapdir=PATH
Specify where to install glade 3.0 designer pixmaps
(default=autodetect)
```
and configure.ac
```
dnl *********************************************************
dnl *** Optional support for the Glade Interface Designer ***
dnl *********************************************************
dnl Do not try to build gladeui when gtk2 is disabled
```
I think all modules are optional plugins to glade,
and we should split those plugins out of our libxfce4ui
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (35 preceding siblings ...)
2020-01-20 15:04 ` voidlinux-github
@ 2020-01-20 15:06 ` voidlinux-github
2020-01-20 15:10 ` [PR PATCH] [Updated] " voidlinux-github
` (28 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2124 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576313504
Comment:
I think those modules are plugins to glade's designer tools.
Our libxfce4ui is depended on libglade3ui because we're shipping a glade3's plugin with xfce:
```
$ xbps-query -Rf libxfce4ui | grep glade
/usr/lib/glade/modules/libxfce4uiglade2.so
/usr/share/glade/catalogs/libxfce4ui-2.xml
/usr/share/glade/pixmaps/hicolor/16x16/actions/widget-libxfce4ui-xfce-titled-dialog.png
/usr/share/glade/pixmaps/hicolor/22x22/actions/widget-libxfce4ui-xfce-titled-dialog.png
```
There're another package that ship a libglade's modules, that's libhandy-devel.
From libxfce4ui's configure:
```
$ ./configure --help
--with-gladeui-catalogdir=PATH
Specify where to install glade designer catalog
files (default=autodetect)
--with-gladeui-moduledir=PATH
Specify where to install glade designer modules
(default=autodetect)
--with-gladeui-pixmapdir=PATH
Specify where to install glade designer pixmaps
(default=autodetect)
--with-gladeui2-catalogdir=PATH
Specify where to install glade 3.0 designer catalog
files (default=autodetect)
--with-gladeui2-moduledir=PATH
Specify where to install glade 3.0 designer modules
(default=autodetect)
--with-gladeui2-pixmapdir=PATH
Specify where to install glade 3.0 designer pixmaps
(default=autodetect)
```
and configure.ac
```
dnl *********************************************************
dnl *** Optional support for the Glade Interface Designer ***
dnl *********************************************************
dnl Do not try to build gladeui when gtk2 is disabled
```
I think all modules are optional plugins to glade,
and we should move those plugins from libxfce4ui to libxfce4ui-devel
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (36 preceding siblings ...)
2020-01-20 15:06 ` voidlinux-github
@ 2020-01-20 15:10 ` voidlinux-github
2020-01-20 15:27 ` voidlinux-github
` (27 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 15:10 UTC (permalink / raw)
To: ml
[-- 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: 11119 bytes --]
From 4092df44ece36aa5cd8fc228bd8128f3136d9eb4 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From c8bc3d2a9a7e8b231d3f9a54b320a63561e4e9e5 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
- also split python and webkit module out
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3-python3 | 1 +
srcpkgs/glade3-webkit2gtk | 1 +
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 31 +++++-
6 files changed, 177 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/glade3-python3
create mode 120000 srcpkgs/glade3-webkit2gtk
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3-python3 b/srcpkgs/glade3-python3
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-python3
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3-webkit2gtk b/srcpkgs/glade3-webkit2gtk
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-webkit2gtk
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..fbf62cf60d0
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2020-01-20 09:30:53.496303801 +0700
++++ configure.ac 2020-01-20 09:31:07.815258081 +0700
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..436e1f059ce 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,13 +23,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -50,3 +55,19 @@ glade3-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+glade3-python3_package() {
+ depends="glade3>=${version}_${revision} python3-gobject"
+ short_desc+=" - Python 3 module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladepython.so"
+ }
+}
+
+glade3-webkit2gtk_package() {
+ depends="glade3>=${version}_${revision}"
+ short_desc+=" - Webkit2GTK module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladewebkit2gtk.so"
+ }
+}
From 79b1a211f0f4f0bc5c0a5885387e96cf0d3e4d69 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: move glade's plugin into devel package
---
srcpkgs/libxfce4ui/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..3fa35a47476 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -25,8 +25,10 @@ libxfce4ui-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/glade
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/glade
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (37 preceding siblings ...)
2020-01-20 15:10 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-20 15:27 ` voidlinux-github
2020-01-20 15:32 ` voidlinux-github
` (26 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 15:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576322825
Comment:
As far as I can see those modules are not for the interface designer, but rather they contain widget implementations that can be used at runtime by applications *as well as the designer*, same with the xfce plugin.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (38 preceding siblings ...)
2020-01-20 15:27 ` voidlinux-github
@ 2020-01-20 15:32 ` voidlinux-github
2020-01-21 4:58 ` voidlinux-github
` (25 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-20 15:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 649 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576322825
Comment:
As far as I can see those modules are not for the interface designer, but rather they contain widget implementations that can be used at runtime by applications *as well as the designer*, same with the xfce plugin.
I.e. the modules are loaded and used by `libgladeui`, which exposes them both to the interface designer itself as well as applications with interfaces designed using GLADE.
That's why it does not make sense to move the xfce plugin, and that's why it makes sense to do what i described above.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (39 preceding siblings ...)
2020-01-20 15:32 ` voidlinux-github
@ 2020-01-21 4:58 ` voidlinux-github
2020-01-21 4:59 ` [PR PATCH] [Updated] " voidlinux-github
` (24 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-21 4:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2898 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576518424
Comment:
> As far as I can see those modules are not for the interface designer,
> but rather they contain widget implementations that can be used
> at runtime by applications _as well as the designer_, same with the xfce plugin.
I don't think so,
Let's take libxfce4uiglade2.so as an example, it's compiled from a single C source file,
and contains only 3 functions:
```
void glade_xfce_titled_dialog_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GtkWidget *glade_xfce_titled_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
GtkDialog *dialog,
const gchar *name);
GList *glade_xfce_titled_dialog_get_children (GladeWidgetAdaptor *adaptor,
GtkDialog *dialog);
```
Which is used by glade
```
<?xml version="1.0" encoding="UTF-8"?>
<glade-catalog version="4.12.0" supports="gtkbuilder" name="libxfce4ui-2" library="xfce4uiglade2" domain="glade3" depends="gtk+" book="xfce4">
<glade-widget-classes>
<glade-widget-class name="XfceTitledDialog" generic-name="xfce-titled-dialog" title="Titled Dialog">
<post-create-function>glade_xfce_titled_dialog_post_create</post-create-function>
<get-internal-child-function>glade_xfce_titled_dialog_get_internal_child</get-internal-child-function>
<get-children-function>glade_xfce_titled_dialog_get_children</get-children-function>
<properties>
<property translatable="True" ignore="False" id="subtitle" name="Subtitle"></property>
<property translatable="True" ignore="False" id="title"/>
<property ignore="True" id="icon"/>
<property themed-icon="True" ignore="False" id="icon-name"/>
</properties>
</glade-widget-class>
</glade-widget-classes>
<glade-widget-group name="xfce4-widgets" title="Xfce 4 Widgets">
<glade-widget-class-ref name="XfceTitledDialog"/>
</glade-widget-group>
</glade-catalog>
```
as described by: https://developer.gnome.org/gladeui/stable/catalogintro.html
As far as I can tell, those functions are used to tell glade3
the supported properties of XfceTitledDialog.
> I.e. the modules are loaded and used by `libgladeui`, which exposes them both to the interface designer itself as well as applications with interfaces designed using GLADE.
I strongly believe that the application itself uses the Gtk+ derived Widget,
those modules were there to tell glade their supported properties.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (40 preceding siblings ...)
2020-01-21 4:58 ` voidlinux-github
@ 2020-01-21 4:59 ` voidlinux-github
2020-01-21 5:03 ` voidlinux-github
` (23 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-21 4:59 UTC (permalink / raw)
To: ml
[-- 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: 11186 bytes --]
From 4092df44ece36aa5cd8fc228bd8128f3136d9eb4 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From c8bc3d2a9a7e8b231d3f9a54b320a63561e4e9e5 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
- also split python and webkit module out
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3-python3 | 1 +
srcpkgs/glade3-webkit2gtk | 1 +
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 31 +++++-
6 files changed, 177 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/glade3-python3
create mode 120000 srcpkgs/glade3-webkit2gtk
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3-python3 b/srcpkgs/glade3-python3
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-python3
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3-webkit2gtk b/srcpkgs/glade3-webkit2gtk
new file mode 120000
index 00000000000..9888daa0cae
--- /dev/null
+++ b/srcpkgs/glade3-webkit2gtk
@@ -0,0 +1 @@
+glade3
\ No newline at end of file
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..fbf62cf60d0
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2020-01-20 09:30:53.496303801 +0700
++++ configure.ac 2020-01-20 09:31:07.815258081 +0700
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..436e1f059ce 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,13 +23,16 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
}
libgladeui3_package() {
- depends="python-gobject"
short_desc="GTK+ User Interface Build core library"
pkg_install() {
vmove "usr/lib/*.so.*"
@@ -50,3 +55,19 @@ glade3-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+glade3-python3_package() {
+ depends="glade3>=${version}_${revision} python3-gobject"
+ short_desc+=" - Python 3 module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladepython.so"
+ }
+}
+
+glade3-webkit2gtk_package() {
+ depends="glade3>=${version}_${revision}"
+ short_desc+=" - Webkit2GTK module"
+ pkg_install() {
+ vmove "usr/lib/glade/modules/libgladewebkit2gtk.so"
+ }
+}
From 9639d13e00437b92a0cc0b0dc00804b286e62093 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: move glade's plugin into devel package
---
srcpkgs/libxfce4ui/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..9bceb756c46 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -25,11 +25,13 @@ libxfce4ui-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/glade
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove usr/share/glade
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (41 preceding siblings ...)
2020-01-21 4:59 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-21 5:03 ` voidlinux-github
2020-01-21 5:09 ` voidlinux-github
` (22 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-21 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3049 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576518424
Comment:
> As far as I can see those modules are not for the interface designer,
> but rather they contain widget implementations that can be used
> at runtime by applications _as well as the designer_, same with the xfce plugin.
I don't think so,
Let's take libxfce4uiglade2.so as an example, it's compiled from a single C source file,
and contains only 3 functions:
```
void glade_xfce_titled_dialog_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GtkWidget *glade_xfce_titled_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
GtkDialog *dialog,
const gchar *name);
GList *glade_xfce_titled_dialog_get_children (GladeWidgetAdaptor *adaptor,
GtkDialog *dialog);
```
Which is used by glade
```
<?xml version="1.0" encoding="UTF-8"?>
<glade-catalog version="4.12.0" supports="gtkbuilder" name="libxfce4ui-2" library="xfce4uiglade2" domain="glade3" depends="gtk+" book="xfce4">
<glade-widget-classes>
<glade-widget-class name="XfceTitledDialog" generic-name="xfce-titled-dialog" title="Titled Dialog">
<post-create-function>glade_xfce_titled_dialog_post_create</post-create-function>
<get-internal-child-function>glade_xfce_titled_dialog_get_internal_child</get-internal-child-function>
<get-children-function>glade_xfce_titled_dialog_get_children</get-children-function>
<properties>
<property translatable="True" ignore="False" id="subtitle" name="Subtitle"></property>
<property translatable="True" ignore="False" id="title"/>
<property ignore="True" id="icon"/>
<property themed-icon="True" ignore="False" id="icon-name"/>
</properties>
</glade-widget-class>
</glade-widget-classes>
<glade-widget-group name="xfce4-widgets" title="Xfce 4 Widgets">
<glade-widget-class-ref name="XfceTitledDialog"/>
</glade-widget-group>
</glade-catalog>
```
as described by: https://developer.gnome.org/gladeui/stable/catalogintro.html
As far as I can tell, those functions are used to tell glade3
the supported properties of XfceTitledDialog.
> I.e. the modules are loaded and used by `libgladeui`, which exposes them both to the interface designer itself as well as applications with interfaces designed using GLADE.
I strongly believe that the application itself uses the Gtk+ derived Widget,
those modules were there to tell glade their supported properties.
Anyway, glade3 also ships `./usr/lib/glade/modules/libgladegtk.so` to assist
designer works with gtk+, we don't need it to use gtk+ widget, right?
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (42 preceding siblings ...)
2020-01-21 5:03 ` voidlinux-github
@ 2020-01-21 5:09 ` voidlinux-github
2020-01-22 3:59 ` voidlinux-github
` (21 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-21 5:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 3148 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576518424
Comment:
> As far as I can see those modules are not for the interface designer,
> but rather they contain widget implementations that can be used
> at runtime by applications _as well as the designer_, same with the xfce plugin.
I don't think so,
Let's take libxfce4uiglade2.so as an example, it's compiled from a single C source file,
and contains only 3 functions:
```
void glade_xfce_titled_dialog_post_create (GladeWidgetAdaptor *adaptor,
GObject *object,
GladeCreateReason reason);
GtkWidget *glade_xfce_titled_dialog_get_internal_child (GladeWidgetAdaptor *adaptor,
GtkDialog *dialog,
const gchar *name);
GList *glade_xfce_titled_dialog_get_children (GladeWidgetAdaptor *adaptor,
GtkDialog *dialog);
```
Which is used by glade
```
<?xml version="1.0" encoding="UTF-8"?>
<glade-catalog version="4.12.0" supports="gtkbuilder" name="libxfce4ui-2" library="xfce4uiglade2" domain="glade3" depends="gtk+" book="xfce4">
<glade-widget-classes>
<glade-widget-class name="XfceTitledDialog" generic-name="xfce-titled-dialog" title="Titled Dialog">
<post-create-function>glade_xfce_titled_dialog_post_create</post-create-function>
<get-internal-child-function>glade_xfce_titled_dialog_get_internal_child</get-internal-child-function>
<get-children-function>glade_xfce_titled_dialog_get_children</get-children-function>
<properties>
<property translatable="True" ignore="False" id="subtitle" name="Subtitle"></property>
<property translatable="True" ignore="False" id="title"/>
<property ignore="True" id="icon"/>
<property themed-icon="True" ignore="False" id="icon-name"/>
</properties>
</glade-widget-class>
</glade-widget-classes>
<glade-widget-group name="xfce4-widgets" title="Xfce 4 Widgets">
<glade-widget-class-ref name="XfceTitledDialog"/>
</glade-widget-group>
</glade-catalog>
```
as described by: https://developer.gnome.org/gladeui/stable/catalogintro.html
As far as I can tell, those functions are used to tell glade3
the supported properties of XfceTitledDialog.
> I.e. the modules are loaded and used by `libgladeui`, which exposes them both to the interface designer itself as well as applications with interfaces designed using GLADE.
I strongly believe that the application itself uses the Gtk+ derived Widget,
those modules were there to tell glade their supported properties.
Anyway, glade3 also ships `./usr/lib/glade/modules/libgladegtk.so` to assist
designer works with gtk+, we don't need it to use gtk+ widget, right?
And, both python, gtk+, webkit2gtk are listed under plugins sub-directory of glade source-tree.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (43 preceding siblings ...)
2020-01-21 5:09 ` voidlinux-github
@ 2020-01-22 3:59 ` voidlinux-github
2020-01-22 4:01 ` voidlinux-github
` (20 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-22 3:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576996961
Comment:
If you look at how those functions are implemented: https://github.com/xfce-mirror/libxfce4ui/blob/master/glade/libxfce4ui-glade.c
Yes, these functions are used from XML descriptions of UIs. Then when you create a UI using GLADE, the library will build the UI using those descriptions, and use those functions where appropriate, at runtime, as AFAIK you can introspect the structure of the UI, it's not statically generated Gtk UI. See the documentation at https://developer.gnome.org/gladeui/stable/widgetclasses.html
`libgladegtk.so` is needed for gtk applications using GLADE, so it should always be present. I think the others can be made into subpackages like `libgladeui3-python` and `libgladeui3-webkit`, with dependencies on `libglade3`, in order to reduce base dependencies; then things needing those can depend on them as appropriate.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (44 preceding siblings ...)
2020-01-22 3:59 ` voidlinux-github
@ 2020-01-22 4:01 ` voidlinux-github
2020-01-22 4:04 ` voidlinux-github
` (19 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-22 4:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1272 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576996961
Comment:
If you look at how those functions are implemented: https://github.com/xfce-mirror/libxfce4ui/blob/master/glade/libxfce4ui-glade.c
Yes, these functions are used from XML descriptions of UIs. Then when you create a UI using GLADE, the library will build the UI using those descriptions, and use those functions where appropriate, at runtime, as AFAIK you can introspect the structure of the UI, it's not statically generated Gtk UI. See the documentation at https://developer.gnome.org/gladeui/stable/widgetclasses.html
Another example: https://github.com/GNOME/glade/blob/mainline/plugins/webkit2gtk/glade-webkit2gtk.c This will be called if you use a GLADE webkit widget in your program and then your program logic sets the URL property on the widget - GLADE will propagate it to the webkit webview.
`libgladegtk.so` is needed for gtk applications using GLADE, so it should always be present. I think the others can be made into subpackages like `libgladeui3-python` and `libgladeui3-webkit`, with dependencies on `libglade3`, in order to reduce base dependencies; then things needing those can depend on them as appropriate.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (45 preceding siblings ...)
2020-01-22 4:01 ` voidlinux-github
@ 2020-01-22 4:04 ` voidlinux-github
2020-01-30 2:35 ` voidlinux-github
` (18 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-22 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-576996961
Comment:
If you look at how those functions are implemented: https://github.com/xfce-mirror/libxfce4ui/blob/master/glade/libxfce4ui-glade.c
Yes, these functions are used from XML descriptions of UIs. Then when you create a UI using GLADE, the library will build the UI using those descriptions, and use those functions where appropriate, at runtime, as AFAIK you can introspect the structure of the UI, it's not statically generated Gtk UI. See the documentation at https://developer.gnome.org/gladeui/stable/widgetclasses.html
Another example: https://github.com/GNOME/glade/blob/mainline/plugins/webkit2gtk/glade-webkit2gtk.c This will be called if you use a GLADE webkit widget in your program and then your program logic sets the URL property on the widget - GLADE will propagate it to the webkit webview.
`libgladegtk.so` is needed for gtk applications using GLADE, so it should always be present. I think the others can be made into subpackages like `libgladeui3-python` and `libgladeui3-webkit`, with dependencies on `libglade3`, in order to reduce base dependencies; then things needing those can depend on them as appropriate.
There's a reason pretty much every distro out there (except Arch, which is I'm pretty sure wrong in the same way as us in the current state) puts it in `libgladeui` and not `glade` or its devel pacakges.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (46 preceding siblings ...)
2020-01-22 4:04 ` voidlinux-github
@ 2020-01-30 2:35 ` voidlinux-github
2020-01-30 12:22 ` voidlinux-github
` (17 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-30 2:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-580057231
Comment:
On 2020-01-21 19:59:28-0800, Daniel Kolesa <notifications@github.com> wrote:
> If you look at how those functions are implemented:
> https://github.com/xfce-mirror/libxfce4ui/blob/master/glade/libxfce4ui-glade.c
I'd looked at them already,
> Yes, these functions are used from XML descriptions of UIs. Then
Those catalogues aren't XML description of UI.
Let's take xfce4-terminal as a reference, the generated:
/usr/share/xfce4/terminal/terminal-preferences.ui
doesn't use those functions, and it doesn't refer to glade at all.
> when you create a UI using GLADE, the library will build the UI
The keyword is `create an UI using glade`, which xfce doesn't.
the xfce plugin is merely written to support designer using glade
to design XFCE widget.
And, XFCE doesn't need glade to create widget at runtime.
The real dependency of XFCE to use the glade-generated-xml is
GtkBuilder modules from GTK itself. From https://glade.gnome.org
> The user interfaces designed in Glade are saved as XML, and by using
> the GtkBuilder GTK+ object these can be loaded by applications
> dynamically as needed.
I think you might confuse between libgladeui and libglade,
the former is the one shipped with glade,
the latter is a former dependency of gtk to use those glade generated
XML-base UI, and it's replaced by GtkBuilder from GTK itself.
See: https://mail.gnome.org/archives/devel-announce-list/2009-May/msg00003.html
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (47 preceding siblings ...)
2020-01-30 2:35 ` voidlinux-github
@ 2020-01-30 12:22 ` voidlinux-github
2020-02-03 2:47 ` [PR PATCH] [Updated] " voidlinux-github
` (16 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-01-30 12:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-580228121
Comment:
It doesn't matter what xfce does. GLADE from version 3 is meant to be modular, and via libgladeui you can access exactly the same stuff the designer application does, which includes the plugins. It's just wrong to restrict the plugins to the designer itself.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (48 preceding siblings ...)
2020-01-30 12:22 ` voidlinux-github
@ 2020-02-03 2:47 ` voidlinux-github
2020-02-03 2:47 ` voidlinux-github
` (15 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 2:47 UTC (permalink / raw)
To: ml
[-- 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: 10407 bytes --]
From 6bf84b09091a9953a489722d08d2b831cd5de652 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From fcd541be71a320ef698732dc0d5fed722edb8dd4 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
4 files changed, 159 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..200cf2689f6 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,6 +23,10 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
From bb508a8935a1f97058c0e988504d0a461e2319a2 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: split plugins for glade into subpackage
libxfce4ui-glade is a plugin for glade, XFCE's developer said in their
IRC channel, those plugins is being used only by their developers.
Split them out.
Ubuntu also split it this way, Xubuntu is pretty popular and well-tested
distribution, follows their steps looks like a sensible choice.
---
srcpkgs/libxfce4ui-glade | 1 +
srcpkgs/libxfce4ui/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxfce4ui-glade
diff --git a/srcpkgs/libxfce4ui-glade b/srcpkgs/libxfce4ui-glade
new file mode 120000
index 00000000000..25d90dd6d90
--- /dev/null
+++ b/srcpkgs/libxfce4ui-glade
@@ -0,0 +1 @@
+libxfce4ui
\ No newline at end of file
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..25a5c479955 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -29,7 +29,15 @@ libxfce4ui-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+libxfce4ui-glade_package() {
+ short_desc+=" - glade plugins"
+ pkg_install() {
+ vmove usr/lib/glade
+ vmove usr/share/glade
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (49 preceding siblings ...)
2020-02-03 2:47 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-02-03 2:47 ` voidlinux-github
2020-02-03 2:48 ` voidlinux-github
` (14 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 2:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581215132
Comment:
On 2020-01-30 04:22:30-0800, Daniel Kolesa <notifications@github.com> wrote:
> It doesn't matter what xfce does. GLADE from version 3 is meant to
> be modular, and via libgladeui you can access exactly the same stuff
We don't need anything from glade to use glade-generated-UI.
> the designer application does, which includes the plugins. It's just
> wrong to restrict the plugins to the designer itself.
Here is the answer from #xfce
JackFrost | libxfce4ui-glade, if it's like the one in Ubuntu, contains glade/modules/libxfce4uiglade2.so and is for working on Xfce projects in glade itself, when
| they use xfce-titled-dialog.
sgn | So, it's for developer of XFCE projects only, and it's not meant for end users, right?
Bashing-om | sgn: ^^ and " sysop@x1804mini:~$ apt depends libxfce4ui-glade >> Depends: libxfce4ui-2-0 also has a list of dependencies.
JackFrost | sgn: Unless those end users are developing Xfce. :P
JackFrost | sgn: Is that the GTK2 or GTK3 one?
Anyway, I think a compromised solution may suite your view.
I'll split libgladeui3 as same as Debian and RedHat.
I don't think anyone else would need it, except GTK Designer, themselves.
But, I'll split libxfce4ui-glade out of libxfce4ui.
This libxfce4ui-glade will depend on libgladeui3,
anyone that worry about different UX with designer (which isn't) can install it themselves.
Ubuntu does it that way, Xubuntu is pretty popular and well-tested distribution,
follows their steps look like a sensible choice to me.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (50 preceding siblings ...)
2020-02-03 2:47 ` voidlinux-github
@ 2020-02-03 2:48 ` voidlinux-github
2020-02-03 2:48 ` voidlinux-github
` (13 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 2:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1690 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581215263
Comment:
On 2020-01-30 04:22:30-0800, Daniel Kolesa <notifications@github.com> wrote:
> It doesn't matter what xfce does. GLADE from version 3 is meant to
> be modular, and via libgladeui you can access exactly the same stuff
We don't need anything from glade to use glade-generated-UI.
> the designer application does, which includes the plugins. It's just
> wrong to restrict the plugins to the designer itself.
Here is the answer from #xfce
```
JackFrost | libxfce4ui-glade, if it's like the one in Ubuntu, contains glade/modules/libxfce4uiglade2.so and is for working on Xfce projects in glade itself, when
| they use xfce-titled-dialog.
sgn | So, it's for developer of XFCE projects only, and it's not meant for end users, right?
Bashing-om | sgn: ^^ and " sysop@x1804mini:~$ apt depends libxfce4ui-glade >> Depends: libxfce4ui-2-0 also has a list of dependencies.
JackFrost | sgn: Unless those end users are developing Xfce. :P
JackFrost | sgn: Is that the GTK2 or GTK3 one?
```
Anyway, I think a compromised solution may suite your view.
I'll split libgladeui3 as same as Debian and RedHat.
I don't think anyone else would need it, except GTK Designer, themselves.
But, I'll split libxfce4ui-glade out of libxfce4ui.
This libxfce4ui-glade will depend on libgladeui3,
anyone that worry about different UX with designer (which isn't) can install it themselves.
Ubuntu does it that way, Xubuntu is pretty popular and well-tested distribution,
follows their steps look like a sensible choice to me.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (51 preceding siblings ...)
2020-02-03 2:48 ` voidlinux-github
@ 2020-02-03 2:48 ` voidlinux-github
2020-02-03 10:30 ` voidlinux-github
` (12 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 2:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581215132
Comment:
On 2020-01-30 04:22:30-0800, Daniel Kolesa <notifications@github.com> wrote:
> It doesn't matter what xfce does. GLADE from version 3 is meant to
> be modular, and via libgladeui you can access exactly the same stuff
We don't need anything from glade to use glade-generated-UI.
> the designer application does, which includes the plugins. It's just
> wrong to restrict the plugins to the designer itself.
Here is the answer from #xfce
JackFrost | libxfce4ui-glade, if it's like the one in Ubuntu, contains glade/modules/libxfce4uiglade2.so and is for working on Xfce projects in glade itself, when
| they use xfce-titled-dialog.
sgn | So, it's for developer of XFCE projects only, and it's not meant for end users, right?
Bashing-om | sgn: ^^ and " sysop@x1804mini:~$ apt depends libxfce4ui-glade >> Depends: libxfce4ui-2-0 also has a list of dependencies.
JackFrost | sgn: Unless those end users are developing Xfce. :P
JackFrost | sgn: Is that the GTK2 or GTK3 one?
Anyway, I think a compromised solution may suite your view.
I'll split libgladeui3 as same as Debian and RedHat.
I don't think anyone else would need it, except GTK Designer, themselves.
But, I'll split libxfce4ui-glade out of libxfce4ui.
This libxfce4ui-glade will depend on libgladeui3,
anyone that worry about different UX with designer (which isn't) can install it themselves.
Ubuntu does it that way, Xubuntu is pretty popular and well-tested distribution,
follows their steps look like a sensible choice to me.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (52 preceding siblings ...)
2020-02-03 2:48 ` voidlinux-github
@ 2020-02-03 10:30 ` voidlinux-github
2020-02-03 10:32 ` voidlinux-github
` (11 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 10:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581344252
Comment:
The xfce problem is separate from the Glade problem; libgladeui is not needed to use apps using glade-made UI, but things that do use libgladeui may depend on the plugins. So yes, split off the xfce libgladeui plugin, but do the separation like Debian/RH.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (53 preceding siblings ...)
2020-02-03 10:30 ` voidlinux-github
@ 2020-02-03 10:32 ` voidlinux-github
2020-02-03 10:33 ` voidlinux-github
` (10 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 10:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581344941
Comment:
I will review the PR once you have updated the split, and once it's fine we can merge it.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (54 preceding siblings ...)
2020-02-03 10:32 ` voidlinux-github
@ 2020-02-03 10:33 ` voidlinux-github
2020-02-03 13:09 ` voidlinux-github
` (9 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 10:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 578 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581344252
Comment:
The xfce problem is separate from the Glade problem; libgladeui is not needed to use apps using glade-made UI (libgladeui is NOT what used to be libglade, it's more like a library that can be used to build the designer itself or new plugins for it, what used to be libglade is not needed anymore) but things that do use libgladeui may depend on the plugins. So yes, split off the xfce libgladeui plugin, but do the separation like Debian/RH.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (55 preceding siblings ...)
2020-02-03 10:33 ` voidlinux-github
@ 2020-02-03 13:09 ` voidlinux-github
2020-02-03 13:14 ` [PR PATCH] [Updated] " voidlinux-github
` (8 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 13:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581405674
Comment:
I've splited as the same time as my comment.
On 3 February 2020 17:32:00 GMT+07:00, Daniel Kolesa <notifications@github.com> wrote:
>I will review the PR once you have updated the split, and once it's
>fine we can merge it.
>
>--
>You are receiving this because you authored the thread.
>Reply to this email directly or view it on GitHub:
>https://github.com/void-linux/void-packages/pull/17766#issuecomment-581344941
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (56 preceding siblings ...)
2020-02-03 13:09 ` voidlinux-github
@ 2020-02-03 13:14 ` voidlinux-github
2020-02-04 1:08 ` voidlinux-github
` (7 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-03 13:14 UTC (permalink / raw)
To: ml
[-- 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: 10407 bytes --]
From 5e2fd337469a914ecab3fc459b400a00dd1af4f7 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From f8457ef2e768562026517929c87e233d3317b791 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
4 files changed, 159 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..200cf2689f6 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,6 +23,10 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
From 4f70aef277b5b0760db1615c63a9410ca9a35408 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: split plugins for glade into subpackage
libxfce4ui-glade is a plugin for glade, XFCE's developer said in their
IRC channel, those plugins is being used only by their developers.
Split them out.
Ubuntu also split it this way, Xubuntu is pretty popular and well-tested
distribution, follows their steps looks like a sensible choice.
---
srcpkgs/libxfce4ui-glade | 1 +
srcpkgs/libxfce4ui/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxfce4ui-glade
diff --git a/srcpkgs/libxfce4ui-glade b/srcpkgs/libxfce4ui-glade
new file mode 120000
index 00000000000..25d90dd6d90
--- /dev/null
+++ b/srcpkgs/libxfce4ui-glade
@@ -0,0 +1 @@
+libxfce4ui
\ No newline at end of file
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..25a5c479955 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -29,7 +29,15 @@ libxfce4ui-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+libxfce4ui-glade_package() {
+ short_desc+=" - glade plugins"
+ pkg_install() {
+ vmove usr/lib/glade
+ vmove usr/share/glade
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (57 preceding siblings ...)
2020-02-03 13:14 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-02-04 1:08 ` voidlinux-github
2020-02-04 2:59 ` voidlinux-github
` (6 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 1:08 UTC (permalink / raw)
To: ml
[-- 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: 10407 bytes --]
From eb5c718ff2c6d50851360cd6b34be6269eaf9ba4 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 6a96886c551ce8e938b7030bee24063f8aaec8b2 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
4 files changed, 159 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..200cf2689f6 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,6 +23,10 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
From 8a543ba9222f656ca05184ab36b2ae422efb2a02 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: split plugins for glade into subpackage
libxfce4ui-glade is a plugin for glade, XFCE's developer said in their
IRC channel, those plugins is being used only by their developers.
Split them out.
Ubuntu also split it this way, Xubuntu is pretty popular and well-tested
distribution, follows their steps looks like a sensible choice.
---
srcpkgs/libxfce4ui-glade | 1 +
srcpkgs/libxfce4ui/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxfce4ui-glade
diff --git a/srcpkgs/libxfce4ui-glade b/srcpkgs/libxfce4ui-glade
new file mode 120000
index 00000000000..25d90dd6d90
--- /dev/null
+++ b/srcpkgs/libxfce4ui-glade
@@ -0,0 +1 @@
+libxfce4ui
\ No newline at end of file
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..25a5c479955 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -29,7 +29,15 @@ libxfce4ui-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+libxfce4ui-glade_package() {
+ short_desc+=" - glade plugins"
+ pkg_install() {
+ vmove usr/lib/glade
+ vmove usr/share/glade
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (58 preceding siblings ...)
2020-02-04 1:08 ` voidlinux-github
@ 2020-02-04 2:59 ` voidlinux-github
2020-02-04 7:35 ` voidlinux-github
` (5 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 2:59 UTC (permalink / raw)
To: ml
[-- 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: 10407 bytes --]
From 16581801b748a9c07c5627f1b2b640f788060b61 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 741b41d5bb51d2d45ff75ed3bec5690e021c7b8d 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
4 files changed, 159 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..200cf2689f6 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,6 +23,10 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
From 507ce6a74cc9d7bb8ab28285ecda1bc0bcbff8e3 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: split plugins for glade into subpackage
libxfce4ui-glade is a plugin for glade, XFCE's developer said in their
IRC channel, those plugins is being used only by their developers.
Split them out.
Ubuntu also split it this way, Xubuntu is pretty popular and well-tested
distribution, follows their steps looks like a sensible choice.
---
srcpkgs/libxfce4ui-glade | 1 +
srcpkgs/libxfce4ui/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxfce4ui-glade
diff --git a/srcpkgs/libxfce4ui-glade b/srcpkgs/libxfce4ui-glade
new file mode 120000
index 00000000000..25d90dd6d90
--- /dev/null
+++ b/srcpkgs/libxfce4ui-glade
@@ -0,0 +1 @@
+libxfce4ui
\ No newline at end of file
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..25a5c479955 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -29,7 +29,15 @@ libxfce4ui-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+libxfce4ui-glade_package() {
+ short_desc+=" - glade plugins"
+ pkg_install() {
+ vmove usr/lib/glade
+ vmove usr/share/glade
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (59 preceding siblings ...)
2020-02-04 2:59 ` voidlinux-github
@ 2020-02-04 7:35 ` voidlinux-github
2020-02-04 7:59 ` voidlinux-github
` (4 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 7:35 UTC (permalink / raw)
To: ml
[-- 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: 10407 bytes --]
From eb5c718ff2c6d50851360cd6b34be6269eaf9ba4 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 6a96886c551ce8e938b7030bee24063f8aaec8b2 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
4 files changed, 159 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..200cf2689f6 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,6 +23,10 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
From 8a543ba9222f656ca05184ab36b2ae422efb2a02 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: split plugins for glade into subpackage
libxfce4ui-glade is a plugin for glade, XFCE's developer said in their
IRC channel, those plugins is being used only by their developers.
Split them out.
Ubuntu also split it this way, Xubuntu is pretty popular and well-tested
distribution, follows their steps looks like a sensible choice.
---
srcpkgs/libxfce4ui-glade | 1 +
srcpkgs/libxfce4ui/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxfce4ui-glade
diff --git a/srcpkgs/libxfce4ui-glade b/srcpkgs/libxfce4ui-glade
new file mode 120000
index 00000000000..25d90dd6d90
--- /dev/null
+++ b/srcpkgs/libxfce4ui-glade
@@ -0,0 +1 @@
+libxfce4ui
\ No newline at end of file
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..25a5c479955 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -29,7 +29,15 @@ libxfce4ui-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+libxfce4ui-glade_package() {
+ short_desc+=" - glade plugins"
+ pkg_install() {
+ vmove usr/lib/glade
+ vmove usr/share/glade
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Updated] Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (60 preceding siblings ...)
2020-02-04 7:35 ` voidlinux-github
@ 2020-02-04 7:59 ` voidlinux-github
2020-02-04 12:40 ` voidlinux-github
` (3 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 7:59 UTC (permalink / raw)
To: ml
[-- 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: 10407 bytes --]
From 2be2c8c99c903b863eba55cde8484e5575b94100 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: Sat, 18 Jan 2020 16:59:57 +0700
Subject: [PATCH 1/3] libbytesize: drop python2 in checkdepends
---
srcpkgs/libbytesize/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libbytesize/template b/srcpkgs/libbytesize/template
index af8c33c0450..4cea12da9b8 100644
--- a/srcpkgs/libbytesize/template
+++ b/srcpkgs/libbytesize/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
hostmakedepends="gettext 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"
@@ -33,7 +33,6 @@ libbytesize-devel_package() {
libbytesize-python3_package() {
archs=noarch
- pycompile_module="bytesize"
depends="python3-six ${sourcepkg}>=${version}_${revision}"
short_desc+=" - Python3 bindings"
pkg_install() {
From 80694ce3383379430b5c81d7c676ba23137b2fc7 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: Sat, 18 Jan 2020 17:40:12 +0700
Subject: [PATCH 2/3] glade3: switch to python3, add webkit module
Closes: https://github.com/void-linux/void-packages/issues/18236
---
srcpkgs/glade3/patches/autogen-autoconf.patch | 98 +++++++++++++++++++
.../patches/configure-shell-quote.patch | 11 +++
srcpkgs/glade3/patches/cross.patch | 40 ++++++++
srcpkgs/glade3/template | 14 ++-
4 files changed, 159 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/glade3/patches/autogen-autoconf.patch
create mode 100644 srcpkgs/glade3/patches/configure-shell-quote.patch
create mode 100644 srcpkgs/glade3/patches/cross.patch
diff --git a/srcpkgs/glade3/patches/autogen-autoconf.patch b/srcpkgs/glade3/patches/autogen-autoconf.patch
new file mode 100644
index 00000000000..f1dfc342b47
--- /dev/null
+++ b/srcpkgs/glade3/patches/autogen-autoconf.patch
@@ -0,0 +1,98 @@
+From 8341cf78bc6879cb2d50e12b5886ee7dca3d09f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
+Date: Sat, 9 Feb 2019 13:15:17 +0000
+Subject: [PATCH] Use autoreconf instead deprecated gnome-common
+
+See https://wiki.gnome.org/Projects/GnomeCommon/Migration
+---
+ autogen.sh | 47 +++++++++++++++++++++++++++++++++--------------
+ configure.ac | 6 ++----
+ 2 files changed, 35 insertions(+), 18 deletions(-)
+
+diff --git autogen.sh autogen.sh
+index 1d8cd840..fd35663b 100755
+--- autogen.sh
++++ autogen.sh
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+ # Run this to generate all the initial makefiles, etc.
++test -n "$srcdir" || srcdir=$(dirname "$0")
++test -n "$srcdir" || srcdir=.
+
+-srcdir=`dirname $0`
+-test -z "$srcdir" && srcdir=.
++olddir=$(pwd)
+
+-PKG_NAME="glade"
++cd $srcdir
+
+-(test -f $srcdir/configure.ac \
+- && test -f $srcdir/autogen.sh) || {
+- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+- echo " top-level $PKG_NAME directory"
+- exit 1
++(test -f configure.ac) || {
++ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
++ exit 1
+ }
+
+-which gnome-autogen.sh || {
+- echo "You need to install gnome-common module and make"
+- echo "sure the gnome-autogen.sh script is in your \$PATH."
+- exit 1
+-}
++# shellcheck disable=SC2016
++PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
++
++if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
++ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
++ echo "*** If you wish to pass any to it, please specify them on the" >&2
++ echo "*** '$0' command line." >&2
++ echo "" >&2
++fi
++
++aclocal --install || exit 1
++gtkdocize --copy || exit 1
++intltoolize --force --copy --automake || exit 1
++autoreconf --verbose --force --install || exit 1
++
++cd "$olddir"
++if [ "$NOCONFIGURE" = "" ]; then
++ $srcdir/configure "$@" || exit 1
+
+-. gnome-autogen.sh
++ if [ "$1" = "--help" ]; then
++ exit 0
++ else
++ echo "Now type 'make' to compile $PKG_NAME" || exit 1
++ fi
++else
++ echo "Skipping configure process."
++fi
+diff --git configure.ac configure.ac
+index a3524656..638e7801 100644
+--- configure.ac
++++ configure.ac
+@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
+ # to make
+ AM_SILENT_RULES([yes])
+
++AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
++
+ # Checks for programs
+ AC_PROG_CC
+ AC_PROG_INSTALL
+@@ -79,10 +81,6 @@ AM_CONDITIONAL(GLADE_UNSTABLE, test "x$GLADE_UNSTABLE" = "xyes")
+
+ # ================================================================
+
+-GNOME_DEBUG_CHECK
+-GNOME_COMPILE_WARNINGS([maximum])
+-GNOME_MAINTAINER_MODE_DEFINES
+-
+ # For the plugins, we don't use the warning flags defined by GNOME_COMPILE_WARNINGS.
+ # These flags include -Wmissing-prototypes, which we prefer not to use.
+ if test "x$GCC" = "xyes"; then
+--
+2.24.1
+
diff --git a/srcpkgs/glade3/patches/configure-shell-quote.patch b/srcpkgs/glade3/patches/configure-shell-quote.patch
new file mode 100644
index 00000000000..b3c60ccf365
--- /dev/null
+++ b/srcpkgs/glade3/patches/configure-shell-quote.patch
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -279,7 +279,7 @@
+ dnl Check for GDK Quartz and MacOSX integration package
+ dnl ================================================================
+ _gdk_tgt=`$PKG_CONFIG --variable=targets gdk-3.0`
+-AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test x$_gdk_tgt = xquartz])
++AM_CONDITIONAL([GDK_TARGET_QUARTZ], [test "x$_gdk_tgt" = xquartz])
+ if test "x$_gdk_tgt" = xquartz; then
+ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3)
+
diff --git a/srcpkgs/glade3/patches/cross.patch b/srcpkgs/glade3/patches/cross.patch
new file mode 100644
index 00000000000..03b1d7e846e
--- /dev/null
+++ b/srcpkgs/glade3/patches/cross.patch
@@ -0,0 +1,40 @@
+--- m4/python.m4
++++ m4/python.m4
+@@ -43,17 +43,9 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
+-am_python_print_includes="\
+-from distutils import sysconfig as sc
+-incldirs = [[]]
+-
+-for d in sc.get_config_var('INCLDIRSTOMAKE').split():
+- incldirs.append('-I' + d)
+-
+-print(' '.join(incldirs))
+-"
++xbps_sysroot=`$CC --print-sysroot`
+ if test "x$PYTHON_INCLUDES" == x; then
+- PYTHON_INCLUDES=`$PYTHON -c "$am_python_print_includes"`
++ PYTHON_INCLUDES=`"$xbps_sysroot/$PYTHON-config" --includes`
+ fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+@@ -74,16 +66,11 @@
+ [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS])
+ AC_MSG_CHECKING(for libraries required to embed python)
+ dnl deduce PYTHON_LIBS
+-am_python_print_libs="\
+-from distutils import sysconfig as sc
+-libs = '-L' + sc.get_config_var('LIBDIR').strip()
+-libs += ' ' + sc.get_config_var('BLDLIBRARY')
+-print(libs)"
+ am_python_print_lib_loc="\
+ from distutils import sysconfig as sc
+ print(sc.get_config_var('LIBDIR'))"
+ if test "x$PYTHON_LIBS" == x; then
+- PYTHON_LIBS=`$PYTHON -c "$am_python_print_libs"`
++ PYTHON_LIBS=`"$xbps_sysroot/$PYTHON-config" --ldflags --embed`
+ fi
+ if test "x$PYTHON_LIB_LOC" == x; then
+ PYTHON_LIB_LOC=`$PYTHON -c "$am_python_print_lib_loc"`
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 4b104ffc73a..200cf2689f6 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -1,13 +1,15 @@
# 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"
+configure_args="--disable-static --enable-debug=info PYTHON=/usr/bin/python3
+ --enable-gladeui $(vopt_enable gir introspection)"
+hostmakedepends="glib-devel gnome-doc-utils intltool itstool pkg-config
+ automake autoconf-archive libtool yelp-tools gettext-devel gtk-doc"
+makedepends="gtk+3-devel python3-gobject-devel webkit2gtk-devel"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="User Interface Designer for GTK+3"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -21,6 +23,10 @@ lib32disabled=yes
build_options="gir"
build_options_default="gir"
+pre_configure() {
+ NOCONFIGURE=1 ./autogen.sh
+}
+
do_check() {
# Require running xserver
:
From 160629aa1d22a417d59cff420235fa06ca8378f6 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, 20 Jan 2020 22:09:50 +0700
Subject: [PATCH 3/3] libxfce4ui: split plugins for glade into subpackage
libxfce4ui-glade is a plugin for glade, XFCE's developer said in their
IRC channel, those plugins is being used only by their developers.
Split them out.
Ubuntu also split it this way, Xubuntu is pretty popular and well-tested
distribution, follows their steps looks like a sensible choice.
---
srcpkgs/libxfce4ui-glade | 1 +
srcpkgs/libxfce4ui/template | 14 +++++++++++---
2 files changed, 12 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxfce4ui-glade
diff --git a/srcpkgs/libxfce4ui-glade b/srcpkgs/libxfce4ui-glade
new file mode 120000
index 00000000000..25d90dd6d90
--- /dev/null
+++ b/srcpkgs/libxfce4ui-glade
@@ -0,0 +1 @@
+libxfce4ui
\ No newline at end of file
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index a3fa2471575..25a5c479955 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,7 +1,7 @@
# Template file for 'libxfce4ui'
pkgname=libxfce4ui
version=4.14.1
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static"
@@ -29,7 +29,15 @@ libxfce4ui-devel_package() {
vmove "usr/lib/*.so"
vmove usr/share/gtk-doc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- fi
+ vmove usr/share/gir-1.0
+ fi
+ }
+}
+
+libxfce4ui-glade_package() {
+ short_desc+=" - glade plugins"
+ pkg_install() {
+ vmove usr/lib/glade
+ vmove usr/share/glade
}
}
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (61 preceding siblings ...)
2020-02-04 7:59 ` voidlinux-github
@ 2020-02-04 12:40 ` voidlinux-github
2020-02-04 13:17 ` voidlinux-github
` (2 subsequent siblings)
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 258 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581892123
Comment:
Move the plugins from `glade3` into `libgladeui3` with `vmove usr/lib/glade/modules`. Also, switch `glade3` to `python3`.
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (62 preceding siblings ...)
2020-02-04 12:40 ` voidlinux-github
@ 2020-02-04 13:17 ` voidlinux-github
2020-02-04 20:11 ` voidlinux-github
2020-02-05 15:01 ` [PR PATCH] [Closed]: " voidlinux-github
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 463 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-581905012
Comment:
On 2020-02-04 04:40:39-0800, Daniel Kolesa <notifications@github.com> wrote:
> Move the plugins from `glade3` into `libgladeui3` with `vmove
> usr/lib/glade/modules`. Also, switch `glade3` to `python3`.
I forgot to change it when merge the python3-glade back into
libglade3ui. configure script was changed before.
--
Danh
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (63 preceding siblings ...)
2020-02-04 13:17 ` voidlinux-github
@ 2020-02-04 20:11 ` voidlinux-github
2020-02-05 15:01 ` [PR PATCH] [Closed]: " voidlinux-github
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-04 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/17766#issuecomment-582093099
Comment:
looks good now, i will give it a build and merge it later
^ permalink raw reply [flat|nested] 67+ messages in thread
* Re: [PR PATCH] [Closed]: Xfce switch to python3
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
` (64 preceding siblings ...)
2020-02-04 20:11 ` voidlinux-github
@ 2020-02-05 15:01 ` voidlinux-github
65 siblings, 0 replies; 67+ messages in thread
From: voidlinux-github @ 2020-02-05 15:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
There's a closed pull request on the void-packages repository
Xfce switch to python3
https://github.com/void-linux/void-packages/pull/17766
Description:
- xfce: switch all python in its dependencies chain to Python 3
^ permalink raw reply [flat|nested] 67+ messages in thread
end of thread, other threads:[~2020-02-05 15:01 UTC | newest]
Thread overview: 67+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-25 2:36 [PR PATCH] Xfce switch to python3 voidlinux-github
2019-12-25 8:02 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-25 16:01 ` voidlinux-github
2019-12-25 21:18 ` voidlinux-github
2019-12-26 13:27 ` voidlinux-github
2019-12-26 13:27 ` [PR PATCH] [Updated] " voidlinux-github
2019-12-26 14:23 ` voidlinux-github
2019-12-26 14:40 ` voidlinux-github
2019-12-26 14:42 ` voidlinux-github
2019-12-27 13:01 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-01 6:59 ` voidlinux-github
2020-01-02 12:50 ` voidlinux-github
2020-01-06 23:53 ` voidlinux-github
2020-01-07 0:06 ` voidlinux-github
2020-01-07 14:04 ` voidlinux-github
2020-01-11 2:41 ` voidlinux-github
2020-01-18 10:07 ` voidlinux-github
2020-01-18 10:40 ` voidlinux-github
2020-01-18 11:16 ` voidlinux-github
2020-01-18 14:03 ` voidlinux-github
2020-01-18 23:47 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-18 23:48 ` voidlinux-github
2020-01-18 23:58 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-19 15:00 ` voidlinux-github
2020-01-19 15:00 ` voidlinux-github
2020-01-20 3:06 ` voidlinux-github
2020-01-20 3:09 ` voidlinux-github
2020-01-20 13:26 ` voidlinux-github
2020-01-20 13:36 ` voidlinux-github
2020-01-20 14:14 ` voidlinux-github
2020-01-20 14:26 ` voidlinux-github
2020-01-20 14:39 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-20 14:45 ` voidlinux-github
2020-01-20 14:45 ` voidlinux-github
2020-01-20 14:55 ` voidlinux-github
2020-01-20 15:04 ` voidlinux-github
2020-01-20 15:04 ` voidlinux-github
2020-01-20 15:06 ` voidlinux-github
2020-01-20 15:10 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-20 15:27 ` voidlinux-github
2020-01-20 15:32 ` voidlinux-github
2020-01-21 4:58 ` voidlinux-github
2020-01-21 4:59 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-21 5:03 ` voidlinux-github
2020-01-21 5:09 ` voidlinux-github
2020-01-22 3:59 ` voidlinux-github
2020-01-22 4:01 ` voidlinux-github
2020-01-22 4:04 ` voidlinux-github
2020-01-30 2:35 ` voidlinux-github
2020-01-30 12:22 ` voidlinux-github
2020-02-03 2:47 ` [PR PATCH] [Updated] " voidlinux-github
2020-02-03 2:47 ` voidlinux-github
2020-02-03 2:48 ` voidlinux-github
2020-02-03 2:48 ` voidlinux-github
2020-02-03 10:30 ` voidlinux-github
2020-02-03 10:32 ` voidlinux-github
2020-02-03 10:33 ` voidlinux-github
2020-02-03 13:09 ` voidlinux-github
2020-02-03 13:14 ` [PR PATCH] [Updated] " voidlinux-github
2020-02-04 1:08 ` voidlinux-github
2020-02-04 2:59 ` voidlinux-github
2020-02-04 7:35 ` voidlinux-github
2020-02-04 7:59 ` voidlinux-github
2020-02-04 12:40 ` voidlinux-github
2020-02-04 13:17 ` voidlinux-github
2020-02-04 20:11 ` voidlinux-github
2020-02-05 15:01 ` [PR PATCH] [Closed]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).