* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/dogecoin-qt/files/, net-p2p/dogecoin-qt/
@ 2023-08-09 20:30 Victor Skovorodnikov
0 siblings, 0 replies; 2+ messages in thread
From: Victor Skovorodnikov @ 2023-08-09 20:30 UTC (permalink / raw
To: gentoo-commits
commit: b8c33d3915f7eabf7af032981de4128ea4e55570
Author: Victor Skovorodnikov <victor3.14 <AT> yandex <DOT> com>
AuthorDate: Wed Aug 9 20:28:23 2023 +0000
Commit: Victor Skovorodnikov <victor3.14 <AT> yandex <DOT> com>
CommitDate: Wed Aug 9 20:28:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b8c33d39
net-p2p/dogecoin-qt: keyword 1.14.6 for ~arm64
- Tested arm64 installation on Raspberry pi 400 in systemd and openrc
- Updated symlink setup for condition using dogecoind and dogecoin-cli selection
- Made generic name for some patches to work with next version
Signed-off-by: Victor Skovorodnikov <victor3.14 <AT> yandex.com>
net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild | 23 +++++++++++++++-------
net-p2p/dogecoin-qt/files/gcc13.patch | 13 ++++++++++++
....14.6-hardened-all.patch => hardened-all.patch} | 0
...rdened-minimal.patch => hardened-minimal.patch} | 0
...hardened-no-pie.patch => hardened-no-pie.patch} | 0
...hardened-no-ssp.patch => hardened-no-ssp.patch} | 0
6 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
index bd1c090298..66e117a8a2 100644
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
+++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
@@ -11,8 +11,7 @@ SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz ->
LICENSE="MIT"
SLOT="0"
DB_VER="5.3"
-KEYWORDS="~amd64"
-# Please see Bug 910673 Comment 10
+KEYWORDS="~amd64 ~arm64"
IUSE="cpu_flags_x86_avx2 dogecoind +pie +prune +ssp tests utils +wallet zmq"
REQUIRED_USE="dogecoind? ( utils )"
DOGEDIR="/opt/${PN}"
@@ -46,7 +45,7 @@ PATCHES=(
"${FILESDIR}"/"${PV}"-paymentserver.patch
"${FILESDIR}"/"${PV}"-transactiondesc.patch
"${FILESDIR}"/"${PV}"-deque.patch
- "${FILESDIR}"/"${PV}"-gcc13.patch
+ "${FILESDIR}"/gcc13.patch
)
WORKDIR_="${WORKDIR}/dogecoin-${PV}"
@@ -55,13 +54,13 @@ S=${WORKDIR_}
src_prepare() {
if use pie && use ssp ; then
- PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-all.patch )
+ PATCHES+=( "${FILESDIR}"/hardened-all.patch )
elif use pie && ! use ssp ; then
- PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-no-ssp.patch )
+ PATCHES+=( "${FILESDIR}"/hardened-no-ssp.patch )
elif use ssp && ! use pie ; then
- PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-no-pie.patch )
+ PATCHES+=( "${FILESDIR}"/hardened-no-pie.patch )
else
- PATCHES+=( "${FILESDIR}"/"${PV}"-hardened-minimal.patch )
+ PATCHES+=( "${FILESDIR}"/hardened-minimal.patch )
fi
default
@@ -96,6 +95,11 @@ src_install() {
doins src/qt/res/icons/dogecoin.png
dosym "${DOGEDIR}/bin/${PN}" "/usr/bin/${PN}"
+ if use dogecoind ; then
+ dosym "${DOGEDIR}/bin/dogecoind" "/usr/bin/dogecoind"
+ dosym "${DOGEDIR}/bin/dogecoin-cli" "/usr/bin/dogecoin-cli"
+ fi
+
if use prune ; then
domenu "${FILESDIR}"/"${PN}-prune.desktop"
else
@@ -111,6 +115,11 @@ pkg_postinst() {
elog "Dogecoin Core Qt ${PV} has been installed."
elog "Dogecoin Core Qt binaries have been placed in ${DOGEDIR}/bin."
elog "${PN} has been symlinked with /usr/bin/${PN}."
+
+ if use dogecoind ; then
+ elog "dogecoin daemon has been symlinked with /usr/bin/dogecoind."
+ elog "dogecoin client utils have been symlinked with /usr/bin/dogecoin-cli."
+ fi
}
pkg_postrm() {
diff --git a/net-p2p/dogecoin-qt/files/gcc13.patch b/net-p2p/dogecoin-qt/files/gcc13.patch
new file mode 100644
index 0000000000..0e4852815b
--- /dev/null
+++ b/net-p2p/dogecoin-qt/files/gcc13.patch
@@ -0,0 +1,13 @@
+# Fixes error when building with gcc13
+diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
+index ccebbe8..9d57846 100644
+--- a/src/support/lockedpool.cpp
++++ b/src/support/lockedpool.cpp
+@@ -5,6 +5,7 @@
+
+ #include "support/lockedpool.h"
+ #include "support/cleanse.h"
++#include <stdexcept>
+
+ #if defined(HAVE_CONFIG_H)
+ #include "config/bitcoin-config.h"
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-all.patch b/net-p2p/dogecoin-qt/files/hardened-all.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-all.patch
rename to net-p2p/dogecoin-qt/files/hardened-all.patch
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-minimal.patch b/net-p2p/dogecoin-qt/files/hardened-minimal.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-minimal.patch
rename to net-p2p/dogecoin-qt/files/hardened-minimal.patch
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-no-pie.patch b/net-p2p/dogecoin-qt/files/hardened-no-pie.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-no-pie.patch
rename to net-p2p/dogecoin-qt/files/hardened-no-pie.patch
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-hardened-no-ssp.patch b/net-p2p/dogecoin-qt/files/hardened-no-ssp.patch
similarity index 100%
rename from net-p2p/dogecoin-qt/files/1.14.6-hardened-no-ssp.patch
rename to net-p2p/dogecoin-qt/files/hardened-no-ssp.patch
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/dogecoin-qt/files/, net-p2p/dogecoin-qt/
@ 2024-08-08 15:41 Victor Skovorodnikov
0 siblings, 0 replies; 2+ messages in thread
From: Victor Skovorodnikov @ 2024-08-08 15:41 UTC (permalink / raw
To: gentoo-commits
commit: c0f48d5e5261bca118dce25f91a0045ae138af9d
Author: Victor Skovorodnikov <victor3.14 <AT> yandex <DOT> com>
AuthorDate: Thu Aug 8 15:39:06 2024 +0000
Commit: Victor Skovorodnikov <victor3.14 <AT> yandex <DOT> com>
CommitDate: Thu Aug 8 15:41:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c0f48d5e
net-p2p/dogecoin-qt: drop 1.14.6
Signed-off-by: Victor Skovorodnikov <victor3.14 <AT> yandex.com>
net-p2p/dogecoin-qt/Manifest | 1 -
net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild | 137 ---------------------
net-p2p/dogecoin-qt/files/1.14.6-deque.patch | 15 ---
.../dogecoin-qt/files/1.14.6-net_processing.patch | 12 --
.../dogecoin-qt/files/1.14.6-paymentserver.patch | 16 ---
.../dogecoin-qt/files/1.14.6-transactiondesc.patch | 24 ----
net-p2p/dogecoin-qt/files/gcc13.patch | 13 --
7 files changed, 218 deletions(-)
diff --git a/net-p2p/dogecoin-qt/Manifest b/net-p2p/dogecoin-qt/Manifest
index aab23826d..34a3cd01f 100644
--- a/net-p2p/dogecoin-qt/Manifest
+++ b/net-p2p/dogecoin-qt/Manifest
@@ -1,3 +1,2 @@
-DIST dogecoin-qt-v1.14.6.tar.gz 8162072 BLAKE2B e2d1abe7b60cc2f15998834ec1f23570ad3d471d80e9d05b8e5aa64d6e46b7196d7a13d134e6721fe57b6afd34811bd486de02c00b54ee8516313b81ae6821c2 SHA512 05f1142a22f36a04e65ef91c834b3e724280e29b930617bb66fac98777bb541ddca15771db4205f0cdc14389f3eb4e94fda550f7806b3e9863d909c063f38610
DIST dogecoin-qt-v1.14.7.tar.gz 11546516 BLAKE2B e292983d6fb0ecb35c1d8e45705b38563e3076400aa90b36d5edd0e9adac42d697179362718ed81aead4cb86633d98234b36a46e6e960296abf3029525861c70 SHA512 4febf88cc80565c25a4ec9a809b4ef6a7054d93a57cc0dafbb6f2c2bd8166111507431356227a4c372590450c1c6c80dd365ed666c6a48a04288efdbda74f9f2
DIST dogecoin-qt-v1.14.8.tar.gz 11572143 BLAKE2B f1ee546eda5eba77234cb4634bf067b4c8d1e2e8ffe11d6265e00909281491f2e68934b4ed9bd2f3f9729294f96f0d192d8b800ace1a725cf517869dcf4d2744 SHA512 e1a401093e86bd2c0b4ef96fcb45bb3dc978eee549cbb39fd09bc8fd6edb699e01ad4f9c2b31a1097beb21ad447841e2693b8503d89567e9d9a50fbf2803de7e
diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
deleted file mode 100644
index e47ff9e1c..000000000
--- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-WANT_AUTOCONF="2.5"
-inherit autotools desktop xdg-utils flag-o-matic
-DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure."
-HOMEPAGE="https://github.com/dogecoin"
-SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-WORKDIR_="${WORKDIR}/dogecoin-${PV}"
-S="${WORKDIR_}"
-
-LICENSE="MIT"
-SLOT="0"
-DB_VER="5.3"
-KEYWORDS="~amd64 ~arm64"
-IUSE="cpu_flags_x86_avx2 dogecoind +pie +prune +ssp tests utils +wallet zmq"
-REQUIRED_USE="dogecoind? ( utils )"
-DOGEDIR="/opt/${PN}"
-DEPEND="
- sys-libs/db:"${DB_VER}"=[cxx]
- dev-libs/libevent:=
- dev-libs/protobuf
- dev-libs/openssl
- dev-build/libtool
- dev-build/automake:=
- >=dev-libs/boost-1.81.0-r1
- dev-qt/qtcore
- dev-qt/qtgui
- dev-qt/qtwidgets
- dev-qt/qtdbus
- dev-qt/qtnetwork
- dev-qt/qtprintsupport
- dev-qt/linguist-tools:=
- cpu_flags_x86_avx2? ( =app-crypt/intel-ipsec-mb-1.3 )
- wallet? ( media-gfx/qrencode )
- zmq? ( net-libs/cppzmq )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
- dev-build/automake
- dev-build/automake
-"
-
-PATCHES=(
- "${FILESDIR}"/"${PV}"-net_processing.patch
- "${FILESDIR}"/"${PV}"-paymentserver.patch
- "${FILESDIR}"/"${PV}"-transactiondesc.patch
- "${FILESDIR}"/"${PV}"-deque.patch
- "${FILESDIR}"/gcc13.patch
-)
-
-pkg_pretend() {
-
- if use cpu_flags_x86_avx2 && [[ ! -e "${ROOT}"/etc/portage/patches/app-crypt/intel-ipsec-mb/remove_digest_init.patch ]]; then
- eerror "${ROOT}/etc/portage/patches/app-crypt/intel-ipsec-mb/remove_digest_init.patch does not exist!"
- eerror "To build with avx2 intel support, please create ${ROOT}/etc/portage/patches/app-crypt/intel-ipsec-mb directory"
- eerror "and copy patch from package net-p2p/dogecoin-qt/files/intel-ipsec-mb/remove_digest_init.patch into that directory"
- die
- fi
-}
-
-src_prepare() {
-
- if use pie && use ssp ; then
- PATCHES+=( "${FILESDIR}"/hardened-all.patch )
- elif use pie && ! use ssp ; then
- PATCHES+=( "${FILESDIR}"/hardened-no-ssp.patch )
- elif use ssp && ! use pie ; then
- PATCHES+=( "${FILESDIR}"/hardened-no-pie.patch )
- else
- PATCHES+=( "${FILESDIR}"/hardened-minimal.patch )
- fi
-
- default
-
- einfo "Generating autotools files..."
- eaclocal -I "${WORKDIR_}"
- eautoreconf
-}
-
-src_configure() {
- local my_econf=(
- --bindir="${DOGEDIR}/bin"
- --with-gui=qt5
- --disable-bench
- $(use_with cpu_flags_x86_avx2 intel-avx2)
- $(use_with dogecoind daemon)
- $(use_with utils utils)
- $(use_enable wallet)
- $(use_enable zmq)
- $(use_enable tests tests)
- )
-
- append-cxxflags "-std=c++14"
- econf "${my_econf[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- insinto "${DOGEDIR}/bin"
- insinto /usr/share/pixmaps
- doins src/qt/res/icons/dogecoin.png
- dosym "${DOGEDIR}/bin/${PN}" "/usr/bin/${PN}"
-
- if use dogecoind ; then
- dosym "${DOGEDIR}/bin/dogecoind" "/usr/bin/dogecoind"
- dosym "${DOGEDIR}/bin/dogecoin-cli" "/usr/bin/dogecoin-cli"
- fi
-
- if use prune ; then
- domenu "${FILESDIR}"/"${PN}-prune.desktop"
- else
- domenu "${FILESDIR}"/"${PN}.desktop"
- fi
-
- find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- elog "Dogecoin Core Qt ${PV} has been installed."
- elog "Dogecoin Core Qt binaries have been placed in ${DOGEDIR}/bin."
- elog "${PN} has been symlinked with /usr/bin/${PN}."
-
- if use dogecoind ; then
- elog "dogecoin daemon has been symlinked with /usr/bin/dogecoind."
- elog "dogecoin client utils have been symlinked with /usr/bin/dogecoin-cli."
- fi
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-deque.patch b/net-p2p/dogecoin-qt/files/1.14.6-deque.patch
deleted file mode 100644
index a25164d43..000000000
--- a/net-p2p/dogecoin-qt/files/1.14.6-deque.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Please refer to https://github.com/dogecoin/dogecoin/pull/3207/files
-# for information about changes that this patch is applying.
-
-diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
-index 00446aa..e7c3053 100644
---- a/src/test/cuckoocache_tests.cpp
-+++ b/src/test/cuckoocache_tests.cpp
-@@ -6,6 +6,7 @@
- #include "test/test_bitcoin.h"
- #include "random.h"
- #include <thread>
-+#include <deque>
- #include <boost/thread.hpp>
-
-
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-net_processing.patch b/net-p2p/dogecoin-qt/files/1.14.6-net_processing.patch
deleted file mode 100644
index a166625ee..000000000
--- a/net-p2p/dogecoin-qt/files/1.14.6-net_processing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/net_processing.cpp b/src/net_processing.cpp
-index ee3612b..20fe16f 100644
---- a/src/net_processing.cpp
-+++ b/src/net_processing.cpp
-@@ -31,6 +31,7 @@
- #include "utilstrencodings.h"
- #include "validationinterface.h"
-
-+#include <array>
- #include <boost/thread.hpp>
-
- #if defined(NDEBUG)
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-paymentserver.patch b/net-p2p/dogecoin-qt/files/1.14.6-paymentserver.patch
deleted file mode 100644
index 92d4b5524..000000000
--- a/net-p2p/dogecoin-qt/files/1.14.6-paymentserver.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Please refer to https://github.com/dogecoin/dogecoin/pull/3207/files
-# for information about changes that this patch is applying.
-
-diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
-index d894745..2278c69 100644
---- a/src/qt/paymentserver.cpp
-+++ b/src/qt/paymentserver.cpp
-@@ -553,7 +553,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen
- QList<std::pair<CScript, CAmount> > sendingTos = request.getPayTo();
- QStringList addresses;
-
-- Q_FOREACH(const PAIRTYPE(CScript, CAmount)& sendingTo, sendingTos) {
-+ for (const PAIRTYPE(CScript, CAmount)& sendingTo : sendingTos) {
- // Extract and check destination addresses
- CTxDestination dest;
- if (ExtractDestination(sendingTo.first, dest)) {
diff --git a/net-p2p/dogecoin-qt/files/1.14.6-transactiondesc.patch b/net-p2p/dogecoin-qt/files/1.14.6-transactiondesc.patch
deleted file mode 100644
index b32d0e5cd..000000000
--- a/net-p2p/dogecoin-qt/files/1.14.6-transactiondesc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# Please refer to https://github.com/dogecoin/dogecoin/pull/3207/files
-# for information about changes that this patch is applying.
-
-diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
-index 00b83e8..b8cc486 100644
---- a/src/qt/transactiondesc.cpp
-+++ b/src/qt/transactiondesc.cpp
-@@ -237,14 +237,14 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
- strHTML += "<b>" + tr("Output index") + ":</b> " + QString::number(rec->getOutputIndex()) + "<br>";
-
- // Message from normal bitcoin:URI (bitcoin:123...?message=example)
-- Q_FOREACH (const PAIRTYPE(std::string, std::string)& r, wtx.vOrderForm)
-+ for (const PAIRTYPE(std::string, std::string)& r : wtx.vOrderForm)
- if (r.first == "Message")
- strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
-
- //
- // PaymentRequest info:
- //
-- Q_FOREACH (const PAIRTYPE(std::string, std::string)& r, wtx.vOrderForm)
-+ for (const PAIRTYPE(std::string, std::string)& r : wtx.vOrderForm)
- {
- if (r.first == "PaymentRequest")
- {
diff --git a/net-p2p/dogecoin-qt/files/gcc13.patch b/net-p2p/dogecoin-qt/files/gcc13.patch
deleted file mode 100644
index 0e4852815..000000000
--- a/net-p2p/dogecoin-qt/files/gcc13.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Fixes error when building with gcc13
-diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp
-index ccebbe8..9d57846 100644
---- a/src/support/lockedpool.cpp
-+++ b/src/support/lockedpool.cpp
-@@ -5,6 +5,7 @@
-
- #include "support/lockedpool.h"
- #include "support/cleanse.h"
-+#include <stdexcept>
-
- #if defined(HAVE_CONFIG_H)
- #include "config/bitcoin-config.h"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-08-08 15:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-08 15:41 [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/dogecoin-qt/files/, net-p2p/dogecoin-qt/ Victor Skovorodnikov
-- strict thread matches above, loose matches on Subject: below --
2023-08-09 20:30 Victor Skovorodnikov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox