[packages/primecoin-hp] - updated to 0.1.2-hp14 - fixed building with boost 1.58
baggins
baggins at pld-linux.org
Sat Jun 27 10:37:39 CEST 2015
commit 643028935d108fc7f24f1acbe3d6234616a264a1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jun 27 10:37:04 2015 +0200
- updated to 0.1.2-hp14
- fixed building with boost 1.58
boost-1.58.patch | 11 +++++++++++
build-i486.patch | 22 +++++++++++-----------
primecoin-hp.spec | 8 +++++---
3 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/primecoin-hp.spec b/primecoin-hp.spec
index 3a36b9d..a46c150 100644
--- a/primecoin-hp.spec
+++ b/primecoin-hp.spec
@@ -1,14 +1,15 @@
%define ver 0.1.2
-%define subver hp11
+%define subver hp14
Summary: Primecoin - First Scientific Computing Cryptocurrency
Name: primecoin-hp
Version: %{ver}.%{subver}
-Release: 5
+Release: 1
License: MIT/X11
Group: X11/Applications
Source0: http://downloads.sourceforge.net/primecoin-hp/%{ver}-%{subver}/primecoin-%{ver}-%{subver}.tar.bz2
-# Source0-md5: 7d17123d62fe4ef6205da4775e5a3228
+# Source0-md5: 90115f413a3244aaf6271b1c83c0ddae
Patch0: build-i486.patch
+Patch1: boost-1.58.patch
URL: http://primecoin.org
BuildRequires: QtCore-devel
BuildRequires: QtDBus-devel
@@ -35,6 +36,7 @@ Qt-based Primecoin Wallet.
%prep
%setup -q -n primecoin-%{ver}-%{subver}
%patch0 -p1
+%patch1 -p1
%build
qmake-qt4 \
diff --git a/boost-1.58.patch b/boost-1.58.patch
new file mode 100644
index 0000000..b42b428
--- /dev/null
+++ b/boost-1.58.patch
@@ -0,0 +1,11 @@
+--- primecoin-0.1.2-hp14/src/rpcrawtransaction.cpp~ 2014-04-26 17:02:25.000000000 +0200
++++ primecoin-0.1.2-hp14/src/rpcrawtransaction.cpp 2015-06-27 10:29:55.461778255 +0200
+@@ -238,7 +238,7 @@
+ CTxDestination address;
+ if (ExtractDestination(pk, address))
+ {
+- const CScriptID& hash = boost::get<const CScriptID&>(address);
++ const CScriptID& hash = boost::get<CScriptID>(address);
+ CScript redeemScript;
+ if (pwalletMain->GetCScript(hash, redeemScript))
+ entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));
diff --git a/build-i486.patch b/build-i486.patch
index 172e8f0..8a585bd 100644
--- a/build-i486.patch
+++ b/build-i486.patch
@@ -1,11 +1,11 @@
---- primecoin-20131127/src/main.cpp~ 2013-11-27 13:35:16.000000000 +0100
-+++ primecoin-20131127/src/main.cpp 2013-12-04 14:58:01.574592313 +0100
-@@ -4756,7 +4756,7 @@
- }
- else
- {
--#ifdef __GNUC__
-+#if defined __GNUC__ && ! defined __i486__
- // Use atomic increment
- __sync_add_and_fetch(&nPrimeCounter, nPrimesHit);
- __sync_add_and_fetch(&nTestCounter, nTests);
+--- primecoin-0.1.2-hp14/src/prime.h~ 2014-04-26 17:02:25.000000000 +0200
++++ primecoin-0.1.2-hp14/src/prime.h 2015-06-27 10:33:03.301061751 +0200
+@@ -165,7 +165,7 @@
+ * __builtin_popcountl and
+ * __sync_add_and_fetch
+ */
+-#if defined(__GNUC__) || defined(__clang__)
++#if (defined(__GNUC__) && ! defined(__i486__)) || defined(__clang__)
+ # define USE_GCC_BUILTINS
+ #endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/primecoin-hp.git/commitdiff/643028935d108fc7f24f1acbe3d6234616a264a1
More information about the pld-cvs-commit
mailing list