revision

2 files changed, 18 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b89a0d5625a5..f70eb05521e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gittyup-git
 	pkgdesc = Graphical Git client (GitAhead fork)
-	pkgver = 1.2.0.r0.gb663589
-	pkgrel = 1
+	pkgver = 1.3.0.r26.g34625fb
+	pkgrel = 3
 	url = https://github.com/Murmele/Gittyup
 	arch = x86_64
 	license = MIT
@@ -22,7 +22,7 @@ pkgbase = gittyup-git
 	provides = gittyup
 	conflicts = gittyup
 	source = git+https://github.com/Murmele/Gittyup.git
-	source = Gittyup-libgit2::git+https://github.com/stinb/libgit2.git
+	source = stinb-libgit2::git+https://github.com/stinb/libgit2.git
 	source = git+https://github.com/kuba--/zip.git
 	source = git+https://github.com/ScintillaOrg/lexilla.git
 	source = git+https://github.com/orbitalquark/scintillua.git
diff --git a/PKGBUILD b/PKGBUILD
index 529491fc7f3c..4cab22b5b6e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Whovian9369 <Whovian9369@gmail.com>
 
 pkgname=gittyup-git
-pkgver=1.2.0.r0.gb663589
-pkgrel=1
+pkgver=1.3.0.r26.g34625fb
+pkgrel=3
 pkgdesc="Graphical Git client (GitAhead fork)"
 url="https://github.com/Murmele/Gittyup"
 arch=(x86_64)
@@ -19,7 +19,7 @@ optdepends=('git-lfs: git-lfs support'
 provides=(gittyup)
 conflicts=(gittyup)
 source=("git+https://github.com/Murmele/Gittyup.git"
-        "Gittyup-libgit2::git+https://github.com/stinb/libgit2.git"
+        "stinb-libgit2::git+https://github.com/stinb/libgit2.git"
         "git+https://github.com/kuba--/zip.git"
         "git+https://github.com/ScintillaOrg/lexilla.git"
         "git+https://github.com/orbitalquark/scintillua.git")
@@ -31,14 +31,14 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd "${srcdir}/Gittyup"
-  git describe --long --tags --exclude latest | sed 's/^gittyup_v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags --exclude latest --exclude development | sed 's/^gittyup_v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
   cd "${srcdir}/Gittyup"
 
   git submodule init
-  git config submodule.dep/libgit2/libgit2.url "${srcdir}/Gittyup-libgit2"
+  git config submodule.dep/libgit2/libgit2.url "${srcdir}/stinb-libgit2"
   git config submodule.dep/git/git.update none
   git config submodule.dep/cmark/cmark.update none
   git config submodule.dep/libssh2/libssh2.update none
@@ -55,10 +55,13 @@ prepare() {
 build() {
   cd "${srcdir}/Gittyup/build"
   cmake -G Ninja .. -Wno-dev \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr/lib/gittyup \
     -DCMAKE_INSTALL_DATADIR=/usr/lib \
+    -DCMAKE_INSTALL_BINDIR=/usr/lib/gittyup \
     -DENABLE_REPRODUCIBLE_BUILDS=ON \
+    -DENABLE_UPDATE_OVER_GUI=OFF \
+    -DGENERATE_APPDATA=ON \
     -DBUILD_SHARED_LIBS=OFF \
     -DUSE_SYSTEM_CMARK=ON \
     -DUSE_SYSTEM_GIT=ON \
@@ -81,13 +84,16 @@ package() {
   DESTDIR="${pkgdir}" ninja -C build install
 
   install -d "${pkgdir}/usr/bin"
-  ln -s /usr/lib/gittyup/Gittyup "${pkgdir}/usr/bin/gittyup"
-  ln -s /usr/lib/gittyup/Gittyup "${pkgdir}/usr/bin/Gittyup"
+  ln -s /usr/lib/gittyup/gittyup "${pkgdir}/usr/bin/gittyup"
+  ln -s /usr/lib/gittyup/gittyup "${pkgdir}/usr/bin/Gittyup"
+
+  #mv "${pkgdir}"/usr/lib/Gittyup/*  "${pkgdir}"/usr/lib/gittyup/
+  #rmdir "${pkgdir}"/usr/lib/Gittyup
 
   install -Dm644 LICENSE.md "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   install -Dm644 rsrc/linux/com.github.Murmele.Gittyup.desktop -t "${pkgdir}/usr/share/applications/"
-  #install -Dm644 rsrc/linux/com.github.Murmele.Gittyup.appdata.xml.in -t "${pkgdir}/usr/share/metainfo/"
+  install -Dm644 rsrc/linux/com.github.Murmele.Gittyup.appdata.xml.in "${pkgdir}/usr/share/metainfo/com.github.Murmele.Gittyup.appdata.xml"
 
   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