From 23e625297aedf2183914dfdce66f6ec22aac42c3 Mon Sep 17 00:00:00 2001
From: lod <github@bremsspur.org>
Date: Mon, 9 Sep 2024 12:21:41 +0200
Subject: [PATCH] change version string and make pkgver easier to read

---
 .SRCINFO | 11 ++++++-----
 PKGBUILD | 15 +++++++++------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index f65f94d..ec4cc4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = orca-slicer-git
 	pkgdesc = G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)
-	pkgver = 2.2.0_dev.c179a57725
+	pkgver = 2.2.0.158c71f05e_beta
 	pkgrel = 1
 	url = https://github.com/SoftFever/OrcaSlicer
 	arch = x86_64
@@ -8,26 +8,27 @@ pkgbase = orca-slicer-git
 	makedepends = cmake
 	makedepends = extra-cmake-modules
 	makedepends = git
+	makedepends = glew
 	makedepends = m4
 	makedepends = ninja
 	makedepends = pkgconf
 	makedepends = wayland-protocols
-	makedepends = glew
 	depends = cairo
 	depends = dbus
 	depends = expat
 	depends = fontconfig
 	depends = gcc-libs
+	depends = gdk-pixbuf2
 	depends = glib2
 	depends = glibc
-	depends = gtk3
-	depends = gdk-pixbuf2
-	depends = gstreamer
 	depends = gst-plugins-bad-libs
+	depends = gstreamer
+	depends = gtk3
 	depends = hicolor-icon-theme
 	depends = libglvnd
 	depends = libjpeg-turbo
 	depends = libspnav
+	depends = libtiff
 	depends = libx11
 	depends = pango
 	depends = python
diff --git a/PKGBUILD b/PKGBUILD
index 5e2e1a1..87b051a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,24 @@
 pkgname=orca-slicer-git
-pkgver=2.2.0_dev.c179a57725
+pkgver=2.2.0.158c71f05e_beta
 pkgrel=1
 pkgdesc="G-code generator for 3D printers (Bambu, Prusa, Voron, VzBot, RatRig, Creality, etc.)"
 arch=('x86_64')
 url="https://github.com/SoftFever/OrcaSlicer"
 license=('AGPL-3.0-only')
-depends=('cairo' 'dbus' 'expat' 'fontconfig' 'gcc-libs' 'glib2' 'glibc' 'gtk3' 'gdk-pixbuf2' 'gstreamer' 
-         'gst-plugins-bad-libs' 'hicolor-icon-theme' 'libglvnd' 'libjpeg-turbo' 'libspnav' 'libx11' 'pango' 
-         'python' 'wayland' 'webkit2gtk-4.1' 'zlib')
-makedepends=('cmake' 'extra-cmake-modules' 'git' 'm4' 'ninja' 'pkgconf' 'wayland-protocols' 'glew')
+depends=('cairo' 'dbus' 'expat' 'fontconfig' 'gcc-libs' 'gdk-pixbuf2' 'glib2' 'glibc' 
+         'gst-plugins-bad-libs' 'gstreamer' 'gtk3' 'hicolor-icon-theme' 'libglvnd' 'libjpeg-turbo' 
+         'libspnav' 'libtiff' 'libx11' 'pango' 'python' 'wayland' 'webkit2gtk-4.1' 'zlib')
+makedepends=('cmake' 'extra-cmake-modules' 'git' 'glew' 'm4' 'ninja' 'pkgconf' 'wayland-protocols')
 provides=("orca-slicer")
 source=("$pkgname::git+https://github.com/SoftFever/OrcaSlicer.git")
 b2sums=('SKIP')
 
 pkgver() {
   cd $pkgname
-  printf "%s_dev.%s" "$(sed -n 's/.*SoftFever_VERSION "\([^"]*\)".*/\1/p' version.inc | sed 's/-dev//')" "$(git rev-parse --short HEAD)"
+  _version=$(sed -n 's/set(SoftFever_VERSION "\([^"]*\)-.*".*/\1/p' version.inc)
+  _suffix=$(sed -n 's/set(SoftFever_VERSION ".*-\([^"]*\)".*/\1/p' version.inc)
+  _commit=$(git rev-parse --short HEAD)
+  printf "%s.%s_%s" $_version $_commit $_suffix
 }
 
 prepare() {