[retroshare]: upgrade to v0.6.6

2 files changed, 83 insertions, 46 deletions

diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD
index f5e6901e7..312a3e8db 100644
--- a/pcr/retroshare/PKGBUILD
+++ b/pcr/retroshare/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer (AUR): sehraf
-# Contributor (AUR): stqn
-# Contributor (AUR): JHeaton <jheaton at archlinux dot us>
-# Contributor (AUR): Tristero <tristero at online dot de>
-# Contributor (AUR): funkyou
+# Maintainer (aur): 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 the plugins
 #_plugin_feedreader='true'
@@ -14,44 +14,58 @@
 # Set this to 'true' to enable auto login
 #_autologin='true'
 
+# Set this to 'false' to disable nativ (system) dialogs
+_nativ_dialogs='true'
+
 # Set this to 'true' to enable wiki functionality (experimental)
 #_wiki='true'
 
 # set this to 'true' to use clang for compiling (experimental)
 #_clang='true'
 
-# Unofficial plugins
-#_plugin_lua4rs='true'
-
-# Set this to 'true' to use use archlinux' rapidjson instead of shipped version
-_systems_rapidjson='true'
-
 ### Nothing to be changed below this line ###
 
 pkgname=retroshare
-pkgver=0.6.5
-pkgrel=1
+pkgver=0.6.6
+pkgrel=2
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
-arch=('i686' 'x86_64' 'armv7h')
+arch=('armv7h' 'i686' 'x86_64')
 url='http://retroshare.cc/'
-license=('GPL2')
-depends=('qt5-multimedia' 'qt5-x11extras' 'libupnp' 'libxss' 'libmicrohttpd' 'sqlcipher')
-makedepends=('git' 'qt5-tools')
+license=('AGPL3')
+
+depends=('qt5-multimedia' 'qt5-x11extras' 'miniupnpc' 'libxss' 'sqlcipher')
+makedepends=('git' 'qt5-tools' 'rapidjson' 'cmake')
 optdepends=('tor: tor hidden node support'
-            'i2p: i2p hidden node support')
-provides=("${pkgname}")
-conflicts=("${pkgname}")
+            'i2p: i2p hidden node support'
+            'i2pd: i2p hidden node support')
+
+_restbed_cid='c27c6726d28c42e2e1b7537ba63eeb23e944789d'
+_udpdiscoverycpp_cid='f3a3103a6c52e5707629e8d0a7e279a7758fe845'
+_asio_cid='22afb86087a77037cd296d27134756c9b0d2cb75'
+_catch_cid='d10b9bd02e098476670f5eb0527d2c7281476e8a'
+_openssl_cid='894da2fb7ed5d314ee5c2fc9fd2d9b8b74111596'
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/retroshare/${pkgname}/archive/v${pkgver}.tar.gz"
+        "restbed-${_restbed_cid}.tar.gz::https://github.com/corvusoft/restbed/archive/${_restbed_cid}.tar.gz"
+        "asio-${_asio_cid}.tar.gz::https://github.com/corvusoft/asio-dependency/archive/${_asio_cid}.tar.gz"
+        "catch-${_catch_cid}.tar.gz::https://github.com/corvusoft/catch-dependency/archive/${_catch_cid}.tar.gz"
+        "openssl-${_openssl_cid}.tar.gz::https://github.com/corvusoft/openssl-dependency/archive/${_openssl_cid}.tar.gz"
+        "udp-discovery-cpp-${_udpdiscoverycpp_cid}.tar.gz::https://github.com/truvorskameikin/udp-discovery-cpp/archive/${_udpdiscoverycpp_cid}.tar.gz"
+        "fix_icon_path.patch")
+
+sha256sums=('c545b9249ac7dbfef72a2d636bc0f8b729c7ce05f21a54dd9284b2a387592d4a'
+            'e01389d3f0481458e14861ee33abc2f7aec3a382bd70e91dee495ac6e943d403'
+            'a4a47becc545c88724fa831617e628c66503d5ef7faf235c7c7237611230f59f'
+            'df455d92de685af7798c2e18811a5e86f95777e8c022ab9b13f3b2b3d134a16d'
+            'd5e94ef0fd5aa9168080cc3c086093443964b582292c91519d391db8ac4065b4'
+            'ec00c4da0d43769351ff94cef81b30afe0dd1932a80ded497a338b2f2364d232'
+            '724f55edb3aa5ae34abfcba341cdecf3d6f5095d1d7018de4e254ae5627c426f')
 
-source=("https://github.com/RetroShare/RetroShare/archive/v${pkgver}.tar.gz")
-sha256sums=('901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5')
 
 # Add missing dependencies if needed
