From de1dc7fbde46c6e6f7c27ed0a6c105cae5c795d4 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Wed, 22 Mar 2023 16:56:02 +0100
Subject: [PATCH] [*] add back commit's hash to VERSION

---
 a/broadcom-bt-firmware/SlackBuild    | 2 +-
 a/nct6687d/SlackBuild                | 2 +-
 a/pine64-platform-scripts/SlackBuild | 2 +-
 a/rpi-firmware-nonfree/SlackBuild    | 2 +-
 ap/amdgpud/SlackBuild                | 2 +-
 ap/bandwhich/SlackBuild              | 2 +-
 ap/bat/SlackBuild                    | 2 +-
 ap/btm/SlackBuild                    | 2 +-
 ap/checkssl/SlackBuild               | 2 +-
 ap/delta/SlackBuild                  | 2 +-
 ap/diskus/SlackBuild                 | 2 +-
 ap/dive/SlackBuild                   | 2 +-
 ap/dua/SlackBuild                    | 2 +-
 ap/dust/SlackBuild                   | 2 +-
 ap/esptool/SlackBuild                | 2 +-
 ap/exa/SlackBuild                    | 2 +-
 ap/f3/SlackBuild                     | 2 +-
 ap/fd/SlackBuild                     | 2 +-
 ap/fish/SlackBuild                   | 2 +-
 ap/getssl/SlackBuild                 | 2 +-
 ap/gopsuinfo/SlackBuild              | 2 +-
 ap/grex/SlackBuild                   | 2 +-
 ap/himalaya/SlackBuild               | 2 +-
 ap/ht/SlackBuild                     | 2 +-
 ap/humble-cli/SlackBuild             | 2 +-
 ap/hyperfine/SlackBuild              | 2 +-
 ap/icr/SlackBuild                    | 2 +-
 ap/ijq/SlackBuild                    | 2 +-
 ap/ion/SlackBuild                    | 2 +-
 ap/itd/SlackBuild                    | 2 +-
 ap/ledger/SlackBuild                 | 2 +-
 ap/legendary/SlackBuild              | 2 +-
 ap/lsd/SlackBuild                    | 2 +-
 ap/lsyncd/SlackBuild                 | 2 +-
 ap/mdcat/SlackBuild                  | 2 +-
 ap/motion/SlackBuild                 | 2 +-
 ap/mozwire/SlackBuild                | 2 +-
 ap/ncdu/SlackBuild                   | 2 +-
 ap/nu/SlackBuild                     | 2 +-
 ap/nvtop/SlackBuild                  | 2 +-
 ap/procs/SlackBuild                  | 2 +-
 ap/protontricks/SlackBuild           | 2 +-
 ap/ripgrep/SlackBuild                | 2 +-
 ap/rustup/SlackBuild                 | 2 +-
 ap/sd/SlackBuild                     | 2 +-
 ap/starship/SlackBuild               | 2 +-
 ap/stow/SlackBuild                   | 2 +-
 ap/tldr/SlackBuild                   | 2 +-
 ap/tre/SlackBuild                    | 2 +-
 ap/tv/SlackBuild                     | 2 +-
 ap/viu/SlackBuild                    | 2 +-
 ap/weboob/SlackBuild                 | 2 +-
 ap/ycmd/SlackBuild                   | 2 +-
 ap/ytop/SlackBuild                   | 2 +-
 d/ameba/SlackBuild                   | 2 +-
 d/chruby/SlackBuild                  | 2 +-
 d/crystal/SlackBuild                 | 4 ++--
 d/dtc/SlackBuild                     | 2 +-
 d/factor/SlackBuild                  | 2 +-
 d/gforth/SlackBuild                  | 2 +-
 d/newrpl/SlackBuild                  | 2 +-
 d/qbe/SlackBuild                     | 2 +-
 d/rbspy/SlackBuild                   | 2 +-
 d/retroforth/SlackBuild              | 2 +-
 d/rpn/SlackBuild                     | 2 +-
 d/ruby-install/SlackBuild            | 2 +-
 d/scry/SlackBuild                    | 2 +-
 d/scryer-prolog/SlackBuild           | 2 +-
 d/wabt/SlackBuild                    | 2 +-
 e/emacs/SlackBuild                   | 2 +-
 fonts/bitmap-fonts/SlackBuild        | 2 +-
 l/apcu/SlackBuild                    | 2 +-
 l/fmt/SlackBuild                     | 2 +-
 l/libucl/SlackBuild                  | 2 +-
 l/python-cairo-cffi/SlackBuild       | 2 +-
 l/raylib/SlackBuild                  | 2 +-
 l/sdl12-compat/SlackBuild            | 2 +-
 l/spdlog/SlackBuild                  | 2 +-
 lua/luarocks/SlackBuild              | 2 +-
 n/calibre-web/SlackBuild             | 2 +-
 n/pluxml/SlackBuild                  | 2 +-
 wayland/Hyprland/SlackBuild          | 2 +-
 wayland/autotiling/SlackBuild        | 2 +-
 wayland/cage/SlackBuild              | 2 +-
 wayland/dwl/SlackBuild               | 2 +-
 wayland/foot/SlackBuild              | 2 +-
 wayland/imv/SlackBuild               | 2 +-
 wayland/japokwm/SlackBuild           | 2 +-
 wayland/kanshi/SlackBuild            | 2 +-
 wayland/lswt/SlackBuild              | 2 +-
 wayland/mako/SlackBuild              | 2 +-
 wayland/nwg-look/SlackBuild          | 2 +-
 wayland/nwg-panel/SlackBuild         | 2 +-
 wayland/persway/SlackBuild           | 2 +-
 wayland/qtile-extras/SlackBuild      | 2 +-
 wayland/qtile/SlackBuild             | 2 +-
 wayland/river/SlackBuild             | 2 +-
 wayland/salut/SlackBuild             | 2 +-
 wayland/seatd/SlackBuild             | 2 +-
 wayland/sfwbar/SlackBuild            | 2 +-
 wayland/sway/SlackBuild              | 8 ++++----
 wayland/swaybg/SlackBuild            | 2 +-
 wayland/swayidle/SlackBuild          | 2 +-
 wayland/swaylock/SlackBuild          | 2 +-
 wayland/swayr/SlackBuild             | 2 +-
 wayland/vivarium/SlackBuild          | 2 +-
 wayland/waybar/SlackBuild            | 2 +-
 wayland/wlopm/SlackBuild             | 2 +-
 wayland/wlr-randr/SlackBuild         | 2 +-
 wayland/wlroots/SlackBuild           | 2 +-
 wayland/wofi/SlackBuild              | 2 +-
 xap/alacritty/SlackBuild             | 2 +-
 xap/alttab/SlackBuild                | 2 +-
 xap/brightnessctl/SlackBuild         | 2 +-
 xap/gammastep/SlackBuild             | 2 +-
 xap/i3status-rust/SlackBuild         | 2 +-
 xap/image-roll/SlackBuild            | 2 +-
 xap/kitty/SlackBuild                 | 2 +-
 xap/leocad/SlackBuild                | 2 +-
 xap/nextcloud-client/SlackBuild      | 2 +-
 xap/polybar/SlackBuild               | 2 +-
 xap/radeon-profile/SlackBuild        | 2 +-
 xap/rkvm/SlackBuild                  | 2 +-
 xap/wezterm/SlackBuild               | 2 +-
 xap/x48/SlackBuild                   | 2 +-
 xap/x49gp/SlackBuild                 | 2 +-
 y/cboard/SlackBuild                  | 2 +-
 y/steamtinkerlaunch/SlackBuild       | 2 +-
 128 files changed, 132 insertions(+), 132 deletions(-)

