Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 14 insertions, 11 deletions

diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
index 36bfeb18e..f52c614c5 100644
--- a/pcr/retroshare/PKGBUILD
+++ b/pcr/retroshare/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: funkyou
 
 # Set this to true to build and install retroshare-nogui
-_build_nogui=false
+_build_nogui=true
 
 # Set this to true to build and install the plugins
 _build_linkscloud=true
@@ -14,20 +14,21 @@ _build_voip=true
 ### Nothing to be changed below this line ###
 
 pkgname=retroshare
-pkgver=0.5.4e
-pkgrel=3
+pkgver=0.5.5c
+pkgsvn=0.7068
+pkgrel=2
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
-arch=('i686' 'x86_64') 
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'mips64el')
 url="http://retroshare.sourceforge.net/"
 license=('LGPL' 'GPL')
 depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
 install="${pkgname}.install"
 
-source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/${pkgname}_${pkgver::5}-${pkgsvn}.tar.gz \
 	${pkgname}.install \
 	${pkgname}.desktop)
 
-sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
+sha256sums=('772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650'
             '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
             '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
 
@@ -36,8 +37,10 @@ sha256sums=('a1cc85327213aa3bab0eac0923b546472bb41aacd56a11f5f3be1ba2315a0bda'
 [[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
 [[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
 
+_rssrcdir="${pkgname}-${pkgver::5}/src"
+
 build() {
-	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+	local _srcdir="${srcdir}/$_rssrcdir"
 	local _qmake='qmake-qt4'
 
 	msg "Compiling OpenPGP-SDK..."
@@ -63,7 +66,7 @@ build() {
 	if [[ "$_build_voip" == "true" ]] ; then
 		msg "Compiling VOIP plugin..."
 		cd "${_srcdir}/plugins/VOIP"
-		sed -i 's/lessThan.*/true {/' VOIP.pro
+		#sed -i 's/lessThan.*/true {/' VOIP.pro
 		$_qmake
 		make
 	fi
@@ -87,14 +90,14 @@ build() {
 		cd "${_srcdir}/rsctrl/src"
 		make
 		cd "${_srcdir}/retroshare-nogui/src"
-		sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
+		#sed -i 's/pkg-config --atleast-version 0.5.4 libssh/pkg-config --atleast-version 0.5 libssh/' retroshare-nogui.pro
 		$_qmake
 		make
 	fi
 }
 
 package() {
-	local _srcdir="${srcdir}/retroshare-0.5.4/src"
+	local _srcdir="${srcdir}/$_rssrcdir"
 
 	# --- Install Files ---
 
@@ -144,5 +147,5 @@ package() {
 
 	# Skins
 	cp -r "${_srcdir}/retroshare-gui/src/qss" "${pkgdir}/usr/share/RetroShare/"
-	find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
+	#find "${pkgdir}/usr/share/RetroShare/" -depth -type d -name ".svn" -exec rm -r {} \;
 }