New version

1 files changed, 26 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3f7215bab6ce..77ad0e92485c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,41 @@
-# Maintainer: MatMoul <matmoul at the google email domain which is .com>
+# Maintainer: MatMoul <matmoul@gmail.com>
 
-_githubuser=aarnt
-_githubrepo=octopi
-_pkgtagname=v0.14.0
+_pkggit=octopi
+_gitcommit=0a47127c711c20f9f8f4c42298a25992dbbf98b9
+_gitsha256='41cf58d9fd12143e34b75798cc65ad467aed69257c8e04a7b9cbee77ae01d133'
 
-pkgname=octopi-notifier-qt5
+pkgbase=octopi-notifier-qt5
+pkgname=('octopi-notifier-qt5')
 pkgver=0.14.0
 pkgrel=2
-pkgdesc='Notifier for Octopi using Qt5 libs'
-arch=('any')
+pkgdesc="Notifier for Octopi using Qt5 libs"
+arch=('i686' 'x86_64')
 url="https://tintaescura.com/projects/octopi/"
 license=('GPL2')
-depends=('octopi' 'knotifications')
+depends=('octopi' 'libnotify')
 makedepends=('qt5-tools')
 optdepends=('xfce4-notifyd: for notifications in XFCE')
 provides=('octopi-notifier')
-source=("${_githubrepo}::https://github.com/${_githubuser}/${_githubrepo}/archive/refs/tags/${_pkgtagname}.tar.gz")
-sha256sums=('9b548661807fe8eecc20726a4aefa25658c4ce1bf1bc8f51b54829809d76f12d')
+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}"
+}
 
 build() {
-	cd "${_githubrepo}-${pkgver}"
-	msg "Building octopi-notifier..."
-	cd notifier
-	qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-notifier.pro
-	make
+  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
+  make
 }
 
 package() {
-	cd "${_githubrepo}-${pkgver}"
-	cd notifier
-	make INSTALL_ROOT="${pkgdir}" install
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
+  
+  cd notifier
+  make INSTALL_ROOT="${pkgdir}" install
 }