diff --git a/a/broadcom-bt-firmware/SlackBuild b/a/broadcom-bt-firmware/SlackBuild
index 456a5499..00f22f88 100755
--- a/a/broadcom-bt-firmware/SlackBuild
+++ b/a/broadcom-bt-firmware/SlackBuild
@@ -27,7 +27,7 @@ rm -fr $PKG
 ( cd $REPOSITORY; git pull )
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 mkdir -p $PKG/lib/firmware/
 cp -R $REPOSITORY/brcm/ $PKG/lib/firmware/
diff --git a/a/nct6687d/SlackBuild b/a/nct6687d/SlackBuild
index d6452536..ec57c8d3 100755
--- a/a/nct6687d/SlackBuild
+++ b/a/nct6687d/SlackBuild
@@ -36,7 +36,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/a/pine64-platform-scripts/SlackBuild b/a/pine64-platform-scripts/SlackBuild
index 8b273dfb..c46667ae 100755
--- a/a/pine64-platform-scripts/SlackBuild
+++ b/a/pine64-platform-scripts/SlackBuild
@@ -28,7 +28,7 @@ rm -fr $PKG
 ( cd $REPOSITORY; git pull )
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 mkdir -p $PKG/usr/bin
 cp $REPOSITORY/simpleimage/platform-scripts/* $PKG/usr/bin/
diff --git a/a/rpi-firmware-nonfree/SlackBuild b/a/rpi-firmware-nonfree/SlackBuild
index 57afc5e9..c414d467 100755
--- a/a/rpi-firmware-nonfree/SlackBuild
+++ b/a/rpi-firmware-nonfree/SlackBuild
@@ -28,7 +28,7 @@ rm -fr $PKG
 ( cd $REPOSITORY; git pull )
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 mkdir -p $PKG/lib/firmware
 
diff --git a/ap/amdgpud/SlackBuild b/ap/amdgpud/SlackBuild
index 270ea904..a685608f 100755
--- a/ap/amdgpud/SlackBuild
+++ b/ap/amdgpud/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/bandwhich/SlackBuild b/ap/bandwhich/SlackBuild
index a6e5b154..3e2498d9 100755
--- a/ap/bandwhich/SlackBuild
+++ b/ap/bandwhich/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/bat/SlackBuild b/ap/bat/SlackBuild
index fcccc374..ee2a7c4a 100755
--- a/ap/bat/SlackBuild
+++ b/ap/bat/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/btm/SlackBuild b/ap/btm/SlackBuild
index 4395549f..6e6c6e81 100755
--- a/ap/btm/SlackBuild
+++ b/ap/btm/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout -f $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout -f $VERSION
 
 cargo build --release
 
diff --git a/ap/checkssl/SlackBuild b/ap/checkssl/SlackBuild
index cef083c7..ceb2b792 100755
--- a/ap/checkssl/SlackBuild
+++ b/ap/checkssl/SlackBuild
@@ -29,7 +29,7 @@ cd $REPOSITORY
 git pull --all
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 mkdir -p $PKG$PREFIX/bin
 cp $REPOSITORY/checkssl $PKG$PREFIX/bin/
diff --git a/ap/delta/SlackBuild b/ap/delta/SlackBuild
index 4f4fe3ae..5f166d80 100755
--- a/ap/delta/SlackBuild
+++ b/ap/delta/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/diskus/SlackBuild b/ap/diskus/SlackBuild
index 66ad5e3f..cccbc582 100755
--- a/ap/diskus/SlackBuild
+++ b/ap/diskus/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/dive/SlackBuild b/ap/dive/SlackBuild
index fb6fffb7..57e834c3 100755
--- a/ap/dive/SlackBuild
+++ b/ap/dive/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make
 
diff --git a/ap/dua/SlackBuild b/ap/dua/SlackBuild
index d7527f7d..7d7c6f95 100755
--- a/ap/dua/SlackBuild
+++ b/ap/dua/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/dust/SlackBuild b/ap/dust/SlackBuild
index f7d238db..179ab724 100755
--- a/ap/dust/SlackBuild
+++ b/ap/dust/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/esptool/SlackBuild b/ap/esptool/SlackBuild
index 8760fb34..fd1991df 100755
--- a/ap/esptool/SlackBuild
+++ b/ap/esptool/SlackBuild
@@ -28,7 +28,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 python setup.py install --root $PKG
 
diff --git a/ap/exa/SlackBuild b/ap/exa/SlackBuild
index a3dec03c..c03b93f7 100755
--- a/ap/exa/SlackBuild
+++ b/ap/exa/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/f3/SlackBuild b/ap/f3/SlackBuild
index 6b89bc58..51afb28c 100755
--- a/ap/f3/SlackBuild
+++ b/ap/f3/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make all extra
 
diff --git a/ap/fd/SlackBuild b/ap/fd/SlackBuild
index d53a8daa..38fbe425 100755
--- a/ap/fd/SlackBuild
+++ b/ap/fd/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/fish/SlackBuild b/ap/fish/SlackBuild
index 6f4c13e3..96fc727b 100755
--- a/ap/fish/SlackBuild
+++ b/ap/fish/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 cmake \
diff --git a/ap/getssl/SlackBuild b/ap/getssl/SlackBuild
index ff48f53c..6aa3a32d 100755
--- a/ap/getssl/SlackBuild
+++ b/ap/getssl/SlackBuild
@@ -29,7 +29,7 @@ cd $REPOSITORY
 git pull --all
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 mkdir -p $PKG$PREFIX/bin
 cp $REPOSITORY/getssl $PKG$PREFIX/bin/
diff --git a/ap/gopsuinfo/SlackBuild b/ap/gopsuinfo/SlackBuild
index 3eef745e..1c021341 100755
--- a/ap/gopsuinfo/SlackBuild
+++ b/ap/gopsuinfo/SlackBuild
@@ -34,7 +34,7 @@ cd "$TMP/$PRGNAM/" || exit
 [ "$VERSION" == "latest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "$VERSION" == "" ] && VERSION=trunk
 if [ "$VERSION" == "trunk" ]; then
-    VERSION="git_$(git rev-list --count HEAD)"
+    VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 else
     git checkout "$VERSION"
 fi
diff --git a/ap/grex/SlackBuild b/ap/grex/SlackBuild
index 5edc7b1b..a1dbd6c5 100755
--- a/ap/grex/SlackBuild
+++ b/ap/grex/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/himalaya/SlackBuild b/ap/himalaya/SlackBuild
index 3aba7af6..f2b80e39 100755
--- a/ap/himalaya/SlackBuild
+++ b/ap/himalaya/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/ht/SlackBuild b/ap/ht/SlackBuild
index 64641d54..2f5c353a 100755
--- a/ap/ht/SlackBuild
+++ b/ap/ht/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/humble-cli/SlackBuild b/ap/humble-cli/SlackBuild
index 87075a8c..e84b3eb2 100755
--- a/ap/humble-cli/SlackBuild
+++ b/ap/humble-cli/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/hyperfine/SlackBuild b/ap/hyperfine/SlackBuild
index 2c237bc7..8b538f01 100755
--- a/ap/hyperfine/SlackBuild
+++ b/ap/hyperfine/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/icr/SlackBuild b/ap/icr/SlackBuild
index bdbc9191..da36c5c2 100755
--- a/ap/icr/SlackBuild
+++ b/ap/icr/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make
 make install PREFIX=$PKG$PREFIX
diff --git a/ap/ijq/SlackBuild b/ap/ijq/SlackBuild
index ae1d3ce8..edbe143e 100755
--- a/ap/ijq/SlackBuild
+++ b/ap/ijq/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make install DESTDIR=$PKG prefix=$PREFIX mandir=$PREFIX/man
 
diff --git a/ap/ion/SlackBuild b/ap/ion/SlackBuild
index f89c43d3..1498fad4 100755
--- a/ap/ion/SlackBuild
+++ b/ap/ion/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/itd/SlackBuild b/ap/itd/SlackBuild
index d3346dc3..3a4d7063 100755
--- a/ap/itd/SlackBuild
+++ b/ap/itd/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make
 
diff --git a/ap/ledger/SlackBuild b/ap/ledger/SlackBuild
index 77767d53..8b8c0cf5 100755
--- a/ap/ledger/SlackBuild
+++ b/ap/ledger/SlackBuild
@@ -51,7 +51,7 @@ find . \
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cmake . \
       -DUSE_DOXYGEN=ON \
diff --git a/ap/legendary/SlackBuild b/ap/legendary/SlackBuild
index 745d14df..7f9b67a6 100755
--- a/ap/legendary/SlackBuild
+++ b/ap/legendary/SlackBuild
@@ -31,7 +31,7 @@ git pull --all
 
 cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
-VERSION="$(git rev-list --count HEAD)"
+VERSION="$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 
 # installation
 python3 ./setup.py install --root=$PKG
diff --git a/ap/lsd/SlackBuild b/ap/lsd/SlackBuild
index e59c6617..b82d60ec 100755
--- a/ap/lsd/SlackBuild
+++ b/ap/lsd/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/lsyncd/SlackBuild b/ap/lsyncd/SlackBuild
index 144b9d90..02a341c5 100755
--- a/ap/lsyncd/SlackBuild
+++ b/ap/lsyncd/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 cmake \
diff --git a/ap/mdcat/SlackBuild b/ap/mdcat/SlackBuild
index e3cc9337..56cb8a38 100755
--- a/ap/mdcat/SlackBuild
+++ b/ap/mdcat/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/motion/SlackBuild b/ap/motion/SlackBuild
index 63086496..5d866f17 100755
--- a/ap/motion/SlackBuild
+++ b/ap/motion/SlackBuild
@@ -69,7 +69,7 @@ cp -R $REPOSITORY $PRGNAM
 cd $PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 chown -R root:root .
 find -L . \
      \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/ap/mozwire/SlackBuild b/ap/mozwire/SlackBuild
index cbf9ccf1..4f4832ec 100755
--- a/ap/mozwire/SlackBuild
+++ b/ap/mozwire/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/ncdu/SlackBuild b/ap/ncdu/SlackBuild
index 5634a397..43f15f2e 100755
--- a/ap/ncdu/SlackBuild
+++ b/ap/ncdu/SlackBuild
@@ -36,7 +36,7 @@ git checkout zig-0.10
 
 [ "$VERSION" == "latest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "$VERSION" == "" ] && VERSION=trunk
-[ "$VERSION" == "trunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout "$VERSION"
+[ "$VERSION" == "trunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout "$VERSION"
 
 #zig build -Drelease-safe --prefix "$PKG$PREFIX" install
 make
diff --git a/ap/nu/SlackBuild b/ap/nu/SlackBuild
index 5e065d36..3b9621e1 100755
--- a/ap/nu/SlackBuild
+++ b/ap/nu/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/nvtop/SlackBuild b/ap/nvtop/SlackBuild
index 2a1cfaa3..f145c210 100755
--- a/ap/nvtop/SlackBuild
+++ b/ap/nvtop/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 cmake -DNVIDIA_SUPPORT=ON \
diff --git a/ap/procs/SlackBuild b/ap/procs/SlackBuild
index d3e05c14..1868f503 100755
--- a/ap/procs/SlackBuild
+++ b/ap/procs/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/protontricks/SlackBuild b/ap/protontricks/SlackBuild
index 4c6ba2f1..37313f84 100755
--- a/ap/protontricks/SlackBuild
+++ b/ap/protontricks/SlackBuild
@@ -31,7 +31,7 @@ git pull --all
 
 cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
-VERSION="$(git rev-list --count HEAD)"
+VERSION="$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 
 # installation
 python3 ./setup.py install --root=$PKG
diff --git a/ap/ripgrep/SlackBuild b/ap/ripgrep/SlackBuild
index dad05dd8..389d458a 100755
--- a/ap/ripgrep/SlackBuild
+++ b/ap/ripgrep/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/rustup/SlackBuild b/ap/rustup/SlackBuild
index cfcdcb1e..9b30650b 100755
--- a/ap/rustup/SlackBuild
+++ b/ap/rustup/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release --features no-self-update
 
diff --git a/ap/sd/SlackBuild b/ap/sd/SlackBuild
index 99a60e90..df98f6da 100755
--- a/ap/sd/SlackBuild
+++ b/ap/sd/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/starship/SlackBuild b/ap/starship/SlackBuild
index 5f6eeb4e..141091a2 100755
--- a/ap/starship/SlackBuild
+++ b/ap/starship/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/stow/SlackBuild b/ap/stow/SlackBuild
index c70723d4..06df4b90 100755
--- a/ap/stow/SlackBuild
+++ b/ap/stow/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 autoconf
 aclocal --force
diff --git a/ap/tldr/SlackBuild b/ap/tldr/SlackBuild
index 360d40db..419c07f9 100755
--- a/ap/tldr/SlackBuild
+++ b/ap/tldr/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/tre/SlackBuild b/ap/tre/SlackBuild
index be82dbef..9a98b96c 100755
--- a/ap/tre/SlackBuild
+++ b/ap/tre/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/tv/SlackBuild b/ap/tv/SlackBuild
index 55e5c4f0..c85b00e2 100755
--- a/ap/tv/SlackBuild
+++ b/ap/tv/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/viu/SlackBuild b/ap/viu/SlackBuild
index c36030a5..baff7279 100755
--- a/ap/viu/SlackBuild
+++ b/ap/viu/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/ap/weboob/SlackBuild b/ap/weboob/SlackBuild
index eca8f9e1..bca3832a 100755
--- a/ap/weboob/SlackBuild
+++ b/ap/weboob/SlackBuild
@@ -29,7 +29,7 @@ git pull --all
 
 cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
-VERSION="$(git rev-list --count HEAD)"
+VERSION="$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 
 # installation
 ./tools/local_install.sh $PKG$PREFIX/bin
diff --git a/ap/ycmd/SlackBuild b/ap/ycmd/SlackBuild
index 1440fb4e..1450557f 100755
--- a/ap/ycmd/SlackBuild
+++ b/ap/ycmd/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 git submodule update --init --recursive
 TERM=xterm \
diff --git a/ap/ytop/SlackBuild b/ap/ytop/SlackBuild
index 28228bb8..146a8e58 100755
--- a/ap/ytop/SlackBuild
+++ b/ap/ytop/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/d/ameba/SlackBuild b/d/ameba/SlackBuild
index 97559d4a..67c9c223 100755
--- a/d/ameba/SlackBuild
+++ b/d/ameba/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # compilation
 shards build --verbose --release
diff --git a/d/chruby/SlackBuild b/d/chruby/SlackBuild
index 75e1f217..89ef8505 100755
--- a/d/chruby/SlackBuild
+++ b/d/chruby/SlackBuild
@@ -36,7 +36,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # compilation
 make -j3 PREFIX=$PREFIX
diff --git a/d/crystal/SlackBuild b/d/crystal/SlackBuild
index 6167a201..b707b00f 100755
--- a/d/crystal/SlackBuild
+++ b/d/crystal/SlackBuild
@@ -31,7 +31,7 @@ cd "$TMP/$PRGNAM/" || exit
 [ "$VERSION" == "latest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "$VERSION" == "" ] && VERSION=trunk
 if [ "$VERSION" == "trunk" ]; then
-    VERSION="git_$(git rev-list --count HEAD)"
+    VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 else
     git checkout "$VERSION"
 fi
@@ -66,7 +66,7 @@ cd $TMP/$SHARDS_PRGNAM/
 [ "$SHARDS_VERSION" == "latest" ] && SHARDS_VERSION=$(git describe --tags --abbrev=0)
 [ "$SHARDS_VERSION" == "" ] && SHARDS_VERSION=trunk
 if [ "$SHARDS_VERSION" == "trunk" ]; then
-    SHARDS_VERSION="git_$(git rev-list --count HEAD)"
+    SHARDS_VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 else
     git checkout "$SHARDS_VERSION"
 fi
diff --git a/d/dtc/SlackBuild b/d/dtc/SlackBuild
index 79ce9dd1..a5efa792 100755
--- a/d/dtc/SlackBuild
+++ b/d/dtc/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make
 make install PREFIX=$PKG$PREFIX LIBDIR=$PKG$PREFIX/lib$(uname -m | grep -o 64)
diff --git a/d/factor/SlackBuild b/d/factor/SlackBuild
index 967c3a7d..e19a2c35 100755
--- a/d/factor/SlackBuild
+++ b/d/factor/SlackBuild
@@ -31,7 +31,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 ./build.sh update
 
diff --git a/d/gforth/SlackBuild b/d/gforth/SlackBuild
index 5d163242..52de0e4d 100755
--- a/d/gforth/SlackBuild
+++ b/d/gforth/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 ./BUILD-FROM-SCRATCH --prefix=${PREFIX} \
diff --git a/d/newrpl/SlackBuild b/d/newrpl/SlackBuild
index 9edb35fc..989f0657 100755
--- a/d/newrpl/SlackBuild
+++ b/d/newrpl/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="$(git rev-list --count master)_git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="$(git rev-list --count master)_git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # https://www.hpmuseum.org/forum/thread-17667-post-154012.html#pid154012
 # elf2rom is only needed to build actual calculator firmware
diff --git a/d/qbe/SlackBuild b/d/qbe/SlackBuild
index 3d7a15e8..0b1b267a 100755
--- a/d/qbe/SlackBuild
+++ b/d/qbe/SlackBuild
@@ -36,7 +36,7 @@ cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xdevelop" ] && git checkout develop && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # compilation
 make -j3
diff --git a/d/rbspy/SlackBuild b/d/rbspy/SlackBuild
index 8432bd08..9d41d687 100755
--- a/d/rbspy/SlackBuild
+++ b/d/rbspy/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/d/retroforth/SlackBuild b/d/retroforth/SlackBuild
index ce5c73da..0f18ad52 100755
--- a/d/retroforth/SlackBuild
+++ b/d/retroforth/SlackBuild
@@ -31,7 +31,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make PREFIX=$PREFIX
 make install PREFIX=$PREFIX DESTDIR=$PKG MANDIR=$PREFIX/man/man1 DOCSDIR=$PREFIX/doc/$PRGNAM/ EXAMPLESDIR=$PREFIX/doc/$PRGNAM/examples/
diff --git a/d/rpn/SlackBuild b/d/rpn/SlackBuild
index d766a3ac..6f1b2442 100755
--- a/d/rpn/SlackBuild
+++ b/d/rpn/SlackBuild
@@ -36,7 +36,7 @@ cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
 [ "x$VERSION" == "xdevelop" ] && git checkout develop && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # sed -i 's|git@github.com:|https://github.com/|g' $(grep -l git@ .*)
 
diff --git a/d/ruby-install/SlackBuild b/d/ruby-install/SlackBuild
index 100f72b2..1e56f9ff 100755
--- a/d/ruby-install/SlackBuild
+++ b/d/ruby-install/SlackBuild
@@ -33,7 +33,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # compilation
 make -j3 PREFIX=$PREFIX
diff --git a/d/scry/SlackBuild b/d/scry/SlackBuild
index 75ddd326..42d64d33 100755
--- a/d/scry/SlackBuild
+++ b/d/scry/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 sed -i 's|Errno|File::Error|g' src/scry/text_document.cr
 
diff --git a/d/scryer-prolog/SlackBuild b/d/scryer-prolog/SlackBuild
index db0811a8..5e7f2426 100755
--- a/d/scryer-prolog/SlackBuild
+++ b/d/scryer-prolog/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/d/wabt/SlackBuild b/d/wabt/SlackBuild
index 67f8ebc1..92cc4c9e 100755
--- a/d/wabt/SlackBuild
+++ b/d/wabt/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 mkdir build
diff --git a/e/emacs/SlackBuild b/e/emacs/SlackBuild
index c237d49d..08735422 100755
--- a/e/emacs/SlackBuild
+++ b/e/emacs/SlackBuild
@@ -96,7 +96,7 @@ git clean -dfX                  # https://github.com/commercial-emacs/commercial
 
 rm lisp/loaddefs.el             # https://lists.gnu.org/r/emacs-devel/2021-04/msg01430.html
 
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)"
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 
 #mkdir -p $TMP/$PKGNAM
 cp -R $REPOSITORY $TMP/$PKGNAM
diff --git a/fonts/bitmap-fonts/SlackBuild b/fonts/bitmap-fonts/SlackBuild
index b69d6666..636f757a 100755
--- a/fonts/bitmap-fonts/SlackBuild
+++ b/fonts/bitmap-fonts/SlackBuild
@@ -32,7 +32,7 @@ cp -R "$REPOSITORY" "$TMP/"
 cd "$TMP/$PRGNAM/" || exit 1
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/l/apcu/SlackBuild b/l/apcu/SlackBuild
index d3643d97..603519b3 100755
--- a/l/apcu/SlackBuild
+++ b/l/apcu/SlackBuild
@@ -39,7 +39,7 @@ cp -R $REPOSITORY $PRGNAM
 cd $PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 phpize
diff --git a/l/fmt/SlackBuild b/l/fmt/SlackBuild
index 2090c77d..779e4354 100755
--- a/l/fmt/SlackBuild
+++ b/l/fmt/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 cmake \
diff --git a/l/libucl/SlackBuild b/l/libucl/SlackBuild
index 7a2e1c95..c219a2b2 100755
--- a/l/libucl/SlackBuild
+++ b/l/libucl/SlackBuild
@@ -38,7 +38,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 # [ -e CMakeLists.txt ] && cmake \
diff --git a/l/python-cairo-cffi/SlackBuild b/l/python-cairo-cffi/SlackBuild
index 618ccdbe..4017c6e7 100755
--- a/l/python-cairo-cffi/SlackBuild
+++ b/l/python-cairo-cffi/SlackBuild
@@ -36,7 +36,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # installation
 python3 ./setup.py install --root=$PKG
diff --git a/l/raylib/SlackBuild b/l/raylib/SlackBuild
index c60c2830..233c7b9d 100755
--- a/l/raylib/SlackBuild
+++ b/l/raylib/SlackBuild
@@ -36,7 +36,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cd src
 make PLATFORM=PLATFORM_DESKTOP RAYLIB_LIBTYPE=SHARED
diff --git a/l/sdl12-compat/SlackBuild b/l/sdl12-compat/SlackBuild
index 739cda55..43b06f65 100755
--- a/l/sdl12-compat/SlackBuild
+++ b/l/sdl12-compat/SlackBuild
@@ -33,7 +33,7 @@ cd "$TMP/$PRGNAM" || exit
 [ "$VERSION" == "latest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "$VERSION" == "" ] && VERSION=trunk
 if [ "$VERSION" == "trunk" ]; then
-    VERSION="git_$(git rev-list --count HEAD)"
+    VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 else
     git checkout "$VERSION"
 fi
diff --git a/l/spdlog/SlackBuild b/l/spdlog/SlackBuild
index 1ca39b70..9aecd691 100755
--- a/l/spdlog/SlackBuild
+++ b/l/spdlog/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 cmake \
diff --git a/lua/luarocks/SlackBuild b/lua/luarocks/SlackBuild
index 679debe1..1bacb902 100755
--- a/lua/luarocks/SlackBuild
+++ b/lua/luarocks/SlackBuild
@@ -40,7 +40,7 @@ cd $PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # configuration
 CFLAGS=$SLCKFLAGS \
diff --git a/n/calibre-web/SlackBuild b/n/calibre-web/SlackBuild
index 0b097bb0..a8719443 100755
--- a/n/calibre-web/SlackBuild
+++ b/n/calibre-web/SlackBuild
@@ -37,7 +37,7 @@ cd $PKG/opt/$PRGNAM
 
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/n/pluxml/SlackBuild b/n/pluxml/SlackBuild
index 7e83ac51..8d8229cb 100755
--- a/n/pluxml/SlackBuild
+++ b/n/pluxml/SlackBuild
@@ -36,7 +36,7 @@ cd $PKG/$VHOSTROOT/htdocs
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 rm -fr $PKG/$VHOSTROOT/htdocs/.git
 mv $PKG/$VHOSTROOT/htdocs/install.php $PKG/$VHOSTROOT/htdocs/install.php.disabled
diff --git a/wayland/Hyprland/SlackBuild b/wayland/Hyprland/SlackBuild
index e91fb66d..f228fe75 100755
--- a/wayland/Hyprland/SlackBuild
+++ b/wayland/Hyprland/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/autotiling/SlackBuild b/wayland/autotiling/SlackBuild
index ffd2b042..5892000a 100755
--- a/wayland/autotiling/SlackBuild
+++ b/wayland/autotiling/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/cage/SlackBuild b/wayland/cage/SlackBuild
index 5294f2fa..50143667 100755
--- a/wayland/cage/SlackBuild
+++ b/wayland/cage/SlackBuild
@@ -33,7 +33,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # wget -c https://github.com/Hjdskes/cage/pull/217.patch
 # git am 217.patch
diff --git a/wayland/dwl/SlackBuild b/wayland/dwl/SlackBuild
index 0948e243..153ac1a2 100755
--- a/wayland/dwl/SlackBuild
+++ b/wayland/dwl/SlackBuild
@@ -79,7 +79,7 @@ cd $TMP/$PRGNAM/
 case $VERSION in
     trunk)
         git checkout wlroots-next
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/foot/SlackBuild b/wayland/foot/SlackBuild
index 99fa784b..9b6df5cf 100755
--- a/wayland/foot/SlackBuild
+++ b/wayland/foot/SlackBuild
@@ -31,7 +31,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup \
       --prefix /usr \
diff --git a/wayland/imv/SlackBuild b/wayland/imv/SlackBuild
index 64da6d5b..5a09d858 100755
--- a/wayland/imv/SlackBuild
+++ b/wayland/imv/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/japokwm/SlackBuild b/wayland/japokwm/SlackBuild
index 83c240b4..5361c57a 100755
--- a/wayland/japokwm/SlackBuild
+++ b/wayland/japokwm/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/kanshi/SlackBuild b/wayland/kanshi/SlackBuild
index 3a451d49..cef48ba4 100755
--- a/wayland/kanshi/SlackBuild
+++ b/wayland/kanshi/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup \
       --prefix /usr \
diff --git a/wayland/lswt/SlackBuild b/wayland/lswt/SlackBuild
index f4d45067..0defbe25 100755
--- a/wayland/lswt/SlackBuild
+++ b/wayland/lswt/SlackBuild
@@ -32,7 +32,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make
 
diff --git a/wayland/mako/SlackBuild b/wayland/mako/SlackBuild
index 6b15c907..aab41197 100755
--- a/wayland/mako/SlackBuild
+++ b/wayland/mako/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup \
       --prefix /usr \
diff --git a/wayland/nwg-look/SlackBuild b/wayland/nwg-look/SlackBuild
index d594c28b..cda35f54 100755
--- a/wayland/nwg-look/SlackBuild
+++ b/wayland/nwg-look/SlackBuild
@@ -34,7 +34,7 @@ cd "$TMP/$PRGNAM/" || exit
 [ "$VERSION" == "latest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "$VERSION" == "" ] && VERSION=trunk
 if [ "$VERSION" == "trunk" ]; then
-    VERSION="git_$(git rev-list --count HEAD)"
+    VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
 else
     git checkout "$VERSION"
 fi
diff --git a/wayland/nwg-panel/SlackBuild b/wayland/nwg-panel/SlackBuild
index 909620cb..451402d7 100755
--- a/wayland/nwg-panel/SlackBuild
+++ b/wayland/nwg-panel/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/persway/SlackBuild b/wayland/persway/SlackBuild
index 559f7286..34c731b3 100755
--- a/wayland/persway/SlackBuild
+++ b/wayland/persway/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/wayland/qtile-extras/SlackBuild b/wayland/qtile-extras/SlackBuild
index 6e163c29..fbaa5a8e 100755
--- a/wayland/qtile-extras/SlackBuild
+++ b/wayland/qtile-extras/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # installation
 python3 ./setup.py install --root=$PKG
diff --git a/wayland/qtile/SlackBuild b/wayland/qtile/SlackBuild
index 3de3c3e6..5b29a357 100755
--- a/wayland/qtile/SlackBuild
+++ b/wayland/qtile/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # installation
 python3 ./setup.py install --root=$PKG
diff --git a/wayland/river/SlackBuild b/wayland/river/SlackBuild
index a90efc5d..a6d3618d 100755
--- a/wayland/river/SlackBuild
+++ b/wayland/river/SlackBuild
@@ -35,7 +35,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 zig build -Dxwayland -Drelease-safe --prefix $PKG$PREFIX install
 
diff --git a/wayland/salut/SlackBuild b/wayland/salut/SlackBuild
index a6793c75..0418f357 100755
--- a/wayland/salut/SlackBuild
+++ b/wayland/salut/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/wayland/seatd/SlackBuild b/wayland/seatd/SlackBuild
index e89f13b4..fdc4951c 100755
--- a/wayland/seatd/SlackBuild
+++ b/wayland/seatd/SlackBuild
@@ -32,7 +32,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/sfwbar/SlackBuild b/wayland/sfwbar/SlackBuild
index 38cb975d..8dbbbf5c 100755
--- a/wayland/sfwbar/SlackBuild
+++ b/wayland/sfwbar/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/sway/SlackBuild b/wayland/sway/SlackBuild
index 801c6f83..53030447 100755
--- a/wayland/sway/SlackBuild
+++ b/wayland/sway/SlackBuild
@@ -36,7 +36,7 @@ cd "$TMP/$PRGNAM/" || exit 1
 case $VERSION in
     trunk)
         # PKGVERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)"
-        PKGVERSION="r$(git rev-list --count HEAD)"
+        PKGVERSION="r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         PKGVERSION=$(git describe --tags --abbrev=0)
@@ -80,7 +80,7 @@ if [ "$EMBED_WLROOTS" = "yes" ]; then
     case $WLROOTS_VERSION in
         trunk)
             # WLROOTS_VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)"
-            WLROOTS_VERSION="r$(git rev-list --count HEAD)"
+            WLROOTS_VERSION="r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
             ;;
         latest)
             WLROOTS_VERSION=$(git describe --tags --abbrev=0)
@@ -110,7 +110,7 @@ if [ "$EMBED_LIBLIFTOFF" = "yes" ]; then
     case $LIBLIFTOFF_VERSION in
         trunk)
             # LIBLIFTOFF_VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)"
-            LIBLIFTOFF_VERSION="r$(git rev-list --count HEAD)"
+            LIBLIFTOFF_VERSION="r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
             ;;
         latest)
             LIBLIFTOFF_VERSION=$(git describe --tags --abbrev=0)
@@ -140,7 +140,7 @@ if [ "$EMBED_LIBDISPLAYINFO" = "yes" ]; then
     case $LIBDISPLAYINFO_VERSION in
         trunk)
             # LIBDISPLAYINFO_VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)"
-            LIBDISPLAYINFO_VERSION="r$(git rev-list --count HEAD)"
+            LIBDISPLAYINFO_VERSION="r$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
             ;;
         latest)
             LIBDISPLAYINFO_VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/swaybg/SlackBuild b/wayland/swaybg/SlackBuild
index b5e61e87..fe7395be 100755
--- a/wayland/swaybg/SlackBuild
+++ b/wayland/swaybg/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/swayidle/SlackBuild b/wayland/swayidle/SlackBuild
index 23d37661..707c8f96 100755
--- a/wayland/swayidle/SlackBuild
+++ b/wayland/swayidle/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/swaylock/SlackBuild b/wayland/swaylock/SlackBuild
index 4845a306..fdaf9c60 100755
--- a/wayland/swaylock/SlackBuild
+++ b/wayland/swaylock/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup --prefix /usr --mandir /usr/man/ build/
 ninja -C build/
diff --git a/wayland/swayr/SlackBuild b/wayland/swayr/SlackBuild
index 4bcea7aa..c67cc95a 100755
--- a/wayland/swayr/SlackBuild
+++ b/wayland/swayr/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/wayland/vivarium/SlackBuild b/wayland/vivarium/SlackBuild
index 996c2217..be60276e 100755
--- a/wayland/vivarium/SlackBuild
+++ b/wayland/vivarium/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/waybar/SlackBuild b/wayland/waybar/SlackBuild
index dd030af8..0c416b45 100755
--- a/wayland/waybar/SlackBuild
+++ b/wayland/waybar/SlackBuild
@@ -48,7 +48,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/wlopm/SlackBuild b/wayland/wlopm/SlackBuild
index be8c8f94..5c7b4c8d 100755
--- a/wayland/wlopm/SlackBuild
+++ b/wayland/wlopm/SlackBuild
@@ -32,7 +32,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make
 
diff --git a/wayland/wlr-randr/SlackBuild b/wayland/wlr-randr/SlackBuild
index 20275c7c..55afcbc1 100755
--- a/wayland/wlr-randr/SlackBuild
+++ b/wayland/wlr-randr/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 meson setup \
       --prefix /usr \
diff --git a/wayland/wlroots/SlackBuild b/wayland/wlroots/SlackBuild
index 4b21ced0..35c1619a 100755
--- a/wayland/wlroots/SlackBuild
+++ b/wayland/wlroots/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 case $VERSION in
     trunk)
-        VERSION="git_$(git rev-list --count HEAD)"
+        VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)"
         ;;
     latest)
         VERSION=$(git describe --tags --abbrev=0)
diff --git a/wayland/wofi/SlackBuild b/wayland/wofi/SlackBuild
index 70af512a..098e8079 100755
--- a/wayland/wofi/SlackBuild
+++ b/wayland/wofi/SlackBuild
@@ -30,7 +30,7 @@ hg pull
 cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM/
 
-# [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+# [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 [ "x$VERSION" == "xtrunk" ] && VERSION="hg_$(date +%F | tr - .)"
 
 meson setup --prefix /usr --mandir /usr/man/ build/
diff --git a/xap/alacritty/SlackBuild b/xap/alacritty/SlackBuild
index 25d9fd62..feac0e21 100755
--- a/xap/alacritty/SlackBuild
+++ b/xap/alacritty/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/xap/alttab/SlackBuild b/xap/alttab/SlackBuild
index b4b9b5ba..9f819a2d 100755
--- a/xap/alttab/SlackBuild
+++ b/xap/alttab/SlackBuild
@@ -36,7 +36,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 chown -R root:root .
 find . \
diff --git a/xap/brightnessctl/SlackBuild b/xap/brightnessctl/SlackBuild
index 70469378..38ea85bd 100755
--- a/xap/brightnessctl/SlackBuild
+++ b/xap/brightnessctl/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORIES/$PRGNAM $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 ./configure \
     --prefix=/usr
diff --git a/xap/gammastep/SlackBuild b/xap/gammastep/SlackBuild
index 129b5496..18164463 100755
--- a/xap/gammastep/SlackBuild
+++ b/xap/gammastep/SlackBuild
@@ -32,7 +32,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 ./bootstrap
 ./configure \
diff --git a/xap/i3status-rust/SlackBuild b/xap/i3status-rust/SlackBuild
index 3a7b84df..e8ec544c 100755
--- a/xap/i3status-rust/SlackBuild
+++ b/xap/i3status-rust/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release --features "pulseaudio"
 
diff --git a/xap/image-roll/SlackBuild b/xap/image-roll/SlackBuild
index 4cc364b1..e1b71cae 100755
--- a/xap/image-roll/SlackBuild
+++ b/xap/image-roll/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/xap/kitty/SlackBuild b/xap/kitty/SlackBuild
index 8f559c58..2efc5b58 100755
--- a/xap/kitty/SlackBuild
+++ b/xap/kitty/SlackBuild
@@ -33,7 +33,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM/
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # installation
 mkdir -p $PKG/
diff --git a/xap/leocad/SlackBuild b/xap/leocad/SlackBuild
index 4840b0e2..75309041 100755
--- a/xap/leocad/SlackBuild
+++ b/xap/leocad/SlackBuild
@@ -30,7 +30,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM/
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 qmake-qt5 DISABLE_UPDATE_CHECK=1 DOCS_DIR=/usr/doc/$PRGNAM MAN_DIR=/usr/man/man1 leocad.pro
 CFLAGS="$SLKCFLAGS" \
diff --git a/xap/nextcloud-client/SlackBuild b/xap/nextcloud-client/SlackBuild
index e607b717..125139a6 100755
--- a/xap/nextcloud-client/SlackBuild
+++ b/xap/nextcloud-client/SlackBuild
@@ -35,7 +35,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 git submodule update --init --recursive
 
 # configuration
diff --git a/xap/polybar/SlackBuild b/xap/polybar/SlackBuild
index 540c1d03..297af27b 100755
--- a/xap/polybar/SlackBuild
+++ b/xap/polybar/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 git submodule init
 git submodule update
diff --git a/xap/radeon-profile/SlackBuild b/xap/radeon-profile/SlackBuild
index a865d1ae..68a28851 100755
--- a/xap/radeon-profile/SlackBuild
+++ b/xap/radeon-profile/SlackBuild
@@ -30,7 +30,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM/$PRGNAM/
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 qmake-qt5 DISABLE_UPDATE_CHECK=1 DOCS_DIR=/usr/doc/$PRGNAM MAN_DIR=/usr/man/man1
 CFLAGS="$SLKCFLAGS" \
diff --git a/xap/rkvm/SlackBuild b/xap/rkvm/SlackBuild
index cf194937..90fba09d 100755
--- a/xap/rkvm/SlackBuild
+++ b/xap/rkvm/SlackBuild
@@ -34,7 +34,7 @@ cp -R $REPOSITORY $TMP/
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/xap/wezterm/SlackBuild b/xap/wezterm/SlackBuild
index 73c3795c..e55c23ed 100755
--- a/xap/wezterm/SlackBuild
+++ b/xap/wezterm/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 cargo build --release
 
diff --git a/xap/x48/SlackBuild b/xap/x48/SlackBuild
index 251c8fc2..4cc91b3e 100755
--- a/xap/x48/SlackBuild
+++ b/xap/x48/SlackBuild
@@ -37,7 +37,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 chown -R root:root .
 find . \
diff --git a/xap/x49gp/SlackBuild b/xap/x49gp/SlackBuild
index 66894a9e..ee14161c 100755
--- a/xap/x49gp/SlackBuild
+++ b/xap/x49gp/SlackBuild
@@ -37,7 +37,7 @@ cp -R $REPOSITORY $TMP/$PRGNAM
 cd $TMP/$PRGNAM
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 # Preparation
 chown -R root:root .
diff --git a/y/cboard/SlackBuild b/y/cboard/SlackBuild
index 2e12a85e..cb924610 100755
--- a/y/cboard/SlackBuild
+++ b/y/cboard/SlackBuild
@@ -34,7 +34,7 @@ cd $TMP/$PRGNAM
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 chown -R root:root .
 find . \
diff --git a/y/steamtinkerlaunch/SlackBuild b/y/steamtinkerlaunch/SlackBuild
index c93113a2..e6155641 100755
--- a/y/steamtinkerlaunch/SlackBuild
+++ b/y/steamtinkerlaunch/SlackBuild
@@ -32,7 +32,7 @@ cd $TMP/$PRGNAM/
 
 [ "x$VERSION" == "xlatest" ] && VERSION=$(git describe --tags --abbrev=0)
 [ "x$VERSION" == "x" ] && VERSION=trunk
-[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)" || git checkout $VERSION
+[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git rev-list --count HEAD)_$(git log -1 --format=%h)" || git checkout $VERSION
 
 make PREFIX="$PKG/usr" install