summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsehraf2020-10-15 23:26:42 +0200
committersehraf2020-10-15 23:26:42 +0200
commit096c45f49535c0ca6c390753d7c5386c2848035d (patch)
tree5663a88c1caee3ee4b25eccde5d3421381cb4c77
parent3f15908d9a170ac35011c44a5d7734b6228c100d (diff)
downloadaur-096c45f49535c0ca6c390753d7c5386c2848035d.tar.gz
switch to miniupnp
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD10
2 files changed, 10 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 65e801194ceb..41f15a38e17d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = retroshare-git
pkgdesc = Serverless encrypted instant messenger with filesharing, chatgroups, e-mail.
- pkgver = v0.6.5.r1965.g5006ee139
+ pkgver = v0.6.6.RC1.r0.g4199b1a02
pkgrel = 1
url = http://retroshare.cc/
arch = i686
@@ -12,9 +12,12 @@ pkgbase = retroshare-git
license = LGPL
makedepends = git
makedepends = qt5-tools
+ makedepends = cmake
+ makedepends = doxygen
+ makedepends = rapidjson
depends = qt5-multimedia
depends = qt5-x11extras
- depends = libupnp
+ depends = miniupnpc
depends = libxss
depends = libmicrohttpd
depends = xapian-core
diff --git a/PKGBUILD b/PKGBUILD
index d6a2855b962f..a001fd1251e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
#_plugin_voip='true'
# Set this to 'true' to enable the new automatically generated jsaon api
-#_jsonapi='true'
+_jsonapi='true'
# Set this to 'true' to enable auto login
#_autologin='true'
@@ -31,13 +31,13 @@ _nativ_dialogs='true'
_pkgname=retroshare
pkgname=${_pkgname}-git
-pkgver=v0.6.5.r1965.g5006ee139
+pkgver=v0.6.6.RC1.r0.g4199b1a02
pkgrel=1
pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
url='http://retroshare.cc/'
license=('GPL' 'LGPL')
-depends=('qt5-multimedia' 'qt5-x11extras' 'libupnp' 'libxss' 'libmicrohttpd' 'xapian-core')
+depends=('qt5-multimedia' 'qt5-x11extras' 'miniupnpc' 'libxss' 'libmicrohttpd' 'xapian-core')
makedepends=('git' 'qt5-tools')
optdepends=('tor: tor hidden node support'
'i2p: i2p hidden node support')
@@ -55,7 +55,7 @@ _optSql=''
# Add missing dependencies if needed
[[ "$_plugin_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv')
[[ "$_plugin_feedreader" == 'true' ]] && depends=(${depends[@]} 'curl' 'libxslt')
-[[ "$_jsonapi" == 'true' ]] && depends=(${depends[@]} 'restbed') && makedepends=(${makedepends[@]} 'cmake' 'doxygen' 'rapidjson')
+[[ "$_jsonapi" == 'true' ]] && makedepends=(${makedepends[@]} 'cmake' 'doxygen' 'rapidjson')
[[ "$_clang" == 'true' ]] && makedepends=(${makedepends[@]} 'clang')
[[ "$_autologin" == 'true' ]] && depends=(${depends[@]} 'libsecret')
@@ -102,7 +102,7 @@ build() {
# rmdir supportlibs/restbed/include || true
# rmdir /tmp/makepkg/retroshare-git/src/retroshare/supportlibs/cmark/build/src && /tmp/makepkg/retroshare-git/src/retroshare/supportlibs/cmark/build || true
- qmake CONFIG-=debug CONFIG+=release 'RS_UPNP_LIB=none' \
+ qmake CONFIG-=debug CONFIG+=release 'RS_UPNP_LIB=miniupnpc'\
${_optSql} \
${_optJsonapi} ${_optAutol} ${_optClang} \
${_optNativDialogs} \