From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] bup: update to 0.32, switch to python3.
Date: Sun, 21 Feb 2021 22:31:59 +0100 [thread overview]
Message-ID: <20210221213159.bHY28bBBP5pqb8dZR3-qmxmHLzfZER9y_FGZDMGAnuA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28904@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages bup
https://github.com/void-linux/void-packages/pull/28904
bup: update to 0.32, switch to python3.
<!-- Mark items with [x] where applicable -->
@Gottox could you please take a look? I just got it far enough to build :P
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/28904.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bup-28904.patch --]
[-- Type: text/x-diff, Size: 2782 bytes --]
From be9b202a48aa40eabbac1c7f2bcd305bea065c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:12:36 -0300
Subject: [PATCH] bup: update to 0.32, switch to python3.
Also fix xbps-src check.
Co-authored-by: Enno Boland <gottox@voidlinux.org>
---
srcpkgs/bup/patches/disable-git-call.patch | 13 +++++++------
srcpkgs/bup/template | 15 ++++++++++-----
2 files changed, 17 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..b40c3cddbf6 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -1,19 +1,24 @@
# 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"
+checkdepends="python3-pytest tar rsync"
short_desc="Backup system based on the git packfile format"
maintainer="Enno Boland <gottox@voidlinux.org>"
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() {
sed -i 's#^PREFIX=.*#PREFIX=/usr#' Makefile
}
+
+do_check() {
+ ./pytest -x --ignore-glob='test/ext/test-ls*'
+}
next prev parent reply other threads:[~2021-02-21 21:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-20 4:14 [PR PATCH] " ericonr
2021-02-21 20:06 ` [PR PATCH] [Updated] " Gottox
2021-02-21 21:31 ` ericonr [this message]
2021-02-22 18:45 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210221213159.bHY28bBBP5pqb8dZR3-qmxmHLzfZER9y_FGZDMGAnuA@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).