Update to 7.3.0

4 files changed, 52 insertions, 79 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 10b86e7084f0..4b030c82fcb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,36 @@
 pkgbase = peazip-qt
-	pkgdesc = QT archiver utility
-	pkgver = 7.2.1
+	pkgver = 7.3.0
 	pkgrel = 1
 	url = http://www.peazip.org/peazip-linux.html
-	install = peazip.install
 	arch = i686
 	arch = x86_64
 	license = LGPL3
-	depends = balz
-	depends = desktop-file-utils
 	depends = lib32-curl
 	depends = lib32-gmp4
-	depends = lib32-libx11
-	depends = lib32-ncurses
 	depends = lib32-qt4pas
+	depends = lib32-ncurses
+	depends = balz
+	depends = paq8o
 	depends = p7zip
 	depends = upx
 	depends = zpaq
-	optdepends = quad
-	optdepends = unace
+	depends = lib32-gcc-libs
+	depends = lib32-xz
+	depends = lib32-zlib
+	depends = lib32-libx11
+	optdepends = quad: A ROLZ-based file compressor
+	optdepends = unace: Support for ace files
+	optdepends = arc: Support for arc files
 	provides = peazip
 	conflicts = peazip
-	conflicts = peazip-gtk2
 	conflicts = peazip-gtk2-build
-	conflicts = peazip-gtk2-portable
-	conflicts = peazip-qt-opensuse-latest
+	conflicts = peazip-qt
 	conflicts = peazip-qt-build
+	conflicts = peazip-qt-opensuse-latest
+	options = !emptydirs
 	options = !strip
-	source = peazip-qt-7.2.1.tgz::https://github.com/giorgiotani/PeaZip/releases/download/7.2.1/peazip-7.2.1.LINUX.Qt.tgz
-	source = peazip.desktop
-	sha256sums = 30fb8ce970d99c31d0c01a6fcd1f358e91d34b31fb266ee982787677fc726bbd
-	sha256sums = 4d876c6a61f25a7e2f3dfa69b1c80e61fdda9220bbf8e23a407e34eae377091b
+	source = peazip-qt-7.3.0.tar.gz::https://github.com/giorgiotani/PeaZip/releases/download/7.3.0/peazip_portable-7.3.0.LINUX.Qt.tar.gz
+	sha256sums = cc8511c572f8d7e770a739c8237a20471102e267f0e72b26ae4dadd213b78a69
 
 pkgname = peazip-qt
 
diff --git a/PKGBUILD b/PKGBUILD
index 5bc81a7718a5..53fa47bdfe3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,45 @@
+# Maintainer: Dimitris Kiziridis <ragouel at outlook dot com>
 # Maintainer: Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 # Contributor: TuxSpirit <tuxspirit@archlinux.fr>
 # Contributor: Jamesjon <universales@protonmail.com>
 
 pkgname=peazip-qt
-pkgver=7.2.1
+pkgver=7.3.0
 pkgrel=1
-pkgdesc="QT archiver utility"
-arch=(i686 x86_64)
-url=http://www.peazip.org/peazip-linux.html
-license=(LGPL3)
-depends=(balz desktop-file-utils lib32-{curl,gmp4,libx11,ncurses,qt4pas} p7zip upx zpaq)
-[[ $CARCH == "i686" ]] && depends=(${depends[@]/lib32-/})
-optdepends=(quad unace)
-provides=(peazip)
-conflicts=("peazip" "peazip-gtk2" "peazip-gtk2-build" "peazip-gtk2-portable" "peazip-qt-opensuse-latest" "peazip-qt-build")
-options=('!strip')
-install=peazip.install
-source=("$pkgname-$pkgver.tgz"::"https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip-$pkgver.LINUX.Qt.tgz"
-        "peazip.desktop")
-sha256sums=('30fb8ce970d99c31d0c01a6fcd1f358e91d34b31fb266ee982787677fc726bbd'
-            '4d876c6a61f25a7e2f3dfa69b1c80e61fdda9220bbf8e23a407e34eae377091b')
-
+arch=('i686' 'x86_64')
+url='http://www.peazip.org/peazip-linux.html'
+license=('LGPL3')
+depends=('lib32-curl'
+         'lib32-gmp4'
+         'lib32-qt4pas'
+         'lib32-ncurses'
+         'balz'
+         'paq8o'
+         'p7zip'
+         'upx'
+         'zpaq'
+         'lib32-gcc-libs'
+         'lib32-xz'
+         'lib32-zlib'
+         'lib32-libx11')
+options=('!emptydirs' '!strip')
+optdepends=('quad: A ROLZ-based file compressor' 
+            'unace: Support for ace files'
+            'arc: Support for arc files')
+provides=('peazip')
+conflicts=('peazip'
+           'peazip-gtk2-build'
+           'peazip-qt'
+           'peazip-qt-build'
+           'peazip-qt-opensuse-latest')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/giorgiotani/PeaZip/releases/download/${pkgver}/peazip_portable-${pkgver}.LINUX.Qt.tar.gz")
+sha256sums=('cc8511c572f8d7e770a739c8237a20471102e267f0e72b26ae4dadd213b78a69')
 
 package() {
-  _pkgres="$pkgdir/usr/lib/peazip/res"
-  install -Dm755 "$srcdir/usr/local/share/PeaZip/peazip" \
-                 "$pkgdir/usr/lib/peazip/peazip"
-
-  cd "$srcdir/usr/local/share/PeaZip/res"
-  for _file in altconf.txt lang/*.txt pea pealauncher rnd themes/{*.7z,*-embedded/*}; do
-    _octal=$(stat -c "%a" "$_file")
-    install -Dm"${_octal}" "$_file" "$_pkgres/$_file"
-  done
-  cd "$srcdir"
-
-  ln -sf -T "/usr/lib/p7zip" "$_pkgres/7z"
-  for _file in arc/{arc,marc} quad/{balz,quad} lpaq/lpaq8 paq/paq8o upx/upx unace/unace zpaq/zpaq; do
-    install -d "$_pkgres/$(dirname $_file)/"
-    ln -sf -T "/usr/bin/$(basename $_file)" "$_pkgres/$_file"
-  done
-  install -d "$pkgdir/usr/bin/"
-  for _file in /usr/lib/peazip/{peazip,res/pea,res/pealauncher}; do
-    ln -sf "$_file" "$pkgdir/usr/bin/$(basename $_file)"
-  done
-
-  install -Dm644 "$srcdir/usr/local/share/icons/peazip.png" "$pkgdir/usr/share/pixmaps/peazip.png"
-  desktop-file-install "$srcdir/peazip.desktop" --dir "$pkgdir/usr/share/applications/"
-}
+  install -d "${pkgdir}/opt" "${pkgdir}/usr/bin"
+  mv peazip_portable-${pkgver}.LINUX.Qt "${pkgdir}/opt/peazip-qt"
+  ln -s /opt/peazip-qt/peazip "${pkgdir}/usr/bin"
+  install -Dm644 "${pkgdir}/opt/peazip-qt/FreeDesktop_integration/peazip.desktop" -t "${pkgdir}/usr/share/applications"
+  install -Dm644 "${pkgdir}/opt/peazip-qt/FreeDesktop_integration/peazip.png" -t "${pkgdir}/usr/share/pixmaps"
+}
\ No newline at end of file
diff --git a/peazip.desktop b/peazip.desktop
deleted file mode 100644
index 6518cb7c97d1..000000000000
--- a/peazip.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PeaZip
-MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-tbz2;application/x-zip;application/zip;application/x-bzip;application/x-rar;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;
-GenericName=Archiving Tool
-Exec=peazip %F
-Icon=peazip
-Type=Application
-Terminal=false
-X-KDE-HasTempFileOption=true
-Categories=GTK;Utility;System;Archiving;
diff --git a/peazip.install b/peazip.install
deleted file mode 100644
index 943c4073ba3d..000000000000
--- a/peazip.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-postmove() {
-    post_install
-}