0.6.7-RC2

5 files changed, 286 insertions, 192 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 942a7b868720..12d6d668d8d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,55 @@
 pkgbase = retroshare
 	pkgdesc = Serverless encrypted instant messenger with filesharing, chatgroups, e-mail.
-	pkgver = 0.6.6
-	pkgrel = 2
-	url = http://retroshare.cc/
+	pkgver = 0.6.7RC2
+	pkgrel = 1
+	url = https://github.com/retroshare/retroshare
 	arch = i686
 	arch = x86_64
 	arch = armv6h
 	arch = armv7h
 	arch = aarch64
 	license = AGPL3
+	makedepends = cmake
 	makedepends = git
 	makedepends = qt5-tools
 	makedepends = rapidjson
-	makedepends = cmake
+	depends = libxss
+	depends = miniupnpc
 	depends = qt5-multimedia
 	depends = qt5-x11extras
-	depends = miniupnpc
-	depends = libxss
 	depends = sqlcipher
 	optdepends = tor: tor hidden node support
 	optdepends = i2p: i2p hidden node support
 	optdepends = i2pd: i2p hidden node support
-	provides = retroshare
-	conflicts = retroshare
-	source = retroshare-0.6.6.tar.gz::https://github.com/retroshare/retroshare/archive/v0.6.6.tar.gz
-	source = restbed-c27c6726d28c42e2e1b7537ba63eeb23e944789d.tar.gz::https://github.com/corvusoft/restbed/archive/c27c6726d28c42e2e1b7537ba63eeb23e944789d.tar.gz
-	source = asio-22afb86087a77037cd296d27134756c9b0d2cb75.tar.gz::https://github.com/corvusoft/asio-dependency/archive/22afb86087a77037cd296d27134756c9b0d2cb75.tar.gz
-	source = catch-d10b9bd02e098476670f5eb0527d2c7281476e8a.tar.gz::https://github.com/corvusoft/catch-dependency/archive/d10b9bd02e098476670f5eb0527d2c7281476e8a.tar.gz
-	source = openssl-894da2fb7ed5d314ee5c2fc9fd2d9b8b74111596.tar.gz::https://github.com/corvusoft/openssl-dependency/archive/894da2fb7ed5d314ee5c2fc9fd2d9b8b74111596.tar.gz
-	source = udp-discovery-cpp-f3a3103a6c52e5707629e8d0a7e279a7758fe845.tar.gz::https://github.com/truvorskameikin/udp-discovery-cpp/archive/f3a3103a6c52e5707629e8d0a7e279a7758fe845.tar.gz
-	source = fix_icon_path.patch
-	source = fix_create_directories.patch
-	sha256sums = c545b9249ac7dbfef72a2d636bc0f8b729c7ce05f21a54dd9284b2a387592d4a
-	sha256sums = e01389d3f0481458e14861ee33abc2f7aec3a382bd70e91dee495ac6e943d403
-	sha256sums = a4a47becc545c88724fa831617e628c66503d5ef7faf235c7c7237611230f59f
-	sha256sums = df455d92de685af7798c2e18811a5e86f95777e8c022ab9b13f3b2b3d134a16d
-	sha256sums = d5e94ef0fd5aa9168080cc3c086093443964b582292c91519d391db8ac4065b4
-	sha256sums = ec00c4da0d43769351ff94cef81b30afe0dd1932a80ded497a338b2f2364d232
-	sha256sums = 724f55edb3aa5ae34abfcba341cdecf3d6f5095d1d7018de4e254ae5627c426f
-	sha256sums = 1019d25aa0f6d467fcd1e67c15acb5e11a44f97b328385b750b061decdcdf6a3
+	source = retroshare::git+https://github.com/retroshare/retroshare.git#tag=v0.6.7-RC2
+	source = cmark::git+https://github.com/commonmark/cmark.git
+	source = libsam3::git+https://github.com/i2p/libsam3.git
+	source = rapidjson::git+https://github.com/Tencent/rapidjson.git
+	source = restbed::git+https://github.com/Corvusoft/restbed.git
+	source = retroshare-OBS::git+https://github.com/RetroShare/OBS.git
+	source = retroshare-jni.hpp::git+https://github.com/RetroShare/jni.hpp.git
+	source = udp-discovery-cpp::git+https://github.com/truvorskameikin/udp-discovery-cpp.git
+	source = libbitdht::git+https://github.com/RetroShare/BitDHT.git
+	source = libretroshare::git+https://github.com/RetroShare/libretroshare.git
+	source = openpgpsdk::git+https://github.com/RetroShare/OpenPGP-SDK.git
+	source = gtest::git+https://github.com/google/googletest.git
+	source = catch::git+https://github.com/corvusoft/catch-dependency.git
+	source = asio::git+https://github.com/corvusoft/asio-dependency.git
+	source = openssl::git+https://github.com/corvusoft/openssl-dependency.git
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = retroshare
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index b725a9c2874d..85bbdd039647 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,136 +1,269 @@
-# Maintainer: sehraf
+# Maintainer:
+# Contributor: 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'
-#_plugin_voip='true' # currently broken!!!
+## default options
+# whether to build and install plugins
+: ${_plugin_feedreader:=false}
+: ${_plugin_voip:=false} # currently broken
 
