updated to 0.9.0 (proxy support added is cool)

updated PKGBUILD to match a closer version to the official one provided on official repo
remove -j from PKGBUILD, if you need parallel build, edit /etc/makepkg.conf and set MAKEFLAGS=-jX
added grey icon color to better support dark themes (WITH_DARK_ICON=0 to disable)

9 files changed, 117 insertions, 167 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5ce6e56c11f..fd070a33b915 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,56 +1,34 @@
 pkgbase = octopi-git
-	pkgdesc = A powerful Pacman frontend using Qt5 libs
-	pkgver = 0.8.1.r1166.144c3f2
+	pkgdesc = This is Octopi, a powerful Pacman frontend using Qt libs
+	pkgver = 0.9.0.r336.a05add1
 	pkgrel = 1
-	epoch = 1
 	url = https://github.com/aarnt/octopi
-	install = octopi-git.install
-	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = git
 	makedepends = qt5-base
-	depends = qt5-quickcontrols
-	depends = pacman
-	depends = pkgfile
-	depends = knotifications
+	makedepends = qt5-tools
 	depends = alpm_octopi_utils
-	depends = xterm
+	depends = pkgfile
 	depends = qtermwidget
-	optdepends = kdesu: for KDE
-	optdepends = gksu: for XFCE, Gnome, LXDE, Cinnamon
-	optdepends = gnome-keyring: for password management
-	optdepends = gist: for SysInfo report
-	optdepends = yaourt: for AUR support
-	optdepends = pacaur: for AUR support
-	optdepends = octopi-notifier: for notifications
-	optdepends = pkgfile: to view uninstalled pkg contents in ArchLinux
-	optdepends = xfce4-notifyd: for notifications in XFCE
-	optdepends = pacmanlogviewer: to view pacman log files
-	optdepends = qtermwidget: for embedded terminal
+	depends = sudo
 	provides = octopi
+	provides = octopi-cachecleaner
+	provides = octopi-helper
 	provides = octopi-notifier
 	provides = octopi-repoeditor
-	provides = octopi-cachecleaner
-	provides = octopi-pacmanhelper
+	provides = octopi-sudo
 	conflicts = octopi
+	conflicts = octopi-cachecleaner
+	conflicts = octopi-helper
 	conflicts = octopi-notifier
 	conflicts = octopi-repoeditor
-	conflicts = octopi-cachecleaner
-	conflicts = octopi-pacmanhelper
-	conflicts = oktopi-git
-	source = octopi::git+https://github.com/aarnt/octopi.git
-	source = octopi_green_numix.png
-	source = octopi_red_numix.png
-	source = octopi_yellow_numix.png
-	source = octopi_transparent_numix.png
-	source = winicon.patch
-	md5sums = SKIP
-	md5sums = 722f6b5f44661a1c97070b7775311fed
-	md5sums = 96e3d342c19515b752b10322737f249f
-	md5sums = a0e53f3ee4bd1830a46cc305b720200b
-	md5sums = c71b9f9d80333d359f5a11e22446c5d0
-	md5sums = 84388e82f3088ccbca0b5392f864ea90
+	conflicts = octopi-sudo
+	conflicts = octopi-dev
+	source = git+https://github.com/aarnt/octopi.git
+	source = octopi_dark.png
+	sha256sums = SKIP
+	sha256sums = 49aa640be835eb9ccf216f44a2d86aba3b39bf349e62b855192096526883cdc0
 
 pkgname = octopi-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b0cd0679112e..882384e15a1d 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,113 +1,124 @@
-# Maintainer: SharkEzz <icraft640@gmail.com>
-# Contributor: Nikola Milinković <nikmil@gmail.com>
+# Maintainer           : Arnaud Dovi <mr.dovi@gmail.com>
+# Contributor          : SharkEzz <icraft640@gmail.com>
+# Contributor          : Nikola Milinković <nikmil@gmail.com>
 
-# Set to 'y' to enable Numix-like icons for Octopi notifier
-_numixicons=
+# WITH_KNOTIFICATION = 0 -> Default notifier is use simply qt5
+# WITH_KNOTIFICATION = 1 -> Enable the Plasma/knotifications support notifier
+WITH_KNOTIFICATION=0
+
+# WITH_DARK_ICON = 0 -> Default icons
+# WITH_DARK_ICON = 1 -> Replace the green icon by a dark one (dark themes support)
+WITH_DARK_ICON=1
 
 pkgname=octopi-git
-_pkgname=octopi
-_pkgver=0.8.1
-pkgver=$_pkgver".r1166.144c3f2"
+pkgver=0.9.0.r336.a05add1
 pkgrel=1
-epoch=1
-pkgdesc="A powerful Pacman frontend using Qt5 libs"
-arch=('i686' 'x86_64')
+pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs"
+arch=('x86_64')
 url="https://github.com/aarnt/octopi"
 license=('GPL2')
-install=$pkgname.install
-makedepends=('git' 'qt5-base')
-depends=('qt5-quickcontrols' 'pacman' 'pkgfile' 'knotifications' 'alpm_octopi_utils' 'xterm' 'qtermwidget')
-optdepends=('kdesu: for KDE'
-            'gksu: for XFCE, Gnome, LXDE, Cinnamon'
-            'gnome-keyring: for password management'
-            'gist: for SysInfo report'
-	    'yaourt: for AUR support'
-	    'pacaur: for AUR support'
-            'octopi-notifier: for notifications'
-            'pkgfile: to view uninstalled pkg contents in ArchLinux'
-	    'xfce4-notifyd: for notifications in XFCE'
-	    'pacmanlogviewer: to view pacman log files'
-	    'qtermwidget: for embedded terminal')
-provides=('octopi' 'octopi-notifier' 'octopi-repoeditor'
-	  'octopi-cachecleaner' 'octopi-pacmanhelper')
-conflicts=('octopi' 'octopi-notifier' 'octopi-repoeditor'
-	   'octopi-cachecleaner' 'octopi-pacmanhelper' 'oktopi-git')
-_gitroot="git+https://github.com/aarnt/octopi.git"
-_gitname="octopi"
-source=("$_gitname::$_gitroot"
-        octopi_green_numix.png
-        octopi_red_numix.png
-        octopi_yellow_numix.png
-	octopi_transparent_numix.png
-        winicon.patch)
-md5sums=('SKIP'
-         '722f6b5f44661a1c97070b7775311fed'
-         '96e3d342c19515b752b10322737f249f'
-         'a0e53f3ee4bd1830a46cc305b720200b'
-         'c71b9f9d80333d359f5a11e22446c5d0'
-         '84388e82f3088ccbca0b5392f864ea90')
+depends=(
+  'alpm_octopi_utils'
+  'pkgfile'
+  'qtermwidget'
+  'sudo'
+)
+makedepends=(
+  'git'
+  'qt5-base'
+  'qt5-tools'
+)
+provides=(
+  'octopi'
+  'octopi-cachecleaner'
+  'octopi-helper'
+  'octopi-notifier'
+  'octopi-repoeditor'
+  'octopi-sudo'
+)
+conflicts=(
+  'octopi'
+  'octopi-cachecleaner'
+  'octopi-helper'
+  'octopi-notifier'
+  'octopi-repoeditor'
+  'octopi-sudo'
+  'octopi-dev'
+)
+source=(
+  'git+https://github.com/aarnt/octopi.git' 
+  'octopi_dark.png'
+)
+sha256sums=('SKIP'
+            '49aa640be835eb9ccf216f44a2d86aba3b39bf349e62b855192096526883cdc0')
 
 pkgver() {
-  cd ${srcdir}/$_gitname
-  printf $_pkgver".r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "${pkgname/-git/}" || exit
+  printf "%s" "$(git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 prepare() {
-  cd ${srcdir}/$_gitname
-  if [ -n "$_numixicons" ]; then
-      patch -Np1 -i ${srcdir}/winicon.patch
-      cp -f ${srcdir}/octopi_green_numix.png ${srcdir}/$_gitname/resources/images/octopi_green.png
-      cp -f ${srcdir}/octopi_red_numix.png ${srcdir}/$_gitname/resources/images/octopi_red.png
-      cp -f ${srcdir}/octopi_yellow_numix.png ${srcdir}/$_gitname/resources/images/octopi_yellow.png
-      cp -f ${srcdir}/octopi_transparent_numix.png ${srcdir}/$_gitname/resources/images/octopi_transparent.png
+  cd "${pkgname/-git/}" || exit
+  [[ "$WITH_KNOTIFICATION" == "1" ]] && sed -e "s|DEFINES += ALPM_BACKEND #KSTATUS|DEFINES += ALPM_BACKEND KSTATUS|" -i notifier/octopi-notifier.pro
+  if [[ "$WITH_DARK_ICON" -eq "1" ]]; then
+    cp resources/images/octopi_green.png resources/images/octopi_green.bak.png
+    cp "${srcdir}/octopi_dark.png" resources/images/octopi_green.png
   fi
+  cp resources/images/octopi_green.png resources/images/octopi.png
+  # https://github.com/aarnt/octopi/commit/2250904a902fca96ea16adf463400fbda913aa70
+  #patch --forward --strip=2 --input="${srcdir}/2250904a902fca96ea16adf463400fbda913aa70.patch"
 }
 
 build() {
-  _cpucount=$(grep -c processor /proc/cpuinfo 2>/dev/null)
-  _jc=$((${_cpucount:-1}))
-
-  cd "$srcdir/$_gitname"
-  qmake-qt5 octopi.pro
-  make -j $_jc
-
-  cd "${srcdir}/$_gitname/notifier/pacmanhelper"
-  msg "Building pacmanhelper..."
-  qmake-qt5 pacmanhelper.pro
-  make -j $_jc
-
-  cd "${srcdir}/$_gitname/notifier/octopi-notifier"
-  msg "Building octopi-notifier..."
-  qmake-qt5 octopi-notifier.pro
-  make -j $_jc
-
-  cd "${srcdir}/$_gitname/repoeditor"
-  msg "Building octopi-repoeditor..."
-  qmake-qt5 octopi-repoeditor.pro
-  make -j $_jc
-
-  cd "${srcdir}/$_gitname/cachecleaner"
-  msg "Building octopi-cachecleaner..."
-  qmake-qt5 octopi-cachecleaner.pro
-  make -j $_jc
+  cd "${pkgname/-git/}" || exit
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi.pro
+  make
+
+  cd helper || exit
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-helper.pro
+  make
+  cd ..
+
+  cd notifier || exit
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-notifier.pro
+  make
+  cd ..
+
+  cd repoeditor || exit
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-repoeditor.pro
+  make
+  cd ..
+
+  cd cachecleaner || exit
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-cachecleaner.pro
+  make
+  cd ..
+
+  cd sudo || exit
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="$CFLAGS" QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" octopi-sudo.pro
+  make
 }
 
 package() {
-   cd ${srcdir}/$_gitname
-   make INSTALL_ROOT=${pkgdir} install
+  cd "${pkgname/-git/}" || exit
+  make INSTALL_ROOT="$pkgdir" install
+
+  cd helper || exit
+  make INSTALL_ROOT="$pkgdir" install
+  cd ..
 
-   cd notifier/pacmanhelper
-   make INSTALL_ROOT=${pkgdir} install
-   cd ../..
+  cd notifier || exit
+  make INSTALL_ROOT="$pkgdir" install
+  cd ..
 
-   cd notifier/octopi-notifier
-   make INSTALL_ROOT=${pkgdir} install
-   cd ../..
+  cd repoeditor || exit
+  make INSTALL_ROOT="$pkgdir" install
+  cd ..
 
-   cd repoeditor
-   make INSTALL_ROOT=${pkgdir} install
-   cd ..
+  cd cachecleaner || exit
+  make INSTALL_ROOT="$pkgdir" install
+  cd ..
 
-   cd cachecleaner
-   make INSTALL_ROOT=${pkgdir} install
+  cd sudo || exit
+  make INSTALL_ROOT="$pkgdir" install   
 }
