From 4f1f8496f8d5bf46417efdf09b1e156250ec0573 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sun, 25 Mar 2018 12:00:43 +0200 Subject: [PATCH] monero: update to 0.12.0.0. Closes: #12903 [via git-merge-pr] --- srcpkgs/monero/patches/easylogging.patch | 12 +++++------ srcpkgs/monero/template | 26 ++++++++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/srcpkgs/monero/patches/easylogging.patch b/srcpkgs/monero/patches/easylogging.patch index 633708d5668..f3ecb999a67 100644 --- a/srcpkgs/monero/patches/easylogging.patch +++ b/srcpkgs/monero/patches/easylogging.patch @@ -1,11 +1,11 @@ ---- external/easylogging++/easylogging++.h -+++ external/easylogging++/easylogging++.h -@@ -195,7 +195,7 @@ +--- external/easylogging++/easylogging++.h 2018-03-25 11:13:30.152606274 +0200 ++++ external/easylogging++/easylogging++.h 2018-03-25 11:14:51.038363937 +0200 +@@ -200,7 +200,7 @@ # define ELPP_INTERNAL_INFO(lvl, msg) #endif // (defined(ELPP_DEBUG_INFO)) #if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG)) --# if (ELPP_COMPILER_GCC && !ELPP_MINGW) -+# if (__has_include() && ELPP_COMPILER_GCC && !ELPP_MINGW) +-# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) ++# if (__has_include() && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD) # define ELPP_STACKTRACE 1 # else - # define ELPP_STACKTRACE 0 + # define ELPP_STACKTRACE 0 diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 704ed727bb7..d39cf1594a0 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -1,13 +1,14 @@ # Template file for 'monero' pkgname=monero -version=0.11.1.0 -revision=3 +version=0.12.0.0 +revision=1 conf_files="/etc/monerod.conf" build_style=cmake -hostmakedepends="pkg-config" +hostmakedepends="pkg-config git qt5-host-tools" configure_args="-DBUILD_GUI_DEPS=ON -DHAVE_LIBRESSL=1" makedepends="libressl-devel boost-devel libldns-devel libunwind-devel - readline-devel unbound-devel miniupnpc-devel libldns-devel expat-devel" + readline-devel unbound-devel miniupnpc-devel libldns-devel expat-devel + cppzmq czmq-devel" system_accounts="monero" make_dirs=" /var/lib/monero 0750 monero monero @@ -17,7 +18,7 @@ maintainer="Helmut Pozimski " license="3-clause-BSD" homepage="https://getmonero.org" distfiles="https://github.com/monero-project/monero/archive/v${version}.tar.gz" -checksum=b5b48d3e5317c599e1499278580e9a6ba3afc3536f4064fcf7b20840066a509b +checksum=5e8303900a39e296c4ebaa41d957ab9ee04e915704e1049f82a9cbd4eedc8ffb if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=OFF" @@ -28,14 +29,17 @@ case "$XBPS_TARGET_MACHINE" in ;; armv6*) configure_args+=" -DARCH=armv6" makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" ;; armv5*) configure_args+=" -DARCH=armv5" makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" ;; aarch64*) configure_args+=" -DARCH=aarch64" ;; mips*) configure_args+=" -DARCH=mipsr32 -DNO_AES=ON" makedepends+=" libatomic-devel" + CFLAGS+=" -latomic" ;; *) configure_args+=" -DARCH=default" ;; @@ -44,11 +48,21 @@ esac pre_configure() { case "$XBPS_TARGET_MACHINE" in armv[56]*|mips*) sed -i CMakeLists.txt \ - -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)' + -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)' ;; esac } +pre_build() { + if [ -n "$CROSS_BUILD" ]; then + # The generate_translations_header binary is executed during the build + # but is not included in the binary package. It thus needs to be + # built for the host + CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \ + make -C build ${makejobs} generate_translations_header + fi +} + post_install() { vlicense LICENSE vbin build/bin/monero-blockchain-import