From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B050915800A for ; Wed, 9 Aug 2023 20:30:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1044B2BC015; Wed, 9 Aug 2023 20:30:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E73542BC015 for ; Wed, 9 Aug 2023 20:30:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9219233D9AD for ; Wed, 9 Aug 2023 20:30:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F41DEF35 for ; Wed, 9 Aug 2023 20:30:18 +0000 (UTC) From: "Victor Skovorodnikov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Victor Skovorodnikov" Message-ID: <1691612915.b8c33d3915f7eabf7af032981de4128ea4e55570.victor3.14@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/dogecoin-qt/files/, net-p2p/dogecoin-qt/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-p2p/dogecoin-qt/dogecoin-qt-1.14.6.ebuild net-p2p/dogecoin-qt/files/1.14.6-hardened-all.patch net-p2p/dogecoin-qt/files/1.14.6-hardened-minimal.patch net-p2p/dogecoin-qt/files/1.14.6-hardened-no-pie.patch net-p2p/dogecoin-qt/files/1.14.6-hardened-no-ssp.patch net-p2p/dogecoin-qt/files/gcc13.patch net-p2p/dogecoin-qt/files/hardened-all.patch net-p2p/dogecoin-qt/files/hardened-minimal.patch net-p2p/dogecoin-qt/files/hardened-no-pie.patch net-p2p/dogecoin-qt/files/hardened-no-ssp.patch X-VCS-Directories: net-p2p/dogecoin-qt/files/ net-p2p/dogecoin-qt/ X-VCS-Committer: victor3.14 X-VCS-Committer-Name: Victor Skovorodnikov X-VCS-Revision: b8c33d3915f7eabf7af032981de4128ea4e55570 X-VCS-Branch: dev Date: Wed, 9 Aug 2023 20:30:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65571baf-1490-4794-bfc8-e7dc72b06200 X-Archives-Hash: 617d55d75b65fc3b4e50a35615f573cb commit: b8c33d3915f7eabf7af032981de4128ea4e55570 Author: Victor Skovorodnikov yandex com> AuthorDate: Wed Aug 9 20:28:23 2023 +0000 Commit: Victor Skovorodnikov yandex 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 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 + + #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