switched to git versioning, added icon support

6 files changed, 80 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 960ec31edb2c..f71488c86a23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,24 @@
 # Generated by mksrcinfo v8
-# Fri Dec 25 22:25:57 UTC 2015
+# Fri Feb 12 19:19:27 UTC 2016
 pkgbase = cubicsdr-git
 	pkgdesc = Cross-Platform Software-Defined Radio Application
-	pkgver = 20151226
+	pkgver = r969.786f5ba
 	pkgrel = 1
+	epoch = 2
 	url = https://github.com/cjcliffe/CubicSDR
+	install = cubicsdr-git.install
 	arch = any
 	license = GPL2
 	makedepends = git
 	makedepends = automake
 	makedepends = cmake
-	makedepends = imagemagick
+	makedepends = libicns
 	depends = fftw
 	depends = wxgtk
 	depends = soapysdr-git
 	depends = liquid-dsp-git
 	optdepends = soapyrtlsdr-git: RTL-SDR dongle support
+	conflicts = cubicsdr
 	source = cubicsdr-git::git+https://github.com/cjcliffe/cubicsdr.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 0f8e45df71f8..1cf15cd61954 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,20 @@
 # Maintainer: valvetime <valvetimepackages@gmail.com>
 # Contributor: Tom Swartz <tom@tswartz.net>
 
-
-#TODO: fix icon installation
-
 pkgname=cubicsdr-git
-pkgver=20151226
+_pkgname=cubicsdr
+pkgver=r969.786f5ba
 pkgrel=1
+epoch=2
 pkgdesc="Cross-Platform Software-Defined Radio Application"
 arch=('any')
 url="https://github.com/cjcliffe/CubicSDR"
 license=('GPL2')
 depends=('fftw' 'wxgtk' 'soapysdr-git' 'liquid-dsp-git')
 optdepends=('soapyrtlsdr-git: RTL-SDR dongle support')
-makedepends=('git' 'automake' 'cmake' 'imagemagick')
+makedepends=('git' 'automake' 'cmake' 'libicns')
+conflicts=('cubicsdr')
+install="${pkgname}.install"
 source=(cubicsdr-git::"git+https://github.com/cjcliffe/cubicsdr.git")
 sha256sums=('SKIP')
 
@@ -26,12 +27,14 @@ build() {
 	make -j2
 
 
+}
+
 
-#convert the icon to png
-	
-	cd "$srcdir/cubicsdr-git/icon"
-	convert CubicSDR.ico CubicSDR.png
 
