diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-02 17:36:40 +0100 |
commit | 171a011ad3a131671aeb5a98b9e3adf219ad2865 (patch) | |
tree | 0c877a3d1a37f10e37ad7168cfc52054aa0948a7 /net-p2p/bitcoin-qt | |
parent | 75fc75ae1f0481ffdb78450e801a9b443ba641bd (diff) |
gentoo resync : 02.04.2018
Diffstat (limited to 'net-p2p/bitcoin-qt')
-rw-r--r-- | net-p2p/bitcoin-qt/Manifest | 6 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild | 182 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch | 46 | ||||
-rw-r--r-- | net-p2p/bitcoin-qt/metadata.xml | 2 |
4 files changed, 234 insertions, 2 deletions
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index 7e76b1d9045a..68efead228ef 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/Manifest @@ -1,7 +1,11 @@ AUX 0.13.2-libressl.patch 1761 BLAKE2B 76aa634056d293f6e175c9c272cc46dc2d0dfb1c8400aecbf027cfe04a9f4b140bd6a5f31c593995abb5cb7c819a3c4e81bc677e2495009718813d63059dfa6d SHA512 88ef81df293bd05dce54aefeda2d0a2c1fd26842ddf26a138760aa365b22637d9d782d41d93967d0a81c6404fd133159d096397c77a2e1ac71787686dc384602 AUX bitcoin-qt-0.15.1-test-build-fix.patch 985 BLAKE2B 9e479dbd4bf8b518b9cf7b759edfb9a866cb8542d90d4bcbc72db99dd23eab695b0fec7c5e8eef617281d208d4c54c03bd3a2bb82ccc170b21f7e2cb73227f3e SHA512 ceb21e20b4356b6eab1c8ad927abef43878d77b27ce5cc83d86b9331c12d3d85c495a2bfc5269973ca0c573c11bd459a0e4fc99410216249e1c4b58be242776d AUX bitcoin-qt-0.15.1-test-util-fix.patch 532 BLAKE2B dca53c1f11da6862af7b04e03818b5d18e964278508b659467b21d128573a2a031033eefa68a77ba135fc53ae616e9203f39b9378086e957ccccff781ccd1660 SHA512 6895c05ac33da58db597b9fdf83bccade30fc2984893807789e70e23db3077ecc42360410290467d32f264bdcc0602409286ab24229a8adc93de143dc8e14a6f +AUX bitcoin-qt-0.16.0-fix_mempoolstats.patch 1672 BLAKE2B 252efa28461f2367044da6e2a46e2273857022da8a73af654ab6b7acd02fd90051290190d3c3de1ce283a930beac64cf15847f2cc8c2b79f3d3ace61b7181bc4 SHA512 b1143d45e8de2d4a1de572bca758b01889bd14140d475de1cdf8224cdb1962dd3c418e504879a0ba81abd5e4e673131646c72ff54e1cf5972d9cc1dafac52b7f DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890 +DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9 +DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c EBUILD bitcoin-qt-0.15.1.ebuild 7197 BLAKE2B 1aa41f45e03b1c567fda197271007a17f07c3600e6759a4a9dfa0be918ff6878d8b81582647316efbe15d386e6499ebdd54b161ce8afe97c81e10a4ea92ef757 SHA512 7d452b1526df5815d309987beaee84086d4091c198b0e31bc2c80f6a6baeab5a99aff4b4b366d3c06829c070f87683bcabbfb6c14a22d7f551c0b53cd8b5bc5d -MISC metadata.xml 1430 BLAKE2B 2dcd5526e33c3ec12074eac15982fc23a4d6fab345eadc44aa2b941066c92255d5e4005308da0f6973593528ec2198a32074d2bc95d941b5b97487054175cc2f SHA512 9f1bedd3494d9dd353efdacc9636316e589c1852a1c7f1266d4812b3e65790f66317ac62495d49ae47e28ca44d79df2d84c7421b2cb2ce8122bc1bcc1093d9a7 +EBUILD bitcoin-qt-0.16.0.ebuild 4987 BLAKE2B 356bc3619bcf546e37fdd2e12287455b9eb84fb1198413e13ecb72a02db25a739e8938acb4b4df6f79c07f3d507bfe96319fa0cb01278ef92564754b5885f59a SHA512 009ffb28925b791b6b330ab9c4d8bef8c2bbbc3c1453b12b1b1fe15c5c87235d9f8147d65741395861aea40d37d1959f9cf6a3561d6544ea0a6325932d7e5a27 +MISC metadata.xml 1485 BLAKE2B e372351807fa1375c29e2fe88cd15e9aa85111069c8876ae1d806bcd509692fc4d173c37c94a8e5bf63d9d1f25b0ddb8895b2cad4e957c4cb11cd29fe837b8c7 SHA512 ebdf31d2908f1828a57b3728a86b65b1818d7ccee0d2725b3f049fb624cc32d72db48b53ce5f99c98cce7926a3e5840eae375227a5ec6ec6719f7c12ae858c20 diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild new file mode 100644 index 000000000000..a0987233c6ff --- /dev/null +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.0.ebuild @@ -0,0 +1,182 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DB_VER="4.8" +inherit autotools bash-completion-r1 db-use gnome2-utils xdg-utils + +BITCOINCORE_COMMITHASH="4b4d7eb255ca8f9a94b92479e6061d129c91a991" +KNOTS_PV="${PV}.knots20180322" +KNOTS_P="bitcoin-${KNOTS_PV}" + +DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency" +HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" +SRC_URI=" + https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz + https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux" + +IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq" + +RDEPEND=" + >=dev-libs/boost-1.52.0:=[threads(+)] + >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] + dev-libs/univalue:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + virtual/bitcoin-leveldb + bip70? ( dev-libs/protobuf:= ) + dbus? ( + dev-qt/qtdbus:5 + ) + libevent? ( dev-libs/libevent:= ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + qrcode? ( + media-gfx/qrencode:= + ) + upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) + wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) + zeromq? ( net-libs/zeromq:= ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + knots? ( + gnome-base/librsvg + media-gfx/imagemagick[png] + ) +" + +DOCS=( doc/bips.md doc/files.md doc/release-notes.md ) + +S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" + +pkg_pretend() { + if use knots; then + elog "You are building ${PN} from Bitcoin Knots." + elog "For more information, see:" + elog "https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.desc.html" + else + elog "You are building ${PN} from Bitcoin Core." + elog "For more information, see:" + elog "https://bitcoincore.org/en/2017/11/11/release-${PV}/" + fi + if use bitcoin_policy_rbf; then + elog "Replace By Fee policy is enabled: Your node will preferentially mine and" + elog "relay transactions paying the highest fee, regardless of receive order." + else + elog "Replace By Fee policy is disabled: Your node will only accept the first" + elog "transaction seen consuming a conflicting input, regardless of fee" + elog "offered by later ones." + fi +} + +src_prepare() { + sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die + + local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" + + eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" + + if use knots; then + eapply "${knots_patchdir}/${KNOTS_P}.f.patch" + eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" + eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" + eapply "${FILESDIR}/${P}-fix_mempoolstats.patch" + fi + + eapply_user + + if ! use bitcoin_policy_rbf; then + sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die + fi + + echo '#!/bin/true' >share/genbuild.sh || die + mkdir -p src/obj || die + echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die + + sed -i 's/^\(Icon=\).*$/\1bitcoin-qt/;s/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die + + eautoreconf + rm -r src/leveldb src/secp256k1 || die +} + +src_configure() { + local my_econf=( + $(use_enable asm) + $(use_enable bip70) + $(use_with dbus qtdbus) + $(use_with libevent) + $(use_with qrcode qrencode) + $(use_with upnp miniupnpc) + $(use_enable upnp upnp-default) + $(use_enable test tests) + $(use_enable wallet) + $(use_enable zeromq zmq) + --with-gui=qt5 + --disable-util-cli + --disable-util-tx + --disable-bench + --without-libs + --without-daemon + --disable-ccache + --disable-static + --with-system-leveldb + --with-system-libsecp256k1 + --with-system-univalue + ) + econf "${my_econf[@]}" +} + +src_install() { + default + + rm -f "${ED%/}/usr/bin/test_bitcoin" || die + + insinto /usr/share/pixmaps + if use knots; then + newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico" + else + newins "share/pixmaps/bitcoin.ico" "${PN}.ico" + fi + insinto /usr/share/applications + newins "contrib/debian/bitcoin-qt.desktop" "org.bitcoin.bitcoin-qt.desktop" + + use libevent && dodoc doc/REST-interface.md doc/tor.md + + use zeromq && dodoc doc/zmq.md + + newbashcomp contrib/bitcoind.bash-completion ${PN} + + if use kde; then + insinto /usr/share/kservices5 + doins contrib/debian/bitcoin-qt.protocol + dosym "../../kservices5/bitcoin-qt.protocol" "/usr/share/kde4/services/bitcoin-qt.protocol" + fi +} + +update_caches() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + update_caches + + if use libevent; then + elog "To have ${PN} automatically use Tor when it's running, be sure your" + elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup" + elog "correctly, and add your user to the 'tor' user group." + fi +} + +pkg_postrm() { + update_caches +} diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch new file mode 100644 index 000000000000..95219c67982b --- /dev/null +++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.0-fix_mempoolstats.patch @@ -0,0 +1,46 @@ +From 450ac607a3568f8c991df1681155de6fa7f5a5cb Mon Sep 17 00:00:00 2001 +From: Luke Dashjr <luke-jr+git@utopios.org> +Date: Fri, 23 Mar 2018 20:30:11 +0000 +Subject: [PATCH] Bugfix: GUI/MempoolStats: Avoid dereferencing NULL + +--- + src/qt/mempoolstats.cpp | 12 ++++-------- + 1 file changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp +index ebc72e95d0..50a3ef71ab 100644 +--- a/src/qt/mempoolstats.cpp ++++ b/src/qt/mempoolstats.cpp +@@ -79,13 +79,9 @@ void MempoolStats::setClientModel(ClientModel *model) + + void MempoolStats::drawChart() + { +- if (!isVisible()) ++ if (!(isVisible() && clientModel)) + return; + +- const bool drawTxCount = cbShowNumTxns->isChecked(); +- const bool drawMinFee = cbShowMinFeerate->isChecked(); +- const bool drawDynMemUsage = cbShowMemUsage->isChecked(); +- + if (!titleItem) + { + // create labels (only once) +@@ -349,11 +345,11 @@ void MempoolStats::drawChart() + QPen linePenRed(QColor(188,49,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); + QPen linePenGreen(QColor(49,188,62, 250), 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin); + +- if (drawTxCount) ++ if (cbShowNumTxns->isChecked()) + redrawItems.append(scene->addPath(txCountPath, linePenRed)); +- if (drawMinFee) ++ if (cbShowMinFeerate->isChecked()) + redrawItems.append(scene->addPath(minFeePath, linePenGreen)); +- if (drawDynMemUsage) ++ if (cbShowMemUsage->isChecked()) + { + redrawItems.append(scene->addPath(dynMemUsagePath, linePenBlue)); + redrawItems.append(scene->addPath(dynMemUsagePathFill, QPen(Qt::NoPen), graBru)); +-- +2.16.1 + diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml index f92f879affd4..c3c11c51b20d 100644 --- a/net-p2p/bitcoin-qt/metadata.xml +++ b/net-p2p/bitcoin-qt/metadata.xml @@ -15,7 +15,7 @@ <flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag> <flag name="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag> <flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag> - <flag name="libevent">Use dev-libs/libevent</flag> + <flag name="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag> <flag name="qrcode">Enable generation of QR Codes for receiving payments</flag> <flag name="tor">Enable automatic configuration of a Tor hidden service</flag> <flag name="upnp">Enable Universal Plug and Play</flag> |