New version

2 files changed, 136 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1c62dec6600f..a70d20915d20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,35 @@
 pkgbase = octopi
-	pkgdesc = A powerful Pacman frontend using Qt5 libs
+	pkgdesc = A powerful Pacman frontend using Qt libs
 	pkgver = 0.9.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://octopiproject.wordpress.com
-	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = qt5-declarative
-	makedepends = alpm_octopi_utils
-	makedepends = clang
-	makedepends = qtermwidget
-	makedepends = qt5-tools
-	depends = qt5-base
-	depends = qt5-declarative
-	depends = pacman
-	depends = alpm_octopi_utils>=1.0.1-1
+	makedepends = git
 	depends = qtermwidget
-	optdepends = octopi-notifier-qt5: Notifier for Octopi using Qt5 libs
-	optdepends = octopi-notifier-frameworks: Notifier for Octopi with Knotifications support
-	optdepends = gist: for SysInfo report
+	depends = pkgfile
+	depends = alpm_octopi_utils
+	depends = qt5-declarative
+	depends = pacman-contrib
+	optdepends = pikaur: for AUR support
 	optdepends = pacaur: for AUR support
 	optdepends = trizen: for AUR support
-	optdepends = pikaur: for AUR support
-	optdepends = yay: for AUR support
 	optdepends = pacmanlogviewer: to view pacman log files
-	provides = octopi
-	provides = octopi-repoeditor
-	provides = octopi-cachecleaner
+	optdepends = gksu: for XFCE, Gnome, LXDE, Cinnamon
+	optdepends = lxqt-sudo: for LXQT
+	provides = octopi-kde-git
 	conflicts = octopi-git
 	conflicts = octopi-kde-git
-	conflicts = octopi-notifier-noknotify
-	source = octopi-0.9.0-3.tar.gz::https://github.com/aarnt/octopi/archive/31060ae2b2f7c496c95b2262b8219c39b65e45be.tar.gz
-	sha256sums = 2eac6062b3589700b0d0e37c601f5bff4ad49dc59847be5950777d7e5a09685c
+	source = octopi-repoeditor.desktop
+	source = 0001-remove-qtermwidget.patch
+	source = 0002-add-pikaur-support.patch
+	source = icons::git+https://gitlab.com/kikadf/octopicons.git
+	source = octopi.0.9.0.tar.gz::https://github.com/aarnt/octopi/archive/v0.9.0.tar.gz
+	sha256sums = 131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef
+	sha256sums = bdf668ae3bcbac4bf908d96ce4115bac77bf8d4e58796d12fc2cd4e8ee8294e7
+	sha256sums = 18d3ee70f520045035c5d9ede6dc5e6121f0f258fe4eaa743551aaf6bd9b0181
+	sha256sums = SKIP
+	sha256sums = f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822
 
 pkgname = octopi
 
diff --git a/PKGBUILD b/PKGBUILD
index 8c60ed02ac44..1e9c1c1286f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,124 +1,138 @@
-# Maintainer: MatMoul <matmoul@gmail.com>
+# Maintainer: Stephan Springer <buzo+arch@Lini.de>
+# Contributor: kikadf <kikadf.01@gmail.com>
+# Contributor: Jameson Pugh <imntreal@gmail.com>
 
+# Default notifier is use simply qt5
+# To use with Knotifications support, uncomment line below
+#USE_NOTIFIER='1'
 
-# Comment to preserve the very old release...
-USE_DEV='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'
 
-pkgbase=octopi
-pkgname=('octopi')
+# Default build with pikaur support
+# To disable, uncomment line below
+#DISABLE_PIKAUR='1'
+
+pkgname=octopi
 pkgver=0.9.0
-pkgrel=3
-pkgdesc="A powerful Pacman frontend using Qt5 libs"
-if [[ ${USE_DEV} == '1' ]]; then
-	_gitcommit=31060ae2b2f7c496c95b2262b8219c39b65e45be
-	_gitsha256='2eac6062b3589700b0d0e37c601f5bff4ad49dc59847be5950777d7e5a09685c'
-fi
-arch=('i686' 'x86_64')
+pkgrel=4
+pkgdesc="A powerful Pacman frontend using Qt libs"
 url="http://octopiproject.wordpress.com"
+arch=('x86_64')
 license=('GPL2')
-depends=('qt5-base' 'qt5-declarative' 'pacman' 'alpm_octopi_utils>=1.0.1-1' 'qtermwidget')
-makedepends=('qt5-declarative' 'alpm_octopi_utils' 'clang' 'qtermwidget' 'qt5-tools')
-optdepends=('octopi-notifier-qt5: Notifier for Octopi using Qt5 libs'
-            'octopi-notifier-frameworks: Notifier for Octopi with Knotifications support'
-            'gist: for SysInfo report'
+depends=('qtermwidget' 'pkgfile' 'alpm_octopi_utils' 'qt5-declarative' 'pacman-contrib')
+[[ ${USE_NOTIFIER} == "1" ]] && depends+=('knotifications')
+[[ ${DISABLE_QTERMWIDGET} == "1" ]] && unset depends[0]
+makedepends=('git')
+optdepends=('pikaur: for AUR support'
             'pacaur: for AUR support'
             'trizen: for AUR support'
-            'pikaur: for AUR support'
-            'yay: for AUR support'
-            'pacmanlogviewer: to view pacman log files')
-provides=('octopi' 'octopi-repoeditor' 'octopi-cachecleaner')
-conflicts=('octopi-git' 'octopi-kde-git' 'octopi-notifier-noknotify')
-
-if [[ ${USE_DEV} == '1' ]]; then
-  source=("octopi-${pkgver}-${pkgrel}.tar.gz::https://github.com/aarnt/octopi/archive/${_gitcommit}.tar.gz")
-  sha256sums=(${_gitsha256})
+            'pacmanlogviewer: to view pacman log files'
+            'gksu: for XFCE, Gnome, LXDE, Cinnamon'
+            'lxqt-sudo: for LXQT')
+[[ ${USE_NOTIFIER} == "1" ]] && optdepends+=('kdesu: for KDE')
+[[ ${DISABLE_PIKAUR} == "1" ]] && unset optdepends[0]
+provides=('octopi-kde-git')
+conflicts=('octopi-git' 'octopi-kde-git')
+source=('octopi-repoeditor.desktop'
+        '0001-remove-qtermwidget.patch'
+        '0002-add-pikaur-support.patch'
+        'icons::git+https://gitlab.com/kikadf/octopicons.git')
+sha256sums=('131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
+            'bdf668ae3bcbac4bf908d96ce4115bac77bf8d4e58796d12fc2cd4e8ee8294e7'
+            '18d3ee70f520045035c5d9ede6dc5e6121f0f258fe4eaa743551aaf6bd9b0181'
+            'SKIP')
+if [ "${USE_SOURCE}" = "" ]; then
+    source+=("$pkgname.$pkgver.tar.gz::https://github.com/aarnt/$pkgname/archive/v$pkgver.tar.gz")
+    sha256sums+=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822')
+    _cd_path="${pkgname}-${pkgver}"
 else
