From ec36feb452d145ec8734f19167486bc4aff1a2bb Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Fri, 20 May 2016 16:13:03 -0300
Subject: libre/octopi: update package

---
 libre/octopi/PKGBUILD             | 24 ++++++++++--------------
 libre/octopi/enable-kstatus.patch | 12 ------------
 libre/octopi/octopi.install       | 12 ------------
 3 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 libre/octopi/enable-kstatus.patch
 delete mode 100644 libre/octopi/octopi.install

(limited to 'libre/octopi')

diff --git a/libre/octopi/PKGBUILD b/libre/octopi/PKGBUILD
index 516252590..989fa872e 100644
--- a/libre/octopi/PKGBUILD
+++ b/libre/octopi/PKGBUILD
@@ -4,27 +4,26 @@
 
 pkgbase=octopi
 pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner')
-pkgver=0.8.0
-pkgrel=1.parabola2
-arch=('i686' 'x86_64')
+pkgver=0.8.1
+pkgrel=1.parabola1
+arch=('i686' 'x86_64' 'armv7h')
 url="https://github.com/aarnt/octopi"
 license=('GPL2')
 makedepends=('qt5-declarative' 'knotifications' 'libnotify')
 source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
-	'octopi-repoeditor.desktop'
-	'enable-kstatus.patch')
-sha256sums=('79ab8a24e3329ab4e5320e03309f44f802336cc00bada0f9a37fae46f5eeb02b'
-            '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
-            '81dcbbda0d020607d23f3f8042fa43bfc4318269a55f9327e4995299b59dcb4b')
+	'octopi-repoeditor.desktop')
+sha256sums=('e01c6d959e5663797771b95b47951e3ad11a9abbc7cbb009f1f835404c5ff43e'
+            '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef')
 
 prepare() {
 	_cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
 	_jc=$((${_cpucount:-1}))
-   
+
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  
-	patch -p1 < ../enable-kstatus.patch
+	# Enable KSTATUS
+	sed -i '|#DEFINES|DEFINES|
+	       ' notifier/octopi-notifier/octopi-notifier.pro
 }            
             
 build() {
@@ -56,7 +55,6 @@ build() {
 
 package_octopi() {
 	pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur and yaourt recommendation"
-	install=octopi.install
 	depends=('qt5-declarative' 'xterm')
 	optdepends=('kdesu: for KDE'
 		    'gksu: for XFCE, Gnome, LXDE, Cinnamon'
@@ -93,7 +91,6 @@ package_octopi-notifier() {
 	pkgdesc="Notifier for Octopi"
 	depends=('octopi' 'libnotify')
 	optdepends=('xfce4-notifyd: for notifications in XFCE')
-	install=octopi.install
 	conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde' 'octopi-notifier-kde4')
 
 	#Octopi-notifier files
@@ -104,7 +101,6 @@ package_octopi-notifier() {
 
 package_octopi-repoeditor() {
 	pkgdesc="Pacman repo editor for Octopi"
-	install=octopi.install
 	depends=('qt5-base')
 
 	#Octopi-repoeditor files
diff --git a/libre/octopi/enable-kstatus.patch b/libre/octopi/enable-kstatus.patch
deleted file mode 100644
index cc88fda68..000000000
--- a/libre/octopi/enable-kstatus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur octopi-master-current/notifier/octopi-notifier/octopi-notifier.pro octopi-master-current-kstatus/notifier/octopi-notifier/octopi-notifier.pro
---- octopi-master-current/notifier/octopi-notifier/octopi-notifier.pro	2015-08-09 13:12:50.000000000 +0200
-+++ octopi-master-current-kstatus/notifier/octopi-notifier/octopi-notifier.pro	2015-08-14 10:15:02.645977100 +0200
-@@ -7,7 +7,7 @@
- QT += core xml gui network dbus
- 
- # This controls whether octopi-notifier uses KStatusNotifier lib
--#DEFINES += KSTATUS
-+DEFINES += KSTATUS
- 
- contains(DEFINES, KSTATUS){
-   QT += KNotifications
diff --git a/libre/octopi/octopi.install b/libre/octopi/octopi.install
deleted file mode 100644
index 8ec315e7c..000000000
--- a/libre/octopi/octopi.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-- 
cgit v1.2.3-54-g00ecf