New version system

2 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef6691f173ee..5fcb815857cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = karaokemugen-git
 	pkgdesc = Karaoke playlist manager/player app used in parties or events.
-	pkgver = 5.0.33.r1477.g120e78627
+	pkgver = 6.0.34.r120e78627
 	pkgrel = 1
 	url = https://mugen.karaokes.moe/
 	install = karaokemugen.install
@@ -12,16 +12,17 @@ pkgbase = karaokemugen-git
 	makedepends = yarn
 	makedepends = nodejs>=16
 	makedepends = python2
+	makedepends = jq
 	depends = mpv
 	depends = ffmpeg
-	depends = postgresql>=14
+	depends = postgresql>=13
 	depends = electron
 	optdepends = sudo: for using karaokemugen-install script
 	provides = karaokemugen
 	conflicts = karaokemugen
-	source = karaokemugen::git+https://lab.shelter.moe/karaokemugen/karaokemugen-app.git
-	source = karaokemugen-lib::git+https://lab.shelter.moe/karaokemugen/lib.git
-	source = karaokemugen-avatars::git+https://lab.shelter.moe/karaokemugen/medias/guest-avatars.git
+	source = karaokemugen::git+https://gitlab.com/karaokemugen/karaokemugen-app.git#branch=master
+	source = karaokemugen-lib::git+https://gitlab.com/karaokemugen/lib.git
+	source = karaokemugen-avatars::git+https://gitlab.com/karaokemugen/medias/guest-avatars.git
 	source = install.sh
 	source = run.sh
 	source = icon256.png
diff --git a/PKGBUILD b/PKGBUILD
index ffd4662f2056..fddd19e7585f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: leonekmi <usingarchbtw@leonekmi.fr>
 pkgname=karaokemugen-git
-pkgver=5.0.33.r1477.g120e78627
+pkgver=6.0.34.r120e78627
 pkgrel=1
 pkgdesc="Karaoke playlist manager/player app used in parties or events."
 arch=('x86_64')
 url="https://mugen.karaokes.moe/"
 license=('MIT')
 groups=()
-depends=('mpv' 'ffmpeg' 'postgresql>=14' 'electron')
-makedepends=('git' 'npm' 'typescript' 'yarn' 'nodejs>=16' 'python2')
+depends=('mpv' 'ffmpeg' 'postgresql>=13' 'electron')
+makedepends=('git' 'npm' 'typescript' 'yarn' 'nodejs>=16' 'python2' 'jq')
 optdepends=('sudo: for using karaokemugen-install script')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -16,9 +16,9 @@ replaces=()
 backup=()
 options=()
 install=${pkgname%-git}.install
-source=('karaokemugen::git+https://lab.shelter.moe/karaokemugen/karaokemugen-app.git'
-        'karaokemugen-lib::git+https://lab.shelter.moe/karaokemugen/lib.git'
-	'karaokemugen-avatars::git+https://lab.shelter.moe/karaokemugen/medias/guest-avatars.git'
+source=('karaokemugen::git+https://gitlab.com/karaokemugen/karaokemugen-app.git#branch=master'
+        'karaokemugen-lib::git+https://gitlab.com/karaokemugen/lib.git'
+	'karaokemugen-avatars::git+https://gitlab.com/karaokemugen/medias/guest-avatars.git'
         'install.sh'
         'run.sh'
         'icon256.png'
@@ -37,8 +37,7 @@ md5sums=('SKIP'
 
 pkgver() {
     cd "$srcdir/${pkgname%-git}"
-    # Git, tags available
-    git describe --long --tags | sed -e 's/^v//' -e 's/\([^-]*-g\)/r\1/;s/-/./g'
+    echo "$(jq -r .version package.json | sed -e 's/-master//g').r$(git rev-parse --short origin/master)"
 }
 
 prepare() {