git » pulseview-git.git » commit 7805c6c

diff --git a/.SRCINFO b/.SRCINFO
index 04f02c8..37b2ed4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by mksrcinfo v8
+# Mon Aug 22 05:50:35 UTC 2016
 pkgbase = pulseview-git
 	pkgdesc = A Qt based logic analyzer GUI for sigrok. (git version)
-	pkgver = 0.2.0.r513.g7c6cbdd
+	pkgver = 0.3.0.r86.g55547a4
 	pkgrel = 1
 	url = http://sigrok.org/wiki/Main_Page
-	install = pulseview.install
 	arch = armv6h
 	arch = armv7h
 	arch = i686
@@ -16,12 +17,11 @@ pkgbase = pulseview-git
 	depends = libsigrokdecode-git
 	depends = qt5-base
 	depends = boost-libs
+	depends = qt5-svg
 	provides = pulseview
 	conflicts = pulseview
 	source = git://sigrok.org/pulseview
-	source = pulseview.desktop
 	md5sums = SKIP
-	md5sums = f816b4aff1ddf5683d5df94e69576ec7
 
 pkgname = pulseview-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 073bf0b..0cfba4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,35 +4,28 @@
 
 _gitname='pulseview'
 pkgname="${_gitname}-git"
-pkgver=0.2.0.r513.g7c6cbdd
+pkgver=0.3.0.r86.g55547a4
 pkgrel=1
 pkgdesc="A Qt based logic analyzer GUI for sigrok. (git version)"
 arch=('armv6h' 'armv7h' 'i686' 'x86_64')
 url="http://sigrok.org/wiki/Main_Page"
 license=('GPL3')
-depends=('libsigrok-git' 'libsigrokdecode-git' 'qt5-base' 'boost-libs')
+depends=('libsigrok-git' 'libsigrokdecode-git' 'qt5-base' 'boost-libs' 'qt5-svg')
 makedepends=('git' 'cmake' 'boost')
 conflicts=("${_gitname}")
 provides=("${_gitname}")
-source=("git://sigrok.org/${_gitname}"
-        'pulseview.desktop')
-md5sums=('SKIP'
-         'f816b4aff1ddf5683d5df94e69576ec7')
-install="${_gitname}.install"
+source=("git://sigrok.org/${_gitname}")
+md5sums=('SKIP')
 
 pkgver() {
   cd "${srcdir}/${_gitname}"
-  (
-    set -o pipefail
-    git describe --long 2>/dev/null | sed "s/\([^-]*-g\)/r\1/;s/-/./g;s/${_gitname}.//" ||
-      printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
+  git describe --long | sed 's/^pulseview-//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
   cd "${srcdir}/${_gitname}"
 
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_CXX_FLAGS=-fext-numeric-literals .
   make
 }
 
@@ -40,7 +33,5 @@ package() {
   cd "${srcdir}/${_gitname}"
 
   make DESTDIR="${pkgdir}" PREFIX=/usr install
-  install -Dm644 ../pulseview.desktop "${pkgdir}/usr/share/applications/pulseview.desktop"
+  install -Dm644 contrib/pulseview.desktop "${pkgdir}/usr/share/applications/pulseview.desktop"
 }
-
-# vim:set et sw=2 sts=2 tw=80:
\ No newline at end of file
diff --git a/pulseview.desktop b/pulseview.desktop
deleted file mode 100644
index 34fc05a..0000000
--- a/pulseview.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Exec=pulseview
-Name=PulseView
-Type=Application
-Categories=Development
diff --git a/pulseview.install b/pulseview.install
deleted file mode 100644
index a6a73e8..0000000
--- a/pulseview.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade(){
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
-
-# vim:set ts=2 sw=2 et: