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?= 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 " 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?= 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 " @@ -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.*"