-[[ "$_plugin_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv')
+[[ "$_plugin_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv3-opt')
 [[ "$_plugin_feedreader" == 'true' ]] && depends=(${depends[@]} 'curl' 'libxslt')
-[[ "$_jsonapi" == 'true' ]] && depends=(${depends[@]} 'restbed')
 [[ "$_clang" == 'true' ]] && makedepends=(${makedepends[@]} 'clang')
 [[ "$_autologin" == 'true' ]] && depends=(${depends[@]} 'libsecret')
-[[ "$_systems_rapidjson" == 'true' ]] && makedepends=(${makedepends[@]} 'rapidjson')
 
 # Set options for qmake
 _optJsonapi=''
@@ -62,31 +76,33 @@ _optWiki=''
 [[ "$_jsonapi" == 'true' ]] && _optJsonapi='CONFIG+=rs_jsonapi'
 [[ "$_clang" == 'true' ]] && _optClang='-spec linux-clang CONFIG+=c++11'
 [[ "$_autologin" == 'true' ]] && _optAutol='CONFIG+=rs_autologin'
-([[ "$_plugin_voip" == 'true' ]] || [[ "$_plugin_feedreader" == 'true' ]] || [[ "$_plugin_lua4rs" == 'true' ]]) && _optPlugin='CONFIG+=retroshare_plugins'
+[[ "$_nativ_dialogs" == 'true' ]] && _optNativDialogs='CONFIG*=rs_use_native_dialogs'
+([[ "$_plugin_voip" == 'true' ]] || [[ "$_plugin_feedreader" == 'true' ]]) && _optPlugin='CONFIG+=retroshare_plugins'
 [[ "$_wiki" == 'true' ]] && _optWiki='CONFIG+=wikipoos'
 
-# Handle unofficial plugins
-if [[ "$_plugin_lua4rs" == 'true' ]] ; then
-	depends=(${depends[@]} 'lua')
-        source=(${source[@]} 'Lua4RS::git+https://github.com/RetroShare/Lua4RS.git')
-        sha256sums=(${sha256sums[@]} 'SKIP')
-fi
 
 prepare() {
-	cd "${srcdir}/RetroShare-${pkgver}"
+	mv "${srcdir}"/{RetroShare,${pkgname}}-${pkgver}
+	cd "${srcdir}"/${pkgname}-${pkgver}
+
+	patch -p1 --ignore-whitespace -i "${srcdir}"/fix_icon_path.patch
 
 	[[ "$_plugin_voip" == 'true' ]] && sed -i -e 's/PKGCONFIG += opencv/PKGCONFIG += opencv3/g' plugins/VOIP/VOIP.pro || true
+
+	# manually clone dependencies (if anybody knows a better way to do this, let me know!)
+	cd supportlibs
+	rm -rf restbed
+	rm -rf udp-discovery-cpp
+	rm -rf "${srcdir}"/restbed-${_restbed_cid}/dependency/*
+	mv "${srcdir}"/restbed-${_restbed_cid}                   restbed
+	mv "${srcdir}"/asio-dependency-${_asio_cid}              restbed/dependency/asio
+	mv "${srcdir}"/catch-dependency-${_catch_cid}            restbed/dependency/catch
+	mv "${srcdir}"/openssl-dependency-${_openssl_cid}        restbed/dependency/kashmir
+	mv "${srcdir}"/udp-discovery-cpp-${_udpdiscoverycpp_cid} udp-discovery-cpp
 }
 
 build() {
-	cd "${srcdir}/RetroShare-${pkgver}"
-
-	# Handle unofficial plugins
-	if [[ "$_plugin_lua4rs" == 'true' ]] ; then
-		[[ -d 'plugins/Lua4RS' ]] &&  rm -r plugins//Lua4RS
-		cp -r -l "${srcdir}/Lua4RS" plugins/
-		sed -i -e 's/SUBDIRS += \\/SUBDIRS += \\\n\t\tLua4RS \\/g' plugins/plugins.pro
-	fi
+	cd "${srcdir}"/${pkgname}-${pkgver}
 
 	# remove unwanted plugins
 	[[ "$_plugin_voip" != 'true' ]] && sed -i '/VOIP \\/d' plugins/plugins.pro
@@ -95,15 +111,23 @@ build() {
 	qmake   CONFIG-=debug CONFIG+=release \
 		${_optJsonapi} ${_optAutol} ${_optClang} \
 		${_optPlugin} ${_optWiki} \
-		QMAKE_CFLAGS_RELEASE="${CFLAGS}"\
-		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"\
+		CONFIG+=no_libresapihttpserver \
+		QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
+		'RS_UPNP_LIB="miniupnpc"' \
+		'RS_MAJOR_VERSION=0' \
+		'RS_MINOR_VERSION=6' \
+		'RS_MINI_VERSION=6' \
+		'RS_EXTRA_VERSION=""' \
 		RetroShare.pro
-	# workaround
-	make || make
+
+	make || true
+	rmdir supportlibs/restbed/include || true
+	make
 }
 
 package() {
-	cd "${srcdir}/RetroShare-${pkgver}"
+	cd "${srcdir}"/${pkgname}-${pkgver}
 
 	make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/pcr/retroshare/fix_icon_path.patch b/pcr/retroshare/fix_icon_path.patch
new file mode 100644
index 000000000..29c173071
--- /dev/null
+++ b/pcr/retroshare/fix_icon_path.patch
@@ -0,0 +1,13 @@
+diff --git a/data/retroshare.desktop b/data/retroshare.desktop
+index efc73dd6b..fb18ce877 100644
+--- a/data/retroshare.desktop
++++ b/data/retroshare.desktop
+@@ -4,7 +4,7 @@ Version=1.0
+ Name=RetroShare
+ Comment=Securely communicate with your friends
+ Exec=/usr/bin/retroshare %U
+-Icon=/usr/share/pixmaps/retroshare.xpm
++Icon=retroshare.xpm
+ Terminal=false
+ Type=Application
+ Categories=Application;Network;P2P;Feed;Chat;InstantMessaging