[PR PATCH] borg: update to 1.2.3.

[PR PATCH] borg: update to 1.2.3.

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 867 bytes --]

There is a new pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages borg
https://github.com/void-linux/void-packages/pull/41699

borg: update to 1.2.3.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc: @leahneukirchen 

Notes on the changes:
* use setuptools_scm for versioning instead of the manual hack
* switch to pyfuse3 from unmaintained llfuse as [recommended](https://github.com/borgbackup/borg/blob/1.2.3/setup.py#L77-L79)
* enable compiling the [hashindex extension](https://github.com/borgbackup/borg/blob/1.2.3/setup.py#L214)
* fix update file which was reporting NO VERSION

A patch file from https://github.com/void-linux/void-packages/pull/41699.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-borg-41699.patch --]
[-- Type: text/x-diff, Size: 4128 bytes --]

From e4c59a2df4cb541d8f80e548acd67f7390d45725 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 17 Jan 2023 22:16:48 +0530
Subject: [PATCH 1/2] New package: python3-pyfuse3-3.2.2

---
 srcpkgs/python3-pyfuse3/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-pyfuse3/template

diff --git a/srcpkgs/python3-pyfuse3/template b/srcpkgs/python3-pyfuse3/template
new file mode 100644
index 000000000000..1463ecb76f81
--- /dev/null
+++ b/srcpkgs/python3-pyfuse3/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pyfuse3'
+pkgname=python3-pyfuse3
+version=3.2.2
+revision=1
+build_style=python3-module
+hostmakedepends="pkg-config python3-setuptools"
+makedepends="fuse3-devel python3-devel"
+depends="python3-trio"
+checkdepends="${depends} which python3-pytest" # pytest-trio
+short_desc="Python3 bindings for libfuse3 with async I/O support"
+maintainer="icp <pangolin@vivaldi.net>"
+license="LGPL-2.0-or-later"
+homepage="https://pypi.org/project/pyfuse3/"
+changelog="https://raw.githubusercontent.com/libfuse/pyfuse3/master/Changes.rst"
+distfiles="${PYPI_SITE}/p/pyfuse3/pyfuse3-${version}.tar.gz"
+checksum=aa4080913e6148bff1365d4aaacdc96767b87a1e178031fd9caeb5f0b9fc8cec

From e6d17655a95ffbb17ed973d0d5fb4d372b1dc232 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Tue, 17 Jan 2023 21:34:31 +0530
Subject: [PATCH 2/2] borg: update to 1.2.3.

Fix update reporting.
---
 srcpkgs/borg/template | 31 +++++++++++--------------------
 srcpkgs/borg/update   |  3 +--
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index 72a211758787..9043acc8c837 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,36 +1,27 @@
 # Template file for 'borg'
 pkgname=borg
-version=1.2.2
-revision=3
+version=1.2.3
+revision=1
 build_style=python3-module
-make_check_args="-k not((benchmark)or(test_readonly_check)or(test_readonly_diff)or(test_readonly_export_tar)or(test_readonly_extract)or(test_readonly_info)or(test_readonly_list))"
+make_check_args="-k not((benchmark)or(readonly))"
 make_check_target="build/lib.*/borg/testsuite"
-hostmakedepends="python3-dateutil python3-pip python3-pkgconfig
- python3-setuptools python3-wheel"
-makedepends="python3-devel openssl-devel acl-devel liblz4-devel libzstd-devel"
-depends="python3-llfuse python3-msgpack python3-packaging python3-argon2"
-# llfuse is purposefully not included in checkdepends since the tests using it
-# don't work in chroot
-checkdepends="python3-pytest ${depends/python3-llfuse/}"
+hostmakedepends="python3-setuptools_scm python3-pkgconfig python3-Cython"
+makedepends="python3-devel openssl-devel acl-devel liblz4-devel
+ libzstd-devel xxHash-devel"
+depends="python3-msgpack python3-packaging python3-pyfuse3"
+checkdepends="tar python3-msgpack python3-dateutil python3-pytest-xdist"
 short_desc="Deduplicating backup program with compression and encryption"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
-homepage="https://borgbackup.github.io/"
+homepage="https://www.borgbackup.org"
 changelog="https://borgbackup.readthedocs.io/en/stable/changes.html#changelog"
 distfiles="${PYPI_SITE}/b/borgbackup/borgbackup-${version}.tar.gz"
-checksum=d730687443f1beb602b1d72bae36318f6f9654818fcdc50458540ec579e57260
+checksum=e32418f8633c96fa9681352a56eb63b98e294203472c114a5242709d36966785
 
 export BORG_OPENSSL_PREFIX="${XBPS_CROSS_BASE}/usr"
 export BORG_LIBLZ4_PREFIX="${XBPS_CROSS_BASE}/usr"
 export BORG_LIBZSTD_PREFIX="${XBPS_CROSS_BASE}/usr"
-
-pre_build() {
-	vsed -i setup.py \
-		-e '/setup_requires=/d' \
-		-e '/use_scm_version=/,+3d' \
-		-e "/name=/ a\
-		version='${version}',"
-}
+export BORG_LIBXXHASH_PREFIX="${XBPS_CROSS_BASE}/usr"
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/borg/update b/srcpkgs/borg/update
index 2e9e3deb43b2..5d55cc9cf8a1 100644
--- a/srcpkgs/borg/update
+++ b/srcpkgs/borg/update
@@ -1,3 +1,2 @@
-site='https://github.com/borgbackup/borg/releases'
-pattern='borgbackup-\K[\d.rcab]+\d'
+pkgname=borgbackup
 ignore='*rc* *b* *a*'

Re: [PR PATCH] [Merged]: borg: update to 1.2.3.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 719 bytes --]

There's a merged pull request on the void-packages repository

borg: update to 1.2.3.
https://github.com/void-linux/void-packages/pull/41699

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture: **x86_64**

cc: @leahneukirchen 

Notes on the changes:
* use setuptools_scm for versioning instead of the manual hack
* switch to pyfuse3 from unmaintained llfuse as [recommended](https://github.com/borgbackup/borg/blob/1.2.3/setup.py#L77-L79)
* enable compiling the [hashindex extension](https://github.com/borgbackup/borg/blob/1.2.3/setup.py#L214)
* fix update file which was reporting NO VERSION