bump, fix for building on latest qt5

2 files changed, 16 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d10b5b66438..035151f70b69 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = quiterss-git
 	pkgdesc = Fast and light RSS/Atom feed reader written in Qt/С++
-	pkgver = 0.18.6.r0.gb92ad3e1
+	pkgver = 0.18.6.r8.g243d40f6
 	pkgrel = 1
 	url = https://quiterss.org
 	arch = i686
@@ -8,6 +8,7 @@ pkgbase = quiterss-git
 	license = GPL3
 	makedepends = git
 	makedepends = qt5-tools
+	depends = desktop-file-utils
 	depends = gtk-update-icon-cache
 	depends = qt5-multimedia
 	depends = qt5-webkit
diff --git a/PKGBUILD b/PKGBUILD
index 2ab52164a32c..05e7819f4f86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Josip Ponjavic <josipponjavic at gmail dot com>
 
 pkgname=quiterss-git
-pkgver=0.18.6.r0.gb92ad3e1
+pkgver=0.18.6.r8.g243d40f6
 pkgrel=1
 pkgdesc="Fast and light RSS/Atom feed reader written in Qt/С++"
 arch=('i686' 'x86_64')
 url="https://quiterss.org"
 license=('GPL3')
-depends=('gtk-update-icon-cache' 'qt5-multimedia' 'qt5-webkit')
+depends=('desktop-file-utils' 'gtk-update-icon-cache' 'qt5-multimedia' 'qt5-webkit')
 makedepends=('git' 'qt5-tools')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
@@ -19,17 +19,25 @@ pkgver() {
   git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd "${pkgname%-*}"
+  # revert commit so it builds on qt5-5.9.0
+  git revert --no-edit --no-commit 66b8b01a2281a85c4d84d6a78626faab00e643ea
+}
+
 build() {
   cd "${pkgname%-*}"
   qmake-qt5 QuiteRSS.pro \
     PREFIX=/usr \
-    CONFIG+=debug \
+    CONFIG+=release \
     CONFIG+=LINUX_INTEGRATED \
-    DISABLE_PHONON=1 \
-    INSTALL_ROOT_PATH="$pkgdir/"
+    DISABLE_PHONON=1
   make
 }
 
 package() {
-  make -C "${pkgname%-*}" INSTALL_ROOT="$pkgdir/" install
+  cd "${pkgname%-*}"
+  make INSTALL_ROOT="$pkgdir/" install
+  # makefile doesn't install translations?
+  cp release/target/lang/*.qm "$pkgdir"/usr/share/quiterss/lang/
 }