summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-05-08 14:30:03 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-05-08 14:37:01 +0000
commit2f4ba4fefd39abc22bdaba325a01df38f8414ad4 (patch)
treea9cc6e8d93b3d58dac7cfdb97ed69686501e931d /testing
parentf0df41eacf24e7e7f2acf680eb0ad45c215430b7 (diff)
downloadaports-2f4ba4fefd39abc22bdaba325a01df38f8414ad4.tar.bz2
aports-2f4ba4fefd39abc22bdaba325a01df38f8414ad4.tar.xz
testing/bitcoin: do the locale trick with qt client as well
Diffstat (limited to 'testing')
-rw-r--r--testing/bitcoin/20-set-default-env.patch19
-rw-r--r--testing/bitcoin/APKBUILD8
2 files changed, 23 insertions, 4 deletions
diff --git a/testing/bitcoin/20-set-default-env.patch b/testing/bitcoin/20-set-default-env.patch
index a2e7833c1..b9717abbc 100644
--- a/testing/bitcoin/20-set-default-env.patch
+++ b/testing/bitcoin/20-set-default-env.patch
@@ -36,3 +36,22 @@
bool fRet = false;
// Connect bitcoind signal handlers
+--- ./src/qt/bitcoin.cpp.orig
++++ ./src/qt/bitcoin.cpp
+@@ -445,6 +445,16 @@
+ #ifndef BITCOIN_QT_TEST
+ int main(int argc, char *argv[])
+ {
++#ifndef WIN32
++ try
++ {
++ boost::filesystem::path::codecvt(); // Raises runtime error if current locale is invalid
++ } catch(std::runtime_error &e)
++ {
++ setenv("LC_ALL", "C", 1); // Force C locale
++ }
++#endif
++
+ /// 1. Parse command-line options. These take precedence over anything else.
+ // Command-line options take precedence:
+ ParseParameters(argc, argv);
diff --git a/testing/bitcoin/APKBUILD b/testing/bitcoin/APKBUILD
index 9b9d08bae..57a27525f 100644
--- a/testing/bitcoin/APKBUILD
+++ b/testing/bitcoin/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bitcoin
pkgver=0.9.1
-pkgrel=1
+pkgrel=2
pkgdesc="decentralized P2P electronic cash system"
url="http://www.bitcoin.org/"
arch="all"
@@ -63,10 +63,10 @@ cli() {
md5sums="7a9c14c09b04e3e37d703fbfe5c3b1e2 bitcoin-0.9.1.tar.gz
716a88e668729e89d3eb929da86f7f04 ssize_t.patch
-1803737cb8f5f95587323b0209bf9df4 20-set-default-env.patch"
+de733598adec12a7c0e8f2665a086f6d 20-set-default-env.patch"
sha256sums="bf5021a426b5e38a741a5294a0ceb22daa74cda11c6dc0478c4aa48c55fdccb3 bitcoin-0.9.1.tar.gz
f0a094c7b374338ad153ee06b7dd2369dad6b97b1f1bb0252da12c9aaace5321 ssize_t.patch
-b9d482ad6fbdaf843ba7b8a20b4fad2624ddaa5e1d1cc3c906a3da37c6e9cdf6 20-set-default-env.patch"
+d0763e09784cb09900be7e702e4bbadfc3230715d1f6afa6d70417ab64dde5ef 20-set-default-env.patch"
sha512sums="75be422fc263f209783fc66d9fd99027d67c7460c599a23badafcf5546ce7cb21206fce04c516a1c101aeff13542b332249b3b70a70c483aa82a5048dbdc9d92 bitcoin-0.9.1.tar.gz
98aa5ad81bdb4ae961b791bc978c39117cdf2d83c2181f92bebbb0db107d9b6e86eda265fb3f93ff8a5ca8a7754d7148818b98095d57201dff9363d60b97e7dd ssize_t.patch
-42f063926d0c527b74b643bc075af41a6530a295e470e95d6e5d0863a4d946a072b4e6925a96fc48591a038e03d77b30a88f0595da52b531aef3bfa72a2738be 20-set-default-env.patch"
+288934bea005cd6fdcf87525ce82fc0c031e0b86bba02c217c1e32536d3c51981ff187ee630f64787c6d7978d89802f8107b91fa8b2a86fbbb45cb79738e291b 20-set-default-env.patch"