New version

2 files changed, 16 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abf80e17af7b..29b21f326c40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,19 @@
 pkgbase = octopi-notifier-qt5
 	pkgdesc = Notifier for Octopi using Qt5 libs
 	pkgver = 0.9.0
-	pkgrel = 6
+	pkgrel = 7
 	url = http://octopiproject.wordpress.com
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = qt5-declarative
-	makedepends = clang
 	makedepends = qt5-tools
-	depends = octopi-dev>=0.9.0-6
+	depends = octopi-dev
 	depends = libnotify
 	optdepends = xfce4-notifyd: for notifications in XFCE
 	provides = octopi-notifier
 	conflicts = octopi-notifier-frameworks
-	source = octopi-0.9.0-6.tar.gz::https://github.com/aarnt/octopi/archive/7c5e3f9f27529f8a372b17611eeec18cf788c8d7.tar.gz
-	sha256sums = 88e3488dcf9035cc754bd4cad34aab8ba68b60f9a19552c63da01738149b472a
+	source = octopi-0.9.0-7.tar.gz::https://github.com/aarnt/octopi/archive/ed0a6c8b822dcc546c56c3f5afe5de3e8b357471.tar.gz
+	sha256sums = 00fa0b882a828973c481d2a5f54e966df0a66e8fcd2a3aad60a3c14b4455143d
 
 pkgname = octopi-notifier-qt5
 
diff --git a/PKGBUILD b/PKGBUILD
index e4626bcf3456..032ae3bb743c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,40 @@
 # Maintainer: MatMoul <matmoul@gmail.com>
 
+_pkggit=octopi
+_gitcommit=ed0a6c8b822dcc546c56c3f5afe5de3e8b357471
+_gitsha256='00fa0b882a828973c481d2a5f54e966df0a66e8fcd2a3aad60a3c14b4455143d'
+
 pkgbase=octopi-notifier-qt5
 pkgname=('octopi-notifier-qt5')
 pkgver=0.9.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Notifier for Octopi using Qt5 libs"
-pkggit=octopi
-_gitcommit=7c5e3f9f27529f8a372b17611eeec18cf788c8d7
-_gitsha256='88e3488dcf9035cc754bd4cad34aab8ba68b60f9a19552c63da01738149b472a'
 arch=('i686' 'x86_64')
 url="http://octopiproject.wordpress.com"
 license=('GPL2')
-depends=("octopi-dev>=${pkgver}-${pkgrel}" 'libnotify')
-makedepends=('qt5-declarative' 'clang' 'qt5-tools')
+depends=("octopi-dev" 'libnotify')
+makedepends=('qt5-tools')
 optdepends=('xfce4-notifyd: for notifications in XFCE')
 provides=('octopi-notifier')
 conflicts=('octopi-notifier-frameworks')
-
 source=("octopi-${pkgver}-${pkgrel}.tar.gz::https://github.com/aarnt/octopi/archive/${_gitcommit}.tar.gz")
 sha256sums=(${_gitsha256})
 
 prepare() {
-  cd "${srcdir}/${pkggit}-${_gitcommit}"
-  
-  # set version
-  sed -i -e "s|0.10.0 (dev)|${pkgver}-${pkgrel} (git-${_gitcommit:0:6})|g" src/strconstants.cpp
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
 }
 
 build() {
-  cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
-  cpucount=$((${cpucount:-1}))
-
-  cd "${srcdir}/${pkggit}-${_gitcommit}"
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
   
   msg "Building octopi-notifier..."
   cd notifier
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-notifier.pro -spec linux-clang
-  make -j $cpucount
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-notifier.pro
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkggit}-${_gitcommit}"
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
   
   cd notifier
   make INSTALL_ROOT="${pkgdir}" install