-  source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz")
-  sha256sums=('f6c7fe6bbcc26a79b1e455a42a8dc906bee4edd1b386b4f76178f006f4d7f822')
+    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() {
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd "${srcdir}/${pkgbase}-${_gitcommit}"
-    
-    # set version if beta
-    sed -i -e "s|0.10.0 (dev)|${pkgver}-${pkgrel} (git-${_gitcommit:0:6})|g" src/strconstants.cpp
-  else
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-  fi
+    cd "$_cd_path"
+
+    # disable lxqt qtermwidget
+    [[ ${DISABLE_QTERMWIDGET} == "1" ]] && patch -Np1 -i ../0001-remove-qtermwidget.patch && rm -rfv src/termwidget.{cpp,h}
+
+    # add pikaur support
+    [[ ${DISABLE_PIKAUR} == "" ]] && patch -Np1 -i ../0002-add-pikaur-support.patch
+
+    # 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() {
-  cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
-  cpucount=$((${cpucount:-1}))
-
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd "${srcdir}/${pkgbase}-${_gitcommit}"
-  else
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-  fi
-
-  msg "Starting build..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro -spec linux-clang
-  make -j $cpucount
-
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd helper
-    msg "Building octopi-helper..."
-    qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-helper.pro -spec linux-clang
-    make -j $cpucount
-  fi
-
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd ../repoeditor
-	else
-    cd repoeditor
-	fi
-  msg "Building octopi-repoeditor..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-repoeditor.pro -spec linux-clang
-  make -j $cpucount
-
-  cd ../cachecleaner
-  msg "Building octopi-cachecleaner..."
-  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-cachecleaner.pro -spec linux-clang
-  make -j $cpucount
-
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd ../sudo
-    msg "Building octopi-sudo..."
-    qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi-sudo.pro -spec linux-clang
-    make -j $cpucount
-  fi
+    cd "$_cd_path"
+    [[ ${DISABLE_QTERMWIDGET} == '1' ]] && export QTERMWIDGET=off
+    msg 'Building octopi…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi.pro
+    make
+
+    cd notifier/pacmanhelper
+    msg 'Building pacmanhelper…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" pacmanhelper.pro
+    make
+
+    cd ../octopi-notifier
+    msg 'Building octopi-notifier…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-notifier.pro
+    make
+
+    cd ../../repoeditor
+    msg 'Building octopi-repoeditor…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-repoeditor.pro
+    make
+
+    cd ../cachecleaner
+    msg 'Building octopi-cachecleaner…'
+    qmake-qt5 QMAKE_CFLAGS_RELEASE="$CFLAGS" QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS" \
+              QMAKE_LFLAGS_RELEASE="$LDFLAGS" octopi-cachecleaner.pro
+    make
 }
 
 package() {
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd "${srcdir}/${pkgbase}-${_gitcommit}"
-  else
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-  fi
-
-  make INSTALL_ROOT="${pkgdir}" install
-
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd helper
-    make INSTALL_ROOT="${pkgdir}" install
-	fi
-
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd ../repoeditor
-	else
+    cd "$_cd_path"
+    make INSTALL_ROOT="$pkgdir" install
+
+    cd notifier/pacmanhelper
+    make INSTALL_ROOT="$pkgdir" install
+    cd ../..
+
+    cd notifier/octopi-notifier
+    make INSTALL_ROOT="$pkgdir" install
+    cd ../..
+
     cd repoeditor
-	fi
-  make INSTALL_ROOT="${pkgdir}" install
+    make INSTALL_ROOT="$pkgdir" install
+    install -D -m644 "$srcdir"/octopi-repoeditor.desktop "$pkgdir"/usr/share/applications/octopi-repoeditor.desktop
+
+    cd ../cachecleaner
+    make INSTALL_ROOT="$pkgdir" install
+    cd ..
 
-  cd ../cachecleaner
-  make INSTALL_ROOT="${pkgdir}" install
+    #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
 
-  if [[ ${USE_DEV} == '1' ]]; then
-    cd ../sudo
-    make INSTALL_ROOT="${pkgdir}" install
-	fi
+    # Add some icons to customize notifier
+    mkdir -p "$pkgdir"/usr/share/octopi/icons/
+    cp ../icons/*.png "$pkgdir"/usr/share/octopi/icons/
 }