Merge updates from master

This commit is contained in:
Repository mirror & CI
2022-12-29 20:33:02 +00:00
5 changed files with 17 additions and 151 deletions

0
app-containers/waydroid/files/waydroid Executable file → Normal file
View File

View File

@@ -1,11 +1,3 @@
DIST feather-2.1.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
DIST feather-2.1.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
DIST feather-2.1.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
DIST feather-2.1.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
DIST feather-2.1.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
DIST feather-2.1.0-monero.tar.gz 11616189 BLAKE2B 704c7455d4ff1483d9b58078997d4371a9736bfacc63bc976ce65fdd966f51727f0cd656223c62f9f7baf95b475af34ac9d9e174fdf32a17d32872c46b7ad4d2 SHA512 44dfe24f4b844d9f1a14160fcf34007e735321f7beb9f6ae94ace46d67ced3e26efdfde82723ab2407c09a38da4a9aef2d52778620317051a3e780f0c0795edf
DIST feather-2.1.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
DIST feather-2.1.0.tar.gz 2005604 BLAKE2B 3e3cbd8334dd0b1b1d233b30f9fbe815a51f3f773ed73873fab316e9e22e616baa0e42112fc9b2450988915d16d7755cf79fa1e1672cb1001b8a50aeca96e102 SHA512 32697bfe80fb2e6fca00d29e78cfb9dae342f47fd47e0d49e03bc2baa18dff8d33f8b69f8658bb5bf5359ffa520a509af2c4e3e72aa80eb08d6967b26cc1870b
DIST feather-2.1.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
DIST feather-2.1.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
DIST feather-2.1.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7

View File

@@ -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."
}

View File

@@ -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

View File

@@ -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)