diff --git a/octopi-git.install b/octopi-git.install
deleted file mode 100644
index 8dea2f4d9e86..000000000000
--- a/octopi-git.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-
-  systemctl enable octopi.service &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/octopi_dark.png b/octopi_dark.png
new file mode 100755
index 000000000000..b7b2cb835cbe
--- /dev/null
+++ b/octopi_dark.png
diff --git a/octopi_green_numix.png b/octopi_green_numix.png
deleted file mode 100644
index 3427a31dec4b..000000000000
--- a/octopi_green_numix.png
+++ /dev/null
diff --git a/octopi_red_numix.png b/octopi_red_numix.png
deleted file mode 100644
index 8ca3f0cf12d0..000000000000
--- a/octopi_red_numix.png
+++ /dev/null
diff --git a/octopi_transparent_numix.png b/octopi_transparent_numix.png
deleted file mode 100644
index e21508f2f39b..000000000000
--- a/octopi_transparent_numix.png
+++ /dev/null
diff --git a/octopi_yellow_numix.png b/octopi_yellow_numix.png
deleted file mode 100644
index 1a6ead9ff561..000000000000
--- a/octopi_yellow_numix.png
+++ /dev/null
diff --git a/winicon.patch b/winicon.patch
deleted file mode 100644
index d2841472fd4d..000000000000
--- a/winicon.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur octopi-73b684d231722181cbc2f8507fb5cd74f3695a78/src/mainwindow_refresh.cpp octopi-new/src/mainwindow_refresh.cpp
---- octopi-73b684d231722181cbc2f8507fb5cd74f3695a78/src/mainwindow_refresh.cpp	2015-03-18 02:51:38.000000000 +0100
-+++ octopi-new/src/mainwindow_refresh.cpp	2015-04-04 08:06:48.948358814 +0200
-@@ -60,18 +60,9 @@
- 
-   if ((m_outdatedStringList->count() > 0))
-   {
--    setWindowIcon(IconHelper::getIconOctopiRed());
--    if(m_commandExecuting != ectn_MIRROR_CHECK && !isAURGroupSelected()) enableSystemUpgrade=true;
-+      if(m_commandExecuting != ectn_MIRROR_CHECK && !isAURGroupSelected()) enableSystemUpgrade=true;
-   }
--  else if(m_outdatedAURStringList->count() > 0)
--  {
--    setWindowIcon(IconHelper::getIconOctopiYellow());
--  }
--  else
--  {
--    setWindowIcon(IconHelper::getIconOctopiGreen());
--  }
--
-+  
-   ui->actionSystemUpgrade->setEnabled(enableSystemUpgrade);
- }
- 
-Only in octopi-new/src: mainwindow_refresh.cpp~