commit: e7b206f216f3f1053b00ba80d6b73ef62ded11ad Author: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> AuthorDate: Thu Dec 29 18:13:08 2022 +0000 Commit: Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com> 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)