-# Set this to 'true' to enable the new automatically generated jsaon api
-#_jsonapi='true'
+# whether to enable automatically generated json api
+: ${_jsonapi:=false}
 
-# Set this to 'true' to enable auto login
-#_autologin='true'
+# whether to enable auto login
+: ${_autologin:=false}
 
-# Set this to 'false' to disable nativ (system) dialogs
-_nativ_dialogs='true'
+# whether to enable native (system) dialogs
+: ${_nativ_dialogs:=true}
 
-# Set this to 'true' to enable wiki functionality (experimental)
-#_wiki='true'
+# whether to enable wiki functionality (experimental)
+: ${_wiki:=false}
 
-# set this to 'true' to use clang for compiling (experimental)
-#_clang='true'
+# whether to compile with clang (experimental)
+: ${_clang:=false}
 
-### Nothing to be changed below this line ###
 
-pkgname=retroshare
-pkgver=0.6.6
-pkgrel=2
+## basic info
+_pkgname="retroshare"
+pkgname="$_pkgname"
+pkgver=0.6.7RC2
+pkgrel=1
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
-arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
-url='http://retroshare.cc/'
+#url="http://retroshare.cc/"
+url="https://github.com/retroshare/retroshare"
 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'
-            'i2pd: i2p hidden node support')
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-
-_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"
-        "fix_create_directories.patch")
-
-sha256sums=('c545b9249ac7dbfef72a2d636bc0f8b729c7ce05f21a54dd9284b2a387592d4a'
-            'e01389d3f0481458e14861ee33abc2f7aec3a382bd70e91dee495ac6e943d403'
-            'a4a47becc545c88724fa831617e628c66503d5ef7faf235c7c7237611230f59f'
-            'df455d92de685af7798c2e18811a5e86f95777e8c022ab9b13f3b2b3d134a16d'
-            'd5e94ef0fd5aa9168080cc3c086093443964b582292c91519d391db8ac4065b4'
-            'ec00c4da0d43769351ff94cef81b30afe0dd1932a80ded497a338b2f2364d232'
-            '724f55edb3aa5ae34abfcba341cdecf3d6f5095d1d7018de4e254ae5627c426f'
-            '1019d25aa0f6d467fcd1e67c15acb5e11a44f97b328385b750b061decdcdf6a3')
-
-# Add missing dependencies if needed
-[[ "$_plugin_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv3-opt')
-[[ "$_plugin_feedreader" == 'true' ]] && depends=(${depends[@]} 'curl' 'libxslt')
-[[ "$_jsonapi" == 'true' ]] && makedepends=(${makedepends[@]} 'doxygen')
-[[ "$_clang" == 'true' ]] && makedepends=(${makedepends[@]} 'clang')
-[[ "$_autologin" == 'true' ]] && depends=(${depends[@]} 'libsecret')
-
-# Set options for qmake
-_optJsonapi=''
-_optClang=''
-_optAutol=''
-_optPlugin=''
-_optWiki=''
-[[ "$_jsonapi" == 'true' ]] && _optJsonapi='CONFIG+=rs_jsonapi'
-[[ "$_clang" == 'true' ]] && _optClang='-spec linux-clang CONFIG+=c++11'
-[[ "$_autologin" == 'true' ]] && _optAutol='CONFIG+=rs_autologin'
-[[ "$_nativ_dialogs" == 'true' ]] && _optNativDialogs='CONFIG*=rs_use_native_dialogs'
-([[ "$_plugin_voip" == 'true' ]] || [[ "$_plugin_feedreader" == 'true' ]]) && _optPlugin='CONFIG+=retroshare_plugins'
-[[ "$_wiki" == 'true' ]] && _optWiki='CONFIG+=wikipoos'
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
+
+depends=(
+  'libxss'
+  'miniupnpc'
+  'qt5-multimedia'
+  'qt5-x11extras'
+  'sqlcipher'
+)
+makedepends=(
+  'cmake'
+  'git'
+  'qt5-tools'
+  'rapidjson'
+)
+optdepends=(
+  'tor: tor hidden node support'
+  'i2p: i2p hidden node support'
+  'i2pd: i2p hidden node support'
+)
+
+# Add extra dependencies
+if [[ "${_plugin_voip::1}" =~ 't|y|1' ]] ; then
+  depends+=('ffmpeg' 'opencv3-opt')
+fi
+
+if [[ "${_plugin_feedreader::1}" =~ 't|y|1' ]] ; then
+  depends+=('curl' 'libxslt')
+fi
+
+if [[ "${_jsonapi::1}" =~ 't|y|1' ]] ; then
+  makedepends+=('doxygen')
+fi
+
+if [[ "${_clang::1}" =~ 't|y|1' ]] ; then
+  makedepends+=('clang')
+fi
+
+if [[ "${_autologin::1}" =~ 't|y|1' ]] ; then
+  depends+=('libsecret')
+fi
+
+# package type
+if [ x"$pkgname" == x"$_pkgname" ] ; then
+  # normal package
+  _pkgver="${pkgver%%.r*}"
+  _pkgsrc="$_pkgname"
+  source=("$_pkgsrc"::"git+$url.git#tag=v${_pkgver/RC/-RC}")
+  sha256sums=('SKIP')
+
+  pkgver() {
+    echo ${_pkgver:?}
+  }
+else
+  # git package
+  provides=("$_pkgname")
+  conflicts=("$_pkgname")
+
+  _pkgsrc="$_pkgname"
+  _pkgsrc="$_pkgname"
+  source=("$_pkgsrc"::"git+$url.git")
+  sha256sums=('SKIP')
+
+  pkgver() {
+    cd "$_pkgsrc"
+    git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+  }
+fi
+
+source+=(
+  # submodules for retroshare
+  'cmark'::'git+https://github.com/commonmark/cmark.git'
+  'libsam3'::'git+https://github.com/i2p/libsam3.git'
+  'rapidjson'::'git+https://github.com/Tencent/rapidjson.git'
+  'restbed'::'git+https://github.com/Corvusoft/restbed.git'
+  'retroshare-OBS'::'git+https://github.com/RetroShare/OBS.git'
+  'retroshare-jni.hpp'::'git+https://github.com/RetroShare/jni.hpp.git'
+  'udp-discovery-cpp'::'git+https://github.com/truvorskameikin/udp-discovery-cpp.git'
+
+  'libbitdht'::'git+https://github.com/RetroShare/BitDHT.git'
+  'libretroshare'::'git+https://github.com/RetroShare/libretroshare.git'
+  'openpgpsdk'::'git+https://github.com/RetroShare/OpenPGP-SDK.git'
+
+  # submodules for rapidjson
+  'gtest'::'git+https://github.com/google/googletest.git'
+
+  # submodules for restbed
+  'catch'::'git+https://github.com/corvusoft/catch-dependency.git'
+  'asio'::'git+https://github.com/corvusoft/asio-dependency.git'
+  'openssl'::'git+https://github.com/corvusoft/openssl-dependency.git'
+)
+
+sha256sums+=(
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
+
+  'SKIP'
+  'SKIP'
+  'SKIP'
+
+  'SKIP'
+
+  'SKIP'
+  'SKIP'
+  'SKIP'
+)
 
 prepare() {
-	mv "${srcdir}"/{RetroShare,${pkgname}}-${pkgver}
-	cd "${srcdir}"/${pkgname}-${pkgver}
-
-	patch -p1 --ignore-whitespace -i "${srcdir}"/fix_icon_path.patch
-        patch -p1 --ignore-whitespace -i "${srcdir}"/fix_create_directories.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
+  cd "$_pkgsrc"
+  (
+    # submodules for retroshare
+    local -A _submodules=(
+      ['cmark']='supportlibs/cmark'
+      ['libsam3']='supportlibs/libsam3'
+      ['rapidjson']='supportlibs/rapidjson'
+      ['restbed']='supportlibs/restbed'
+      ['retroshare-OBS']='build_scripts/OBS'
+      ['retroshare-jni.hpp']='supportlibs/jni.hpp'
+      ['udp-discovery-cpp']='supportlibs/udp-discovery-cpp'
+
+      ['libbitdht']='libbitdht'
+      ['libretroshare']='libretroshare'
+      ['openpgpsdk']='openpgpsdk'
+    )
+     for key in ${!_submodules[@]} ; do
+      git submodule init "${_submodules[${key}]}"
+      git submodule set-url "${_submodules[${key}]}" "${srcdir}/${key}"
+      git -c protocol.file.allow=always submodule update "${_submodules[${key}]}"
+    done
+  )
+  (
+    # submodules for rapidjson
+    cd "supportlibs/rapidjson"
+    local -A _submodules=(
+      ['gtest']='thirdparty/gtest'
+    )
+     for key in ${!_submodules[@]} ; do
+      git submodule init "${_submodules[${key}]}"
+      git submodule set-url "${_submodules[${key}]}" "${srcdir}/${key}"
+      git -c protocol.file.allow=always submodule update "${_submodules[${key}]}"
+    done
+  )
+  (
+    # submodules for restbed
+    cd "supportlibs/restbed"
+    local -A _submodules=(
+      ['catch']='dependency/catch'
+      ['asio']='dependency/asio'
+      ['openssl']='dependency/openssl'
+    )
+     for key in ${!_submodules[@]} ; do
+      git submodule init "${_submodules[${key}]}"
+      git submodule set-url "${_submodules[${key}]}" "${srcdir}/${key}"
+      git -c protocol.file.allow=always submodule update "${_submodules[${key}]}"
+    done
+  )
 }
 
 build() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-
-	# remove unwanted plugins
-	[[ "$_plugin_voip" != 'true' ]] && sed -i '/VOIP \\/d' plugins/plugins.pro
-	[[ "$_plugin_feedreader" != 'true' ]] && sed -i '/FeedReader/d' plugins/plugins.pro
-
-	qmake   CONFIG-=debug CONFIG+=release \
-		${_optJsonapi} ${_optAutol} ${_optClang} \
-		${_optPlugin} ${_optWiki} \
-		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
-
-	make || true
-	rmdir supportlibs/restbed/include || true
-	make
+  cd "$_pkgsrc"
+
+  # remove unwanted plugins
+  [[ "$_plugin_voip" != 'true' ]] && sed -i '/VOIP \\/d' plugins/plugins.pro
+  [[ "$_plugin_feedreader" != 'true' ]] && sed -i '/FeedReader/d' plugins/plugins.pro
+
+
+  local _qmake_options=(
+    CONFIG-=debug
+    CONFIG+=release
+  )
+
+  if [[ "${_jsonapi::1}" =~ 't|y|1' ]] ; then
+    _qmake_options+=(
+      CONFIG+=rs_jsonapi
+    )
+  fi
+
+  if [[ "${_clang::1}" =~ 't|y|1' ]] ; then
+    _qmake_options+=(
+      -spec linux-clang
+      CONFIG+=c++11
+    )
+  fi
+
+  if [[ "${_autologin::1}" =~ 't|y|1' ]] ; then
+    _qmake_options+=(
+      CONFIG+=rs_autologin
+    )
+  fi
+
+  if [[ "${_nativ_dialogs::1}" =~ 't|y|1' ]] ; then
+    _qmake_options+=(
+      CONFIG+=rs_use_native_dialogs
+    )
+  fi
+
+  if [[ "${_plugin_voip::1}" =~ 't|y|1' ]] || [[ "${_plugin_feedreader::1}" =~ 't|y|1' ]] ; then
+    _qmake_options+=(
+      CONFIG+=retroshare_plugins
+    )
+  fi
+
+  if [[ "${_wiki::1}" =~ 't|y|1' ]] ; then
+    _qmake_options+=(
+      CONFIG+=wikipoos
+    )
+  fi
+
+  qmake_options+=(
+    RS_UPNP_LIB="miniupnpc"
+    CONFIG+=no_rs_friendserver
+    QMAKE_CFLAGS_RELEASE="${CFLAGS}"
+    QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"
+    RetroShare.pro
+  )
+
+  qmake "${_qmake_options[@]}"
+
+  make || true
+  rmdir supportlibs/restbed/include || true
+  make
 }
 
 package() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-
-	make INSTALL_ROOT="${pkgdir}" install
+  cd "$_pkgsrc"
+  make INSTALL_ROOT="${pkgdir:?}" install
 }
