From 4d23de959e257227137d74dd302a20071e26dc93 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh 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 " @@ -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 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 " license="LGPL-2.1-or-later" From 32d2081c07462c20822bcca438f8ed463566d1bf Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh 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 " 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 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 " 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