+
+pkgver() {
+  cd "$pkgname"
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 
@@ -39,7 +42,7 @@ build() {
 
 
 
-package() {
+package()	{
 
 cd "$srcdir/$pkgname/build"
 
@@ -51,41 +54,54 @@ cd "$srcdir/$pkgname/build"
 
 	install -dm755 "${pkgdir}/usr/bin"
 	install -dm755 "${pkgdir}/usr/share"
-        install -dm755 "${pkgdir}/usr/share/cubicsdr"
+	install -dm755 "${pkgdir}/usr/share/cubicsdr"
 
 
-#TODO: detect arch to make this work on x86
+#TODO: detect arch to make this work on x86 automatically
 #for now change this manually on 32 bit systems
-	cd "${srcdir}/cubicsdr-git/build/x64"
-        
+cd "${srcdir}/cubicsdr-git/build/x64"
+
 	install -Dm755 CubicSDR "${pkgdir}/usr/share/cubicsdr/cubicsdr"
 
+	install -Dm755 vera_sans_mono12.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono12.fnt"
+	install -Dm755 vera_sans_mono16.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono16.fnt"
+	install -Dm755 vera_sans_mono18.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono18.fnt"
+	install -Dm755 vera_sans_mono24.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono24.fnt"
+	install -Dm755 vera_sans_mono32.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono32.fnt"
+	install -Dm755 vera_sans_mono48.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono48.fnt"
+	install -Dm755 vera_sans_mono12_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono12_0.png"
+	install -Dm755 vera_sans_mono16_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono16_0.png"
+	install -Dm755 vera_sans_mono18_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono18_0.png"
+	install -Dm755 vera_sans_mono24_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono24_0.png"
+	install -Dm755 vera_sans_mono32_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono32_0.png"
+	install -Dm755 vera_sans_mono48_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono48_0.png"
 
-        install -Dm755 vera_sans_mono12.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono12.fnt"
-        install -Dm755 vera_sans_mono16.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono16.fnt"
-        install -Dm755 vera_sans_mono18.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono18.fnt"
-        install -Dm755 vera_sans_mono24.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono24.fnt"
-        install -Dm755 vera_sans_mono32.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono32.fnt"
-        install -Dm755 vera_sans_mono48.fnt "${pkgdir}/usr/share/cubicsdr/vera_sans_mono48.fnt"
-        install -Dm755 vera_sans_mono12_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono12_0.png"
-        install -Dm755 vera_sans_mono16_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono16_0.png"
-        install -Dm755 vera_sans_mono18_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono18_0.png"
-        install -Dm755 vera_sans_mono24_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono24_0.png"
-        install -Dm755 vera_sans_mono32_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono32_0.png"
-        install -Dm755 vera_sans_mono48_0.png "${pkgdir}/usr/share/cubicsdr/vera_sans_mono48_0.png"
 
+cd $srcdir/cubicsdr-git
 
-#install the icon
-	cd "$srcdir/cubicsdr-git/icon"
-	install -Dm644 "CubicSDR-0.png" "$pkgdir/usr/share/cubicsdr/CubicSDR.png"
+    # icons are trapped inside .icns format, free them.
+	icns2png -x icon/CubicSDR.icns
 
-#install the .desktop file
-#dirty hack to get to the root dir (the one with the PKGBUILD)
-	cd $srcdir	
-	cd ..
-	install -Dm644 "cubicsdr.desktop" "$pkgdir/usr/share/applications/cubicsdr.desktop"
+#get a list of icon filenames for renaming
+#gets names of all .pngs and puts it into iconlist file
+ls -1 | grep .png > iconlist
 
-#install the wrapper script into /usr/bin/
-        install -Dm755 wrapper.sh "${pkgdir}/usr/bin/cubicsdr"
+#strip out the cubicsdr part from each line in iconlist
+cut -c 10- iconlist > icons
 
-}
+#iterate over the icons text file, copying icon files for each entry
+for word in $(cat icons); do cp CubicSDR_$word icon_$word; done
+
+#install the icons
+    for size in 16 32 128 256 512; do
+	install -Dm644 "icon_${size}x${size}x32.png" \
+	  "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png"
+done
+
+
+
+#install the desktop file
+	cd $srcdir
+	cd ..
+		install -Dm644 $pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+	}
diff --git a/cubicsdr-git.desktop b/cubicsdr-git.desktop
new file mode 100644
index 000000000000..b491a1e7dc94
--- /dev/null
+++ b/cubicsdr-git.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Cubic SDR
+Comment=Cross platform SDR receiver
+Exec=cubicsdr
+Icon=cubicsdr-git
+Terminal=false
+Type=Application
+Categories=AudioVideo;
+
diff --git a/cubicsdr-git.install b/cubicsdr-git.install
new file mode 100644
index 000000000000..35c861f79904
--- /dev/null
+++ b/cubicsdr-git.install
@@ -0,0 +1,12 @@
+post_install() {
+ln -s /usr/share/cubicsdr/cubicsdr /usr/local/bin/
+	}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	rm /usr/local/bin/cubicsdr
+}
+
diff --git a/cubicsdr.desktop b/cubicsdr.desktop
deleted file mode 100644
index 2d006412de15..000000000000
--- a/cubicsdr.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=CubicSDR
-Comment=Cross-Platform Software-Defined Radio Application
-Path=/usr/share/cubicsdr
-Exec=cubicsdr
-Icon=/usrshare/cubicsdr/CubicSDR.png 
-Terminal=false
-Categories=Science;HamRadio;DataVisualization;
diff --git a/wrapper.sh b/wrapper.sh
deleted file mode 100755
index 3b09d0c25978..000000000000
--- a/wrapper.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/share/cubicsdr/cubicsdr