* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2022-12-29 20:17 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-12-29 20:17 UTC (permalink / raw
To: gentoo-commits
commit: e7b206f216f3f1053b00ba80d6b73ef62ded11ad
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Thu Dec 29 18:13:08 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 18:13:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e7b206f2
net-p2p/feather: remove old ebuild, prevent some CFLAGS from being overridden
Closes: https://bugs.gentoo.org/888876
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/feather-2.1.0.ebuild | 143 ----------------------
net-p2p/feather/feather-2.1.2.ebuild | 1 +
net-p2p/feather/files/feather_remove_cflags.patch | 16 +++
3 files changed, 17 insertions(+), 143 deletions(-)
diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
deleted file mode 100644
index 697aca1eb..000000000
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="b45c66e9c62d7e8f24abbcb447f408e618bfd450"
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
- RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
- dev-libs/libsodium:=
- media-gfx/qrencode:=
- media-gfx/zbar:=[v4l]
- >=dev-libs/polyseed-1.0.0
- dev-libs/libzip:=
- dev-libs/boost:=[nls]
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtwidgets-5.15:5
- >=dev-qt/qtgui-5.15:5
- >=dev-qt/qtnetwork-5.15:5
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtxml-5.15:5
- >=dev-qt/qtwebsockets-5.15:5
- >=dev-qt/qtmultimedia-5.15:5[widgets]
- >=dev-qt/qtconcurrent-5.15:5
- dev-libs/libgcrypt:=
- sys-libs/zlib
- dev-libs/openssl:=
- net-dns/unbound:=[threads]
- net-libs/czmq:=
-"
-RDEPEND="
- ${DEPEND}
- net-vpn/tor
- xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
- unpack ${P}.tar.gz \
- ${P}-singleapplication.tar.gz \
- ${P}-monero.tar.gz \
- ${P}-monero-miniupnp.tar.gz \
- ${P}-monero-randomx.tar.gz \
- ${P}-monero-rapidjson.tar.gz \
- ${P}-monero-supercop.tar.gz \
- ${P}-monero-trezorcommon.tar.gz
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
- "${WORKDIR}"/${P}/src/third-party/singleapplication || die
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero || die
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/miniupnp || die
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/randomx || die
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/rapidjson || die
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/supercop || die
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
- default
- echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
- echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
- pushd monero
- eapply "${FILESDIR}"/monero_add_some_includes.patch
- popd
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE=Release
- -DBUILD_SHARED_LIBS=OFF
- -DARCH=x86-64
- -DBUILD_TAG="linux-x64"
- -DBUILD_64=ON
- -DSELF_CONTAINED=OFF
- -DLOCALMONERO=$(usex localmonero)
- -DXMRIG=$(usex xmrig)
- -DCHECK_UPDATES=OFF
- -DPLATFORM_INSTALLER=OFF
- -DUSE_DEVICE_TREZOR=OFF
- -DDONATE_BEG=OFF
- -DWITH_SCANNER=$(usex qrcode)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build feather
-}
-
-src_install() {
- dobin "${BUILD_DIR}/bin/feather"
-
- doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
- domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Ensure that Tor is running with 'rc-service tor start' before"
- einfo "using Feather."
-}
diff --git a/net-p2p/feather/feather-2.1.2.ebuild b/net-p2p/feather/feather-2.1.2.ebuild
index 1678afc9e..4589f1a31 100644
--- a/net-p2p/feather/feather-2.1.2.ebuild
+++ b/net-p2p/feather/feather-2.1.2.ebuild
@@ -98,6 +98,7 @@ src_prepare() {
default
echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+ eapply "${FILESDIR}"/feather_remove_cflags.patch
pushd monero || die
eapply "${FILESDIR}"/monero_add_some_includes.patch
popd || die
diff --git a/net-p2p/feather/files/feather_remove_cflags.patch b/net-p2p/feather/files/feather_remove_cflags.patch
new file mode 100644
index 000000000..e3a36c9af
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -284,12 +284,6 @@
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${STATIC_FLAGS}")
+
+ add_subdirectory(src)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-02-04 9:39 Viorel Munteanu
0 siblings, 0 replies; 6+ messages in thread
From: Viorel Munteanu @ 2023-02-04 9:39 UTC (permalink / raw
To: gentoo-commits
commit: 74ea05a214c27e2efe5d0036b0ad0a7f121bfa60
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sat Feb 4 09:01:51 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 09:20:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=74ea05a2
net-p2p/feather: version bump to 2.3.0
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 8 ++
net-p2p/feather/feather-2.3.0.ebuild | 144 +++++++++++++++++++++
.../files/feather_remove_cflags-2.3.0.patch | 18 +++
.../feather/files/monero_remove_cflags-2.3.0.patch | 25 ++++
4 files changed, 195 insertions(+)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 69f9a5353..e1be7e09d 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -6,3 +6,11 @@ DIST feather-2.2.3-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
DIST feather-2.2.3-monero.tar.gz 11615445 BLAKE2B b30f7e8b72989f14a482997a17e925afaef4ac198ecfe57e545f72f4923e26d3352db5bcb393252ab2488040b8fe82dba2c7be05c2c59cb5dff2499c6dd306a2 SHA512 cdb4f0634f50319622920faf56484f975fef7e94caf01f276118552ba7de284ec3ec06e43b1476de3255710f7bb47a47d75d974174a3c30657074943fa1f415a
DIST feather-2.2.3-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.2.3.tar.gz 2197323 BLAKE2B 413b6acfbb1eaa55844a01c324325707a25b99f78e52c882c1b57e66ff0f85a0535811568c43f0746818592a8775341678c1f565abdff2eefa25a81ac8d1c97b SHA512 96f5e3a3bd401bea1c15b77b9180da8cfddecfff85138a7cace27876ebe56558e1cf884ef28d9b466bfbf5b7beaa4232d96144e71d458c0d4c647129406199a9
+DIST feather-2.3.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.3.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.3.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.3.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.3.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.3.0-monero.tar.gz 11624682 BLAKE2B cf4e53e4ba08d51a8b8b36181437ff531a37aa04888e0987152f7bc33e71acd8378848ad54caf3184494bf5071f0041fd8059c55047957dc4a973d7519165342 SHA512 a5246e5c1cc65cbc7c719979f07054f55016e8fcb9401b96809b1867d09f262850c7b24d42580f4aad2b0a2d25063b5c405dbc6537f72d87bd3109e52dc3196c
+DIST feather-2.3.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.3.0.tar.gz 2204981 BLAKE2B d2635a52b092e4f90783074b1041a7256fcaa0ae66ae25bd1e19e04e4112a2a5bfb043d78aeeb62e2ce508498d531e4eb9677d6f4f223a298c5fac5d020c434a SHA512 b85f9932ed347cd78f9153a1e50e4374836f5d169efeb0a21e1d319c7f10b3f027a28384cad6fbc322c7bad8766bd30da6cbaf4b64a7a0e501634fe02f5cded0
diff --git a/net-p2p/feather/feather-2.3.0.ebuild b/net-p2p/feather/feather-2.3.0.ebuild
new file mode 100644
index 000000000..02e20aa06
--- /dev/null
+++ b/net-p2p/feather/feather-2.3.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
+MONERO_DIST_COMIT="18bdad879d9f25f35f065354aedf1236e6b0a60b"
+ MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
+ RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
+ RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
+ SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
+ TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
+
+DESCRIPTION="A free, open-source Monero wallet"
+HOMEPAGE="https://featherwallet.org"
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
+${P}.tar.gz
+ https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
+${P}-singleapplication.tar.gz
+ https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
+${P}-monero.tar.gz
+ https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${P}-monero-miniupnp.tar.gz
+ https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${P}-monero-randomx.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${P}-monero-rapidjson.tar.gz
+ https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${P}-monero-supercop.tar.gz
+ https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${P}-monero-trezorcommon.tar.gz
+"
+
+# Feather is released under the terms of the BSD license, but it vendors
+# code from Monero and Tor too.
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qrcode xmrig localmonero"
+
+DEPEND="
+ dev-libs/libsodium:=
+ media-gfx/qrencode:=
+ media-gfx/zbar:=[v4l]
+ >=dev-libs/polyseed-1.0.0
+ dev-libs/libzip:=
+ dev-libs/boost:=[nls]
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtwidgets-5.15:5
+ >=dev-qt/qtgui-5.15:5
+ >=dev-qt/qtnetwork-5.15:5
+ >=dev-qt/qtsvg-5.15:5
+ >=dev-qt/qtxml-5.15:5
+ >=dev-qt/qtwebsockets-5.15:5
+ >=dev-qt/qtmultimedia-5.15:5[widgets]
+ >=dev-qt/qtconcurrent-5.15:5
+ dev-libs/libgcrypt:=
+ sys-libs/zlib
+ dev-libs/openssl:=
+ net-dns/unbound:=[threads]
+ net-libs/czmq:=
+"
+RDEPEND="
+ ${DEPEND}
+ net-vpn/tor
+ xmrig? ( net-misc/xmrig )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${P}.tar.gz \
+ ${P}-singleapplication.tar.gz \
+ ${P}-monero.tar.gz \
+ ${P}-monero-miniupnp.tar.gz \
+ ${P}-monero-randomx.tar.gz \
+ ${P}-monero-rapidjson.tar.gz \
+ ${P}-monero-supercop.tar.gz \
+ ${P}-monero-trezorcommon.tar.gz
+ mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
+ "${WORKDIR}"/${P}/src/third-party/singleapplication || die
+ mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero || die
+ mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/miniupnp || die
+ mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/randomx || die
+ mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/rapidjson || die
+ mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/supercop || die
+ mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/trezor-common || die
+}
+
+src_prepare() {
+ default
+ echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
+ echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+ eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
+ pushd monero || die
+ eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
+ popd || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_BUILD_TYPE=Release
+ -DBUILD_SHARED_LIBS=OFF
+ -DARCH=x86-64
+ -DBUILD_TAG="linux-x64"
+ -DBUILD_64=ON
+ -DSELF_CONTAINED=OFF
+ -DLOCALMONERO=$(usex localmonero)
+ -DXMRIG=$(usex xmrig)
+ -DCHECK_UPDATES=OFF
+ -DPLATFORM_INSTALLER=OFF
+ -DUSE_DEVICE_TREZOR=OFF
+ -DDONATE_BEG=OFF
+ -DWITH_SCANNER=$(usex qrcode)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_build feather
+}
+
+src_install() {
+ dobin "${BUILD_DIR}/bin/feather"
+
+ doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
+ domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ einfo "Ensure that Tor is running with 'rc-service tor start' before"
+ einfo "using Feather."
+}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -262,12 +262,8 @@
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
+
+ add_subdirectory(src)
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -773,9 +773,6 @@
+ message(STATUS "AES support disabled")
+ endif()
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
+-
+ set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
+ if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ if(ARM)
+@@ -901,9 +898,9 @@
+ message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+ message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+
+ # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
+ # is fixed in the code (Issue #847), force compiler to be conservative.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-03-16 8:41 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-03-16 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 3d371c387d801db2f54b3333043a362e03fb464c
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Tue Mar 14 22:12:44 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 22:12:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3d371c38
net-p2p/feather: version bump
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 8 ++
net-p2p/feather/feather-2.4.2.ebuild | 144 +++++++++++++++++++++
.../files/feather_remove_cflags-2.4.2.patch | 18 +++
.../feather/files/monero_remove_cflags-2.4.2.patch | 25 ++++
4 files changed, 195 insertions(+)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 25eccdd69..5dfc062b9 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -22,3 +22,11 @@ DIST feather-2.4.1_pre20230301-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f28
DIST feather-2.4.1_pre20230301-monero.tar.gz 11621070 BLAKE2B 8361a9f44eeb8a2035d3e110481aada7607b4bac2b52efc04ac6003665585d4d56629e88ab8c501e51997b3c3fe514a81b6f981bc07f3070eb24b897169300a6 SHA512 1bc23d60bebd51fdf459244376406c3eaec698457d0fc58f9628081c4b6297a15fb12dc848bbbbaafc77c367c59811ff36dbe499ac0fbcafd4ea10e0c6771f7e
DIST feather-2.4.1_pre20230301-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.4.1_pre20230301.tar.gz 5458207 BLAKE2B 40f754a19778c227fcf73350f4bc5b61df142d18d17227dc7d83f2beef160ad170d1d40eea589d003c19459c2821b6b8630220dc612ba3abb981ebe622225b6d SHA512 eb09f6c7d45e238110d2f7c60401aba147acbb38784e51d5e43966b077c52e4e26c1d08cfbf4093cdb777fc8a01932b927603cb834f0d1b4b8b41fa913a9987b
+DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.4.2-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
+DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
diff --git a/net-p2p/feather/feather-2.4.2.ebuild b/net-p2p/feather/feather-2.4.2.ebuild
new file mode 100644
index 000000000..f2fb17331
--- /dev/null
+++ b/net-p2p/feather/feather-2.4.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
+MONERO_DIST_COMIT="72519d14203061b59191144ee8cab736bc88b978"
+ MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
+ RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
+ RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
+ SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
+ TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
+
+DESCRIPTION="A free, open-source Monero wallet"
+HOMEPAGE="https://featherwallet.org"
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
+${P}.tar.gz
+ https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
+${P}-singleapplication.tar.gz
+ https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
+${P}-monero.tar.gz
+ https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${P}-monero-miniupnp.tar.gz
+ https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${P}-monero-randomx.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${P}-monero-rapidjson.tar.gz
+ https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${P}-monero-supercop.tar.gz
+ https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${P}-monero-trezorcommon.tar.gz
+"
+
+# Feather is released under the terms of the BSD license, but it vendors
+# code from Monero and Tor too.
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qrcode xmrig localmonero"
+
+DEPEND="
+ dev-libs/libsodium:=
+ media-gfx/qrencode:=
+ media-gfx/zbar:=[v4l]
+ >=dev-libs/polyseed-1.0.0
+ dev-libs/libzip:=
+ dev-libs/boost:=[nls]
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtwidgets-5.15:5
+ >=dev-qt/qtgui-5.15:5
+ >=dev-qt/qtnetwork-5.15:5
+ >=dev-qt/qtsvg-5.15:5
+ >=dev-qt/qtxml-5.15:5
+ >=dev-qt/qtwebsockets-5.15:5
+ >=dev-qt/qtmultimedia-5.15:5[widgets]
+ >=dev-qt/qtconcurrent-5.15:5
+ dev-libs/libgcrypt:=
+ sys-libs/zlib
+ dev-libs/openssl:=
+ net-dns/unbound:=[threads]
+ net-libs/czmq:=
+"
+RDEPEND="
+ ${DEPEND}
+ net-vpn/tor
+ xmrig? ( net-misc/xmrig )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${P}.tar.gz \
+ ${P}-singleapplication.tar.gz \
+ ${P}-monero.tar.gz \
+ ${P}-monero-miniupnp.tar.gz \
+ ${P}-monero-randomx.tar.gz \
+ ${P}-monero-rapidjson.tar.gz \
+ ${P}-monero-supercop.tar.gz \
+ ${P}-monero-trezorcommon.tar.gz
+ mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
+ "${WORKDIR}"/${P}/src/third-party/singleapplication || die
+ mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero || die
+ mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/miniupnp || die
+ mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/randomx || die
+ mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/rapidjson || die
+ mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/supercop || die
+ mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/trezor-common || die
+}
+
+src_prepare() {
+ default
+ echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
+ echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+ eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
+ pushd monero || die
+ eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
+ popd || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_BUILD_TYPE=Release
+ -DBUILD_SHARED_LIBS=OFF
+ -DARCH=x86-64
+ -DBUILD_TAG="linux-x64"
+ -DBUILD_64=ON
+ -DSELF_CONTAINED=OFF
+ -DLOCALMONERO=$(usex localmonero)
+ -DXMRIG=$(usex xmrig)
+ -DCHECK_UPDATES=OFF
+ -DPLATFORM_INSTALLER=OFF
+ -DUSE_DEVICE_TREZOR=OFF
+ -DDONATE_BEG=OFF
+ -DWITH_SCANNER=$(usex qrcode)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_build feather
+}
+
+src_install() {
+ dobin "${BUILD_DIR}/bin/feather"
+
+ doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
+ domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ einfo "Ensure that Tor is running with 'rc-service tor start' before"
+ einfo "using Feather."
+}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -262,12 +262,8 @@
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
+
+ add_subdirectory(src)
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -773,9 +773,6 @@
+ message(STATUS "AES support disabled")
+ endif()
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
+-
+ set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
+ if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ if(ARM)
+@@ -901,9 +898,9 @@
+ message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+ message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+
+ # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
+ # is fixed in the code (Issue #847), force compiler to be conservative.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-04-23 8:40 Florian Schmaus
0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-04-23 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 69694a5828da73b27011786de11c968578556285
Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sat Apr 22 05:46:30 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 05:46:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=69694a58
net-p2p/feather: version bump
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>
net-p2p/feather/Manifest | 8 ++
net-p2p/feather/feather-2.4.5.ebuild | 149 +++++++++++++++++++++
.../files/feather_remove_cflags-2.4.5.patch | 18 +++
.../feather/files/monero_remove_cflags-2.4.5.patch | 25 ++++
4 files changed, 200 insertions(+)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 5dfc062b9..33ebcb7c7 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -30,3 +30,11 @@ DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52
DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
+DIST feather-2.4.5-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
+DIST feather-2.4.5-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
+DIST feather-2.4.5-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
+DIST feather-2.4.5-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
+DIST feather-2.4.5-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
+DIST feather-2.4.5-monero.tar.gz 11620246 BLAKE2B 7ea16ac6b61009e8bc562736d00aca8a4b3b2c6b14c22e60a3e198bacb7efc1a557fa7ed17e907a338f9904b161e3ede7e50478b09b43b3cf3e64ca8dd2278a4 SHA512 5ec5fbcbbae9a49d8e558f0b98f587ca704a64075a03874fab5fd77fb008a010baf327079f26a138b0365d728f8e5603fdcb9fdd911523ab7264bbb4a293465f
+DIST feather-2.4.5-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
+DIST feather-2.4.5.tar.gz 1196741 BLAKE2B fe38f8e004f1fdc3cfedcb8596e4a77586e14556148e6692117dcbc5e7ae5265116df90ef40f36a70d7757bf568d485dda8e60dce3dad38b93f69d798a83deac SHA512 48d6a4457e8decf3bf50e4e5b0f1ffb242e6b43d91070ee0d2ad5043fb586772d4cc9cf1f89677b680b6d0cfcd8034a61597dec44a3c62c37cc6cd9ac60bd1b0
diff --git a/net-p2p/feather/feather-2.4.5.ebuild b/net-p2p/feather/feather-2.4.5.ebuild
new file mode 100644
index 000000000..86dd7b83a
--- /dev/null
+++ b/net-p2p/feather/feather-2.4.5.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop xdg
+
+SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
+MONERO_DIST_COMIT="543582872aeb6ac5dd5853983765dbdd7706163d"
+ MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
+ RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
+ RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
+ SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
+ TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
+
+DESCRIPTION="A free, open-source Monero wallet"
+HOMEPAGE="https://featherwallet.org"
+SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
+${P}.tar.gz
+ https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
+${P}-singleapplication.tar.gz
+ https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
+${P}-monero.tar.gz
+ https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
+${P}-monero-miniupnp.tar.gz
+ https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
+${P}-monero-randomx.tar.gz
+ https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
+${P}-monero-rapidjson.tar.gz
+ https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
+${P}-monero-supercop.tar.gz
+ https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
+${P}-monero-trezorcommon.tar.gz
+"
+
+# Feather is released under the terms of the BSD license, but it vendors
+# code from Monero and Tor too.
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qrcode xmrig localmonero"
+
+DEPEND="
+ dev-libs/libsodium:=
+ media-gfx/qrencode:=
+ media-gfx/zbar:=[v4l]
+ =dev-libs/polyseed-1.0.0
+ dev-libs/libzip:=
+ dev-libs/boost:=[nls]
+ >=dev-qt/qtcore-5.15:5
+ >=dev-qt/qtwidgets-5.15:5
+ >=dev-qt/qtgui-5.15:5
+ >=dev-qt/qtnetwork-5.15:5
+ >=dev-qt/qtsvg-5.15:5
+ >=dev-qt/qtxml-5.15:5
+ >=dev-qt/qtwebsockets-5.15:5
+ >=dev-qt/qtmultimedia-5.15:5[widgets]
+ >=dev-qt/qtconcurrent-5.15:5
+ dev-libs/libgcrypt:=
+ sys-libs/zlib
+ dev-libs/openssl:=
+ net-dns/unbound:=[threads]
+ net-libs/czmq:=
+"
+RDEPEND="
+ ${DEPEND}
+ net-vpn/tor
+ xmrig? ( net-misc/xmrig )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${P}.tar.gz \
+ ${P}-singleapplication.tar.gz \
+ ${P}-monero.tar.gz \
+ ${P}-monero-miniupnp.tar.gz \
+ ${P}-monero-randomx.tar.gz \
+ ${P}-monero-rapidjson.tar.gz \
+ ${P}-monero-supercop.tar.gz \
+ ${P}-monero-trezorcommon.tar.gz
+ mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
+ "${WORKDIR}"/${P}/src/third-party/singleapplication || die
+ mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero || die
+ mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/miniupnp || die
+ mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/randomx || die
+ mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/rapidjson || die
+ mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/supercop || die
+ mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
+ "${WORKDIR}"/${P}/monero/external/trezor-common || die
+}
+
+src_prepare() {
+ default
+ echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
+ echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
+ eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
+ pushd monero || die
+ eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
+ popd || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_BUILD_TYPE=Release
+ -DBUILD_SHARED_LIBS=OFF
+ -DARCH=x86-64
+ -DBUILD_TAG="linux-x64"
+ -DBUILD_64=ON
+ -DSELF_CONTAINED=OFF
+ -DLOCALMONERO=$(usex localmonero)
+ -DXMRIG=$(usex xmrig)
+ -DCHECK_UPDATES=OFF
+ -DPLATFORM_INSTALLER=OFF
+ -DUSE_DEVICE_TREZOR=OFF
+ -DDONATE_BEG=OFF
+ -DWITH_SCANNER=$(usex qrcode)
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_build feather
+}
+
+src_install() {
+ dobin "${BUILD_DIR}/bin/feather"
+
+ newicon -s 256 "${WORKDIR}"/${PF}/src/assets/images/appicons/256x256.png feather.png
+ newicon -s 128 "${WORKDIR}"/${PF}/src/assets/images/appicons/128x128.png feather.png
+ newicon -s 96 "${WORKDIR}"/${PF}/src/assets/images/appicons/96x96.png feather.png
+ newicon -s 64 "${WORKDIR}"/${PF}/src/assets/images/appicons/64x64.png feather.png
+ newicon -s 48 "${WORKDIR}"/${PF}/src/assets/images/appicons/48x48.png feather.png
+ newicon -s 32 "${WORKDIR}"/${PF}/src/assets/images/appicons/32x32.png feather.png
+ domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ einfo "Ensure that Tor is running with 'rc-service tor start' before"
+ einfo "using Feather."
+}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
new file mode 100644
index 000000000..a3dbbb06e
--- /dev/null
+++ b/net-p2p/feather/files/feather_remove_cflags-2.4.5.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -262,12 +262,8 @@
+ add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
+ add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
+
+-message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
+-message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+-message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+-
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
++set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
+
+ add_subdirectory(src)
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
new file mode 100644
index 000000000..869a7bdc8
--- /dev/null
+++ b/net-p2p/feather/files/monero_remove_cflags-2.4.5.patch
@@ -0,0 +1,25 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -773,9 +773,6 @@
+ message(STATUS "AES support disabled")
+ endif()
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
+-
+ set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
+ if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ if(ARM)
+@@ -901,9 +898,9 @@
+ message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
+ message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+
+ # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
+ # is fixed in the code (Issue #847), force compiler to be conservative.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-08-18 6:21 Viorel Munteanu
0 siblings, 0 replies; 6+ messages in thread
From: Viorel Munteanu @ 2023-08-18 6:21 UTC (permalink / raw
To: gentoo-commits
commit: af3ffc3cfd5ce3400f84e1fbd9a8762d944c7411
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Thu Aug 17 16:11:32 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 16:11:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=af3ffc3c
net-p2p/feather: drop 2.4.2
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
net-p2p/feather/Manifest | 8 --
net-p2p/feather/feather-2.4.2.ebuild | 144 ---------------------
.../files/feather_remove_cflags-2.4.2.patch | 18 ---
.../files/monero_add_some_includes-2.2.3.patch | 25 ----
.../feather/files/monero_remove_cflags-2.2.3.patch | 24 ----
.../feather/files/monero_remove_cflags-2.3.0.patch | 25 ----
.../monero_remove_cflags-2.4.1_pre20230301.patch | 25 ----
.../feather/files/monero_remove_cflags-2.4.2.patch | 25 ----
8 files changed, 294 deletions(-)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index e9d6f65e19..54c83270ef 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,11 +1,3 @@
-DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.2-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
-DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
DIST feather-2.4.5-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
DIST feather-2.4.5-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
DIST feather-2.4.5-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
diff --git a/net-p2p/feather/feather-2.4.2.ebuild b/net-p2p/feather/feather-2.4.2.ebuild
deleted file mode 100644
index 54dbc41f48..0000000000
--- a/net-p2p/feather/feather-2.4.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="72519d14203061b59191144ee8cab736bc88b978"
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
- RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
- dev-libs/libsodium:=
- media-gfx/qrencode:=
- media-gfx/zbar:=[v4l]
- =dev-libs/polyseed-1.0.0
- dev-libs/libzip:=
- dev-libs/boost:=[nls]
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtwidgets-5.15:5
- >=dev-qt/qtgui-5.15:5
- >=dev-qt/qtnetwork-5.15:5
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtxml-5.15:5
- >=dev-qt/qtwebsockets-5.15:5
- >=dev-qt/qtmultimedia-5.15:5[widgets]
- >=dev-qt/qtconcurrent-5.15:5
- dev-libs/libgcrypt:=
- sys-libs/zlib
- dev-libs/openssl:=
- net-dns/unbound:=[threads]
- net-libs/czmq:=
-"
-RDEPEND="
- ${DEPEND}
- net-vpn/tor
- xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
- unpack ${P}.tar.gz \
- ${P}-singleapplication.tar.gz \
- ${P}-monero.tar.gz \
- ${P}-monero-miniupnp.tar.gz \
- ${P}-monero-randomx.tar.gz \
- ${P}-monero-rapidjson.tar.gz \
- ${P}-monero-supercop.tar.gz \
- ${P}-monero-trezorcommon.tar.gz
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
- "${WORKDIR}"/${P}/src/third-party/singleapplication || die
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero || die
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/miniupnp || die
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/randomx || die
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/rapidjson || die
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/supercop || die
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
- default
- echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
- echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
- eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
- pushd monero || die
- eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
- popd || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE=Release
- -DBUILD_SHARED_LIBS=OFF
- -DARCH=x86-64
- -DBUILD_TAG="linux-x64"
- -DBUILD_64=ON
- -DSELF_CONTAINED=OFF
- -DLOCALMONERO=$(usex localmonero)
- -DXMRIG=$(usex xmrig)
- -DCHECK_UPDATES=OFF
- -DPLATFORM_INSTALLER=OFF
- -DUSE_DEVICE_TREZOR=OFF
- -DDONATE_BEG=OFF
- -DWITH_SCANNER=$(usex qrcode)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build feather
-}
-
-src_install() {
- dobin "${BUILD_DIR}/bin/feather"
-
- doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
- domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Ensure that Tor is running with 'rc-service tor start' before"
- einfo "using Feather."
-}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
diff --git a/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch b/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
deleted file mode 100644
index d048d13de2..0000000000
--- a/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
-index e00421f873e..da144aca403 100644
---- a/src/common/dns_utils.cpp
-+++ b/src/common/dns_utils.cpp
-@@ -30,6 +30,8 @@
- // check local first (in the event of static or in-source compilation of libunbound)
- #include "unbound.h"
-
-+#include <deque>
-+#include <set>
- #include <stdlib.h>
- #include "include_base_utils.h"
- #include "common/threadpool.h"
-diff --git a/src/common/threadpool.h b/src/common/threadpool.h
-index 53421e18b30..fcf8ca9455a 100644
---- a/src/common/threadpool.h
-+++ b/src/common/threadpool.h
-@@ -31,6 +31,7 @@
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
- #include <cstddef>
-+#include <deque>
- #include <functional>
- #include <utility>
- #include <vector>
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
deleted file mode 100644
index 23360c8179..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,8 +773,6 @@
- message(STATUS "AES support disabled")
- endif()
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
-
- set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
- if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-@@ -901,9 +899,9 @@
- message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
- message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-
- # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
- # is fixed in the code (Issue #847), force compiler to be conservative.
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
- message(STATUS "AES support disabled")
- endif()
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
- set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
- if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(ARM)
-@@ -901,9 +898,9 @@
- message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
- message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-
- # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
- # is fixed in the code (Issue #847), force compiler to be conservative.
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
- message(STATUS "AES support disabled")
- endif()
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
- set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
- if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(ARM)
-@@ -901,9 +898,9 @@
- message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
- message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-
- # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
- # is fixed in the code (Issue #847), force compiler to be conservative.
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
- message(STATUS "AES support disabled")
- endif()
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
- set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
- if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(ARM)
-@@ -901,9 +898,9 @@
- message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
- message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-
- # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
- # is fixed in the code (Issue #847), force compiler to be conservative.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/
@ 2023-08-18 6:21 Viorel Munteanu
0 siblings, 0 replies; 6+ messages in thread
From: Viorel Munteanu @ 2023-08-18 6:21 UTC (permalink / raw
To: gentoo-commits
commit: f75e829550641520489b7911fd68aefe89105d90
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Thu Aug 17 16:07:48 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 16:07:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f75e8295
net-p2p/feather: drop 2.2.3, 2.3.0, 2.4.1_pre20230301
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
net-p2p/feather/Manifest | 24 ----
net-p2p/feather/feather-2.2.3.ebuild | 145 --------------------
net-p2p/feather/feather-2.3.0.ebuild | 144 --------------------
net-p2p/feather/feather-2.4.1_pre20230301.ebuild | 149 ---------------------
.../files/feather_remove_cflags-2.2.3.patch | 18 ---
.../files/feather_remove_cflags-2.3.0.patch | 18 ---
.../feather_remove_cflags-2.4.1_pre20230301.patch | 18 ---
7 files changed, 516 deletions(-)
diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 37e26bba1c..e9d6f65e19 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,27 +1,3 @@
-DIST feather-2.2.3-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.2.3-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.2.3-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.2.3-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.2.3-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.2.3-monero.tar.gz 11615445 BLAKE2B b30f7e8b72989f14a482997a17e925afaef4ac198ecfe57e545f72f4923e26d3352db5bcb393252ab2488040b8fe82dba2c7be05c2c59cb5dff2499c6dd306a2 SHA512 cdb4f0634f50319622920faf56484f975fef7e94caf01f276118552ba7de284ec3ec06e43b1476de3255710f7bb47a47d75d974174a3c30657074943fa1f415a
-DIST feather-2.2.3-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.2.3.tar.gz 2197323 BLAKE2B 413b6acfbb1eaa55844a01c324325707a25b99f78e52c882c1b57e66ff0f85a0535811568c43f0746818592a8775341678c1f565abdff2eefa25a81ac8d1c97b SHA512 96f5e3a3bd401bea1c15b77b9180da8cfddecfff85138a7cace27876ebe56558e1cf884ef28d9b466bfbf5b7beaa4232d96144e71d458c0d4c647129406199a9
-DIST feather-2.3.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.3.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.3.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.3.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.3.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.3.0-monero.tar.gz 11624682 BLAKE2B cf4e53e4ba08d51a8b8b36181437ff531a37aa04888e0987152f7bc33e71acd8378848ad54caf3184494bf5071f0041fd8059c55047957dc4a973d7519165342 SHA512 a5246e5c1cc65cbc7c719979f07054f55016e8fcb9401b96809b1867d09f262850c7b24d42580f4aad2b0a2d25063b5c405dbc6537f72d87bd3109e52dc3196c
-DIST feather-2.3.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.3.0.tar.gz 2204981 BLAKE2B d2635a52b092e4f90783074b1041a7256fcaa0ae66ae25bd1e19e04e4112a2a5bfb043d78aeeb62e2ce508498d531e4eb9677d6f4f223a298c5fac5d020c434a SHA512 b85f9932ed347cd78f9153a1e50e4374836f5d169efeb0a21e1d319c7f10b3f027a28384cad6fbc322c7bad8766bd30da6cbaf4b64a7a0e501634fe02f5cded0
-DIST feather-2.4.1_pre20230301-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.1_pre20230301-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.1_pre20230301-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.1_pre20230301-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.1_pre20230301-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.1_pre20230301-monero.tar.gz 11621070 BLAKE2B 8361a9f44eeb8a2035d3e110481aada7607b4bac2b52efc04ac6003665585d4d56629e88ab8c501e51997b3c3fe514a81b6f981bc07f3070eb24b897169300a6 SHA512 1bc23d60bebd51fdf459244376406c3eaec698457d0fc58f9628081c4b6297a15fb12dc848bbbbaafc77c367c59811ff36dbe499ac0fbcafd4ea10e0c6771f7e
-DIST feather-2.4.1_pre20230301-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.1_pre20230301.tar.gz 5458207 BLAKE2B 40f754a19778c227fcf73350f4bc5b61df142d18d17227dc7d83f2beef160ad170d1d40eea589d003c19459c2821b6b8630220dc612ba3abb981ebe622225b6d SHA512 eb09f6c7d45e238110d2f7c60401aba147acbb38784e51d5e43966b077c52e4e26c1d08cfbf4093cdb777fc8a01932b927603cb834f0d1b4b8b41fa913a9987b
DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
diff --git a/net-p2p/feather/feather-2.2.3.ebuild b/net-p2p/feather/feather-2.2.3.ebuild
deleted file mode 100644
index 6a22d7eb07..0000000000
--- a/net-p2p/feather/feather-2.2.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="5e3c15637ed0ecbef44782247ce7364c2893a674"
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
- RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
- dev-libs/libsodium:=
- media-gfx/qrencode:=
- media-gfx/zbar:=[v4l]
- >=dev-libs/polyseed-1.0.0
- dev-libs/libzip:=
- dev-libs/boost:=[nls]
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtwidgets-5.15:5
- >=dev-qt/qtgui-5.15:5
- >=dev-qt/qtnetwork-5.15:5
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtxml-5.15:5
- >=dev-qt/qtwebsockets-5.15:5
- >=dev-qt/qtmultimedia-5.15:5[widgets]
- >=dev-qt/qtconcurrent-5.15:5
- dev-libs/libgcrypt:=
- sys-libs/zlib
- dev-libs/openssl:=
- net-dns/unbound:=[threads]
- net-libs/czmq:=
-"
-RDEPEND="
- ${DEPEND}
- net-vpn/tor
- xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
- unpack ${P}.tar.gz \
- ${P}-singleapplication.tar.gz \
- ${P}-monero.tar.gz \
- ${P}-monero-miniupnp.tar.gz \
- ${P}-monero-randomx.tar.gz \
- ${P}-monero-rapidjson.tar.gz \
- ${P}-monero-supercop.tar.gz \
- ${P}-monero-trezorcommon.tar.gz
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
- "${WORKDIR}"/${P}/src/third-party/singleapplication || die
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero || die
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/miniupnp || die
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/randomx || die
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/rapidjson || die
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/supercop || die
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
- default
- echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
- echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
- eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
- pushd monero || die
- eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
- eapply "${FILESDIR}"/monero_add_some_includes-${PV}.patch
- popd || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE=Release
- -DBUILD_SHARED_LIBS=OFF
- -DARCH=x86-64
- -DBUILD_TAG="linux-x64"
- -DBUILD_64=ON
- -DSELF_CONTAINED=OFF
- -DLOCALMONERO=$(usex localmonero)
- -DXMRIG=$(usex xmrig)
- -DCHECK_UPDATES=OFF
- -DPLATFORM_INSTALLER=OFF
- -DUSE_DEVICE_TREZOR=OFF
- -DDONATE_BEG=OFF
- -DWITH_SCANNER=$(usex qrcode)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build feather
-}
-
-src_install() {
- dobin "${BUILD_DIR}/bin/feather"
-
- doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
- domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Ensure that Tor is running with 'rc-service tor start' before"
- einfo "using Feather."
-}
diff --git a/net-p2p/feather/feather-2.3.0.ebuild b/net-p2p/feather/feather-2.3.0.ebuild
deleted file mode 100644
index 02e20aa061..0000000000
--- a/net-p2p/feather/feather-2.3.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="18bdad879d9f25f35f065354aedf1236e6b0a60b"
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
- RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
- dev-libs/libsodium:=
- media-gfx/qrencode:=
- media-gfx/zbar:=[v4l]
- >=dev-libs/polyseed-1.0.0
- dev-libs/libzip:=
- dev-libs/boost:=[nls]
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtwidgets-5.15:5
- >=dev-qt/qtgui-5.15:5
- >=dev-qt/qtnetwork-5.15:5
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtxml-5.15:5
- >=dev-qt/qtwebsockets-5.15:5
- >=dev-qt/qtmultimedia-5.15:5[widgets]
- >=dev-qt/qtconcurrent-5.15:5
- dev-libs/libgcrypt:=
- sys-libs/zlib
- dev-libs/openssl:=
- net-dns/unbound:=[threads]
- net-libs/czmq:=
-"
-RDEPEND="
- ${DEPEND}
- net-vpn/tor
- xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
- unpack ${P}.tar.gz \
- ${P}-singleapplication.tar.gz \
- ${P}-monero.tar.gz \
- ${P}-monero-miniupnp.tar.gz \
- ${P}-monero-randomx.tar.gz \
- ${P}-monero-rapidjson.tar.gz \
- ${P}-monero-supercop.tar.gz \
- ${P}-monero-trezorcommon.tar.gz
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
- "${WORKDIR}"/${P}/src/third-party/singleapplication || die
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero || die
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/miniupnp || die
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/randomx || die
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/rapidjson || die
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/supercop || die
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
- default
- echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
- echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
- eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
- pushd monero || die
- eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
- popd || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE=Release
- -DBUILD_SHARED_LIBS=OFF
- -DARCH=x86-64
- -DBUILD_TAG="linux-x64"
- -DBUILD_64=ON
- -DSELF_CONTAINED=OFF
- -DLOCALMONERO=$(usex localmonero)
- -DXMRIG=$(usex xmrig)
- -DCHECK_UPDATES=OFF
- -DPLATFORM_INSTALLER=OFF
- -DUSE_DEVICE_TREZOR=OFF
- -DDONATE_BEG=OFF
- -DWITH_SCANNER=$(usex qrcode)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build feather
-}
-
-src_install() {
- dobin "${BUILD_DIR}/bin/feather"
-
- doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
- domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Ensure that Tor is running with 'rc-service tor start' before"
- einfo "using Feather."
-}
diff --git a/net-p2p/feather/feather-2.4.1_pre20230301.ebuild b/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
deleted file mode 100644
index 2f597359e7..0000000000
--- a/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-# Comit that fixes qt5:
-FEATHER_DIST_COMIT="8e10731e37621e271eea481dd93065a55c0a74c8"
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="772d207026dac31f927efa733fda3f73b103e71a"
- MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
- RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
- RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
- SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
- TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/${FEATHER_DIST_COMIT}.tar.gz -> \
-${P}.tar.gz
- https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
- https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
- https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
- https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
- https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
- https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
- https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
- dev-libs/libsodium:=
- media-gfx/qrencode:=
- media-gfx/zbar:=[v4l]
- >=dev-libs/polyseed-1.0.0
- dev-libs/libzip:=
- dev-libs/boost:=[nls]
- >=dev-qt/qtcore-5.15:5
- >=dev-qt/qtwidgets-5.15:5
- >=dev-qt/qtgui-5.15:5
- >=dev-qt/qtnetwork-5.15:5
- >=dev-qt/qtsvg-5.15:5
- >=dev-qt/qtxml-5.15:5
- >=dev-qt/qtwebsockets-5.15:5
- >=dev-qt/qtmultimedia-5.15:5[widgets]
- >=dev-qt/qtconcurrent-5.15:5
- dev-libs/libgcrypt:=
- sys-libs/zlib
- dev-libs/openssl:=
- net-dns/unbound:=[threads]
- net-libs/czmq:=
-"
-RDEPEND="
- ${DEPEND}
- net-vpn/tor
- xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
- unpack ${P}.tar.gz \
- ${P}-singleapplication.tar.gz \
- ${P}-monero.tar.gz \
- ${P}-monero-miniupnp.tar.gz \
- ${P}-monero-randomx.tar.gz \
- ${P}-monero-rapidjson.tar.gz \
- ${P}-monero-supercop.tar.gz \
- ${P}-monero-trezorcommon.tar.gz
- mv -T "${WORKDIR}"/feather-${FEATHER_DIST_COMIT} \
- "${WORKDIR}"/${P} || die
- mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
- "${WORKDIR}"/${P}/src/third-party/singleapplication || die
- mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero || die
- mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/miniupnp || die
- mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/randomx || die
- mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/rapidjson || die
- mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/supercop || die
- mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
- "${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
- default
- echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
- echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
- eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
- pushd monero || die
- eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
- popd || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_BUILD_TYPE=Release
- -DBUILD_SHARED_LIBS=OFF
- -DARCH=x86-64
- -DBUILD_TAG="linux-x64"
- -DBUILD_64=ON
- -DSELF_CONTAINED=OFF
- -DLOCALMONERO=$(usex localmonero)
- -DXMRIG=$(usex xmrig)
- -DCHECK_UPDATES=OFF
- -DPLATFORM_INSTALLER=OFF
- -DUSE_DEVICE_TREZOR=OFF
- -DDONATE_BEG=OFF
- -DWITH_SCANNER=$(usex qrcode)
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_build feather
-}
-
-src_install() {
- dobin "${BUILD_DIR}/bin/feather"
-
- doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
- domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "Ensure that Tor is running with 'rc-service tor start' before"
- einfo "using Feather."
-}
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch b/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
deleted file mode 100644
index 480179a15f..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,12 +284,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-18 6:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-18 6:21 [gentoo-commits] repo/proj/guru:master commit in: net-p2p/feather/, net-p2p/feather/files/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2023-08-18 6:21 Viorel Munteanu
2023-04-23 8:40 Florian Schmaus
2023-03-16 8:41 Florian Schmaus
2023-02-04 9:39 Viorel Munteanu
2022-12-29 20:17 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox