[arch-commits] Commit in doublecmd/trunk (PKGBUILD)

[Ike Devolder]

    Date: Sunday, February 25, 2018 @ 08:43:30
  Author: idevolder
Revision: 297943

upgpkg: doublecmd 0.8.2-1

Modified:
  doublecmd/trunk/PKGBUILD

----------+
 PKGBUILD |   48 ++++++++++++------------------------------------
 1 file changed, 12 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-25 08:42:04 UTC (rev 297942)
+++ PKGBUILD	2018-02-25 08:43:30 UTC (rev 297943)
@@ -4,36 +4,36 @@
 # Contributor: (sirocco AT ngs.ru)
 
 pkgbase=doublecmd
-pkgname=('doublecmd-gtk2' 'doublecmd-qt4' 'doublecmd-qt5')
-pkgver=0.8.1
-_helpver=0.6.0
+pkgname=('doublecmd-gtk2' 'doublecmd-qt5')
+pkgver=0.8.2
 pkgrel=1
 url="http://doublecmd.sourceforge.net/"
 arch=('x86_64')
 license=('GPL')
 provides=("$pkgbase")
-makedepends=('lazarus' 'qt4pas' 'qt5pas' 'gtk2')
+makedepends=('lazarus' 'qt5pas' 'gtk2')
 optdepends=(
 	'lua51: scripting'
+    'unzip: support extracting zip archives'
+    'zip: suport packing zip archives'
 	'p7zip: support for 7zip archives'
 	'libunrar: support for rar 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"
 )
-sha512sums=('8e80ba5914362572d77403e054873665dcf9dcf2dd9258acd07888aa5dfa05e7b6537e9e7750f26eadb09091915bd314f859d29c0527bb3aa45e936763a664d4'
-            '2fe7a58e317c93baf4cfcb9cfc660647d71f4454eef588a512a9b9e8467477a691ec1061f014a42dff4ae0a0ba0600824b33c12c950fe1e26fba2a51122404bb')
+sha512sums=('04ba2d064322b18525e4185a8710f94dcff2d1df2e8f8acee5963fc7824bcb7c2670471cd42fc4c9e040a25cde7f9e3ea1c42948fad34466562ceed0424d042b')
 
 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
 
     cd "$srcdir"
 
     cp -a "$pkgbase-$pkgver" "$pkgbase-gtk"
-    cp -a "$pkgbase-$pkgver" "$pkgbase-qt4"
     cp -a "$pkgbase-$pkgver" "$pkgbase-qt5"
 }
 
@@ -42,10 +42,6 @@
     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
@@ -54,36 +50,16 @@
 package_doublecmd-gtk2() {
     pkgdesc="twin-panel (commander-style) file manager (GTK)"
     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)"
-    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)"
     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/"
 }