libre/doublecmd: updated to 0.9.0

1 files changed, 30 insertions, 61 deletions

diff --git a/libre/doublecmd/PKGBUILD b/libre/doublecmd/PKGBUILD
index 436bb2821..c530b63df 100644
--- a/libre/doublecmd/PKGBUILD
+++ b/libre/doublecmd/PKGBUILD
@@ -1,61 +1,52 @@
 # vim:set ft=sh:
-# $Id$
 # Maintainer (Arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor (Arch): (sirocco AT ngs.ru)
+# Contributor: André Silva <emulatorman@hyperbola.info>
+
+# parabola changes and rationale:
+#  - removed libunrar support
 
 pkgbase=doublecmd
-pkgname=('doublecmd-gtk2' 'doublecmd-qt4' 'doublecmd-qt5')
-pkgver=0.8.1
-_helpver=0.6.0
-pkgrel=1.parabola1
+pkgname=('doublecmd-gtk2' 'doublecmd-qt5')
+pkgver=0.9.0
+pkgrel=2
+pkgrel+=.parabola1
 url="http://doublecmd.sourceforge.net/"
-arch=('x86_64' 'i686' 'armv7h')
+arch=('x86_64')
+arch+=('i686' 'armv7h')
 license=('GPL')
 provides=("$pkgbase")
-makedepends=('lazarus' 'qt4pas' 'qt5pas' 'gtk2')
+makedepends=('lazarus' 'qt5pas' 'gtk2')
 optdepends=(
-	'lua51: scripting'
-	'p7zip: support for 7zip archives'
+    'lua: scripting'
+    'unzip: support extracting zip archives'
+    'zip: suport packing zip archives'
+    'p7zip: support for 7zip archives'
 )
 source=(
-	"https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
-	"https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz"
-	"libre.patch"
-	"help-libre.patch"
+    "https://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
+    "libre.patch"
 )
-sha512sums=('8e80ba5914362572d77403e054873665dcf9dcf2dd9258acd07888aa5dfa05e7b6537e9e7750f26eadb09091915bd314f859d29c0527bb3aa45e936763a664d4'
-            '2fe7a58e317c93baf4cfcb9cfc660647d71f4454eef588a512a9b9e8467477a691ec1061f014a42dff4ae0a0ba0600824b33c12c950fe1e26fba2a51122404bb'
-            '874a81b27d891cff3eefc8ed6aa128b4eb4abeb4e69247108544a60cda9a3f98b552196a8414d4835d358a426d74ff10823610acf605d3a4d5651f6c9dd3dcfa'
-            'f71a328d592c4f45535480477e3e6a2e0dc3ea08bfae059a3f707a2d7d8d85407379dfbe8c54fb179e4f10c4d5078f29063ccd763d1af6525152053b6f00f746')
-
-mksource() {
-    cd "$pkgbase-$pkgver"
-
-    msg2 'remove nonfree unRAR utility files from the source'
-    rm -rv install/linux/deb/libunrar
-}
+sha512sums=('79dc348d9b44581cf353e5f6de2a56aa858d22429a6e66b40cff4269ebb34c4d8e5f5c3c5c07fb8779106c0486a938360198af78633b0aec170fb9b9249841e8'
+            '874a81b27d891cff3eefc8ed6aa128b4eb4abeb4e69247108544a60cda9a3f98b552196a8414d4835d358a426d74ff10823610acf605d3a4d5651f6c9dd3dcfa')
 
 prepare() {
+    cp -a /usr/lib/lazarus ./
+
     cd "$pkgbase-$pkgver"
     sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i install/linux/install.sh
-    sed -e 's/=$(which lazbuild)/="$(which lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
+    sed -e "s@=\$(which lazbuild)@=\"\$(which lazbuild) --lazarusdir=$srcdir/lazarus\"@" -i build.sh
 
     msg2 'remove nonfree libunrar, unace, unarj support and references'
     rm -rv plugins/wcx/unrar
+    rm -rv install/linux/deb/libunrar
     rm -v install/linux/rpm/libunrar.spec
     rm -v install/darwin/make-unrar.sh
     patch -Np1 -i "$srcdir"/libre.patch
 
-    cd "$srcdir/$pkgbase-help-$_helpver"
-
-    msg2 'remove nonfree libunrar, unace, unarj support and references on the help'
-    patch -Np1 -i "$srcdir"/help-libre.patch
-
     cd "$srcdir"
 
     cp -a "$pkgbase-$pkgver" "$pkgbase-gtk"
-    cp -a "$pkgbase-$pkgver" "$pkgbase-qt4"
     cp -a "$pkgbase-$pkgver" "$pkgbase-qt5"
 }
 
@@ -64,48 +55,26 @@ build() {
     cd "$srcdir/$pkgbase-gtk"
     ./build.sh beta gtk2
 
-    msg2 'build qt4'
-    cd "$srcdir/$pkgbase-qt4"
-    ./build.sh beta qt
-
     msg2 'build qt5'
     cd "$srcdir/$pkgbase-qt5"
     ./build.sh beta qt5
 }
 
 package_doublecmd-gtk2() {
-    pkgdesc="twin-panel (commander-style) file manager (GTK), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj"
+    pkgdesc="twin-panel (commander-style) file manager (GTK2)"
+    pkgdesc+=", without nonfree decompression engine for RAR archives and support for nonfree unace and unarj"
     depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info')
-    conflicts=('doublecmd-qt4' 'doublecmd-qt5')
+    conflicts=('doublecmd-qt5')
     cd "$srcdir/$pkgbase-gtk"
     ./install/linux/install.sh --install-prefix="$pkgdir"
-
-    # install doc
-    cd "$srcdir/$pkgbase-help-$_helpver"
-    cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
-}
-
-package_doublecmd-qt4() {
-    pkgdesc="twin-panel (commander-style) file manager (QT4), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj"
-    depends=('qt4pas' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info')
-    conflicts=('doublecmd-gtk2' 'doublecmd-qt5')
-    replaces=('doublecmd-qt')
-    cd "$srcdir/$pkgbase-qt4"
-    ./install/linux/install.sh --install-prefix="$pkgdir"
-
-    # install doc
-    cd "$srcdir/$pkgbase-help-$_helpver"
-    cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
 }
 
 package_doublecmd-qt5() {
-    pkgdesc="twin-panel (commander-style) file manager (QT5), without nonfree decompression engine for RAR archives and support for nonfree unace and unarj"
+    pkgdesc="twin-panel (commander-style) file manager (Qt5)"
+    pkgdesc+=", without nonfree decompression engine for RAR archives and support for nonfree unace and unarj"
     depends=('qt5pas' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info')
-    conflicts=('doublecmd-gtk2' 'doublecmd-qt4')
+    conflicts=('doublecmd-gtk2')
+    replaces=('doublecmd-qt' 'doublecmd-qt4')
     cd "$srcdir/$pkgbase-qt5"
     ./install/linux/install.sh --install-prefix="$pkgdir"
-
-    # install doc
-    cd "$srcdir/$pkgbase-help-$_helpver"
-    cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
 }