revision

3 files changed, 18 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4172da854843..a962e69228f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gittyup-git
 	pkgdesc = Graphical Git client (GitAhead fork)
-	pkgver = r533.73bf3db
+	pkgver = r534.4313005
 	pkgrel = 1
 	url = https://github.com/Murmele/Gittyup
 	arch = x86_64
@@ -20,7 +20,6 @@ pkgbase = gittyup-git
 	optdepends = git-lfs: git-lfs support
 	provides = gittyup
 	conflicts = gittyup
-	conflicts = gitahead
 	source = gittyup::git+https://github.com/Murmele/Gittyup.git
 	source = git+https://github.com/stinb/libgit2.git
 	source = git+https://github.com/git/git.git
@@ -32,6 +31,6 @@ pkgbase = gittyup-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 537674eec14d36761691e7ab803ceed47107c60f34cfe556f708284ebda9a96f
+	sha256sums = a07943687afee5f3664219373b60ae54eaa207414646181df107893407119462
 
 pkgname = gittyup-git
diff --git a/PKGBUILD b/PKGBUILD
index b9cba679dd2d..012eee248748 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer:  Tim Schumacher <timschumi@gmx.de>
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org>
+# Contributor: Tim Schumacher <timschumi@gmx.de>
 # Contributor: KillWolfVlad <github.com/KillWolfVlad>
 # Contributor: WaveHack <email@wavehack.net>
 # Contributor: Whovian9369 <Whovian9369@gmail.com>
 
 pkgname=gittyup-git
-pkgver=r533.73bf3db
+pkgver=r534.4313005
 pkgrel=1
 pkgdesc="Graphical Git client (GitAhead fork)"
 url="https://github.com/Murmele/Gittyup"
@@ -16,7 +17,7 @@ optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
             'qt5-translations: translations '
             'git-lfs: git-lfs support')
 provides=(gittyup)
-conflicts=(gittyup gitahead)
+conflicts=(gittyup)
 source=("${pkgname%-git}::git+https://github.com/Murmele/Gittyup.git"
         "git+https://github.com/stinb/libgit2.git"
         "git+https://github.com/git/git.git"
@@ -28,7 +29,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            '537674eec14d36761691e7ab803ceed47107c60f34cfe556f708284ebda9a96f')
+            'a07943687afee5f3664219373b60ae54eaa207414646181df107893407119462')
 
 pkgver() {
   cd "${srcdir}/${pkgname%-git}"
@@ -53,7 +54,7 @@ build() {
   cd "${srcdir}/${pkgname%-git}/build"
   cmake -G Ninja .. -Wno-dev \
     -DCMAKE_BUILD_TYPE=None \
-    -DCMAKE_INSTALL_PREFIX=/usr/lib/gitahead \
+    -DCMAKE_INSTALL_PREFIX=/usr/lib/gittyup \
     -DCMAKE_INSTALL_MANDIR=/usr/share/man \
     -DENABLE_REPRODUCIBLE_BUILDS=ON \
     -DBUILD_SHARED_LIBS=OFF
@@ -65,19 +66,17 @@ package() {
   cd "${srcdir}/${pkgname%-git}"
   DESTDIR="${pkgdir}" ninja -C build install
 
-  rm -rf "${pkgdir}/usr/lib/gitahead/"*.so.*
+  rm -rf "${pkgdir}/usr/lib/gittyup/"*.so.*
   install -d "${pkgdir}/usr/bin"
-  ln -s /usr/lib/gitahead/Gittyup "${pkgdir}/usr/bin/gittyup"
+  ln -s /usr/lib/gittyup/Gittyup "${pkgdir}/usr/bin/gittyup"
 
   install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 "${srcdir}/gittyup.desktop" "${pkgdir}/usr/share/applications/gittyup.desktop"
+  install -Dm644 ../gittyup.desktop "${pkgdir}/usr/share/applications/gittyup.desktop"
 
-  install -Dm644 "${pkgdir}/usr/lib/gitahead/Resources/Gittyup.iconset/icon_16x16.png" "${pkgdir}/usr/share/icons/hicolor/16x16/apps/gitahead.png"
-  install -Dm644 "${pkgdir}/usr/lib/gitahead/Resources/Gittyup.iconset/icon_32x32.png" "${pkgdir}/usr/share/icons/hicolor/32x32/apps/gitahead.png"
-  install -Dm644 "${pkgdir}/usr/lib/gitahead/Resources/Gittyup.iconset/icon_64x64.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/gitahead.png"
-  install -Dm644 "${pkgdir}/usr/lib/gitahead/Resources/Gittyup.iconset/icon_128x128.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/gitahead.png"
-  install -Dm644 "${pkgdir}/usr/lib/gitahead/Resources/Gittyup.iconset/icon_256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/gitahead.png"
-  install -Dm644 "${pkgdir}/usr/lib/gitahead/Resources/Gittyup.iconset/icon_512x512.png" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/gitahead.png"
+  install -Dm644 rsrc/Gittyup.iconset/gittyup_logo.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/gittyup.svg"
+  for s in 16x16 32x32 64x64 128x128 256x256 512x512; do
+    install -Dm0644 "rsrc/Gittyup.iconset/icon_$s.png" "icons/hicolor/$s/apps/$pkgname.png"
+  done
 
   rm -rf "${pkgdir}/usr/share/man" # libssh2 man pages
 }
diff --git a/gittyup.desktop b/gittyup.desktop
index 4b7a733f85d7..d7dd51acb59c 100644
--- a/gittyup.desktop
+++ b/gittyup.desktop
@@ -1,11 +1,10 @@
 [Desktop Entry]
-Name= Gittyup
+Name=Gittyup
 Comment=Graphical git client
-Exec=gittyup
-Icon=gitahead
+Exec=/usr/bin/gittyup
+Icon=gittyup
 Terminal=false
 Type=Application
 StartupNotify=true
 Categories=GNOME;GTK;Development;Documentation;
 MimeType=text/plain;
-Name[it_IT]=gittyup.desktop