Basing 0.8.3 off Manjaro PKGBUILD

2 files changed, 195 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69a6cb049925..33e6d2824e16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
+# Generated by mksrcinfo v8
+# Fri Aug 19 12:51:24 UTC 2016
 pkgbase = octopi
 	pkgdesc = a powerful Pacman frontend using Qt libs
-	pkgver = 0.8.1
-	pkgrel = 4
+	pkgver = 0.8.3
+	pkgrel = 1
 	url = http://octopiproject.wordpress.com
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = qt5-declarative
-	source = https://github.com/aarnt/octopi/archive/v0.8.1.tar.gz
+	makedepends = git
+	source = octopi-0.8.3-1.tar.gz::https://github.com/aarnt/octopi/archive/f07959e06ba5033c99a75ef2710dbd56f8d618a1.tar.gz
 	source = octopi-repoeditor.desktop
-	source = enable-kstatus.patch
-	sha256sums = e01c6d959e5663797771b95b47951e3ad11a9abbc7cbb009f1f835404c5ff43e
+	sha256sums = 2dc9e18c0e8676e6db35d5bbf8462ccd88088e73776538c317df45ca969350e4
 	sha256sums = 131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef
-	sha256sums = 288dd58a8aa98ef5ad901aec600d0a3c36fa81b60d51385bceeadec0c1aa7b01
 
 pkgname = octopi
 	pkgdesc = A powerful Pacman frontend using Qt5 libs
@@ -27,18 +28,49 @@ pkgname = octopi
 	optdepends = yaourt: for AUR support
 	optdepends = octopi-repoeditor: for editing functions
 	optdepends = octopi-cachecleaner: for cleaning functions
-	optdepends = octopi-notifier: for notifications
+	optdepends = octopi-notifier-qt4: for notifications
+	optdepends = octopi-notifier-qt5: for notifications
+	optdepends = octopi-notifier-frameworks: for notifications
 	optdepends = pacmanlogviewer: to view pacman log files
 	conflicts = octopi-git
 
-pkgname = octopi-notifier
-	pkgdesc = Notifier for Octopi
-	depends = octopi
+pkgname = octopi-pacmanhelper
+	pkgdesc = Pacman helper for Octopi notifier
+	depends = qt5-base
+
+pkgname = octopi-notifier-qt4
+	pkgdesc = Notifier for Octopi using Qt4 libs
+	depends = octopi-pacmanhelper
+	depends = libnotify
+	depends = qt4
+	optdepends = xfce4-notifyd: for notifications in XFCE
+	provides = octopi-notifier
+	conflicts = octopi-notifier
+	conflicts = octopi-notifier-qt5
+	conflicts = octopi-notifier-frameworks
+
+pkgname = octopi-notifier-qt5
+	pkgdesc = Notifier for Octopi using Qt5 libs
+	depends = octopi-pacmanhelper
+	depends = libnotify
+	depends = qt5-base
+	optdepends = xfce4-notifyd: for notifications in XFCE
+	provides = octopi-notifier
+	conflicts = octopi-notifier
+	conflicts = octopi-notifier-qt4
+	conflicts = octopi-notifier-frameworks
+
+pkgname = octopi-notifier-frameworks
+	pkgdesc = Notifier for Octopi with Knotifications support
+	depends = octopi-pacmanhelper
 	depends = libnotify
 	depends = knotifications
 	optdepends = xfce4-notifyd: for notifications in XFCE
+	provides = octopi-notifier
+	conflicts = octopi-notifier
 	conflicts = octopi-notifier-qt4
-	conflicts = octopi-notifier-kde
+	conflicts = octopi-notifier-qt5
+	replaces = octopi-notifier
 
 pkgname = octopi-repoeditor
 	pkgdesc = Pacman repo editor for Octopi
diff --git a/PKGBUILD b/PKGBUILD
index 125894901e53..9d7eacc5ffb0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,79 @@
 # Maintainer: Jameson Pugh <imntreal@gmail.com>
 
 pkgbase=octopi
-pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner')
-pkgver=0.8.1
-pkgrel=4
+pkgname=('octopi' 'octopi-pacmanhelper' 'octopi-notifier-qt4' 'octopi-notifier-qt5' 'octopi-notifier-frameworks' 'octopi-repoeditor' 'octopi-cachecleaner')
+pkgver=0.8.3
+pkgrel=1
+# This is the release package so the below _gitcommit variable should (usually) be commented out.
+_gitcommit="f07959e06ba5033c99a75ef2710dbd56f8d618a1"
 pkgdesc="a powerful Pacman frontend using Qt libs"
 arch=('i686' 'x86_64')
 url="http://octopiproject.wordpress.com"
 license=('GPL2')
-makedepends=('qt5-declarative')
-source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
-	'octopi-repoeditor.desktop'
-	'enable-kstatus.patch')
-sha256sums=('e01c6d959e5663797771b95b47951e3ad11a9abbc7cbb009f1f835404c5ff43e'
-            '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
-            '288dd58a8aa98ef5ad901aec600d0a3c36fa81b60d51385bceeadec0c1aa7b01')
+makedepends=('qt5-declarative' 'git')
+if [ "${_gitcommit}" != "" ]; then
+	source=("octopi-${pkgver}-${pkgrel}.tar.gz::https://github.com/aarnt/octopi/archive/${_gitcommit}.tar.gz"
+	'octopi-repoeditor.desktop')
+else
+  source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
+	'octopi-repoeditor.desktop')
+fi
+sha256sums=('2dc9e18c0e8676e6db35d5bbf8462ccd88088e73776538c317df45ca969350e4'
+            '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef')
 
 prepare() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
+  if [ "${_gitcommit}" != "" ]; then
+    cd "${srcdir}/${pkgbase}-${_gitcommit}"
+  else
+	  cd "${srcdir}/${pkgbase}-${pkgver}"
+  fi
   
-	patch -p0 < ../enable-kstatus.patch
+	# sed version
+  sed -i -e "s|0.9.0 (dev)|${pkgver}-${pkgrel}|g" src/strconstants.h
+
+  cp -r notifier notifier-qt4
+  cp -r notifier notifier-qt5
+  cp -r notifier notifier-frameworks
+	sed -i 's|#DEFINES += KSTATUS|DEFINES += KSTATUS|' notifier-frameworks/octopi-notifier/octopi-notifier.pro
 }            
            
 build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
+	if [ "${_gitcommit}" != "" ]; then
+    cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+  	cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
 
+	msg "Building octopi..."
 	qmake-qt5 octopi.pro
 	make
 
-	cd "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper"
+	cd notifier/pacmanhelper
 	msg "Building pacmanhelper..."
 	qmake-qt5 pacmanhelper.pro
 	make
 
-	cd "${srcdir}/${pkgbase}-${pkgver}/notifier/octopi-notifier"
-	msg "Building octopi-notifier..."
+	cd ../../notifier-qt4/octopi-notifier
+	msg "Building octopi-notifier-qt4..."
+	qmake-qt4 octopi-notifier.pro
+	make
+  
+	cd ../../notifier-qt5/octopi-notifier
+	msg "Building octopi-notifier-qt5..."
+	qmake-qt5 octopi-notifier.pro
+	make
+  
+	cd ../../notifier-frameworks/octopi-notifier
+	msg "Building octopi-notifier-frameworks..."
 	qmake-qt5 octopi-notifier.pro
 	make
   
-	cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor"
+	cd ../../repoeditor
 	msg "Building octopi-repoeditor..."
 	qmake-qt5 octopi-repoeditor.pro
 	make
 
-	cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner"
+	cd ../cachecleaner
 	msg "Building octopi-cachecleaner..."
 	qmake-qt5 octopi-cachecleaner.pro
 	make
