community/bitcoin: fix locales

* bitcoin now sets a C.UTF-8 environment which clashes with ours
  this patch reverts bitcoin to it's previous C environment

* fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/11620
This commit is contained in:
Stuart Cardall 2020-10-25 12:32:47 +00:00 committed by Leo
parent 5df407a7b4
commit add104d995
2 changed files with 17 additions and 3 deletions

View File

@ -2,11 +2,12 @@
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=bitcoin
pkgver=0.20.1
pkgrel=0
pkgrel=1
pkgdesc="Decentralized P2P electronic cash system"
url="https://www.bitcoin.org"
arch="all !armhf !x86" # x86: segfault in check
license="MIT"
options="!check" # temporarily disabled: https://github.com/bitcoin/bitcoin/issues/20236
makedepends="autoconf automake libtool boost-dev openssl-dev db-dev miniupnpc-dev
qt5-qtbase-dev qt5-qttools-dev protobuf-dev libqrencode-dev libevent-dev chrpath zeromq-dev"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-install"
@ -14,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-qt $pkgname-cli $pkgname-tx $pkgname-tests $p
$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v$pkgver.tar.gz
ssize_t.patch
use-c-locale.patch
$pkgname.initd
$pkgname.conf
"
@ -89,5 +91,6 @@ dev() {
sha512sums="ce5a06aa57475c7d8d94a60f2487ef9646406f7c96f68ab845f085121507455b495f9460a25d5ab2348d326117b25115b0f86015d939089829e68d6d7e0e2b13 bitcoin-0.20.1.tar.gz
98aa5ad81bdb4ae961b791bc978c39117cdf2d83c2181f92bebbb0db107d9b6e86eda265fb3f93ff8a5ca8a7754d7148818b98095d57201dff9363d60b97e7dd ssize_t.patch
71e5f3b5079a22b6ddecfad89363fc642d5ea7da18f1203057f626d214734467f4b933b839c269401be7af2c3dcc01afcb3b98198b7d580c56d8740b34451558 bitcoin.initd
a31210d8db76c5a9b614a6de756c1678c0344898565ac3e5d6a34ac1bed66aec4964f1dc874294bc978f53b0e961df921655f7309df19b66c90aa6bd40379a09 bitcoin.conf"
6f3098a8da217c465b3d8ed66fd4d15f0a64f1aa813a18d72d0fa97cb612682d33554d6b4e9fbfd5c8c06950531ac15514cbafeb91ac0887c30f1527c3a20b13 use-c-locale.patch
c88ca4f0c8a3179dbac274db1719983352caa5074b236e59d8fe31ab45ffa99bd90c1a566c4459261a9dcdcc990b826f3466c77aa7a32cf9fb15529a510ac7fd bitcoin.initd
726e7525d35b83f5f7548e050632e3d3c762cf6f924d6e347806caa103af4b36838263f7342a4127cd5bfb035d79254095ec63deb1d75975753a664e48f7cafd bitcoin.conf"

View File

@ -0,0 +1,11 @@
--- bitcoin-0.20.1/src/util/system.cpp
+++ bitcoin-0.20.1/src/util/system.cpp.new
@@ -1089,7 +1089,7 @@
try {
std::locale(""); // Raises a runtime error if current locale is invalid
} catch (const std::runtime_error&) {
- setenv("LC_ALL", "C.UTF-8", 1);
+ setenv("LC_ALL", "C", 1);
}
#elif defined(WIN32)
// Set the default input/output charset is utf-8