merge PR to fix linking error re libsodium

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35ad39ef4332..2b99c316583e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Jul 27 00:32:32 UTC 2018
+# Sat Aug 11 21:53:41 UTC 2018
 pkgbase = monero-wallet-qt-git
 	pkgdesc = Official QT GUI wallet for Monero, a private, secure, untraceable peer-to-peer currency
 	pkgver = 0.12.3.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://getmonero.org/
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 8edef9c442ed..435aecaa261b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname='monero-wallet-qt-git'
 _monerover=0.12.3.0
 pkgver=0.12.3.0
-pkgrel=2
+pkgrel=3
 arch=('x86_64' 'i686')
 url="https://getmonero.org/"
 license=('custom:Cryptonote')
@@ -43,6 +43,8 @@ prepare() {
 
     echo "var GUI_VERSION = \"$pkgver\"" > version.js
     echo "var GUI_MONERO_VERSION = \"$_monerover\"" >> version.js
+
+    git pull --no-edit origin refs/pull/1540/head # libsodium linking error
 }
 
 build() {