Merge branch 'master-remote' into master-undelete

2 files changed, 31 insertions, 15 deletions

diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 5eee8985c..a311ba26b 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,42 +1,58 @@
-# $Id$
+# vim:set ft=sh:
+# $Id: PKGBUILD 93493 2013-07-04 12:38:15Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
 _pkgbase=doublecmd
 pkgbase=doublecmd-libre
 pkgname=('doublecmd-gtk2-libre' 'doublecmd-qt-libre')
-pkgver=0.5.4
-_helpver=0.5.1
-pkgrel=2.1
+pkgver=0.5.5
+_helpver=0.5.5
+pkgrel=1
 url="http://doublecmd.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
 install="$_pkgbase.install"
+provides=("$_pkgbase")
 makedepends=('lazarus' 'qt4pas' 'gtk2')
-optdepends=('lua: scripting' 'p7zip: support for 7zip archives')
-source=("http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
+optdepends=(
+	'lua51: scripting'
+	'p7zip: support for 7zip archives'
+	'unar: support for rar archives'
+)
+source=(
+	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
 	"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
 )
-sha256sums=('480b83279adeba007ad5c54f455733fae3d9c9ee61762e6b5a63e2e67b1cd7b7'
-            'd9f518e05e089b71aaa31c7d4af8177e77594a02be2c316e85e061e63b4c03e5')
+sha256sums=('253ec036ec119c067f501247445acdd35d67ffd9693d246dc4e98897c6df6434'
+            '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
 
 build() {
 	cp -a $_pkgbase-$pkgver $_pkgbase-gtk
 	cp -a $_pkgbase-$pkgver $_pkgbase-qt
 
 	cd "$srcdir/$_pkgbase-gtk"
+	if [ "$CARCH" = "i686" ]; then
+		sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-gtk/components/doublecmd/doublecmd_common.lpk"
+	fi
+	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
 	./build.sh beta gtk2
 
 	cd "$srcdir/$_pkgbase-qt"
+	# dont use fPIC on i686
+	if [ "$CARCH" = "i686" ]; then
+		sed -e '/fPIC/d' -i "$srcdir/$_pkgbase-qt/components/doublecmd/doublecmd_common.lpk"
+	fi
+	sed -e 's/\(export\ lazbuild=\).*/\1"$(which\ lazbuild) --lazarusdir=\/usr\/lib\/lazarus"/' -i build.sh
 	./build.sh beta qt
 }
 
 package_doublecmd-gtk2-libre() {
-	pkgdesc="twin-panel (commander-style) file manager (GTK)"
+	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
 	depends=('gtk2')
 	conflicts=('doublecmd-gtk2')
 	replaces=('doublecmd-gtk2')
-	provides=("doublecmd-gtk2=${pkgver}" 'doublecmd')
+	provides=("doublecmd-gtk2=${pkgver}")
 	cd "$srcdir/$_pkgbase-gtk"
 	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
 	./install/linux/install.sh --install-prefix="$pkgdir"
@@ -47,11 +63,11 @@ package_doublecmd-gtk2-libre() {
 }
 
 package_doublecmd-qt-libre() {
-	pkgdesc="twin-panel (commander-style) file manager (QT)"
+	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
 	depends=('qt4pas')
 	conflicts=('doublecmd-qt')
 	replaces=('doublecmd-qt')
-	provides=("doublecmd-qt=${pkgver}" 'doublecmd')
+	provides=("doublecmd-qt=${pkgver}")
 	cd "$srcdir/$_pkgbase-qt"
 	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
 	./install/linux/install.sh --install-prefix="$pkgdir"
diff --git a/libre/doublecmd-libre/doublecmd.install b/libre/doublecmd-libre/doublecmd.install
index 40d56528f..c27b5bb23 100644
--- a/libre/doublecmd-libre/doublecmd.install
+++ b/libre/doublecmd-libre/doublecmd.install
@@ -3,20 +3,20 @@ update_icons() {
 	# Setup Menus
 	if which update-desktop-database
 	then
-		update-desktop-database -q /usr/share/applications
+		update-desktop-database -q /usr/share/applications > /dev/null 2>&1
 	fi
 
 	# Setup MIME types
 	if which update-mime-database
 	then
-		update-mime-database /usr/share/mime >/dev/null
+		update-mime-database /usr/share/mime > /dev/null 2>&1
 	fi
 
 	# Setup Icons
 	touch -c /usr/share/icons/hicolor
 	if which gtk-update-icon-cache
 	then
-		gtk-update-icon-cache -tq /usr/share/icons/hicolor
+		gtk-update-icon-cache -tq /usr/share/icons/hicolor > /dev/null 2>&1
 	fi
 
 }