From 6ce8cf0a69d34b9f9616196e23ff6e756db3e0bc Mon Sep 17 00:00:00 2001 From: Vladislav Nepogodin Date: Thu, 28 Nov 2024 00:32:58 +0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20pacman:=20hardcode=20package=20v?= =?UTF-8?q?ersion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit due to the way the pkgver and pulling source currently works is broken and should never be used --- pacman/.SRCINFO | 4 ++-- pacman/PKGBUILD | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pacman/.SRCINFO b/pacman/.SRCINFO index 34f28a1a..7e5cdd34 100644 --- a/pacman/.SRCINFO +++ b/pacman/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = pacman pkgdesc = A library-based package manager with dependency support. CachyOS fork. - pkgver = 7.0.0.r17.ge5f1532 - pkgrel = 1 + pkgver = 7.0.0.r6.gc685ae6 + pkgrel = 2 url = https://www.archlinux.org/pacman/ arch = x86_64 arch = aarch64 diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index c3e8640a..4e7c92e9 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -9,13 +9,13 @@ _staging=false pkgname=pacman -pkgver=7.0.0.r17.ge5f1532 +pkgver=7.0.0.r6.gc685ae6 _sqlitever=$(curl -s 'https://archlinux.org/packages/search/json/?name=sqlite' | grep -oP '"pkgver":\s*"\K[^"]+' | head -n 1 | awk -F. '{ printf "%d%02d%02d", $1, $2, $3; if (NF == 4) { printf "%02d", $4 } else { printf "00" } }') -pkgrel=1 +pkgrel=2 pkgdesc="A library-based package manager with dependency support. CachyOS fork." arch=('x86_64' 'aarch64') url="https://www.archlinux.org/pacman/" @@ -92,10 +92,10 @@ validpgpkeys=( #source+=(https://raw.githubusercontent.com/vnepogodin/my-patches/develop/pacman/0001-libalpm-parallel-signature-check.patch) #fi -pkgver() { - cd "$pkgname" - git describe --abbrev=7 --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} +#pkgver() { +# cd "$pkgname" +# git describe --abbrev=7 --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' +#} prepare() { cd "${pkgname}"