summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsehraf2019-01-30 19:15:28 +0100
committersehraf2019-01-30 19:15:28 +0100
commite49e5263ece82211143f23975517931644c6f22a (patch)
treefa61737424e01b51d9ded7d5afc9562bcd716fd9
parent1c595268c1703f25f548e2f3453a46df26e8a863 (diff)
downloadaur-e49e5263ece82211143f23975517931644c6f22a.tar.gz
v0.6.5
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD58
2 files changed, 36 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a8ec712fe5b..27a0edf1572 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Sep 8 07:40:17 UTC 2018
+# Wed Jan 30 18:14:58 UTC 2019
pkgbase = retroshare
pkgdesc = Serverless encrypted instant messenger with filesharing, chatgroups, e-mail.
- pkgver = 0.6.4
- pkgrel = 4
+ pkgver = 0.6.5
+ pkgrel = 1
url = http://retroshare.sourceforge.net/
arch = i686
arch = x86_64
@@ -23,12 +23,8 @@ pkgbase = retroshare
optdepends = i2p: i2p hidden node support
provides = retroshare
conflicts = retroshare
- source = https://github.com/RetroShare/RetroShare/archive/v0.6.4.tar.gz
- source = https://github.com/RetroShare/RetroShare/commit/4d287d68bc9725f403dc7d952a927d401c5d6c97.patch
- source = https://github.com/RetroShare/RetroShare/commit/428b331d8efede1e2f39f2fc49216c675d081030.patch
- sha256sums = 84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a
- sha256sums = d5b775333a351068711dc12bb50d92fde4966fcaaf393039c324b46e2f03f986
- sha256sums = eb2586311e56f2cf3ce42eccc3b1647e4a06cba8042e867f379e7d4601ab5172
+ source = https://github.com/RetroShare/RetroShare/archive/v0.6.5.tar.gz
+ sha256sums = 2181b406d3ed6c4ce71d9f9dea45c646d9f91cd7029575a5a14278eb94fe1054
pkgname = retroshare
diff --git a/PKGBUILD b/PKGBUILD
index 53338f3ac1f..79dd74abd46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,23 +5,32 @@
# Contributor: funkyou
# Set this to 'true' to build and install the plugins
-#_plugin_feedreader=true
-#_plugin_voip=true
+#_plugin_feedreader='true'
+#_plugin_voip='true'
+
+# Set this to 'true' to enable the new automatically generated jsaon api
+#_jsonapi='true'
# Set this to 'true' to enable auto login
#_autologin='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.4
-pkgrel=4
+pkgver=0.6.5
+pkgrel=1
pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
url="http://retroshare.sourceforge.net/"
@@ -33,37 +42,39 @@ optdepends=('tor: tor hidden node support'
provides=("${pkgname}")
conflicts=("${pkgname}")
-source=("https://github.com/RetroShare/RetroShare/archive/v${pkgver}.tar.gz"
- 'https://github.com/RetroShare/RetroShare/commit/4d287d68bc9725f403dc7d952a927d401c5d6c97.patch'
- 'https://github.com/RetroShare/RetroShare/commit/428b331d8efede1e2f39f2fc49216c675d081030.patch')
-sha256sums=('84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a'
- 'd5b775333a351068711dc12bb50d92fde4966fcaaf393039c324b46e2f03f986'
- 'eb2586311e56f2cf3ce42eccc3b1647e4a06cba8042e867f379e7d4601ab5172')
+source=("https://github.com/RetroShare/RetroShare/archive/v${pkgver}.tar.gz")
+sha256sums=('2181b406d3ed6c4ce71d9f9dea45c646d9f91cd7029575a5a14278eb94fe1054')
# Add missing dependencies if needed
[[ "$_plugin_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv')
[[ "$_plugin_feedreader" == 'true' ]] && depends=(${depends[@]} 'curl' 'libxslt')
+[[ "$_jsonapi" == 'true' ]] && depends=(${depends[@]} 'restbed')
[[ "$_clang" == 'true' ]] && makedepends=(${makedepends[@]} 'clang')
-[[ "$_autologin" == 'true' ]] && depends=(${depends[@]} 'libgnome-keyring')
+[[ "$_autologin" == 'true' ]] && depends=(${depends[@]} 'libsecret')
+[[ "$_systems_rapidjson" == 'true' ]] && makedepends=(${makedepends[@]} 'rapidjson')
# 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'
([[ "$_plugin_voip" == 'true' ]] || [[ "$_plugin_feedreader" == 'true' ]] || [[ "$_plugin_lua4rs" == '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')
+ source=(${source[@]} 'Lua4RS::git+https://github.com/RetroShare/Lua4RS.git')
fi
prepare() {
cd "${srcdir}/RetroShare-${pkgver}"
- patch -p1 -i "${srcdir}"/4d287d68bc9725f403dc7d952a927d401c5d6c97.patch
- patch -p1 -i "${srcdir}"/428b331d8efede1e2f39f2fc49216c675d081030.patch
+ #patch -p1 -i "${srcdir}"/4d287d68bc9725f403dc7d952a927d401c5d6c97.patch
+ #patch -p1 -i "${srcdir}"/428b331d8efede1e2f39f2fc49216c675d081030.patch
}
build() {
@@ -80,21 +91,14 @@ build() {
[[ "$_plugin_voip" != 'true' ]] && sed -i '/VOIP \\/d' plugins/plugins.pro
[[ "$_plugin_feedreader" != 'true' ]] && sed -i '/FeedReader/d' plugins/plugins.pro
- # call version scripts
- cd libretroshare/src
- LANG=C ./version_detail.sh
- cd ../..
-
- cd retroshare-gui/src
- LANG=C ./version_detail.sh
- cd ../..
-
qmake CONFIG-=debug CONFIG+=release \
- ${_optAutol} ${_optClang} ${_optPlugin} \
- QMAKE_CFLAGS_RELEASE="${CFLAGS}"\
- QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"\
+ ${_optJsonapi} ${_optAutol} ${_optClang} \
+ ${_optPlugin} ${_optWiki} \
+ QMAKE_CFLAGS_RELEASE="${CFLAGS}" \
+ QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
RetroShare.pro
- make
+ # workaround
+ make || make
}
package() {