[PR PATCH] srcpkgs/: use ${version} in distfiles

[PR PATCH] srcpkgs/: use ${version} in distfiles

[Chocimier]

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

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

https://github.com/Chocimier/void-packages-org version-in-distfiles
https://github.com/void-linux/void-packages/pull/49036

srcpkgs/: use ${version} in distfiles
follows https://github.com/leahneukirchen/xtools/pull/324

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-version-in-distfiles-49036.patch --]
[-- Type: text/x-diff, Size: 10172 bytes --]

From 64b27fcb8a3a9a3f92930e13d930a4bc39c7a4cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 2 Mar 2024 20:55:34 +0100
Subject: [PATCH] srcpkgs/: use ${version} in distfiles

---
 srcpkgs/codec2/template            | 2 +-
 srcpkgs/dcadec/template            | 2 +-
 srcpkgs/font-libre-hebrew/template | 2 +-
 srcpkgs/fsv/template               | 3 ++-
 srcpkgs/gnunet/template            | 2 +-
 srcpkgs/gsoap/template             | 2 +-
 srcpkgs/iotop/template             | 2 +-
 srcpkgs/lbzip2/template            | 2 +-
 srcpkgs/libx86/template            | 2 +-
 srcpkgs/lua51-luasocket/template   | 2 +-
 srcpkgs/par/template               | 4 ++--
 srcpkgs/python3-pychm/template     | 2 +-
 srcpkgs/qt5-webkit/template        | 2 +-
 srcpkgs/taglib-extras/template     | 2 +-
 14 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/codec2/template b/srcpkgs/codec2/template
index 474578d47b2b8c..dc51b0f1dd6658 100644
--- a/srcpkgs/codec2/template
+++ b/srcpkgs/codec2/template
@@ -13,7 +13,7 @@ distfiles="https://github.com/drowe67/codec2/archive/v${version}.tar.gz"
 # In July 2023 this repo was refactored, older code can be found in
 # https://github.com/drowe67/codec2-dev
 # diffed, no change