diff --git a/fix_create_directories.patch b/fix_create_directories.patch
deleted file mode 100644
index f57885d8842b..000000000000
--- a/fix_create_directories.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc
-index 8556b8198..0277762d8 100644
---- a/libretroshare/src/util/rsdir.cc
-+++ b/libretroshare/src/util/rsdir.cc
-@@ -528,7 +528,7 @@ bool RsDirUtil::checkCreateDirectory(const std::string& dir)
- 	return true;
- }
- 
--#if __cplusplus < 201703L
-+//#if __cplusplus < 201703L
- bool std::filesystem::create_directories(const std::string& path)
- {
- 	for( std::string::size_type lastIndex = 0; lastIndex < std::string::npos;
-@@ -544,7 +544,7 @@ bool std::filesystem::create_directories(const std::string& path)
- 	}
- 	return true;
- }
--#endif // __cplusplus < 201703L
-+//#endif // __cplusplus < 201703L
- 
- std::string RsDirUtil::removeSymLinks(const std::string& path)
- {
-diff --git a/libretroshare/src/util/rsdir.h b/libretroshare/src/util/rsdir.h
-index 50e636541..af8e59509 100644
---- a/libretroshare/src/util/rsdir.h
-+++ b/libretroshare/src/util/rsdir.h
-@@ -153,7 +153,7 @@ std::string makePath(const std::string &path1, const std::string &path2);
- RS_SET_CONTEXT_DEBUG_LEVEL(1);
- }
- 
--#if __cplusplus < 201703L
-+//#if __cplusplus < 201703L
- namespace std
- {
- namespace filesystem
-@@ -161,4 +161,4 @@ namespace filesystem
- bool create_directories(const std::string& path);
- }
- }
--#endif // __cplusplus < 201703L
-+//#endif // __cplusplus < 201703L
diff --git a/fix_icon_path.patch b/fix_icon_path.patch
deleted file mode 100644
index 29c173071357..000000000000
--- a/fix_icon_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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