summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsehraf2018-09-07 13:24:31 +0200
committersehraf2018-09-07 13:24:31 +0200
commit6c995c2cc2d54cd2eff6bfb9c0051763daf712f7 (patch)
treeff04db00cc832f063f3af68097ad2153219dc04a
parent5a321364263e56256ab176b669bfbe84369c4d6c (diff)
downloadaur-6c995c2cc2d54cd2eff6bfb9c0051763daf712f7.tar.gz
more backports
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
2 files changed, 10 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c3543803eb4..227b8cc3acf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Sep 7 10:53:08 UTC 2018
+# Fri Sep 7 11:24:11 UTC 2018
pkgbase = retroshare
pkgdesc = Serverless encrypted instant messenger with filesharing, chatgroups, e-mail.
pkgver = 0.6.4
- pkgrel = 2
+ pkgrel = 3
url = http://retroshare.sourceforge.net/
arch = i686
arch = x86_64
@@ -26,8 +26,10 @@ pkgbase = 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
pkgname = retroshare
diff --git a/PKGBUILD b/PKGBUILD
index c3752d696df..6df20284619 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@
pkgname=retroshare
pkgver=0.6.4
-pkgrel=2
+pkgrel=3
pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
url="http://retroshare.sourceforge.net/"
@@ -34,9 +34,11 @@ 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/4d287d68bc9725f403dc7d952a927d401c5d6c97.patch'
+ 'https://github.com/RetroShare/RetroShare/commit/428b331d8efede1e2f39f2fc49216c675d081030.patch')
sha256sums=('84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a'
- 'd5b775333a351068711dc12bb50d92fde4966fcaaf393039c324b46e2f03f986')
+ 'd5b775333a351068711dc12bb50d92fde4966fcaaf393039c324b46e2f03f986'
+ 'eb2586311e56f2cf3ce42eccc3b1647e4a06cba8042e867f379e7d4601ab5172')
# Add missing dependencies if needed
[[ "$_plugin_voip" == 'true' ]] && depends=(${depends[@]} 'ffmpeg' 'opencv')
@@ -61,6 +63,7 @@ fi
prepare() {
cd "${srcdir}/RetroShare-${pkgver}"
git apply ../4d287d68bc9725f403dc7d952a927d401c5d6c97.patch
+ git apply ../428b331d8efede1e2f39f2fc49216c675d081030.patch
}
build() {