@@ -63,60 +92,134 @@ package_octopi() {
 		    'yaourt: for AUR support'
 		    'octopi-repoeditor: for editing functions'
 		    'octopi-cachecleaner: for cleaning functions'
-		    'octopi-notifier: for notifications'
+		    'octopi-notifier-qt4: for notifications'
+		    'octopi-notifier-qt5: for notifications'
+		    'octopi-notifier-frameworks: for notifications'
 		    'pacmanlogviewer: to view pacman log files')
 	conflicts=('octopi-git')
 
-	cd "${srcdir}/${pkgbase}-${pkgver}"
+	if [ "${_gitcommit}" != "" ]; then
+    cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+		cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
  
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgname}_green.png" "${pkgdir}/usr/share/icons/${pkgname}.png"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgname}_green.png" "${pkgdir}/usr/share/icons/gnome/32x32/apps/${pkgname}.png"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgname}_red.png" "${pkgdir}/usr/share/icons/${pkgname}_red.png"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgname}_yellow.png" "${pkgdir}/usr/share/icons/${pkgname}_yellow.png"
+	install -D -m755 "bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+	install -D -m644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -D -m644 "resources/images/${pkgname}_green.png" "${pkgdir}/usr/share/icons/${pkgname}.png"
+	install -D -m644 "resources/images/${pkgname}_green.png" "${pkgdir}/usr/share/icons/gnome/32x32/apps/${pkgname}.png"
+	install -D -m644 "resources/images/${pkgname}_red.png" "${pkgdir}/usr/share/icons/${pkgname}_red.png"
+	install -D -m644 "resources/images/${pkgname}_yellow.png" "${pkgdir}/usr/share/icons/${pkgname}_yellow.png"
   
-	#Pacmanhelper service files
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/pacmanhelper" "${pkgdir}/usr/lib/octopi/pacmanhelper"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacman.policy" "${pkgdir}/usr/share/polkit-1/actions/org.octopi.pacman.policy"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.conf" "${pkgdir}/etc/dbus-1/system.d/org.octopi.pacmanhelper.conf"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.xml" "${pkgdir}/usr/share/dbus-1/interfaces/org.octopi.pacmanhelper.xml"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.service" "${pkgdir}/usr/share/dbus-1/system-services/org.octopi.pacmanhelper.service"
-
 	#speedup files
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/speedup/speedup-octopi.sh" "${pkgdir}/usr/bin/speedup-octopi.sh"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/speedup/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+	install -D -m755 "speedup/speedup-octopi.sh" "${pkgdir}/usr/bin/speedup-octopi.sh"
+	install -D -m644 "speedup/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+}
+
+package_octopi-pacmanhelper() {
+	pkgdesc="Pacman helper for Octopi notifier"
+  depends=('qt5-base')
+	
+  if [ "${_gitcommit}" != "" ]; then
+    cd "${srcdir}/${pkgbase}-${_gitcommit}"
+  else
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+  fi
+	
+  install -Dm755 "notifier/bin/pacmanhelper" "${pkgdir}/usr/lib/octopi/pacmanhelper"
+	install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacman.policy" "${pkgdir}/usr/share/polkit-1/actions/org.octopi.pacman.policy"
+	install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.conf" "${pkgdir}/etc/dbus-1/system.d/org.octopi.pacmanhelper.conf"
+	install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.xml" "${pkgdir}/usr/share/dbus-1/interfaces/org.octopi.pacmanhelper.xml"
+	install -Dm644 "notifier/pacmanhelper/polkit/org.octopi.pacmanhelper.service" "${pkgdir}/usr/share/dbus-1/system-services/org.octopi.pacmanhelper.service"
 }
 
