updating PKBUILD from upstream, won't build binary until we know it's GPL-compliant

1 files changed, 51 insertions, 26 deletions

diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
index c314bd08f..3954f1d96 100644
--- a/pcr/retroshare/PKGBUILD
+++ b/pcr/retroshare/PKGBUILD
@@ -1,43 +1,46 @@
-# Maintainer (Arch): stqn
-# Contributor (Arch): JHeaton <jheaton at archlinux dot us>
-# Contributor (Arch): Tristero <tristero at online dot de>
-# Contributor (Arch): funkyou
+# Maintainer: sehraf
+# Contributor: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
 
 # Set this to true to build and install retroshare-nogui
 _build_nogui=true
 
 # Set this to true to build and install the plugins
-_build_linkscloud=true
 _build_feedreader=true
 _build_voip=true
 
 ### Nothing to be changed below this line ###
 
 pkgname=retroshare
-pkgver=0.5.5c
-pkgsvn=0.7068
-pkgrel=2
+pkgver=0.6.0.RC2
+pkgrel=3
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'mips64el')
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://retroshare.sourceforge.net/"
-license=('LGPL' 'GPL')
-depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss')
+license=('GPL' 'LGPL')
+
+depends=('qt4' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd' 'sqlcipher')
+provides=('retroshare')
+conflicts=('retroshare')
+
 install="${pkgname}.install"
 
-source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/${pkgname}_${pkgver::5}-${pkgsvn}.tar.gz \
-	${pkgname}.install \
-	${pkgname}.desktop)
+source=(#http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/retroshare_0.6.0.RC2~8551.tar.gz \
+		http://downloads.sourceforge.net/project/retroshare/RetroShare/0.6.0-rc2/retroshare_0.6.0.RC2~8551_src.tgz \
+		${pkgname}.install \
+		${pkgname}.desktop)
 
-sha256sums=('772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650'
-            '4b50547648612e9091536205402a4da9ddea9c18c0f71e5d6cd30b2226f206d9'
-            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
+sha512sums=('6cfd714f6e72d43559909a72d448b90068414be26da73928ff7bfaaf5be5f7c47f5e7932f1ff2ab4d8a7c277ea4407ab3bd539a1ad4a2a7810dc79b32b1348b1'
+            '9f976e0fad553abeeff2d58f12f72c6bfdbb36ee85fc9f8c150c2c232ea4e2d6a5d565e6ce8235f5b131371748e3c11f28270c59a52f8a9c5156f27cbc68e78a'
+            '703190641cb004116ef84de0e8ef4e7c5563236509cb318b8658edd9d3d6434c13650268d8a29169e1f7989ce81db821f183b900fd7fdf89f7d4a31b5945bc40')
 
 # Add missing dependencies if needed
-[[ $_build_nogui == true ]] && depends=(${depends[@]} 'libssh' 'protobuf')
-[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex')
+[[ $_build_voip == true ]] && depends=(${depends[@]} 'speex' 'opencv')
 [[ $_build_feedreader == true ]] && depends=(${depends[@]} 'curl' 'libxslt')
 
-_rssrcdir="${pkgname}-${pkgver::5}/src"
+_rssrcdir="retroshare06-0.6.0/src"
 
 build() {
 	local _srcdir="${srcdir}/$_rssrcdir"
@@ -53,11 +56,28 @@ build() {
 	$_qmake
 	make
 
+	msg "Compiling pegmarkdown..."
+	cd "${_srcdir}/supportlibs/pegmarkdown"
+	$_qmake
+	make
+
+
 	msg "Compiling libretroshare..."
 	cd "${_srcdir}/libretroshare/src"
 	$_qmake
 	make
 
+	msg "Compiling libresapi..."
+	cd "${_srcdir}/libresapi/src"
+	$_qmake
+	make
+
+	# i'm not 100% sure if this step is required
+	# it will download/update some JavaScript files
+	msg "Updating webui files..."
+	cd "${_srcdir}/libresapi/src/webui/"
+	make
+
 	msg "Compiling retroshare-gui..."
 	cd "${_srcdir}/retroshare-gui/src"
 	$_qmake
@@ -66,7 +86,6 @@ build() {
 	if [[ "$_build_voip" == "true" ]] ; then
 		msg "Compiling VOIP plugin..."
 		cd "${_srcdir}/plugins/VOIP"
-		#sed -i 's/lessThan.*/true {/' VOIP.pro
 		$_qmake
 		make
 	fi
@@ -87,10 +106,7 @@ build() {
 
 	if [[ $_build_nogui == "true" ]] ; then
 		msg "Compiling retroshare-nogui..."
-		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
 		$_qmake
 		make
 	fi
@@ -113,6 +129,15 @@ package() {
 			"${pkgdir}/usr/bin/${pkgname}-nogui"
 	fi
 
+    # Webui files ( the path is currently hardcoded for the gui )
+	install -d -m 655 "${pkgdir}/usr/share/RetroShare06/webui/"
+	for _file in $(ls "${_srcdir}/libresapi/src/webfiles/"); do
+		install -D -m 644 \
+			"${_srcdir}/libresapi/src/webfiles/${_file}" \
+			"${pkgdir}/usr/share/RetroShare06/webui/"
+	done
+
+
 	# Plugins
 	if [[ "$_build_linkscloud" == "true" ]] ; then
 		install -D -m 755 \
@@ -132,7 +157,7 @@ package() {
 
 	# Icons
 	install -D -m 644 \
-		"${_srcdir}/retroshare-gui/src/gui/images/retrosharelogo2.png" \
+		"${_srcdir}/retroshare-gui/src/gui/images/logo/logo_512.png" \
 		"${pkgdir}/usr/share/pixmaps/retroshare.png"
 
 	# Desktop File
@@ -148,4 +173,4 @@ 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 {} \;
-}
+}
\ No newline at end of file