From 66d054993882e706625e3aafafa6289538d056a3 Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Mon, 23 Feb 2026 09:54:11 -0700
Subject: [PATCH] Fixed Manjaro pkgver() generation to produce Arch-valid
 version strings when git describe includes pre-release hyphens (for example
 -pre1) by normalizing the describe suffix and replacing remaining hyphens
 with dots. This prevents invalid pkgver values like ...pre1-40-g....

---
 packaging/manjaro/PKGBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/manjaro/PKGBUILD b/packaging/manjaro/PKGBUILD
index c594d204..85fa6f39 100644
--- a/packaging/manjaro/PKGBUILD
+++ b/packaging/manjaro/PKGBUILD
@@ -42,7 +42,8 @@ pkgver() {
   if git describe --long --tags --abbrev=7 >/dev/null 2>&1; then
     git describe --long --tags --abbrev=7 \
       | sed 's/^v//' \
-      | sed 's/-/.r/;s/-/./'
+      | sed -E 's/([^-]+)-([0-9]+)-g/\1.r\2.g/' \
+      | sed 's/-/./g'
   else
     printf '0.r%s.%s\n' \
       "$(git rev-list --count HEAD)" \