-distfiles="https://github.com/drowe67/codec2-dev/archive/refs/tags/v1.0.1.tar.gz"
+distfiles="https://github.com/drowe67/codec2-dev/archive/refs/tags/v${version}.tar.gz"
 checksum=e6f12129f0f63d65a3c7b2c9bf8ddf4ec3b481123279890bf87271a8bb55d8be
 
 do_check() {
diff --git a/srcpkgs/dcadec/template b/srcpkgs/dcadec/template
index fc0fc698e0a77b..d0a1b1a0402f3b 100644
--- a/srcpkgs/dcadec/template
+++ b/srcpkgs/dcadec/template
@@ -7,7 +7,7 @@ short_desc="DTS Coherent Acoustics decoder with support for HD extensions"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1"
 homepage="https://github.com/foo86/dcadec"
-distfiles="$homepage/archive/v0.2.0.tar.gz"
+distfiles="$homepage/archive/v${version}.tar.gz"
 checksum=ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44
 CFLAGS='-std=gnu99'
 make_build_args="CONFIG_SHARED=TRUE"
diff --git a/srcpkgs/font-libre-hebrew/template b/srcpkgs/font-libre-hebrew/template
index 6962e7de99fe32..9e681762cfa38c 100644
--- a/srcpkgs/font-libre-hebrew/template
+++ b/srcpkgs/font-libre-hebrew/template
@@ -7,7 +7,7 @@ short_desc="LibreOffice fonts for Hebrew"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="OFL-1.1"
 homepage="https://www.libreoffice.org/"
-distfiles="https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"
+distfiles="https://dev-www.libreoffice.org/src/libre-hebrew-${version}.tar.gz"
 checksum=f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
 font_dirs="/usr/share/fonts/TTF/hebrew"
 
diff --git a/srcpkgs/fsv/template b/srcpkgs/fsv/template
index 4702cede37a908..a6b06797692003 100644
--- a/srcpkgs/fsv/template
+++ b/srcpkgs/fsv/template
@@ -2,6 +2,7 @@
 pkgname=fsv
 version=0.9.1
 revision=2
+_distver="${version%.*}-${version##*.}"
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel libtool pkg-config"
 makedepends="gtkmm-devel ftgl-devel gtkglarea-devel"
@@ -9,7 +10,7 @@ short_desc="GTK2 port of fsv, the filesystem visualizer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://fsv.sourceforge.net/"
-distfiles="https://github.com/mcuelenaere/fsv/archive/fsv-0.9-1.tar.gz"
+distfiles="https://github.com/mcuelenaere/fsv/archive/fsv-${_distver}.tar.gz"
 checksum=aede9d231858016d410eb1cc47f5315055eafc259f80a9e82a5846ea2f682d18
 
 pre_configure() {
diff --git a/srcpkgs/gnunet/template b/srcpkgs/gnunet/template
index 38c96146f154d8..9c333045b1f2e9 100644
--- a/srcpkgs/gnunet/template
+++ b/srcpkgs/gnunet/template
@@ -25,7 +25,7 @@ maintainer="Anachron <gith@cron.world>"
 license="GPL-3.0-or-later"
 homepage="https://gnunet.org"
 #distfiles="http://ftpmirror.gnu.org/gnunet/${pkgname}-${version}.tar.gz"
-distfiles="https://sources.voidlinux.org/gnunet-0.12.2/gnunet-0.12.2.tar.gz"
+distfiles="https://sources.voidlinux.org/gnunet-${version}/gnunet-${version}.tar.gz"
 checksum=ac288b047d1156fc5e739062b11242bad0487993631e79781aede620ddf18cd7
 
 build_options="bluetooth extractor iptables ifconfig jansson microhttpd opus gstreamer pulseaudio zbar"
diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 4370979794031b..9d8428043b7fe8 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="https://www.genivia.com/dev.html"
 # distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip"
 # distfile is gone from upstream
-distfiles="https://sources.voidlinux.org/gsoap-2.8.124/gsoap_2.8.124.zip"
+distfiles="https://sources.voidlinux.org/gsoap-${version}/gsoap_${version}.zip"
 checksum=4b798780989338f665ef8e171bbcc422a271004d62d5852666d5eeca33a6a636
 disable_parallel_build=yes
 CFLAGS="-fcommon"
diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template
index 93437a53a16263..8e9a15fc66f2e2 100644
--- a/srcpkgs/iotop/template
+++ b/srcpkgs/iotop/template
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://guichaz.free.fr/iotop"
 #distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"
-distfiles="https://void.johnnynator.dev/iotop-0.6.tar.bz2"
+distfiles="https://void.johnnynator.dev/iotop-${version}.tar.bz2"
 checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
 
 post_install() {
diff --git a/srcpkgs/lbzip2/template b/srcpkgs/lbzip2/template
index 17559a876fe08a..50e503ea6c0d1b 100644
--- a/srcpkgs/lbzip2/template
+++ b/srcpkgs/lbzip2/template
@@ -8,5 +8,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://lbzip2.org/"
 # lbzip2.org no longer host the tarball
-distfiles="https://fossies.org/linux/privat/lbzip2-2.5.tar.gz"
+distfiles="https://fossies.org/linux/privat/lbzip2-${version}.tar.gz"
 checksum=46c75ee93cc95eedc6005625442b2b8e59a2bef3ba80987d0491f055185650e9
diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template
index 14324884dbcd6f..551e2fee3e4b7a 100644
--- a/srcpkgs/libx86/template
+++ b/srcpkgs/libx86/template
@@ -8,7 +8,7 @@ short_desc="Library for making real-mode x86 calls"
 homepage="http://www.codon.org.uk/~mjg59/libx86/"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${DEBIAN_SITE}/main/libx/libx86/libx86_1.1+ds1.orig.tar.bz2"
+distfiles="${DEBIAN_SITE}/main/libx/libx86/libx86_${version}+ds1.orig.tar.bz2"
 checksum=88036ba62465491b35cffa00dc6d9d07b6ee9610a41ae626779d264b418c8211
 archs="i686* x86_64*"
 
diff --git a/srcpkgs/lua51-luasocket/template b/srcpkgs/lua51-luasocket/template
index 98bf69535d8399..2bc7d859a26ba7 100644
--- a/srcpkgs/lua51-luasocket/template
+++ b/srcpkgs/lua51-luasocket/template
@@ -10,7 +10,7 @@ short_desc="Network support for the Lua language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://lunarmodules.github.io/luasocket/"
-distfiles="https://github.com/lunarmodules/luasocket/archive/refs/tags/v3.1.0.tar.gz"
+distfiles="https://github.com/lunarmodules/luasocket/archive/refs/tags/v${version}.tar.gz"
 checksum=bf033aeb9e62bcaa8d007df68c119c966418e8c9ef7e4f2d7e96bddeca9cca6e
 
 do_build() {
diff --git a/srcpkgs/par/template b/srcpkgs/par/template
index e463801814b55a..c0ae34efe983f6 100644
--- a/srcpkgs/par/template
+++ b/srcpkgs/par/template
@@ -7,8 +7,8 @@ short_desc="Paragraph reformatter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="custom:par"
 homepage="http://www.nicemice.net/par/"
-distfiles="http://www.nicemice.net/par/Par152-autoconf.tar.gz
- http://www.nicemice.net/par/Par152.tar.gz"
+distfiles="http://www.nicemice.net/par/Par${version/./}-autoconf.tar.gz
+ http://www.nicemice.net/par/Par${version/./}.tar.gz"
 checksum="034fb943236523629eefee0a33fc6afb5b881648a2fc5c6bef7fd1b89ce44d34
  33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082"
 patch_args=-Np0
diff --git a/srcpkgs/python3-pychm/template b/srcpkgs/python3-pychm/template
index 9a4faac928d1f4..149d004f217328 100644
--- a/srcpkgs/python3-pychm/template
+++ b/srcpkgs/python3-pychm/template
@@ -12,7 +12,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/dottedmag/pychm"
 #distfiles="${PYPI_SITE}/p/pychm/pychm-${version}.tar.gz"
-distfiles=https://github.com/dottedmag/pychm/archive/refs/tags/v0.8.6.tar.gz
+distfiles=https://github.com/dottedmag/pychm/archive/refs/tags/v${version}.tar.gz
 checksum=23cdc3bbbeb97b57b472a67a0c7c96c6f1ec2d684a73a69fa84aaaeb195cab6c
 
 do_check() {
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 99c13786aab50e..1f50c6dc60141a 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -23,7 +23,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.qt.io/"
 # distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-opensource-src-${_v}.tar.xz"
-distfiles="https://sources.voidlinux.org/qt5-webkit-5.212.0/qtwebkit-opensource-src-5.212.tar.xz"
+distfiles="https://sources.voidlinux.org/qt5-webkit-${version}/qtwebkit-opensource-src-${version%.*}.tar.xz"
 checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
diff --git a/srcpkgs/taglib-extras/template b/srcpkgs/taglib-extras/template
index ce3c90a3e86a54..4157777e18a4c6 100644
--- a/srcpkgs/taglib-extras/template
+++ b/srcpkgs/taglib-extras/template
@@ -10,7 +10,7 @@ short_desc="Additional taglib plugins for KDE"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 homepage="http://developer.kde.org/~wheeler/taglib.html"
 license="LGPL-2.1, MPL-1.1"
-distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-1.0.1.tar.gz"
+distfiles="http://download.kde.org/stable/taglib-extras/${version}/src/taglib-extras-${version}.tar.gz"
 checksum=fe546b4b315f3227c975fed8ea9dfc0e54fc6997fdbba2a9da7beba479229632
 
 pre_configure() {