Fix PKGBUILD, update to 6.0.0

1 files changed, 28 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1cf74ea68bdd..a7fe1064b7c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,31 @@
 # Contributor: hagabaka
 
 pkgname='peazip-qt-build'
-pkgver=5.8.1
-pkgrel=3
+pkgver=6.0.0
+pkgrel=1
 pkgdesc='Free cross-platform file archiver (compiles from source)'
-license='GPL3'
+license=('GPL3')
 url='http://peazip.org'
 arch=('i686' 'x86_64')
-depends=('qt4pas')
+depends=( 'qt4pas' 'desktop-file-utils' 'balz' 'lpaq' 'paq8o' 'p7zip' 'upx' 'zpaq')
+optdepends=('quad' 'unace')
 makedepends=('lazarus-qt' 'icoutils')
 provides=('peazip')
-conflicts=('peazip' 'peazip-gtk2' 'peazip-qt')
+conflicts=('peazip' 'peazip-gtk2' 'peazip-qt' 'peazip-gtk2-portable')
 install=peazip.install
 source=("https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip-$pkgver.src.zip"
-        "https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip_portable-$pkgver.LINUX.Qt.tar.gz")
-sha256sums=('aac16a76b3853ebd88cd69034771cadacf287ddb06392a1398dc6eec3472507e'
-            '69c3be0c886f8b37bb1c5f03d4bdf6e0fc22aa0cbc52266713b5d20564790aef')
-sha512sums=('67b25442791f40277020673223a650fd31fcf808ac1a598e4dc5287497ff74b5513078ea4602f63f9465ceedf26083331f2a8d27c6320867c1ad58e31cb80bb4'
-            '0ac1986b9a0776855bfe6d6bca52c4dd72a33778fcf8684ccd7c1d9f28fd80a1f77a60a08cdf8ecafdf48d7381b788c86f50e9c538d63f2b9b1dab49a52a3c40')
+        "http://www.peazip.org/downloads/additional/peazip_optional_formats_plugin-1.LINUX.INST.tar.gz")
+sha256sums=('d585c79c632eac43edbfb133a0b59767424d137f3db75c55d49a793664af7bf2'
+            '7f3fc1ea200d482500360eadda9298c4d5900ca822d21b5a0e11ff9de4d499ff')
+sha512sums=('bf781f3644432c4f89f606c1eb55a42439f0b5731f955b76a7f5fdaad583054fe3caf1c44a1fa52a283ac06f80279e1a1e675484860ec9c434957acc83a14bd4'
+            '8b308510a2c81ad2704cef19ed3fb2baf1dde0e123cf3e4c96e5e42a330e23002f3443c9fce009120492afc82b0ab063344c8029fe6fe851a4bea4814bacdaa8')
 
 build() {
-  cp -Rf "$srcdir/peazip_portable-$pkgver.LINUX.Qt/res" "$srcdir/peazip-$pkgver.src"
+  cp -Rf "$srcdir/res" "$srcdir/peazip-$pkgver.src"
   cd "$srcdir/peazip-$pkgver.src"
-  sudo lazbuild --widgetset=qt  project_pea.lpi   && [ -f pea ]
-  sudo lazbuild --widgetset=qt  project_gwrap.lpi && [ -f pealauncher ]
-  sudo lazbuild --widgetset=qt  project_peach.lpi && [ -f peazip ]
+  lazbuild --widgetset=qt --build-all project_pea.lpi && [ -f pea ]
+  lazbuild --widgetset=qt --build-all project_gwrap.lpi && [ -f pealauncher ]
+  lazbuild --widgetset=qt --build-all project_peach.lpi && [ -f peazip ]
   icotool -x -w 256 "./res/icons/PeaZip.ico" -o "$srcdir/peazip-$pkgver.src/peazip.png"
 }
 
@@ -36,13 +37,20 @@ package() {
   install -Dm755 "../pea" "$_resdir/pea"
   install -Dm755 "../pealauncher" "$_resdir/pealauncher"
   install -Dm644 "../peazip.png" "$pkgdir/usr/share/pixmaps/peazip.png"
-  # Install res directory
-  for i in rnd arc/{arc,*.sfx}; do install -Dm755 $i "$_resdir"/$i; done
-  for i in *.txt lang/* themes/{{nographic,seven}-embedded/*,*.7z} arc/arc.{ini,groups}
+  ## Install res directory
+  for i in arc/{arc,*.sfx}; do install -Dm755 $i "$_resdir"/$i; done
+  for i in *.txt lang/* themes/{*-embedded/*,*.7z} arc/arc.{ini,groups}
     do install -Dm644 $i "$_resdir"/$i; done
-  for i in 7z/{7z{,.so,Con.sfx,.sfx},Codecs/Rar29.so}; do install -Dm755 $i "$_resdir"/$i; done
-  for i in quad/bcm upx/upx lpaq/lpaq8 paq/paq8o zpaq/zpaq; do install -Dm755 $i "$_resdir"/$i; done
-  #
+  ln -sf -T /usr/lib/p7zip $_resdir/7z
+  for i in quad/{balz,quad} unace/unace upx/upx lpaq/lpaq8 paq/paq8o zpaq/zpaq; do
+    install -d "$_resdir"/$(dirname $i)/
+    ln -sf /usr/bin/$(basename $i) "$_resdir"/$i;
+  done
+  install -d "$pkgdir"/usr/bin/
+  for i in /opt/peazip/{peazip,res/pea,res/pealauncher}; do
+    ln -sf $i "$pkgdir"/usr/bin/$(basename $i)
+  done
+  ##
   desktop-file-install --dir="$pkgdir/usr/share/applications/" --set-icon="peazip"\
   --remove-key="Name[en_US]" "$srcdir/peazip-$pkgver.src/FreeDesktop_integration/peazip.desktop"
 }