From 981802685dfb0e651a944a3c4f26bb10c9d1e4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sat, 20 Feb 2021 01:12:36 -0300 Subject: [PATCH 1/2] bup: update to 0.32, switch to python3. --- srcpkgs/bup/patches/disable-git-call.patch | 13 +++++++------ srcpkgs/bup/template | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/srcpkgs/bup/patches/disable-git-call.patch b/srcpkgs/bup/patches/disable-git-call.patch index 5468b5992f3..3abedea5aba 100644 --- a/srcpkgs/bup/patches/disable-git-call.patch +++ b/srcpkgs/bup/patches/disable-git-call.patch @@ -1,13 +1,14 @@ --- Makefile.orig 2016-05-25 16:57:27.966465927 +0200 +++ Makefile 2016-05-25 16:57:32.091465618 +0200 @@ -39,8 +39,8 @@ else - test_tmp := $(CURDIR)/t/tmp + test_tmp := $(CURDIR)/test/tmp endif --initial_setup := $(shell ./configure-version --update $(isok)) --initial_setup := $(call shout,$(initial_setup),Version configuration failed)) -+#initial_setup := $(shell ./configure-version --update $(isok)) -+#initial_setup := $(call shout,$(initial_setup),Version configuration failed)) +-initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok)) +-initial_setup := $(call shout,$(initial_setup),update-checkout-info failed)) ++#initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok)) ++#initial_setup := $(call shout,$(initial_setup),update-checkout-info failed)) - config/config.vars: configure config/configure config/configure.inc \ + config/config.vars: \ + configure config/configure config/configure.inc \ $(wildcard config/*.in) diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template index 8bec5f8bdc9..2c28542a074 100644 --- a/srcpkgs/bup/template +++ b/srcpkgs/bup/template @@ -1,17 +1,17 @@ # Template file for 'bup' pkgname=bup -version=0.30 +version=0.32 revision=1 build_style=configure -hostmakedepends="python perl git" -makedepends="python-devel" +hostmakedepends="python3 perl git" +makedepends="python3-devel" short_desc="Backup system based on the git packfile format" maintainer="Enno Boland " license="LGPL-2.0-only" homepage="https://github.com/bup/bup" distfiles="https://github.com/bup/bup/archive/${version}.tar.gz" -checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2 -python_version=2 #unverified +checksum=a894cfa96c44b9ef48003b2c2104dc5fa6361dd2f4d519261a93178984a51259 +python_version=3 nocross=yes pre_configure() { From 61db0cc4f8b63bd8f142af9c05833c6e5b072c42 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sun, 21 Feb 2021 21:06:42 +0100 Subject: [PATCH 2/2] bup: fix xbps-src check --- srcpkgs/bup/template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template index 2c28542a074..b40c3cddbf6 100644 --- a/srcpkgs/bup/template +++ b/srcpkgs/bup/template @@ -5,6 +5,7 @@ revision=1 build_style=configure hostmakedepends="python3 perl git" makedepends="python3-devel" +checkdepends="python3-pytest tar rsync" short_desc="Backup system based on the git packfile format" maintainer="Enno Boland " license="LGPL-2.0-only" @@ -17,3 +18,7 @@ nocross=yes pre_configure() { sed -i 's#^PREFIX=.*#PREFIX=/usr#' Makefile } + +do_check() { + ./pytest -x --ignore-glob='test/ext/test-ls*' +}