updated deps to qt5, added other deps, removed deps, cleanup

4 files changed, 37 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2d70b7c65c8..ae65f7fb66f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = sayonara-player-svn
 	pkgdesc = Sayonara is a small, clear and fast audio player for Linux written in C++, supported by the Qt framework. It uses Gstreamer as audio backend.
-	pkgver = r1092
-	pkgrel = 2
+	pkgver = r1194
+	pkgrel = 1
 	url = https://sayonara-player.com/
 	install = sayonara-player-svn.install
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = GPL3
 	makedepends = subversion
 	makedepends = cmake
-	depends = qt4
-	depends = curl
-	depends = taglib
+	makedepends = desktop-file-utils
+	makedepends = xdg-utils
+	depends = qt5-base
 	depends = gst-plugins-base
 	depends = gst-plugins-good
+	depends = gst-plugins-bad
 	depends = libnotify
+	depends = hicolor-icon-theme
 	optdepends = lame: mp3 converter, broadcasting
 	optdepends = gst-plugins-ugly: mp3 converter, broadcasting
 	conflicts = sayonara-player
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f43484c7b529
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.un~
+pkg/*
+src/*
+sayonara-player-svn/*
+*.pkg*
diff --git a/PKGBUILD b/PKGBUILD
index f0a6c78df92c..ae3a93fdd1cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,23 @@
 #Maintainer: Leonard König <leonard dot r dot koenig at googlemail dot com>
 pkgname=sayonara-player-svn
-pkgver=r1092
-pkgrel=2
+pkgver=r1194
+pkgrel=1
 pkgdesc="Sayonara is a small, clear and fast audio player for Linux written in C++, supported by the Qt framework. It uses Gstreamer as audio backend."
-arch=('any')
+arch=('i686' 'x86_64')
 url="https://sayonara-player.com/"
 license=('GPL3')
-depends=('qt4' 'curl' 'taglib' 'gst-plugins-base' 'gst-plugins-good' 'libnotify')
+depends=('qt5-base'
+	 'gst-plugins-base'
+	 'gst-plugins-good'
+	 'gst-plugins-bad'
+	 'libnotify'
+	 'hicolor-icon-theme')
+# taglib not needed as it is already covered by gst-plugins-good dependency
+# hicolor theme for the icon structure
 optdepends=('lame: mp3 converter, broadcasting'
             'gst-plugins-ugly: mp3 converter, broadcasting')
-makedepends=('subversion' 'cmake')
+makedepends=('subversion' 'cmake' 'desktop-file-utils' 'xdg-utils')
+# desktop-file-utils and xdg-utils needed for MIME and icon DB
 conflicts=('sayonara-player')
 install=sayonara-player-svn.install
 source=($pkgname::svn+http://sayonara-player.com/svn/sayonara/trunk)
@@ -17,22 +25,23 @@ md5sums=('SKIP')
 
 pkgver() {
   cd "$pkgname"
-  # workaround the reset of the svn-version...
+  # Workaround the reset of the svn-version:
+  # The package uses a workaround that adds 1042 to the revision number, as due to source-transfer
+  # the revision counter got reset. So while the svn-revision is ~50, the actual version is much higher.
   local sver=$(svnversion)
   local ver=$(($sver + 1042))
   printf "r%s" "${ver//[[:alpha:]]}"
 }
 
 build() {
-#  msg "$PWD"
-#  msg "$pkgname"
-#  msg "$ls"
   cd "$pkgname"
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
+  mkdir build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE="Release"
   make
 }
 
 package() {
-  cd "$SRCDEST/$pkgname"
-  make prefix=/usr DESTDIR="$pkgdir/" install
+  cd "$pkgname/build"
+  make DESTDIR="$pkgdir/" install
 }
diff --git a/sayonara-player-svn.install b/sayonara-player-svn.install
index d5c316566edc..758828f38eb4 100644
--- a/sayonara-player-svn.install
+++ b/sayonara-player-svn.install
@@ -1,8 +1,4 @@
 post_upgrade() {
-  (( $(vercmp $2 1092) < 0 )) && cat <<MSG
->>> The package now uses a workaround that adds 1042 to the revision number
-    as due to source-transfer the revision counter got reset.
-    So while the svn-revision is ~50, the actual version is much higher.
-MSG
-  true
+  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }