octopi-0.10.0-2.parabola3: rebuild

2 files changed, 35 insertions, 24 deletions

diff --git a/pcr/octopi/PKGBUILD b/pcr/octopi/PKGBUILD
index d55490dcf..632650c63 100644
--- a/pcr/octopi/PKGBUILD
+++ b/pcr/octopi/PKGBUILD
@@ -1,42 +1,38 @@
-# 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>
 
-_pkggit=octopi
-_gitcommit=f6961a89cab1078989a084b42694516ffc75c491
-_gitsha256='d05ba89605fd601b2c5ddd09e019d9912207674825c463cdd32c8c057cb68e94'
-
-pkgbase=octopi
-pkgname='octopi'
+pkgname=octopi
 pkgver=0.10.0
 pkgrel=2
-pkgrel+=.parabola2
-pkgdesc="A powerful Pacman frontend using Qt5 libs"
-pkgdesc+=", without nonfree pacaur, pikaur, trizen and yay recommendation"
+pkgrel+=.parabola3
+pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur, pikaur, trizen and yay recommendation"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
 url="https://tintaescura.com/projects/octopi/"
-license=('GPL2')
+license=('GPL')
 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})
+optdepends=('pacmanlogviewer: to view pacman log files'
+            'gksu: for XFCE, Gnome, LXDE, Cinnamon'
+            'lxqt-sudo: for LXQT')
+provides=("octopi-cachecleaner=$pkgver" "octopi-notifier=$pkgver" "octopi-repoeditor=$pkgver")
+conflicts=('octopi-cachecleaner' 'octopi-notifier' 'octopi-repoeditor'
+           'octopi-git' 'octopi-kde-git')
+source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz"
+        'octopi-repoeditor.desktop')
+sha256sums=('7e4d484816fa0f1356e783a612ae54cbaf9627c5f848c19ed85d69ce288b0904'
+            '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef')
 
-_subdirs=(helper repoeditor cachecleaner sudo)
+_subdirs=(helper repoeditor cachecleaner sudo notifier)
 
 prepare() {
-  cd "${srcdir}/${_pkggit}-${_gitcommit}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   cp resources/images/octopi_green.png resources/images/octopi.png
 }
 
 build() {
-  cd "${srcdir}/${_pkggit}-${_gitcommit}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   echo "Starting build..."
   qmake-qt5 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro
@@ -52,13 +48,19 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkggit}-${_gitcommit}"
-  
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   for _subdir in ${_subdirs[@]}; do
     pushd $_subdir
     make INSTALL_ROOT="${pkgdir}" install
     popd
   done
+
+  install -D -m644 "$srcdir"/octopi-repoeditor.desktop "$pkgdir"/usr/share/applications/octopi-repoeditor.desktop
+
+  #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
 }
diff --git a/pcr/octopi/octopi-repoeditor.desktop b/pcr/octopi/octopi-repoeditor.desktop
new file mode 100644
index 000000000..6e52a0076
--- /dev/null
+++ b/pcr/octopi/octopi-repoeditor.desktop
@@ -0,0 +1,9 @@
+[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