add option for auto login

2 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7b365e8724c..28be2fd981ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Oct  7 19:12:22 UTC 2016
+# Thu Dec 15 09:31:52 UTC 2016
 pkgbase = retroshare-git
 	pkgdesc = Serverless encrypted instant messenger with filesharing, chatgroups, e-mail.
-	pkgver = 0.6.1.r162.g7cd31aa
+	pkgver = 0.6.1.r426.g31b1583
 	pkgrel = 1
 	url = http://retroshare.sourceforge.net/
 	arch = i686
@@ -16,7 +16,6 @@ pkgbase = retroshare-git
 	depends = qt5-multimedia
 	depends = qt5-x11extras
 	depends = libupnp
-	depends = libgnome-keyring
 	depends = libxss
 	depends = libmicrohttpd
 	depends = sqlcipher
diff --git a/PKGBUILD b/PKGBUILD
index 156ee846eb85..e64530db3eff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,6 +5,9 @@
 _build_feedreader=true
 _build_voip=true
 
+# Set this to 'true' to enable auto login
+_autologin=
+
 # set this to 'true' to use clang for compiling (experimental)
 _clang=
 
@@ -12,13 +15,13 @@ _clang=
 
 _pkgname=retroshare
 pkgname=${_pkgname}-git
-pkgver=0.6.1.r162.g7cd31aa
+pkgver=0.6.1.r426.g31b1583
 pkgrel=1
 pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://retroshare.sourceforge.net/"
 license=('GPL' 'LGPL')
-depends=('qt5-multimedia' 'qt5-x11extras' 'libupnp' 'libgnome-keyring' 'libxss' 'libmicrohttpd' 'sqlcipher')
+depends=('qt5-multimedia' 'qt5-x11extras' 'libupnp' 'libxss' 'libmicrohttpd' 'sqlcipher')
 makedepends=('git' 'qt5-tools')
 optdepends=('tor: tor hidden node support'
             'i2p: i2p hidden node support')
@@ -32,10 +35,13 @@ sha256sums=('SKIP')
 [[ "$_build_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv')
 [[ "$_build_feedreader" == 'true' ]] && depends=(${depends[@]} 'curl' 'libxslt')
 [[ "$_clang" == 'true' ]] && makedepends=(${makedepends[@]} 'clang')
+[[ "$_autologin" == 'true' ]] && depends=(${depends[@]} 'libgnome-keyring')
 
 # Set options for qmake
-_options=''
-[[ "$_clang" == 'true' ]] && _options='-spec linux-clang CONFIG+=c++11'
+_optClang=''
+_optAutol=''
+[[ "$_clang" == 'true' ]] && _optClang='-spec linux-clang CONFIG+=c++11'
+[[ "$_autologin" == 'true' ]] && _optAutol='CONFIG+=rs_autologin'
 
 pkgver() {
 	cd "${srcdir}/${_pkgname}"
@@ -59,7 +65,7 @@ build() {
 	cd ../..
 
 	qmake   CONFIG-=debug CONFIG+=release \
-		${_options} \
+		${_optAutol} ${_optClang} \
 		QMAKE_CFLAGS_RELEASE="${CFLAGS}"\
 		QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}"\
 		RetroShare.pro