summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-06-24 17:52:48 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-06-24 17:55:11 -0300
commit005b88507f19d576c9296fcf0e1de3c78ff549a3 (patch)
tree30bfdce421bf293263d3ef9c4a7a445919aef9a5
parent842170bddd6790a1e2da3896a7b7c79aadd36913 (diff)
octopi-0.8.0-4.parabola1: add lxqt-sudo as optdep, clean up dependencies and remove -j from make commands
-rw-r--r--libre/octopi/PKGBUILD38
-rw-r--r--libre/octopi/enable-kstatus.patch12
2 files changed, 30 insertions, 20 deletions
diff --git a/libre/octopi/PKGBUILD b/libre/octopi/PKGBUILD
index ba673a4da..cf0b8ed8b 100644
--- a/libre/octopi/PKGBUILD
+++ b/libre/octopi/PKGBUILD
@@ -5,52 +5,49 @@
pkgbase=octopi
pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner')
pkgver=0.8.1
-pkgrel=1.parabola1
+pkgrel=4.parabola1
arch=('i686' 'x86_64' 'armv7h')
-url="https://github.com/aarnt/octopi"
+url="http://octopiproject.wordpress.com"
license=('GPL2')
-makedepends=('qt5-declarative' 'knotifications' 'libnotify')
+makedepends=('qt5-declarative')
source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
- 'octopi-repoeditor.desktop')
+ 'octopi-repoeditor.desktop'
+ 'enable-kstatus.patch')
sha256sums=('e01c6d959e5663797771b95b47951e3ad11a9abbc7cbb009f1f835404c5ff43e'
- '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef')
+ '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
+ '288dd58a8aa98ef5ad901aec600d0a3c36fa81b60d51385bceeadec0c1aa7b01')
prepare() {
- _cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
- _jc=$((${_cpucount:-1}))
-
cd "${srcdir}/${pkgbase}-${pkgver}"
- # Enable KSTATUS
- sed -i 's|#DEFINES|DEFINES|
- ' notifier/octopi-notifier/octopi-notifier.pro
-}
-
+ patch -p0 < ../enable-kstatus.patch
+}
+
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
qmake-qt5 octopi.pro
- make -j $_jc
+ make
cd "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper"
msg "Building pacmanhelper..."
qmake-qt5 pacmanhelper.pro
- make -j $_jc
+ make
cd "${srcdir}/${pkgbase}-${pkgver}/notifier/octopi-notifier"
msg "Building octopi-notifier..."
qmake-qt5 octopi-notifier.pro
- make -j $_jc
+ make
cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor"
msg "Building octopi-repoeditor..."
qmake-qt5 octopi-repoeditor.pro
- make -j $_jc
+ make
cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner"
msg "Building octopi-cachecleaner..."
qmake-qt5 octopi-cachecleaner.pro
- make -j $_jc
+ make
}
package_octopi() {
@@ -58,6 +55,7 @@ package_octopi() {
depends=('qt5-declarative' 'xterm')
optdepends=('kdesu: for KDE'
'gksu: for XFCE, Gnome, LXDE, Cinnamon'
+ 'lxqt-sudo: for LXQT'
'gnome-keyring: for password management'
'gist: for SysInfo report'
'octopi-repoeditor: for editing functions'
@@ -89,9 +87,9 @@ package_octopi() {
package_octopi-notifier() {
pkgdesc="Notifier for Octopi"
- depends=('octopi' 'libnotify')
+ depends=('octopi' 'libnotify' 'knotifications')
optdepends=('xfce4-notifyd: for notifications in XFCE')
- conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde' 'octopi-notifier-kde4')
+ conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde')
#Octopi-notifier files
install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
diff --git a/libre/octopi/enable-kstatus.patch b/libre/octopi/enable-kstatus.patch
new file mode 100644
index 000000000..43b897707
--- /dev/null
+++ b/libre/octopi/enable-kstatus.patch
@@ -0,0 +1,12 @@
+diff -Naur notifier/octopi-notifier/octopi-notifier.pro-orig notifier/octopi-notifier/octopi-notifier.pro
+--- notifier/octopi-notifier/octopi-notifier.pro-orig 2016-04-01 16:34:55.541500593 -0400
++++ notifier/octopi-notifier/octopi-notifier.pro 2016-04-01 16:34:59.948205892 -0400
+@@ -8,7 +8,7 @@
+
+ # This controls whether octopi-notifier uses KStatusNotifier lib
+ # You SHOULD REALLY enable the following define in plasma 5 desktops!
+-#DEFINES += KSTATUS
++DEFINES += KSTATUS
+
+ contains(DEFINES, KSTATUS){
+ QT += KNotifications