v1.0.0, from source

2 files changed, 52 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cbd009ada8fe..67646f097eb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,26 @@
 pkgbase = guitar
-	pkgdesc = Git GUI Client
-	pkgver = 0.9.4
+	pkgdesc = Open source Git GUI Client
+	pkgver = 1.0.0
 	pkgrel = 1
-	url = https://github.com/soramimi/Guitar/
+	url = https://soramimi.github.io/Guitar/
 	arch = x86_64
+	arch = i686
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = GPL
-	depends = xdg-utils
+	makedepends = ruby
+	makedepends = cmake
+	makedepends = qt5-tools
+	depends = qt5-svg
 	depends = git
-	depends = qt5ct
-	depends = libpng
-	depends = libxcb
-	depends = icu
+	depends = file
+	source = guitar-1.0.0.tar.gz::https://github.com/soramimi/Guitar/archive/v1.0.0.tar.gz
 	source = guitar.desktop
-	source = guitar.svg
-	sha512sums = 24cfa7553e3eb911a921a688d12f035989503998e19cd63e237491a4a462ead3add785ab0b0a50a5bdddb308560b89902f6a19b85aed26aff46be99f6754cdbe
-	sha512sums = a731360c2dfbcc74017d0952bad6467d22a23e11d886ad12f18efe96e63e89b0aea76ecc10e5c385fc337191ebe468cf3394c5981f368065d6dab5ddb9723571
-	source_x86_64 = http://files.soramimi.jp/guitar/0.9.4/Guitar-0.9.4-ubuntu16-x64.tar.gz
-	sha512sums_x86_64 = ec641d7a577a662e5523e5acc6242ce7002135f9dc7331d96c005c3c9677ad9d27c958f34ad1f1efb98de3e40be73387f14ef439e433c7001e259459dc7af4fd
+	source = https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/guitar-zlib.patch
+	sha256sums = 195cb61012d5586d7e6f819f4d3b3caee2c35f0b806629c6ee1c894548ba0075
+	sha256sums = 794c814a3181a3c0f69406876972df06d1e885033624aa5e6141cdf9ece2cfa7
+	sha256sums = fe61f4003461995615ba62cc7b70f3c32872aba5b84129e35e590014f52db87e
 
 pkgname = guitar
 
diff --git a/PKGBUILD b/PKGBUILD
index d7020420cf3c..d27d5f5fbbc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,39 @@
-# Maintainer: liberodark
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Alejandro Valdes <alejandrovaldes@live.com>
+# Contributor: liberodark
 
-pkgname=guitar-bin
-pkgver=0.9.4
+pkgname=guitar
+pkgver=1.0.0
 pkgrel=1
-pkgdesc="Git GUI Client"
-arch=('x86_64')
-url="https://github.com/soramimi/Guitar/"
-license=('GPL')
-depends=('xdg-utils' 'git' 'qt5ct' 'libpng' 'libxcb' 'icu')
-source_x86_64=("http://files.soramimi.jp/guitar/${pkgver}/Guitar-${pkgver}-ubuntu16-x64.tar.gz")
-source=($pkgname.desktop
-        $pkgname.svg)
-sha512sums=('24cfa7553e3eb911a921a688d12f035989503998e19cd63e237491a4a462ead3add785ab0b0a50a5bdddb308560b89902f6a19b85aed26aff46be99f6754cdbe'
-         'a731360c2dfbcc74017d0952bad6467d22a23e11d886ad12f18efe96e63e89b0aea76ecc10e5c385fc337191ebe468cf3394c5981f368065d6dab5ddb9723571')
-sha512sums_x86_64=('ec641d7a577a662e5523e5acc6242ce7002135f9dc7331d96c005c3c9677ad9d27c958f34ad1f1efb98de3e40be73387f14ef439e433c7001e259459dc7af4fd')
-        
+pkgdesc="Open source Git GUI Client"
+arch=(x86_64 i686 armv6h armv7h aarch64)
+url="https://soramimi.github.io/Guitar/"
+license=(GPL)
+depends=(qt5-svg git file)
+makedepends=(ruby cmake qt5-tools)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/soramimi/Guitar/archive/v${pkgver}.tar.gz"
+        "${pkgname}.desktop"
+        "https://raw.githubusercontent.com/FabioLolix/AUR-artifacts/master/guitar-zlib.patch")
+sha256sums=('195cb61012d5586d7e6f819f4d3b3caee2c35f0b806629c6ee1c894548ba0075'
+            '794c814a3181a3c0f69406876972df06d1e885033624aa5e6141cdf9ece2cfa7'
+            'fe61f4003461995615ba62cc7b70f3c32872aba5b84129e35e590014f52db87e')
+
+prepare() {
+  cd "Guitar-${pkgver}"
+  ruby prepare.rb
+  patch --forward --strip=1 --input="${srcdir}/guitar-zlib.patch"
+  mkdir -p build
+}
+
+build() {
+  cd "$srcdir/Guitar-${pkgver}/build"
+  qmake ../Guitar.pro
+  make
+}
+
 package() {
-  cd $srcdir
-  tar xvf Guitar-${pkgver}-ubuntu16-x64.tar.gz
-  mkdir -p "$pkgdir/opt/Guitar/"
-  rm -r "Guitar/LinuxDesktop"
-  cp "Guitar/Guitar" "$pkgdir/opt/Guitar/"
-  install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  install -vDm644 $srcdir/$pkgname.svg $pkgdir/opt/Guitar/$pkgname.svg
+  cd "Guitar-${pkgver}"
+  install -Dm755 "_bin/Guitar" "$pkgdir/usr/bin/$pkgname"
+  install -D "LinuxDesktop/Guitar.svg" "$pkgdir/usr/share/pixmaps/${pkgname}.svg"
+  install -D "$srcdir/guitar.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop"
 }