summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugenio M. Vigo2016-06-17 09:14:45 +0200
committerEugenio M. Vigo2016-06-17 09:14:45 +0200
commitc16170c97b0929696bfd00b9c708edb547dc3751 (patch)
treea130e566cea0faefd7971fcb5a3834789541e795
parented94b17b58c410d1eec3c8d05993caddc12be6a4 (diff)
downloadaur-c16170c97b0929696bfd00b9c708edb547dc3751.tar.gz
Backported fix compile-time error with boost 1.60
-rw-r--r--.SRCINFO6
-rw-r--r--0001-fix-issue-14.patch26
-rw-r--r--PKGBUILD15
3 files changed, 41 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fd6eae70f97c..04ec7739a498 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Dec 26 16:17:30 UTC 2015
+# Fri Jun 17 07:13:33 UTC 2016
pkgbase = fair-coin
pkgdesc = FairCoin Qt official client
pkgver = 1.5.2
- pkgrel = 4
+ pkgrel = 5
url = https://fair-coin.org/
install = fair-coin.install
arch = i686
@@ -17,8 +17,10 @@ pkgbase = fair-coin
depends = protobuf
source = https://github.com/FairCoinTeam/fair-coin/archive/v1.5.2.tar.gz
source = fair-coin.desktop
+ source = 0001-fix-issue-14.patch
sha256sums = 72e512768f8307db5c2f1ae5513bf222835919268110db7361bab056ee44db5e
sha256sums = 7bf32cef879eb08682d92cd8ee35d68b8e295030d2873dc6a3a95cd37b88612c
+ sha256sums = 3742eb31eab4ab8a91ce975b03d56220638c4e926dea6f098e0a786407ec20c3
pkgname = fair-coin
diff --git a/0001-fix-issue-14.patch b/0001-fix-issue-14.patch
new file mode 100644
index 000000000000..83a0b95bcd97
--- /dev/null
+++ b/0001-fix-issue-14.patch
@@ -0,0 +1,26 @@
+From 761475dbe4c5cb8dcc2a99ee4f67271c4cb5c357 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20K=C3=B6nig?= <tom@fair-coin.org>
+Date: Wed, 25 May 2016 10:14:53 +0200
+Subject: [PATCH] fixed issue #14: compiler error with newer versions the boost
+ library
+
+---
+ src/net.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/net.cpp b/src/net.cpp
+index 77d4783..4f19e29 100644
+--- a/src/net.cpp
++++ b/src/net.cpp
+@@ -61,7 +61,7 @@ static bool vfLimited[NET_MAX] = {};
+ static CNode* pnodeLocalHost = NULL;
+ CAddress addrSeenByPeer(CService("0.0.0.0", 0), nLocalServices);
+ uint64 nLocalHostNonce = 0;
+-array<int, THREAD_MAX> vnThreadsRunning;
++boost::array<int, THREAD_MAX> vnThreadsRunning;
+ static std::vector<SOCKET> vhListenSocket;
+ CAddrMan addrman;
+
+--
+2.8.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 781b5d838b64..88af3c6ef154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=fair-coin
pkgver=1.5.2
-pkgrel=4
+pkgrel=5
pkgdesc="FairCoin Qt official client"
arch=(i686 x86_64)
url="https://fair-coin.org/"
@@ -11,10 +11,17 @@ license=('MIT')
depends=('qt4' 'boost-libs' 'qrencode' 'protobuf')
makedepends=('boost' 'imagemagick')
source=("https://github.com/FairCoinTeam/fair-coin/archive/v$pkgver.tar.gz"
- "$pkgname.desktop")
-install=("$pkgname.install")
+ "$pkgname.desktop"
+ "0001-fix-issue-14.patch")
+install="$pkgname.install"
sha256sums=("72e512768f8307db5c2f1ae5513bf222835919268110db7361bab056ee44db5e"
- "7bf32cef879eb08682d92cd8ee35d68b8e295030d2873dc6a3a95cd37b88612c")
+ "7bf32cef879eb08682d92cd8ee35d68b8e295030d2873dc6a3a95cd37b88612c"
+ "3742eb31eab4ab8a91ce975b03d56220638c4e926dea6f098e0a786407ec20c3")
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 < ../0001-fix-issue-14.patch
+}
build() {
cd $pkgname-$pkgver