Update to 6.5.1

2 files changed, 33 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 268ebb4803e5..186b242ec6a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 # Generated by mksrcinfo v8
-# Sun May  7 22:37:18 UTC 2017
+# Fri Mar  2 23:34:02 UTC 2018
 pkgbase = peazip-qt-build
 	pkgdesc = Free cross-platform file archiver (compiles from source)
-	pkgver = 6.4.1
+	pkgver = 6.5.1
 	pkgrel = 1
 	url = http://peazip.org
 	install = peazip.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = lazarus-qt
+	makedepends = lazarus-qt4
 	makedepends = icoutils
 	depends = qt4pas
 	depends = desktop-file-utils
@@ -26,16 +26,13 @@ pkgbase = peazip-qt-build
 	conflicts = peazip
 	conflicts = peazip-gtk2
 	conflicts = peazip-gtk2-build
+	conflicts = peazip-gtk2-portable
 	conflicts = peazip-qt
-	conflicts = peazip-qt-opensuse
 	conflicts = peazip-qt-opensuse-latest
 	options = !strip
-	source = https://github.com/giorgiotani/PeaZip/releases/download/6.4.1/peazip-6.4.1.src.zip
-	source = http://www.peazip.org/downloads/additional/peazip_optional_formats_plugin-1.LINUX.INST.tar.gz
-	sha256sums = 6be126675c83df95b020da6221cf5063aed83510783d55254f4923c29a5245d0
-	sha256sums = 7f3fc1ea200d482500360eadda9298c4d5900ca822d21b5a0e11ff9de4d499ff
-	sha512sums = c77c9f21f037e76448076c23a3d2643ae6ee2cdd4db42bdbf05353adee35eb00198a99fa9c6dfdcc0178578b62e2eb7db211ee972b0ed090e4c786c2a55201ba
-	sha512sums = 8b308510a2c81ad2704cef19ed3fb2baf1dde0e123cf3e4c96e5e42a330e23002f3443c9fce009120492afc82b0ab063344c8029fe6fe851a4bea4814bacdaa8
+	source = https://github.com/giorgiotani/PeaZip/releases/download/6.5.1/peazip-6.5.1.src.zip
+	sha256sums = b106811311fbaf42ad5374520df2be8b20a545b80e6f8713a1f10e2e5a79d01e
+	sha512sums = db930b704e26a8dbcf69dc00af7a9cff44fdbc397a56cc4efaca672cac8f55307d054d6e9ecd3b70ba2778043c8694ffcacc332a6d7d084f5fabcff7482a9c0a
 
 pkgname = peazip-qt-build
 
diff --git a/PKGBUILD b/PKGBUILD
index 9abc42210edf..28f5dc2a3ba6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: hagabaka
 
 pkgname='peazip-qt-build'
-pkgver=6.4.1
+pkgver=6.5.1
 pkgrel=1
 pkgdesc='Free cross-platform file archiver (compiles from source)'
 license=('GPL3')
@@ -10,48 +10,47 @@ url='http://peazip.org'
 arch=('i686' 'x86_64')
 depends=( 'qt4pas' 'desktop-file-utils' 'balz' 'lpaq' 'paq8o' 'p7zip' 'upx' 'zpaq')
 optdepends=('quad' 'unace')
-makedepends=('lazarus-qt' 'icoutils')
+makedepends=('lazarus-qt4' 'icoutils')
 provides=('peazip' 'peazip-qt')
-conflicts=('peazip' 'peazip-gtk2' 'peazip-gtk2-build' 'peazip-qt' 'peazip-qt-opensuse' 'peazip-qt-opensuse-latest')
+conflicts=('peazip' 'peazip-gtk2' 'peazip-gtk2-build' 'peazip-gtk2-portable' 'peazip-qt' 'peazip-qt-opensuse-latest')
 options=('!strip')
 install=peazip.install
-source=("https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip-$pkgver.src.zip"
-        "http://www.peazip.org/downloads/additional/peazip_optional_formats_plugin-1.LINUX.INST.tar.gz")
-sha256sums=('6be126675c83df95b020da6221cf5063aed83510783d55254f4923c29a5245d0'
-            '7f3fc1ea200d482500360eadda9298c4d5900ca822d21b5a0e11ff9de4d499ff')
-sha512sums=('c77c9f21f037e76448076c23a3d2643ae6ee2cdd4db42bdbf05353adee35eb00198a99fa9c6dfdcc0178578b62e2eb7db211ee972b0ed090e4c786c2a55201ba'
-            '8b308510a2c81ad2704cef19ed3fb2baf1dde0e123cf3e4c96e5e42a330e23002f3443c9fce009120492afc82b0ab063344c8029fe6fe851a4bea4814bacdaa8')
+source=("https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip-$pkgver.src.zip")
+sha256sums=('b106811311fbaf42ad5374520df2be8b20a545b80e6f8713a1f10e2e5a79d01e')
+sha512sums=('db930b704e26a8dbcf69dc00af7a9cff44fdbc397a56cc4efaca672cac8f55307d054d6e9ecd3b70ba2778043c8694ffcacc332a6d7d084f5fabcff7482a9c0a')
 
 build() {
-  cp -Rf "$srcdir/res" "$srcdir/peazip-$pkgver.src"
   cd "$srcdir/peazip-$pkgver.src"
   lazbuild --lazarusdir=/usr/lib/lazarus --widgetset=qt --build-all project_pea.lpi && [ -f pea ]
   lazbuild --lazarusdir=/usr/lib/lazarus --widgetset=qt --build-all project_gwrap.lpi && [ -f pealauncher ]
   lazbuild --lazarusdir=/usr/lib/lazarus --widgetset=qt --build-all project_peach.lpi && [ -f peazip ]
-  icotool -x -w 256 "./res/icons/PeaZip.ico" -o "$srcdir/peazip-$pkgver.src/peazip.png"
+  icotool -x -w 256 "$srcdir/peazip-$pkgver.src/res/icons/PeaZip.ico" -o "$srcdir/peazip.png"
 }
 
 package() {
-  _resdir="$pkgdir/opt/peazip/res"
+  _pkgres="$pkgdir/opt/peazip/res"
+  install -Dm755 "$srcdir/peazip-$pkgver.src/peazip" "$pkgdir/opt/peazip/peazip"
+  install -Dm755 "$srcdir/peazip-$pkgver.src/pea" "$_pkgres/pea"
+  install -Dm755 "$srcdir/peazip-$pkgver.src/pealauncher" "$_pkgres/pealauncher"
+  install -Dm644 "$srcdir/peazip.png" "$pkgdir/usr/share/pixmaps/peazip.png"
+
   cd "$srcdir/peazip-$pkgver.src/res"
-  install -Dm755 "../peazip" "$pkgdir/opt/peazip/peazip"
-  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 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
-  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";
+  for _file in *.txt icons/*.ico lang/* themes/{*-embedded/*,*.7z}; 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 quad/{balz,quad} unace/unace upx/upx lpaq/lpaq8 paq/paq8o zpaq/zpaq; do
+    install -d "$_pkgres/$(dirname $_file)/"
+    ln -sf "/usr/bin/$(basename $_file)" "$_pkgres/$_file";
   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)"
+  for _file in /opt/peazip/{peazip,res/pea,res/pealauncher}; do
+    ln -sf $_file "$pkgdir/usr/bin/$(basename $_file)"
   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"
 }