2 files changed, 104 insertions, 111 deletions
diff --git a/pcr/octopi/PKGBUILD b/pcr/octopi/PKGBUILD
index 56af13966..bf8413cff 100644
--- a/pcr/octopi/PKGBUILD
+++ b/pcr/octopi/PKGBUILD
@@ -1,120 +1,125 @@
-# Maintainer (Arch): Jameson Pugh <imntreal@gmail.com>
+# Maintainer (Arch): kikadf <kikadf.01@gmail.com>
+# Contributor (Arch): Jameson Pugh <imntreal@gmail.com>
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgbase=octopi
-pkgname=('octopi' 'octopi-notifier' 'octopi-repoeditor' 'octopi-cachecleaner')
-pkgver=0.8.1
-pkgrel=4.parabola2
-arch=('i686' 'x86_64' 'armv7h')
+# Default notifier is use simply qt5
+# To use with Knotifications support, uncomment line below
+#USE_NOTIFIER='1'
+
+# Default source is the latest release tarball
+# To use a specified git version, uncomment line below and set to the git commit hash
+#USE_SOURCE='251822c88747c216c6ebb9a342a80097ee744117'
+
+# Default build with qtermwidget support
+# To disable, uncomment line below
+#DISABLE_QTERMWIDGET='1'
+
+
+pkgname=octopi
+pkgver=0.9.0
+pkgrel=1.parabola1
+pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs, without nonfree pacaur, pikaur, trizen, and yaourt recommendation"
 url="http://octopiproject.wordpress.com"
+arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2')
-makedepends=('qt5-declarative' 'knotifications')
-source=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz"
-	'octopi-repoeditor.desktop'
-	'enable-kstatus.patch')
-sha256sums=('e01c6d959e5663797771b95b47951e3ad11a9abbc7cbb009f1f835404c5ff43e'
-            '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
-            '288dd58a8aa98ef5ad901aec600d0a3c36fa81b60d51385bceeadec0c1aa7b01')
+depends=('qtermwidget' 'pkgfile' 'alpm_octopi_utils' 'qt5-declarative' 'pacman-contrib')
+[[ ${USE_NOTIFIER} == "1" ]] && depends+=('knotifications')
+[[ ${DISABLE_QTERMWIDGET} == "1" ]] && unset depends[0]
+makedepends=('git')
+optdepends=('pacmanlogviewer: to view pacman log files'
+            'gksu: for XFCE, Gnome, LXDE, Cinnamon'
+            'lxqt-sudo: for LXQT')
+[[ ${USE_NOTIFIER} == "1" ]] && optdepends+=('kdesu: for KDE')
+provides=('octopi-kde-git')
+conflicts=('octopi-git' 'octopi-kde-git')
+source=('octopi-repoeditor.desktop'
+        "https://code.chakralinux.org/packages/desktop/raw/master/octopi/0001-remove-qtermwidget.patch"
+        "icons::git+https://gitlab.com/kikadf/octopicons.git")
+sha256sums=('131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
+            'bdf668ae3bcbac4bf908d96ce4115bac77bf8d4e58796d12fc2cd4e8ee8294e7'
+            'SKIP')
+if [ "${USE_SOURCE}" = "" ]; then
+  source+=("https://github.com/aarnt/${pkgname}/archive/v${pkgver}.tar.gz")
+  sha256sums+=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822')
+  _cd_path="${pkgname}-${pkgver}"
+else
+  source+=("${pkgname}-${USE_SOURCE}.tar.gz::https://github.com/aarnt/octopi/archive/${USE_SOURCE}.tar.gz")
+  sha256sums+=('SKIP')
+  _cd_path="${pkgname}-${USE_SOURCE}"
+fi
+
 
 prepare() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd ${_cd_path}
 
-	patch -p0 < ../enable-kstatus.patch
+  # disable lxqt qtermwidget
+  [[ ${DISABLE_QTERMWIDGET} == "1" ]] && patch -Np1 -i ../0001-remove-qtermwidget.patch && rm -rfv src/termwidget.{cpp,h}
+
+  # enable the kstatus switch to build with Plasma/knotifications support
+  [[ ${USE_NOTIFIER} == "1" ]] && sed -e "s|DEFINES += ALPM_BACKEND #KSTATUS|DEFINES += ALPM_BACKEND KSTATUS|" -i notifier/octopi-notifier/octopi-notifier.pro
+
+  # set version
+  [[ ${USE_SOURCE} != "" ]] && sed -e "s|${pkgver}|${pkgver} (${USE_SOURCE})|g" -i src/strconstants.cpp
+
+  cp resources/images/octopi_green.png resources/images/octopi.png
 }
 
 build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
-	qmake-qt5 octopi.pro
-	make
-
-	cd "${srcdir}/${pkgbase}-${pkgver}/notifier/pacmanhelper"
-	msg "Building pacmanhelper..."
-	qmake-qt5 pacmanhelper.pro
-	make
-
-	cd "${srcdir}/${pkgbase}-${pkgver}/notifier/octopi-notifier"
-	msg "Building octopi-notifier..."
-	qmake-qt5 octopi-notifier.pro
-	make
-  
-	cd "${srcdir}/${pkgbase}-${pkgver}/repoeditor"
-	msg "Building octopi-repoeditor..."
-	qmake-qt5 octopi-repoeditor.pro
-	make
-
-	cd "${srcdir}/${pkgbase}-${pkgver}/cachecleaner"
-	msg "Building octopi-cachecleaner..."
-	qmake-qt5 octopi-cachecleaner.pro
-	make
+  cd ${_cd_path}
+  [[ ${DISABLE_QTERMWIDGET} == "1" ]] && export QTERMWIDGET=off
+  msg "Building octopi..."
+  qmake-qt5 octopi.pro
+  make
+
+  cd notifier/pacmanhelper
+  msg "Building pacmanhelper..."
+  qmake-qt5 pacmanhelper.pro
+  make
+
+  cd ../octopi-notifier
+  msg "Building octopi-notifier..."
+  qmake-qt5 octopi-notifier.pro
+  make
+
+  cd ../../repoeditor
+  msg "Building octopi-repoeditor..."
+  qmake-qt5 octopi-repoeditor.pro
+  make
+
+  cd ../cachecleaner
+  msg "Building octopi-cachecleaner..."
+  qmake-qt5 octopi-cachecleaner.pro
+  make
 }
 
-package_octopi() {
-	pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur and yaourt recommendation"
-	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'
-		    'octopi-cachecleaner: for cleaning functions'
-		    'octopi-notifier: for notifications'
-		    'pacmanlogviewer: to view pacman log files')
-	conflicts=('octopi-git')
-
-	cd "${srcdir}/${pkgbase}-${pkgver}"
- 
-	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"
-  
-	#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"
-}
+package() {
+  cd ${_cd_path}
+  make INSTALL_ROOT=${pkgdir} install
 
-package_octopi-notifier() {
-	pkgdesc="Notifier for Octopi"
-	depends=('octopi' 'libnotify' 'knotifications')
-	optdepends=('xfce4-notifyd: for notifications in XFCE')
-	conflicts=('octopi-notifier-qt4' 'octopi-notifier-kde')
+  cd notifier/pacmanhelper
+  make INSTALL_ROOT=${pkgdir} install
+  cd ../..
 
-	#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"
-}
+  cd notifier/octopi-notifier
+  make INSTALL_ROOT=${pkgdir} install
+  cd ../..
 
-package_octopi-repoeditor() {
-	pkgdesc="Pacman repo editor for Octopi"
-	depends=('qt5-base')
+  cd repoeditor
+  make INSTALL_ROOT=${pkgdir} install
+  install -D -m644 "${srcdir}/octopi-repoeditor.desktop" "${pkgdir}/usr/share/applications/octopi-repoeditor.desktop"
+  cd ..
 
-	#Octopi-repoeditor files
-	install -D -m755 "${srcdir}/${pkgbase}-${pkgver}/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"
-}
+  cd cachecleaner
+  make INSTALL_ROOT=${pkgdir} install
+  cd ..
 
-package_octopi-cachecleaner() {
-	pkgdesc="Cachecleaner for Octopi"
-	depends=('qt5-base')
+  #speedup files
+  install -D -m755 "speedup/speedup-octopi.sh" "${pkgdir}/usr/bin/speedup-octopi.sh"
+  install -D -m644 "speedup/octopi.service" "${pkgdir}/usr/lib/systemd/system/octopi.service"
 
-	#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"
+  # Add some icons to customize notifier
+  mkdir -p "${pkgdir}/usr/share/octopi/icons/"
+  cp ../icons/*.png "${pkgdir}/usr/share/octopi/icons/"
 }
-
-# vim: set ts=2 sw=2 ft=sh noet:
diff --git a/pcr/octopi/enable-kstatus.patch b/pcr/octopi/enable-kstatus.patch
deleted file mode 100644
index 43b897707..000000000
--- a/pcr/octopi/enable-kstatus.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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