* Re: [PR PATCH] [Updated] restic: update to 0.15.0.
2023-01-14 1:05 [PR PATCH] restic: update to 0.15.0 sbromberger
@ 2023-01-14 1:08 ` sbromberger
2023-01-14 1:08 ` sbromberger
2023-01-15 11:21 ` [PR PATCH] [Merged]: " paper42
2 siblings, 0 replies; 4+ messages in thread
From: sbromberger @ 2023-01-14 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 687 bytes --]
There is an updated pull request by sbromberger against master on the void-packages repository
https://github.com/sbromberger/void-packages master
https://github.com/void-linux/void-packages/pull/41629
restic: update to 0.15.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86-64-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64
- armv6l
A patch file from https://github.com/void-linux/void-packages/pull/41629.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41629.patch --]
[-- Type: text/x-diff, Size: 19976 bytes --]
From 6e6339fdda1643d479944a339cfb595367ea0837 Mon Sep 17 00:00:00 2001
From: Seth Bromberger <github@bromberger.com>
Date: Fri, 13 Jan 2023 20:03:20 -0500
Subject: [PATCH 1/9] restic: update to 0.15.0.
---
srcpkgs/restic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 2c39c1b02a36..a0f3c5955928 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
# Template file for 'restic'
pkgname=restic
-version=0.14.0
+version=0.15.0
revision=1
build_style=go
go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
homepage="https://restic.net/"
changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=78cdd8994908ebe7923188395734bb3cdc9101477e4163c67e7cc3b8fd3b4bd6
+checksum=85a6408cfb0798dab52335bcb00ac32066376c32daaa75461d43081499bc7de8
post_install() {
vlicense LICENSE
From 7d83e52f8973d5cd17e7120ac9d9eaf1dbef2216 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Mon, 12 Dec 2022 21:26:10 +0530
Subject: [PATCH 2/9] python3-marshmallow: update to 3.19.0.
---
srcpkgs/python3-marshmallow/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-marshmallow/template b/srcpkgs/python3-marshmallow/template
index ec244ddaa9e2..eb3ccc5b76ad 100644
--- a/srcpkgs/python3-marshmallow/template
+++ b/srcpkgs/python3-marshmallow/template
@@ -1,18 +1,18 @@
# Template file for 'python3-marshmallow'
pkgname=python3-marshmallow
-version=3.7.0
-revision=4
+version=3.19.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3-packaging"
checkdepends="python3-pytest python3-simplejson python3-pytz"
short_desc="Library for converting complex datatypes (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
-homepage="https://github.com/marshmallow-code/marshmallow"
+homepage="https://marshmallow.readthedocs.io/en/stable/"
changelog="https://raw.githubusercontent.com/marshmallow-code/marshmallow/dev/CHANGELOG.rst"
distfiles="${PYPI_SITE}/m/marshmallow/marshmallow-${version}.tar.gz"
-checksum=ba949379cb6ef73655f72075e82b31cf57012a5557ede642fc8614ab0354f869
+checksum=90032c0fd650ce94b6ec6dc8dfeb0e3ff50c144586462c389b81a07205bedb78
post_install() {
vlicense LICENSE
From 7de24e5079d811ee3d34207f6603b3258ffa0fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Sat, 24 Dec 2022 10:31:36 +0000
Subject: [PATCH 3/9] batsignal: update to 1.6.4.
---
srcpkgs/batsignal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/batsignal/template b/srcpkgs/batsignal/template
index 0db0df07e303..a366e282d532 100644
--- a/srcpkgs/batsignal/template
+++ b/srcpkgs/batsignal/template
@@ -1,6 +1,6 @@
# Template file for 'batsignal'
pkgname=batsignal
-version=1.6.2
+version=1.6.4
revision=1
build_style=gnu-makefile
make_use_env=yes
@@ -11,7 +11,7 @@ maintainer="André Cerqueira <acerqueira021@gmail.com>"
license="ISC"
homepage="https://github.com/electrickite/batsignal"
distfiles="https://github.com/electrickite/batsignal/archive/${version}.tar.gz"
-checksum=0576257b6b960826799641e15521317a2d075d24f5da0c1abf180e2731022673
+checksum=58439dac2b678ab798831fe861c06d2d5c128c4bb4bae1476a62ba1771da3983
post_install() {
vlicense LICENSE
From e2e718015fd448f75664a06bc99d0b9921501bff Mon Sep 17 00:00:00 2001
From: Luna <git@l4.pm>
Date: Sun, 25 Dec 2022 15:02:27 -0300
Subject: [PATCH 4/9] libsndfile: update to 1.2.0
---
.../patches/identify-naked-mpeg-last.patch | 73 -------------------
srcpkgs/libsndfile/template | 4 +-
2 files changed, 2 insertions(+), 75 deletions(-)
delete mode 100644 srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch
diff --git a/srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch b/srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch
deleted file mode 100644
index a817a7e41b12..000000000000
--- a/srcpkgs/libsndfile/patches/identify-naked-mpeg-last.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Author: Arthur Taylor <art@ified.ca>
-Reason: The minimal possible MPEG file contains no headers or identification
-other than the brief sync header. This header is only 3 bytes, and is quite
-prone to false-positives. Particularly raw PCM can look like a sync header.
-
-As such, move detection of 'naked' MPEG files in guess_file_type()
-to the very last test. Give more weight to a sync header if it
-follows an ID3 tag.
-
-See https://github.com/libsndfile/libsndfile/pull/898
-Upstream: yes
---- a/src/sndfile.c
-+++ b/src/sndfile.c
-@@ -2771,6 +2771,17 @@ format_from_extension (SF_PRIVATE *psf)
- return format ;
- } /* format_from_extension */
-
-+static int
-+identify_mpeg (uint32_t marker)
-+{ if ((marker & MAKE_MARKER (0xFF, 0xE0, 0, 0)) == MAKE_MARKER (0xFF, 0xE0, 0, 0) && /* Frame sync */
-+ (marker & MAKE_MARKER (0, 0x18, 0, 0)) != MAKE_MARKER (0, 0x08, 0, 0) && /* Valid MPEG version */
-+ (marker & MAKE_MARKER (0, 0x06, 0, 0)) != MAKE_MARKER (0, 0, 0, 0) && /* Valid layer description */
-+ (marker & MAKE_MARKER (0, 0, 0xF0, 0)) != MAKE_MARKER (0, 0, 0xF0, 0) && /* Valid bitrate */
-+ (marker & MAKE_MARKER (0, 0, 0x0C, 0)) != MAKE_MARKER (0, 0, 0x0C, 0)) /* Valid samplerate */
-+ return SF_FORMAT_MPEG ;
-+ return 0 ;
-+} /* identify_mpeg */
-+
- static int
- guess_file_type (SF_PRIVATE *psf)
- { uint32_t buffer [3], format ;
-@@ -2872,13 +2883,6 @@ guess_file_type (SF_PRIVATE *psf)
- if (buffer [0] == MAKE_MARKER ('R', 'F', '6', '4') && buffer [2] == MAKE_MARKER ('W', 'A', 'V', 'E'))
- return SF_FORMAT_RF64 ;
-
-- if ((buffer [0] & MAKE_MARKER (0xFF, 0xE0, 0, 0)) == MAKE_MARKER (0xFF, 0xE0, 0, 0) && /* Frame sync */
-- (buffer [0] & MAKE_MARKER (0, 0x18, 0, 0)) != MAKE_MARKER (0, 0x08, 0, 0) && /* Valid MPEG version */
-- (buffer [0] & MAKE_MARKER (0, 0x06, 0, 0)) != MAKE_MARKER (0, 0, 0, 0) && /* Valid layer description */
-- (buffer [0] & MAKE_MARKER (0, 0, 0xF0, 0)) != MAKE_MARKER (0, 0, 0xF0, 0) && /* Valid bitrate */
-- (buffer [0] & MAKE_MARKER (0, 0, 0x0C, 0)) != MAKE_MARKER (0, 0, 0x0C, 0)) /* Valid samplerate */
-- return SF_FORMAT_MPEG ;
--
- if (buffer [0] == MAKE_MARKER ('I', 'D', '3', 2) || buffer [0] == MAKE_MARKER ('I', 'D', '3', 3)
- || buffer [0] == MAKE_MARKER ('I', 'D', '3', 4))
- { psf_log_printf (psf, "Found 'ID3' marker.\n") ;
-@@ -2887,6 +2891,10 @@ guess_file_type (SF_PRIVATE *psf)
- return 0 ;
- } ;
-
-+ /* ID3v2 tags + MPEG */
-+ if (psf->id3_header.len > 0 && (format = identify_mpeg (buffer [0])) != 0)
-+ return format ;
-+
- /* Turtle Beach SMP 16-bit */
- if (buffer [0] == MAKE_MARKER ('S', 'O', 'U', 'N') && buffer [1] == MAKE_MARKER ('D', ' ', 'S', 'A'))
- return 0 ;
-@@ -2898,10 +2906,16 @@ guess_file_type (SF_PRIVATE *psf)
- if (buffer [0] == MAKE_MARKER ('a', 'j', 'k', 'g'))
- return 0 /*-SF_FORMAT_SHN-*/ ;
-
-- /* This must be the last one. */
-+ /* This must be (almost) the last one. */
- if (psf->filelength > 0 && (format = try_resource_fork (psf)) != 0)
- return format ;
-
-+ /* MPEG with no ID3v2 tags. Only have the MPEG sync header for
-+ * identification and it is quite brief, and prone to false positives.
-+ * Check for this last, even after resource forks. */
-+ if (psf->id3_header.len == 0 && (format = identify_mpeg (buffer [0])) != 0)
-+ return format ;
-+
- return 0 ;
- } /* guess_file_type */
diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template
index 3ffbe1026e4c..728ced9a39aa 100644
--- a/srcpkgs/libsndfile/template
+++ b/srcpkgs/libsndfile/template
@@ -1,6 +1,6 @@
# Template file for 'libsndfile'
pkgname=libsndfile
-version=1.1.0
+version=1.2.0
revision=1
build_style=gnu-configure
configure_args="--enable-static"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
homepage="https://libsndfile.github.io/libsndfile/"
changelog="https://github.com/libsndfile/libsndfile/raw/master/CHANGELOG.md"
distfiles="https://github.com/libsndfile/libsndfile/releases/download/${version}/libsndfile-${version}.tar.xz"
-checksum=0f98e101c0f7c850a71225fb5feaf33b106227b3d331333ddc9bacee190bcf41
+checksum=0e30e7072f83dc84863e2e55f299175c7e04a5902ae79cfb99d4249ee8f6d60a
libsndfile-progs_package() {
short_desc+=" - bundled cmdline apps"
From b07b9f884393bc3f43c9f19dac37dfe6fc4cbd7e Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 23 Dec 2022 21:27:16 +0530
Subject: [PATCH 5/9] khard: update to 0.18.0.
---
srcpkgs/khard/template | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index 3f8ec969adf8..6dabbf668daa 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,21 +1,25 @@
# Template file for 'khard'
pkgname=khard
-version=0.17.0
-revision=5
+version=0.18.0
+revision=1
build_style=python3-module
+# fails in CI
+make_check_args="--deselect test/test_command_line_interface.py::MiscCommands"
hostmakedepends="python3-setuptools_scm"
-depends="python3-setuptools python3-atomicwrites python3-configobj
+depends="python3-atomicwrites python3-configobj
python3-vobject python3-Unidecode python3-ruamel.yaml"
+checkdepends="${depends} python3-pytest"
short_desc="Command-line addressbook built around CardDAV"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
-homepage="https://github.com/scheibler/khard"
+homepage="https://khard.readthedocs.io/en/latest/"
+changelog="https://raw.githubusercontent.com/lucc/khard/develop/CHANGES"
distfiles="${PYPI_SITE}/k/khard/khard-${version}.tar.gz"
-checksum=164e1aee9264735ec0473a74a38842e6272bbb814d949a66084c6a373bd95618
+checksum=fe88d4b47fdd948610ac573c01fa13d1b7996265cbc44391085761af9a030615
post_install() {
vsconf doc/source/examples/khard.conf.example
vsconf khard/data/template.yaml
- vinstall misc/zsh/_khard 644 usr/share/zsh/site-functions
- vinstall misc/zsh/_email-khard 644 usr/share/zsh/site-functions
+ vcompletion misc/zsh/_khard zsh
+ vcompletion misc/zsh/_email-khard zsh email-khard
}
From 434c13ca16b3aadc7164620b65c29f98ea6d0dfe Mon Sep 17 00:00:00 2001
From: Sirn Thanabulpong <sirn@ogsite.net>
Date: Thu, 29 Dec 2022 05:41:35 +0900
Subject: [PATCH 6/9] openrgb: update to 0.8
---
srcpkgs/openrgb/patches/musl.patch | 37 ++++++++++++++++++++----------
srcpkgs/openrgb/template | 4 ++--
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/srcpkgs/openrgb/patches/musl.patch b/srcpkgs/openrgb/patches/musl.patch
index 05fe5df2597e..a57d93ecfd17 100644
--- a/srcpkgs/openrgb/patches/musl.patch
+++ b/srcpkgs/openrgb/patches/musl.patch
@@ -1,13 +1,26 @@
-diff --git a/i2c_smbus/i2c_smbus_linux.cpp b/i2c_smbus/i2c_smbus_linux.cpp
-index 33d1494b..f8a2c503 100644
---- a/i2c_smbus/i2c_smbus_linux.cpp
-+++ b/i2c_smbus/i2c_smbus_linux.cpp
-@@ -133,7 +133,7 @@ bool i2c_smbus_linux_detect()
- strcat(path, ent->d_name);
- if(ent->d_type == DT_LNK)
- {
-- ptr = canonicalize_file_name(path);
-+ ptr = realpath(path, NULL);
- if(ptr == NULL)
- continue;
+https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/8c893fba4fcec17e6221f2d754def4aa71b020b8
+
+From 8c893fba4fcec17e6221f2d754def4aa71b020b8 Mon Sep 17 00:00:00 2001
+From: Sirn Thanabulpong <sirn@ogsite.net>
+Date: Wed, 28 Dec 2022 00:49:47 +0900
+Subject: [PATCH] Fix build on musl in Nanoleaf settings
+
+---
+ qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
+index 1e3c926b3..55ed5fcaa 100644
+--- a/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
++++ b/qt/OpenRGBNanoleafSettingsPage/OpenRGBNanoleafScanningThread.cpp
+@@ -8,6 +8,7 @@
+ #else
+ #include <netdb.h>
+ #include <ifaddrs.h>
++#include <sys/select.h>
+ #endif
+ #include "mdns.h"
+--
+GitLab
+
diff --git a/srcpkgs/openrgb/template b/srcpkgs/openrgb/template
index 5b1d8c43eeeb..273dd7356ef2 100644
--- a/srcpkgs/openrgb/template
+++ b/srcpkgs/openrgb/template
@@ -1,6 +1,6 @@
# Template file for 'openrgb'
pkgname=openrgb
-version=0.7
+version=0.8
revision=1
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools git pkg-config"
@@ -10,7 +10,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
license="GPL-2.0-only"
homepage="https://gitlab.com/CalcProgrammer1/OpenRGB"
distfiles="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${version}/OpenRGB-release_${version}.tar.gz"
-checksum=6052e04ad736f94a91a386f6cfc0aaff9554fafdabe99cdd46a296fd49132569
+checksum=0d803753873ca1ec2bd78632b4ac605669394e7eeba2d2efe305c7f9c9d7df0c
pre_build() {
sed -i 's|rules.path=/lib|rules.path=/usr/lib|g' OpenRGB.pro
From 4e31b5dfff6b31065a8890c8994bc31c68effb0c Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Mon, 26 Dec 2022 23:11:56 -0800
Subject: [PATCH 7/9] zoom: update to 5.13.0.599
---
srcpkgs/zoom/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 3ba65b0c5aad..0a6896873ae6 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
# Template file for 'zoom'
pkgname=zoom
-version=5.12.2.4816
+version=5.13.0.599
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -14,7 +14,7 @@ maintainer="Daniel Santana <daniel@santana.tech>"
license="custom:Proprietary"
homepage="https://zoom.us/"
distfiles="https://cdn.zoom.us/prod/${version}/zoom_x86_64.rpm"
-checksum=521fae96425429a2d459adfd10bef021444b8daf15c2b630aed4fb07d861f402
+checksum=410c9363a2c96f95e8bac8af4a76c097ab6f372cad9e158f2b5dc19987084e4b
repository=nonfree
noshlibprovides=yes
noverifyrdeps=yes
From 4c37a34d37b468def945520366a2f809a031160f Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 28 Dec 2022 15:17:07 -0600
Subject: [PATCH 8/9] rinse: update to 4.0.4.
---
srcpkgs/rinse/patches/fix-tests.patch | 95 ---------------------------
srcpkgs/rinse/template | 10 +--
2 files changed, 5 insertions(+), 100 deletions(-)
delete mode 100644 srcpkgs/rinse/patches/fix-tests.patch
diff --git a/srcpkgs/rinse/patches/fix-tests.patch b/srcpkgs/rinse/patches/fix-tests.patch
deleted file mode 100644
index 041421b63648..000000000000
--- a/srcpkgs/rinse/patches/fix-tests.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-Source: maxice8
-Upstream: no (feel free to)
-Reason: fixes test for tab chars
-
---- a/scripts/opensuse-11.1/post-install.sh
-+++ b/scripts/opensuse-11.1/post-install.sh
-@@ -42,8 +42,8 @@ gpgcheck=1
- EOF
-
- if [ $ARCH = "i386" ] ; then
-- echo " Setting architecture to i686"
-- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
-+ echo " Setting architecture to i686"
-+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
- fi
-
-
---- a/scripts/opensuse-11.2/post-install.sh
-+++ b/scripts/opensuse-11.2/post-install.sh
-@@ -60,8 +60,8 @@ gpgcheck=1
- EOF
-
- if [ $ARCH = "i386" ] ; then
-- echo " Setting architecture to i686"
-- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
-+ echo " Setting architecture to i686"
-+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
- fi
-
-
---- a/scripts/opensuse-11.3/post-install.sh
-+++ b/scripts/opensuse-11.3/post-install.sh
-@@ -39,8 +39,8 @@ gpgcheck=1
- EOF
-
- if [ $ARCH = "i386" ] ; then
-- echo " Setting architecture to i686"
-- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
-+ echo " Setting architecture to i686"
-+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
- fi
-
-
---- a/scripts/opensuse-12.3/post-install.sh
-+++ b/scripts/opensuse-12.3/post-install.sh
-@@ -38,8 +38,8 @@ gpgcheck=1
- EOF
-
- if [ $ARCH = "i386" ] ; then
-- echo " Setting architecture to i686"
-- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
-+ echo " Setting architecture to i686"
-+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
- fi
-
-
---- a/scripts/opensuse-13.1/post-install.sh
-+++ b/scripts/opensuse-13.1/post-install.sh
-@@ -38,8 +38,8 @@ gpgcheck=1
- EOF
-
- if [ $ARCH = "i386" ] ; then
-- echo " Setting architecture to i686"
-- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
-+ echo " Setting architecture to i686"
-+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
- fi
-
-
---- a/scripts/centos-7/post-install.sh
-+++ b/scripts/centos-7/post-install.sh
-@@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog
-
- cd $prefix/var/log
- for n in messages secure maillog spooler;do
-- [ -f $n ] && continue
-- umask 066 && touch $n
-+ [ -f $n ] && continue
-+ umask 066 && touch $n
- done
- cd /
- touch $prefix/var/log/lastlog
---- a/scripts/opensuse-42.2/post-install.sh
-+++ b/scripts/opensuse-42.2/post-install.sh
-@@ -38,8 +38,8 @@ gpgcheck=1
- EOF
-
- if [ $ARCH = "i386" ] ; then
-- echo " Setting architecture to i686"
-- sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
-+ echo " Setting architecture to i686"
-+ sed -i 's/\(# \)\?arch = .*/arch = i686/' ${prefix}/etc/zypp/zypp.conf
- fi
-
-
diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template
index 27d6d0acd2fb..33cf849944cd 100644
--- a/srcpkgs/rinse/template
+++ b/srcpkgs/rinse/template
@@ -1,20 +1,20 @@
# Template file for 'rinse'
pkgname=rinse
-version=3.5
-revision=2
+version=4.0.4
+revision=1
build_style=gnu-makefile
make_check_target=test
hostmakedepends="dpkg"
makedepends="perl"
-depends="perl-LWP rpm wget"
+depends="perl-LWP perl-LWP-Protocol-https perl-HTML-Parser rpm wget"
checkdepends="perl-LWP perl-Test-Pod rpm wget"
short_desc="Bootstrap a rpm based distribution like debootstrap"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="Artistic-1.0-Perl, GPL-1.0-or-later"
homepage="https://salsa.debian.org/debian/rinse"
changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog"
distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz"
-checksum=ebe2384f2aa4565c5f29882b177f7afd4c7cdbca9de9525618c6040e63a76d23
+checksum=fc320d9a258e0b90986054641e86fcbe29b0710ae8be2cfb89875a98af4a64b2
conf_files="/etc/rinse/rinse.conf"
From 6699c120bf7706ab3eea8b72949f67866fcd0d54 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 29 Dec 2022 12:38:42 +0530
Subject: [PATCH 9/9] difftastic: update to 0.41.0.
---
srcpkgs/difftastic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/difftastic/template b/srcpkgs/difftastic/template
index 4e19e477a5ed..a25aee7aa04d 100644
--- a/srcpkgs/difftastic/template
+++ b/srcpkgs/difftastic/template
@@ -1,6 +1,6 @@
# Template file for 'difftastic'
pkgname=difftastic
-version=0.39.0
+version=0.41.0
revision=1
build_style=cargo
short_desc="Structural diff tool that understands syntax"
@@ -9,7 +9,7 @@ license="MIT"
homepage="https://difftastic.wilfred.me.uk"
changelog="https://raw.githubusercontent.com/Wilfred/difftastic/master/CHANGELOG.md"
distfiles="https://static.crates.io/crates/difftastic/difftastic-${version}.crate"
-checksum=410eff9c811751c54ceb0edb2635ee5466a61c1b6b6600bb58cf0145efdd0459
+checksum=97dd6518d1d2ee46db04ecc4170f4fb90ce0a4e54672a64bee7e1b7aa8776c60
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
^ permalink raw reply [flat|nested] 4+ messages in thread