updated to version 1.1.0-rc2, fixed build and added desktop file

1 files changed, 21 insertions, 24 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c13efaf36453..f82d0d14d33c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,20 @@
 # PKGBUILD for qtcbm
 #
 # Contributor: Uffe Jakobsen <microtop@starion.dk>
-# Maintainer: Uffe Jakobsen <microtop@starion.dk>
+# Contributor: Jochen Jägers <jochen.jaegers@gmail.com>
+# Maintainer: Jochen Jägers <jochen.jaegers@gmail.com>
 #
 pkgname=qtcbm
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.1.0
+pkgrel=0
 epoch=
 pkgdesc="Qt GUI Frontend for the (Open)CBM utils"
 arch=('i686' 'x86_64')
 _pkgname=QtCBM
-_pkgver=1.0.0
+_pkgver=1.1.0
 url="https://github.com/mveinot/QtCBM"
 license=('GPLv2')
 groups=()
-#depends=('qt5-base' 'qt-solutions' 'opencbm-git')
 depends=('qt5-base' 'opencbm-git')
 makedepends=()
 checkdepends=()
@@ -27,43 +27,40 @@ backup=()
 options=()
 install=
 changelog=
-source=("https://github.com/mveinot/${_pkgname}/archive/v${_pkgver}.tar.gz"
-         "git+https://git.gitorious.org/qt-solutions/qt-solutions.git")
+source=("git+https://github.com/mveinot/QtCBM.git"
+         "git+https://github.com/qtproject/qt-solutions.git")
 noextract=()
-sha512sums=('ee9c057e4f00916a0e2a450c4e4f50177ce76d54dd546786dd59903aa65883013bc811d82290e79e492da9c3c0b34b3eb83b8c377bba8255d53757c58b35e004'
-            'SKIP')
-md5sums=('d53f8b0c09059604ed698ac6c11ed061'
+
+md5sums=('SKIP'
          'SKIP')
-sha1sums=('ff8f24fdf1b2316f65433766c72de58520512d06'
-          'SKIP')
-sha256sums=('dbeb32a8c51c84c434918a9c31729ea37be2a7b9788d1417bac5cf8d88a49d2a'
-            'SKIP')
-sha384sums=('eed22d0d693304d867fcaf5df3cf242e15bb17bd45889fe1ed063df22e8f95ffbd91d59ce44965d63900c6efc0a98eb7'
-            'SKIP')
-sha512sums=('ee9c057e4f00916a0e2a450c4e4f50177ce76d54dd546786dd59903aa65883013bc811d82290e79e492da9c3c0b34b3eb83b8c377bba8255d53757c58b35e004'
-            'SKIP')
 
 
 prepare() {
-  cd "$srcdir/${_pkgname}-${_pkgver}"
+  cd "$srcdir/${_pkgname}"
+  patch -p1 < ../../0001-add-missing-include.patch
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}-${_pkgver}"
-  #make -C diskimage -f Makefile.unix
+  cd "${srcdir}/${_pkgname}"
+  make -C diskimage -f Makefile.unix
   qmake
   make
+
+  # convert ico to png
+  convert QtCBM.ico qtcbm.png
 }
 
 check() {
-  cd "${srcdir}/${_pkgname}-${_pkgver}"
+  cd "${srcdir}/${_pkgname}"
   make -k check
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${_pkgver}"
+  cd "${srcdir}/${_pkgname}"
   make DESTDIR="${pkgdir}/" install
-  install -Dm0755 ${_pkgname} "$pkgdir/usr/local/bin/qtcbm"
+  install -Dm0755 ${_pkgname} "$pkgdir/usr/bin/qtcbm"
+  install -Dm0755 qtcbm-1.png "$pkgdir/usr/share/pixmaps/qtcbm.png"
+  install -Dm0755 ../../qtcbm.desktop "$pkgdir/usr/share/applications/qtcbm.desktop"
 }
 
 # EOF