octopi-0.10.0-2.parabola2: updating version

3 files changed, 43 insertions, 231 deletions

diff --git a/pcr/octopi/0001-remove-qtermwidget.patch b/pcr/octopi/0001-remove-qtermwidget.patch
deleted file mode 100644
index 2d491b2b1..000000000
--- a/pcr/octopi/0001-remove-qtermwidget.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 992761b6c71740729c05f6312b8f46ae036e3186 Mon Sep 17 00:00:00 2001
-From: BrLi <rainman59118@gmail.com>
-Date: Sat, 24 Feb 2018 20:45:34 +0800
-Subject: [PATCH] remove qtermwidget
-
----
- notifier/octopi-notifier/octopi-notifier.pro | 16 ++--------------
- octopi.pro                                   | 16 ++--------------
- 2 files changed, 4 insertions(+), 28 deletions(-)
-
-diff --git a/notifier/octopi-notifier/octopi-notifier.pro b/notifier/octopi-notifier/octopi-notifier.pro
-index a3902e2..c6c3a86 100644
---- a/notifier/octopi-notifier/octopi-notifier.pro
-+++ b/notifier/octopi-notifier/octopi-notifier.pro
-@@ -8,8 +8,8 @@ QT += core xml gui network dbus
- 
- # This controls whether octopi-notifier uses KStatusNotifier lib
- # You SHOULD REALLY enable KSTATUS define in plasma 5 desktops!
--DEFINES += ALPM_BACKEND QTERMWIDGET #KSTATUS
--CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
-+DEFINES += ALPM_BACKEND #KSTATUS
-+CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND
- 
- ALPM_BACKEND {
-   QMAKE_CXXFLAGS += -std=c++11
-@@ -19,10 +19,6 @@ ALPM_BACKEND {
-   QMAKE_CXXFLAGS += -std=c++11
- }
- 
--QTERMWIDGET {
--  LIBS += -lqtermwidget5
--}
--
- contains(DEFINES, KSTATUS){
-   QT += KNotifications
- }
-@@ -56,10 +52,6 @@ HEADERS  += \
-     ../../src/searchbar.h \
-     ../../src/optionsdialog.h
- 
--QTERMWIDGET{
--  HEADERS += ../../src/termwidget.h
--}
--
- ALPM_BACKEND{
-   HEADERS += ../../src/alpmbackend.h
- }
-@@ -82,10 +74,6 @@ SOURCES += main.cpp \
-     ../../src/searchbar.cpp \
-     ../../src/optionsdialog.cpp
- 
--QTERMWIDGET{
--  SOURCES += ../../src/termwidget.cpp
--}
--
- ALPM_BACKEND{
-   SOURCES += ../../src/alpmbackend.cpp
- }
-diff --git a/octopi.pro b/octopi.pro
-index 815ea21..f8ac381 100644
---- a/octopi.pro
-+++ b/octopi.pro
-@@ -5,8 +5,8 @@
- #-------------------------------------------------
- 
- QT += core gui network xml dbus widgets
--DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND QTERMWIDGET
--CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
-+DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND
-+CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND
- 
- ALPM_BACKEND {
-   QMAKE_CXXFLAGS += -std=c++11
-@@ -16,10 +16,6 @@ ALPM_BACKEND {
-   QMAKE_CXXFLAGS += -std=c++11
- }
- 
--QTERMWIDGET {
--  LIBS += -lqtermwidget5
--}
--
- TEMPLATE = app
- DESTDIR += bin
- OBJECTS_DIR += build
-@@ -53,10 +49,6 @@ HEADERS += src/QtSolutions/qtsingleapplication.h \
-         src/constants.h \
-         src/optionsdialog.h
- 
--QTERMWIDGET{
--  HEADERS += src/termwidget.h
--}
--
- ALPM_BACKEND{
-   HEADERS += src/alpmbackend.h
- }
-@@ -94,10 +86,6 @@ SOURCES += src/QtSolutions/qtsingleapplication.cpp \
-         src/pacmanexec.cpp \
-         src/optionsdialog.cpp
- 
--QTERMWIDGET{
--  SOURCES += src/termwidget.cpp
--}
--
- ALPM_BACKEND{
-   SOURCES += src/alpmbackend.cpp
- }
--- 
-2.16.2
-
diff --git a/pcr/octopi/PKGBUILD b/pcr/octopi/PKGBUILD
index 28104a523..d55490dcf 100644
--- a/pcr/octopi/PKGBUILD
+++ b/pcr/octopi/PKGBUILD
@@ -1,134 +1,64 @@
-# Maintainer (Arch): Stephan Springer <buzo+arch@Lini.de>
-# Contributor (Arch): kikadf <kikadf.01@gmail.com>
-# Contributor (Arch): Jameson Pugh <imntreal@gmail.com>
+# Maintainer (Arch): MatMoul <matmoul@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>
 
-# Default notifier is use simply qt5
-# To use with Knotifications support, uncomment line below
-#USE_NOTIFIER='1'
+_pkggit=octopi
+_gitcommit=f6961a89cab1078989a084b42694516ffc75c491
+_gitsha256='d05ba89605fd601b2c5ddd09e019d9912207674825c463cdd32c8c057cb68e94'
 
-# 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=4
+pkgbase=octopi
+pkgname='octopi'
+pkgver=0.10.0
+pkgrel=2
 pkgrel+=.parabola2
-pkgdesc="A powerful Pacman frontend using Qt libs"
-pkgdesc+=", without nonfree pacaur, pikaur and trizen recommendation"
-url="http://octopiproject.wordpress.com"
+pkgdesc="A powerful Pacman frontend using Qt5 libs"
+pkgdesc+=", without nonfree pacaur, pikaur, trizen and yay recommendation"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
+url="https://tintaescura.com/projects/octopi/"
 license=('GPL2')
-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-cachecleaner=$pkgver" "octopi-notifier=$pkgver" "octopi-repoeditor=$pkgver")
-conflicts=('octopi-cachecleaner' 'octopi-notifier' 'octopi-repoeditor'
-	   'octopi-git' 'octopi-kde-git')
-replaces=('octopi-cachecleaner' 'octopi-notifier' 'octopi-repoeditor'
-          'octopi-git' 'octopi-kde-git')
-source=('octopi-repoeditor.desktop'
-        '0001-remove-qtermwidget.patch'
-        'icons::git+https://gitlab.com/kikadf/octopicons.git')
-sha256sums=('131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef'
-            'bdf668ae3bcbac4bf908d96ce4115bac77bf8d4e58796d12fc2cd4e8ee8294e7'
-            '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+=("${pkgname}-${USE_SOURCE}.tar.gz::https://github.com/aarnt/octopi/archive/${USE_SOURCE}.tar.gz")
-    sha256sums+=('SKIP')
-    _cd_path="${pkgname}-${USE_SOURCE}"
-fi
+depends=('alpm_octopi_utils' 'pkgfile' 'qtermwidget' 'sudo')
+makedepends=('qt5-tools')
+optdepends=('octopi-notifier-qt5: Notifier for Octopi using Qt5 libs'
+            'octopi-notifier-frameworks: Notifier for Octopi with Knotifications support'
+            'pacmanlogviewer: to view pacman log files')
+provides=('octopi' 'octopi-repoeditor' 'octopi-cachecleaner')
+conflicts=('octopi')
+source=("octopi-${pkgver}-${pkgrel}.tar.gz::https://github.com/aarnt/octopi/archive/${_gitcommit}.tar.gz")
+sha256sums=(${_gitsha256})
+
+_subdirs=(helper repoeditor cachecleaner sudo)
 
 prepare() {
-    cd "$_cd_path"
-
-    # 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
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
+  cp resources/images/octopi_green.png resources/images/octopi.png
 }
 
 build() {
-    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 "${srcdir}/${_pkggit}-${_gitcommit}"
 
-    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
+  echo "Starting build..."
+  qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.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
+  for _subdir in ${_subdirs[@]}; do
+    pushd $_subdir
+    echo "Building octopi-$_subdir..."
+    qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" "octopi-$_subdir.pro"
     make
+    popd
+  done
 }
 
 package() {
-    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
-    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 ..
-
-    #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
-
-    # Add some icons to customize notifier
-    mkdir -p "$pkgdir"/usr/share/octopi/icons/
-    cp ../icons/*.png "$pkgdir"/usr/share/octopi/icons/
+  cd "${srcdir}/${_pkggit}-${_gitcommit}"
+  
+  make INSTALL_ROOT="${pkgdir}" install
+  
+  for _subdir in ${_subdirs[@]}; do
+    pushd $_subdir
+    make INSTALL_ROOT="${pkgdir}" install
+    popd
+  done
 }
diff --git a/pcr/octopi/octopi-repoeditor.desktop b/pcr/octopi/octopi-repoeditor.desktop
deleted file mode 100644
index 6e52a0076..000000000
--- a/pcr/octopi/octopi-repoeditor.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Octopi Repo Editor
-Icon=octopi-repoeditor
-Exec=octopi-repoeditor
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;System;
-#NotShowIn=GNOME;XFCE;LXDE;KDE;
-StartupNotify=true