-package_octopi-notifier() {
-	pkgdesc="Notifier for Octopi"
-	depends=('octopi' 'libnotify' 'knotifications')
+package_octopi-notifier-qt4() {
+	pkgdesc="Notifier for Octopi using Qt4 libs"
+	depends=('octopi-pacmanhelper' 'libnotify' 'qt4')
 	optdepends=('xfce4-notifyd: for notifications in XFCE')
-	conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde')
+	conflicts=('octopi-notifier' 'octopi-notifier-qt5' 'octopi-notifier-frameworks')
+	provides=('octopi-notifier')
+	
+	if [ "${_gitcommit}" != "" ]; then
+		cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+		cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
+	
+	#Octopi-notifier files
+	install -D -m755 "notifier-qt4/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
+	install -D -m644 "octopi-notifier.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -D -m644 "octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/${pkgname}.desktop"
+}
 
+package_octopi-notifier-qt5() {
+	pkgdesc="Notifier for Octopi using Qt5 libs"
+	depends=('octopi-pacmanhelper' 'libnotify' 'qt5-base')
+	optdepends=('xfce4-notifyd: for notifications in XFCE')
+	conflicts=('octopi-notifier' 'octopi-notifier-qt4' 'octopi-notifier-frameworks')
+	provides=('octopi-notifier')
+	
+	if [ "${_gitcommit}" != "" ]; then
+		cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+		cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
+	
 	#Octopi-notifier files
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/notifier/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/octopi-notifier.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/${pkgname}.desktop"
+	install -D -m755 "notifier-qt5/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
+	install -D -m644 "octopi-notifier.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -D -m644 "octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/${pkgname}.desktop"
+}
+
+package_octopi-notifier-frameworks() {
+	pkgdesc="Notifier for Octopi with Knotifications support"
+	depends=('octopi-pacmanhelper' 'libnotify' 'knotifications')
+	optdepends=('xfce4-notifyd: for notifications in XFCE')
+	conflicts=('octopi-notifier' 'octopi-notifier-qt4' 'octopi-notifier-qt5')
+	provides=('octopi-notifier')
+	replaces=('octopi-notifier')
+	
+	if [ "${_gitcommit}" != "" ]; then
+		cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+		cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
+	
+	#Octopi-notifier files
+	install -D -m755 "notifier-frameworks/bin/octopi-notifier" "${pkgdir}/usr/bin/octopi-notifier"
+	install -D -m644 "octopi-notifier.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	install -D -m644 "octopi-notifier.desktop" "${pkgdir}/etc/xdg/autostart/${pkgname}.desktop"
 }
 
 package_octopi-repoeditor() {
 	pkgdesc="Pacman repo editor for Octopi"
 	depends=('qt5-base')
-
+	
+	if [ "${_gitcommit}" != "" ]; then
+  	cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+	  cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
+	
 	#Octopi-repoeditor files
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/repoeditor/bin/octopi-repoeditor" "${pkgdir}/usr/bin/octopi-repoeditor"
+	install -D -m755 "repoeditor/bin/octopi-repoeditor" "${pkgdir}/usr/bin/octopi-repoeditor"
 	install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/resources/images/${pkgbase}_red.png" "${pkgdir}/usr/share/icons/${pkgname}.png"
+	install -D -m644 "resources/images/${pkgbase}_red.png" "${pkgdir}/usr/share/icons/${pkgname}.png"
 }
 
 package_octopi-cachecleaner() {
 	pkgdesc="Cachecleaner for Octopi"
 	depends=('qt5-base')
-
+	
+	if [ "${_gitcommit}" != "" ]; then
+	  cd "${srcdir}/${pkgbase}-${_gitcommit}"
+	else
+		cd "${srcdir}/${pkgbase}-${pkgver}"
+	fi
+	
 	#Octopi-cachecleaner files
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/cachecleaner/bin/octopi-cachecleaner" "${pkgdir}/usr/bin/octopi-cachecleaner"
-	install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/cachecleaner/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop"
+	install -D -m755 "cachecleaner/bin/octopi-cachecleaner" "${pkgdir}/usr/bin/octopi-cachecleaner"
+	install -D -m644 "cachecleaner/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop"
 }
 
 # vim: set ts=2 sw=2 ft=sh noet: