split package

2 files changed, 41 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64718bb99ae8..d6a54d56d201 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,6 +5,7 @@ pkgbase = octopi
 	arch = x86_64
 	license = GPL-2.0-or-later
 	makedepends = qt5-tools
+	makedepends = knotifications5
 	depends = alpm-octopi-utils
 	depends = qtermwidget
 	source = octopi-0.15.0.tar.gz::https://github.com/aarnt/octopi/archive/v0.15.0.tar.gz
@@ -24,3 +25,18 @@ pkgname = octopi
 	optdepends = sudo: privilege elevation
 	provides = octopi-repoeditor
 	provides = octopi-cachecleaner
+
+pkgname = octopi-notifier-qt5
+	pkgdesc = Notifier for Octopi using Qt5 libs
+	depends = octopi
+	provides = octopi-notifier
+	conflicts = octopi-notifier
+	replaces = octopi-qt5-notifier
+	replaces = octopi-notifier-qt4
+
+pkgname = octopi-notifier-frameworks
+	pkgdesc = Notifier for Octopi with Knotifications support
+	depends = octopi
+	depends = knotifications5
+	provides = octopi-notifier
+	conflicts = octopi-notifier
diff --git a/PKGBUILD b/PKGBUILD
index a07b78d57257..e80de359a5d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: MatMoul <matmoul at the google email domain which is .com>
 pkgbase=octopi
 pkgname=('octopi'
-#         'octopi-notifier-qt5'
-#         'octopi-notifier-frameworks'
+         'octopi-notifier-qt5'
+         'octopi-notifier-frameworks'
 )
 pkgbase=octopi
 pkgver=0.15.0
@@ -12,15 +12,14 @@ arch=('x86_64')
 url="https://tintaescura.com/projects/octopi"
 license=('GPL-2.0-or-later')
 depends=('alpm-octopi-utils' 'qtermwidget')
-#makedepends=('qt5-tools' 'knotifications5')
-makedepends=('qt5-tools')
+makedepends=('qt5-tools' 'knotifications5')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz")
 sha256sums=('e94525d906d6ab4f5fc594cf1a267668ae5f1fa7f32e449ddfa84328dd738f30')
 
 _subdirs=(
   helper
-#  notifier
-#  notifier-frameworks
+  notifier
+  notifier-frameworks
   repoeditor
   cachecleaner
   sudo
@@ -30,11 +29,11 @@ prepare() {
   cd "${pkgbase}-${pkgver}"
 
   # copy notifier folder for building both qt5 & kstatus notifier backends
-#  cp -rf notifier notifier-qt5
-#  cp -rf notifier notifier-frameworks
+  cp -rf notifier notifier-qt5
+  cp -rf notifier notifier-frameworks
 
   # enable building the kstatus alpm backend for notifier-frameworks
-#  sed -i 's|#KSTATUS|KSTATUS|' "notifier-frameworks/${pkgbase}-notifier.pro"
+  sed -i 's|#KSTATUS|KSTATUS|' "notifier-frameworks/${pkgbase}-notifier.pro"
 
   # why doesn't upstream just do this so we don't have to...
   cp -f "resources/images/${pkgbase}_green.png" "resources/images/${pkgbase}.png"
@@ -83,23 +82,23 @@ package_octopi() {
   done
 }
 
-#package_octopi-notifier-qt5() {
-#  pkgdesc="Notifier for Octopi using Qt5 libs"
-#  depends=('octopi')
-#  provides=('octopi-notifier')
-#  conflicts=('octopi-notifier')
-#  replaces=('octopi-qt5-notifier' 'octopi-notifier-qt4')
+package_octopi-notifier-qt5() {
+  pkgdesc="Notifier for Octopi using Qt5 libs"
+  depends=('octopi')
+  provides=('octopi-notifier')
+  conflicts=('octopi-notifier')
+  replaces=('octopi-qt5-notifier' 'octopi-notifier-qt4')
 
-#  cd "${pkgbase}-${pkgver}"
-#  make -C notifier INSTALL_ROOT="${pkgdir}" install
-#}
+  cd "${pkgbase}-${pkgver}"
+  make -C notifier INSTALL_ROOT="${pkgdir}" install
+}
 
-#package_octopi-notifier-frameworks() {
-#  pkgdesc="Notifier for Octopi with Knotifications support"
-#  depends=('octopi' 'knotifications5')
-#  provides=('octopi-notifier')
-#  conflicts=('octopi-notifier')
+package_octopi-notifier-frameworks() {
+  pkgdesc="Notifier for Octopi with Knotifications support"
+  depends=('octopi' 'knotifications5')
+  provides=('octopi-notifier')
+  conflicts=('octopi-notifier')
 
-#  cd "${pkgbase}-${pkgver}"
-#  make -C notifier-frameworks INSTALL_ROOT="${pkgdir}" install
-#}
+  cd "${pkgbase}-${pkgver}"
+  make -C notifier-frameworks INSTALL_ROOT="${pkgdir}" install
+}