* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/
@ 2017-01-05 14:12 Anthony G. Basile
0 siblings, 0 replies; 6+ messages in thread
From: Anthony G. Basile @ 2017-01-05 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 31ab6249b3a35002038c6c7f0a4e33cf482aff88
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Wed Jan 4 18:37:51 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 14:07:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ab6249
net-p2p/bitcoin-qt: Backport LibreSSL fix for 0.13.2
net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild | 2 ++
net-p2p/bitcoin-qt/files/0.13.2-libressl.patch | 48 ++++++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild
index 30cc24a..45b5c94 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.13.2.ebuild
@@ -79,6 +79,8 @@ src_prepare() {
sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die
einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang"
+ epatch "${FILESDIR}/0.13.2-libressl.patch"
+
bitcoincore_autoreconf
}
diff --git a/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch b/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch
new file mode 100644
index 00000000..415adcc
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/0.13.2-libressl.patch
@@ -0,0 +1,48 @@
+commit 0388afe69dd85ca9549727ee105ba7017169b464 (HEAD -> EVP_MD_CTX_new, personal-github/EVP_MD_CTX_new)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Wed Jan 4 17:07:42 2017 +0000
+
+ Let autoconf detect presence of EVP_MD_CTX_new
+
+ Fixes LibreSSL compatibility
+
+diff --git a/configure.ac b/configure.ac
+index ced258e..02af0d6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -832,6 +832,13 @@ else
+ fi
+ fi
+
++save_CXXFLAGS="${CXXFLAGS}"
++CXXFLAGS="${CXXFLAGS} ${CRYPTO_CFLAGS} ${SSL_CFLAGS}"
++AC_CHECK_DECLS([EVP_MD_CTX_new],,,[AC_INCLUDES_DEFAULT
++#include <openssl/x509_vfy.h>
++])
++CXXFLAGS="${save_CXXFLAGS}"
++
+ dnl univalue check
+
+ need_bundled_univalue=yes
+diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
+index 82be4d8..0d4907b 100644
+--- a/src/qt/paymentrequestplus.cpp
++++ b/src/qt/paymentrequestplus.cpp
+@@ -159,7 +159,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
+ std::string data_to_verify; // Everything but the signature
+ rcopy.SerializeToString(&data_to_verify);
+
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if HAVE_DECL_EVP_MD_CTX_NEW
+ EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+ if (!ctx) throw SSLVerifyError("Error allocating OpenSSL context.");
+ #else
+@@ -174,7 +174,7 @@ bool PaymentRequestPlus::getMerchant(X509_STORE* certStore, QString& merchant) c
+ !EVP_VerifyFinal(ctx, (const unsigned char*)paymentRequest.signature().data(), (unsigned int)paymentRequest.signature().size(), pubkey)) {
+ throw SSLVerifyError("Bad signature, invalid payment request.");
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if HAVE_DECL_EVP_MD_CTX_NEW
+ EVP_MD_CTX_free(ctx);
+ #endif
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/
@ 2018-01-23 10:37 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2018-01-23 10:37 UTC (permalink / raw
To: gentoo-commits
commit: c8b2c0820cd84adac47e20c4eb4ce8440114e9ba
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Tue Jan 23 04:51:19 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 10:37:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b2c082
net-p2p/bitcoin-qt-0.15.1: Fix tests
net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild | 4 +++-
.../files/bitcoin-qt-0.15.1-test-build-fix.patch | 24 ++++++++++++++++++++++
.../files/bitcoin-qt-0.15.1-test-util-fix.patch | 15 ++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 64339edd7ca..75bc2d1f74f 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -124,11 +124,13 @@ src_prepare() {
sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
eapply "$(KNOTS_PATCH syslibs)"
+ eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
if use knots; then
eapply "$(KNOTS_PATCH f)"
eapply "$(KNOTS_PATCH branding)"
eapply "$(KNOTS_PATCH ts)"
+ eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
fi
eapply_user
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
new file mode 100644
index 00000000000..3d953d9c0a9
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Tue Jan 23 03:37:10 2018 +0000
+
+ Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+ ++data->eof;
+ }
+
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+ .ScriptBegin = script_tests_debugger_ScriptBegin,
+ .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+ .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
new file mode 100644
index 00000000000..60fc9d84905
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+
+ check-local:
++if BUILD_BITCOIN_TX
+ @echo "Running test/util/bitcoin-util-test.py..."
+ $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/
@ 2019-01-11 21:38 Craig Andrews
0 siblings, 0 replies; 6+ messages in thread
From: Craig Andrews @ 2019-01-11 21:38 UTC (permalink / raw
To: gentoo-commits
commit: 388b9026168198eb824d76a06960c7353c2f2152
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Sat Dec 29 23:38:00 2018 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 21:38:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388b9026
net-p2p/bitcoin-qt: Bump to 0.17.1
Closes: https://bugs.gentoo.org/668520
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
net-p2p/bitcoin-qt/Manifest | 2 +
net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild | 180 +++++++++++++++++++++
net-p2p/bitcoin-qt/files/bitcoin-qt.protocol | 11 ++
.../files/org.bitcoin.bitcoin-qt.desktop | 15 ++
net-p2p/bitcoin-qt/metadata.xml | 1 +
5 files changed, 209 insertions(+)
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 443491598dd..c3a90d5a2b6 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -1,2 +1,4 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
+DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
+DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
new file mode 100644
index 00000000000..f13ca6f859b
--- /dev/null
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 2010-2019 Gentoo Authors
+# 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="ef70f9b52b851c7997a9f1a0834714e3eebc1fd8"
+KNOTS_PV="${PV}.knots20181229"
+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.17.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde knots libressl +qrcode +system-leveldb test upnp +wallet zeromq"
+
+RDEPEND="
+ >=dev-libs/boost-1.52.0:=[threads(+)]
+ >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+ >=dev-libs/univalue-1.0.4:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ system-leveldb? ( virtual/bitcoin-leveldb )
+ bip70? ( dev-libs/protobuf:= )
+ dbus? ( dev-qt/qtdbus:5 )
+ 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/descriptors.md doc/files.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.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.17.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/2018/12/25/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
+
+ # Save the generic icon for later
+ cp src/qt/res/src/bitcoin.svg bitcoin128.svg || 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"
+ 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
+
+ eautoreconf
+ if use system-leveldb; then
+ rm -r src/leveldb src/secp256k1 || die
+ fi
+}
+
+src_configure() {
+ local my_econf=(
+ $(use_enable asm)
+ $(use_enable bip70)
+ $(use_with dbus qtdbus)
+ $(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
+ $(use_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/icons/hicolor/scalable/apps/
+ doins bitcoin128.svg
+ if use knots; then
+ newins src/qt/res/src/bitcoin.svg bitcoinknots.svg
+ fi
+
+ insinto /usr/share/applications
+ doins "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop"
+ if ! use knots; then
+ sed -i 's/Knots/Core/;s/^\(Icon=\).*$/\1bitcoin128/' "${D}/usr/share/applications/org.bitcoin.bitcoin-qt.desktop" || die
+ fi
+
+ use zeromq && dodoc doc/zmq.md
+
+ newbashcomp contrib/bitcoind.bash-completion ${PN}
+
+ if use kde; then
+ insinto /usr/share/kservices5
+ doins "${FILESDIR}/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
+
+ 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."
+}
+
+pkg_postrm() {
+ update_caches
+}
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt.protocol b/net-p2p/bitcoin-qt/files/bitcoin-qt.protocol
new file mode 100644
index 00000000000..014588d5367
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt.protocol
@@ -0,0 +1,11 @@
+[Protocol]
+exec=bitcoin-qt '%u'
+protocol=bitcoin
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
diff --git a/net-p2p/bitcoin-qt/files/org.bitcoin.bitcoin-qt.desktop b/net-p2p/bitcoin-qt/files/org.bitcoin.bitcoin-qt.desktop
new file mode 100644
index 00000000000..0b03d45c1cd
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/org.bitcoin.bitcoin-qt.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Bitcoin Knots
+Comment=Connect to the Bitcoin P2P Network
+Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
+Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
+Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
+Exec=bitcoin-qt %u
+Terminal=false
+Type=Application
+Icon=bitcoinknots
+MimeType=x-scheme-handler/bitcoin;
+Categories=Office;Finance;P2P;Network;Qt;
+StartupWMClass=Bitcoin-qt
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index f88446cdbbe..0e5739a7325 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -16,6 +16,7 @@
<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</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="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag>
<flag name="upnp">Enable Universal Plug and Play</flag>
<flag name="wallet">Enable wallet support</flag>
<flag name="zeromq">Report blocks and transactions via zeromq</flag>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/
@ 2019-12-31 13:24 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2019-12-31 13:24 UTC (permalink / raw
To: gentoo-commits
commit: df43761599a959604676e2245b6e44d7d6a8e44b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 13:24:10 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 13:24:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df437615
net-p2p/bitcoin-qt: Add patch for missing include
Closes: https://bugs.gentoo.org/703544
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild | 1 +
net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild | 1 +
net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild | 1 +
...coin-qt-0.16.3-boost-1.72-missing-include.patch | 24 ++++++++++++++++++++++
4 files changed, 27 insertions(+)
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
index e6d5e30a932..0ee413a509b 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild
@@ -87,6 +87,7 @@ src_prepare() {
local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+ eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
if use knots; then
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
index 28c1e57132f..1ae0e2eadb7 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.17.1.ebuild
@@ -85,6 +85,7 @@ src_prepare() {
local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+ eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
if use knots; then
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
index 0aa8b5e1079..5c492841815 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.18.0.ebuild
@@ -85,6 +85,7 @@ src_prepare() {
local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+ eapply "${FILESDIR}"/${PN}-0.16.3-boost-1.72-missing-include.patch
eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
if use knots; then
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch
new file mode 100644
index 00000000000..b553a245806
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.16.3-boost-1.72-missing-include.patch
@@ -0,0 +1,24 @@
+From a5929130223973636f3fd25fbfaf2953f2ec96a9 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Fri, 25 Oct 2019 13:05:17 +0000
+Subject: [PATCH] http: add missing header bootlegged by boost < 1.72
+
+httpserver.cpp:74:10: error: no template named 'deque' in namespace 'std'
+ std::deque<std::unique_ptr<WorkItem>> queue;
+ ~~~~~^
+---
+ src/httpserver.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/httpserver.cpp b/src/httpserver.cpp
+index 81137771871f..d9c711332358 100644
+--- a/src/httpserver.cpp
++++ b/src/httpserver.cpp
+@@ -15,6 +15,7 @@
+ #include <sync.h>
+ #include <ui_interface.h>
+
++#include <deque>
+ #include <memory>
+ #include <stdio.h>
+ #include <stdlib.h>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/
@ 2021-11-18 6:55 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2021-11-18 6:55 UTC (permalink / raw
To: gentoo-commits
commit: 60cb9ac2e5e2b0b201c6f50c6941ee5f34df61f4
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Sat Nov 6 17:23:22 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 06:52:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60cb9ac2
net-p2p/bitcoin-qt: Add patch for boost 1.77 compatibility
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild | 2 +
net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild | 2 +
net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild | 2 +
.../bitcoin-qt-0.20.1-boost-1.77-compat.patch | 56 ++++++++++++++++++++++
4 files changed, 62 insertions(+)
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
index 3644f4d6d0ca..c05e4213cd0f 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.20.1.ebuild
@@ -99,6 +99,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${P}-boost-1.77-compat.patch"
+
eapply_user
echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
index 7f9d109b04a4..33e07afa9afe 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.0.ebuild
@@ -100,6 +100,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch"
+
eapply_user
echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
index 71f88ca3d981..eebd7ff2f4de 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.21.1.ebuild
@@ -116,6 +116,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch"
+
eapply_user
echo '#!/bin/true' >share/genbuild.sh || die
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.20.1-boost-1.77-compat.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.20.1-boost-1.77-compat.patch
new file mode 100644
index 000000000000..53b5563cb662
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.20.1-boost-1.77-compat.patch
@@ -0,0 +1,56 @@
+commit acb7aad27ec8a184808aa7905887e3b2c5d54e9c
+Author: Rafael Sadowski <rafael@sizeofvoid.org>
+Date: Mon Aug 16 06:34:02 2021 +0200
+
+ Fix build with Boost 1.77.0
+
+ BOOST_FILESYSTEM_C_STR changed to accept the path as an argument
+
+diff --git a/src/fs.cpp b/src/fs.cpp
+index 4f20ca4d28f..89c7ad27dc4 100644
+--- a/src/fs.cpp
++++ b/src/fs.cpp
+@@ -242,7 +242,11 @@ void ofstream::close()
+ }
+ #else // __GLIBCXX__
+
++#if BOOST_VERSION >= 107700
++static_assert(sizeof(*BOOST_FILESYSTEM_C_STR(fs::path())) == sizeof(wchar_t),
++#else
+ static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
++#endif // BOOST_VERSION >= 107700
+ "Warning: This build is using boost::filesystem ofstream and ifstream "
+ "implementations which will fail to open paths containing multibyte "
+ "characters. You should delete this static_assert to ignore this warning, "
+diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp
+index 17f5264b459..16cb7e0baf0 100644
+--- a/src/wallet/test/db_tests.cpp
++++ b/src/wallet/test/db_tests.cpp
+@@ -25,7 +25,11 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
+ std::string test_name = "test_name.dat";
+ const fs::path datadir = gArgs.GetDataDirNet();
+ fs::path file_path = datadir / test_name;
++#if BOOST_VERSION >= 107700
++ std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
++#else
+ std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+ f.close();
+
+ std::string filename;
+diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp
+index dd9354848d7..53c972c46d3 100644
+--- a/src/wallet/test/init_test_fixture.cpp
++++ b/src/wallet/test/init_test_fixture.cpp
+@@ -32,7 +32,11 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainNam
+ fs::create_directories(m_walletdir_path_cases["default"]);
+ fs::create_directories(m_walletdir_path_cases["custom"]);
+ fs::create_directories(m_walletdir_path_cases["relative"]);
++#if BOOST_VERSION >= 107700
++ std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
++#else
+ std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
++#endif // BOOST_VERSION >= 107700
+ f.close();
+ }
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/
@ 2023-04-10 4:11 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-04-10 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 2d9e3f5a95e66bd492349e29a066d25ae7744a20
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 04:05:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 04:05:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d9e3f5a
net-p2p/bitcoin-qt: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/900246
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/bitcoin-qt/bitcoin-qt-24.0.1.ebuild | 1 +
net-p2p/bitcoin-qt/files/24.0.1-gcc13.patch | 39 +++++++++++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-24.0.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-24.0.1.ebuild
index 76fdba8ff317..bd11d93118f0 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-24.0.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-24.0.1.ebuild
@@ -68,6 +68,7 @@ DOCS=(
PATCHES=(
"${FILESDIR}"/24.0.1-syslibs.patch
+ "${FILESDIR}"/24.0.1-gcc13.patch
)
pkg_pretend() {
diff --git a/net-p2p/bitcoin-qt/files/24.0.1-gcc13.patch b/net-p2p/bitcoin-qt/files/24.0.1-gcc13.patch
new file mode 100644
index 000000000000..39cf81b14953
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/24.0.1-gcc13.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/903781
+https://bugs.gentoo.org/900246
+https://bugs.gentoo.org/895814
+https://bugs.gentoo.org/894734
+https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715
+
+From fadeb6b103cb441e0e91ef506ef29febabb10715 Mon Sep 17 00:00:00 2001
+From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
+Date: Thu, 19 Jan 2023 19:35:43 +0100
+Subject: [PATCH] Add missing includes to fix gcc-13 compile error
+
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -19,6 +19,9 @@
+ #endif
+
+ #include <algorithm>
++#include <limits>
++#include <stdexcept>
++#include <utility>
+ #ifdef ARENA_DEBUG
+ #include <iomanip>
+ #include <iostream>
+--- a/src/support/lockedpool.h
++++ b/src/support/lockedpool.h
+@@ -5,11 +5,11 @@
+ #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H
+ #define BITCOIN_SUPPORT_LOCKEDPOOL_H
+
+-#include <stdint.h>
++#include <cstddef>
+ #include <list>
+ #include <map>
+-#include <mutex>
+ #include <memory>
++#include <mutex>
+ #include <unordered_map>
+
+ /**
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-10 4:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-18 6:55 [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/, net-p2p/bitcoin-qt/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-04-10 4:11 Sam James
2019-12-31 13:24 David Seifert
2019-01-11 21:38 Craig Andrews
2018-01-23 10:37 Thomas Deutschmann
2017-01-05 14:12 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox