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

[Ike Devolder]

    Date: Thursday, July 4, 2013 @ 14:38:15
  Author: idevolder
Revision: 93493

doublecmd :: 0.5.5

Modified:
  doublecmd/trunk/PKGBUILD
  doublecmd/trunk/doublecmd.install

-------------------+
 PKGBUILD          |   30 +++++++++++++++++++++++-------
 doublecmd.install |    6 +++---
 2 files changed, 26 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-04 12:15:25 UTC (rev 93492)
+++ PKGBUILD	2013-07-04 12:38:15 UTC (rev 93493)
@@ -1,3 +1,4 @@
+# vim:set ft=sh:
 # $Id$
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
@@ -4,30 +5,44 @@
 
 pkgbase=doublecmd
 pkgname=('doublecmd-gtk2' 'doublecmd-qt')
-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' 'libunrar: support for rar archives')
-source=("http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
+optdepends=(
+	'lua51: scripting'
+	'p7zip: support for 7zip archives'
+	'libunrar: 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
 }
 
@@ -54,3 +69,4 @@
 	cd "$srcdir/$pkgbase-help-$_helpver"
 	cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
 }
+

Modified: doublecmd.install
===================================================================
--- doublecmd.install	2013-07-04 12:15:25 UTC (rev 93492)
+++ doublecmd.install	2013-07-04 12:38:15 UTC (rev 93493)
@@ -3,20 +3,20 @@
 	# 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
 
 }