commit: 13954a2b66a0a8983ffa041108a69ccef9b54354 Author: RavFX XMR <ravfx <AT> xmr <DOT> mx> AuthorDate: Thu Sep 18 04:11:19 2025 +0000 Commit: RavFX <ravfx <AT> xmr <DOT> mx> CommitDate: Thu Sep 18 04:13:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13954a2b
net-p2p/feather: add support for wayland USE flag and fix build when wayland is not present. remove older versions. Signed-off-by: RavFX XMR <ravfx <AT> xmr.mx> net-p2p/feather/Manifest | 4 - net-p2p/feather/feather-2.7.0-r1.ebuild | 107 -------------------- ...eather-2.8.0.ebuild => feather-2.8.1-r1.ebuild} | 13 ++- net-p2p/feather/feather-2.8.1.ebuild | 108 --------------------- net-p2p/feather/files/feather-no-wayland.patch | 43 ++++++++ 5 files changed, 51 insertions(+), 224 deletions(-) diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest index 347167108c..3fd8745ce5 100644 --- a/net-p2p/feather/Manifest +++ b/net-p2p/feather/Manifest @@ -1,6 +1,2 @@ -DIST feather-2.7.0.tar.gz 27411343 BLAKE2B 764ff22a36e1668da3fa2109a13802b96c432be3a35c58923daa9e23d1fe8cae6c8c853e939abc2aee60f7fb2e4bcca405f59ae545939128f3a78c5d9bbc99dd SHA512 b627f8af250860b8ea3788affec13fbd70f8687f58241e7840685c663f8ad057856247ff3b31273f33bddb879a7ee56f3b5fc4c47dff40e7afe73dd5fc5a56ea -DIST feather-2.7.0.tar.gz.asc 833 BLAKE2B a6a37eb2470c2dc7e3c3a72812681e62458b30925b6b12fb9a1f3b7eb8351294e202b4af38c757adff7a3e9d84df37a0560e189cffbeaa32910e859171fa576c SHA512 3ba73562fb712a28b84d7185235d31a62dc967b25eea4764f4c8c89329427a126eb3ebef3e28182c3d53e1fcf2c2b4c45e732fb209f77d16756609e510e281ec -DIST feather-2.8.0.tar.gz 25873275 BLAKE2B 8d3d7041a8239f2b5dcf833ea79c589b78fcaefdd2bb54bb628c5ef8b9702ab2fd18f7841c3ed2d6327b05a167b91958d3214d03e74c55ae0cba7eb80454fbe8 SHA512 fde873a8f7442fe65ea390c4b410cc3d1331d2dd455704f264dc1bd0d21babede17b04e96e1671c424966abe6b674799c02eb375fa14f91baaa61d631627b425 -DIST feather-2.8.0.tar.gz.asc 833 BLAKE2B dc44d0d9fa1aca692cd0a31a1bb7a624ef29032a83fdd6fadf87f9d7f31469e147a17def3725e0ff24095d913a803fb515931161bf2da3cdefefc531a5abeb76 SHA512 53a41c1c688111fdd3ae5fc0270551148de5d966442293536569d4159440af9af53614bc28d2c79fcdf0f16479ee5210259de8c7ad65993b81c43baf14368641 DIST feather-2.8.1.tar.gz 25878783 BLAKE2B 02f7ec447c8962dce689a7c679eb407aaf406f7a970146ba7c2551abfae7d69077817087b83e1b3f6064d789c78e48b1788af8a9f7f0d7c760f098e359248e60 SHA512 3852e412e43abdce271a441c9ed2deb38f9c755b63e2caaf903e70c0291bfa1a9c8fa64a453f136c53fd16c35e5844d3d8884f917ea34feca4e0e3e3d844d6bb DIST feather-2.8.1.tar.gz.asc 833 BLAKE2B 727ab2049323d03d839fb8f570cbb687829aa2a8abe1e8d5d7abecd1689559389696707da7bc570b6f6d17256c6785f5071c75f0ec89f96ad3d30e3b69e6b915 SHA512 2a082d467c95cb7757dc5261e93a1ecfbec5a4881cab3c88c25b7869af76892965904a9e3d8fc250e57c3f2210002aa695960f3bc32c97b59313504a6e0e2eef diff --git a/net-p2p/feather/feather-2.7.0-r1.ebuild b/net-p2p/feather/feather-2.7.0-r1.ebuild deleted file mode 100644 index 23906b8d45..0000000000 --- a/net-p2p/feather/feather-2.7.0-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop verify-sig xdg - -DESCRIPTION="A free, open-source Monero wallet" -HOMEPAGE="https://featherwallet.org"; -SRC_URI=" - https://featherwallet.org/files/releases/source/${P}.tar.gz - verify-sig? ( https://featherwallet.org/files/releases/source/${P}.tar.gz.asc ) -" - -# 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="bounties calc crowdfunding home qrcode revuo tickers xmrig" -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/qtbase-6.7.3:6 - >=dev-qt/qtsvg-6.7.3:6 - >=dev-qt/qtmultimedia-6.7.3:6 - >=dev-qt/qtwebsockets-6.7.3:6 - dev-libs/libgcrypt:= - sys-libs/zlib - dev-libs/openssl:= - net-dns/unbound:=[threads] - net-libs/czmq:= - qrcode? ( media-libs/zxing-cpp ) -" -RDEPEND=" - ${DEPEND} - net-vpn/tor - xmrig? ( net-misc/xmrig ) -" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-featherwallet ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/featherwallet.asc - -src_prepare() { - default - echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die - echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || 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 - -DWITH_PLUGIN_HOME=$(usex home) - -DWITH_PLUGIN_TICKERS=$(usex tickers) - -DWITH_PLUGIN_CROWDFUNDING=$(usex crowdfunding) - -DWITH_PLUGIN_BOUNTIES=$(usex bounties) - -DWITH_PLUGIN_REVUO=$(usex revuo) - -DWITH_PLUGIN_CALC=$(usex calc) - -DWITH_PLUGIN_XMRIG=$(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}"/${P}/src/assets/images/appicons/256x256.png feather.png - newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png feather.png - newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png feather.png - newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png feather.png - newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png feather.png - newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png feather.png - domenu "${WORKDIR}"/${P}/src/assets/feather.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "Ensure that Tor is running with 'rc-service tor start' before" - einfo "using Feather." - einfo "" - einfo "Donation popup has been disabled in this build." - einfo "Consider donating to upstream developers here:" - einfo "https://docs.featherwallet.org/guides/donate"; -} diff --git a/net-p2p/feather/feather-2.8.0.ebuild b/net-p2p/feather/feather-2.8.1-r1.ebuild similarity index 93% rename from net-p2p/feather/feather-2.8.0.ebuild rename to net-p2p/feather/feather-2.8.1-r1.ebuild index f1e6d8384d..fefc44d765 100644 --- a/net-p2p/feather/feather-2.8.0.ebuild +++ b/net-p2p/feather/feather-2.8.1-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI=" LICENSE="BSD MIT" SLOT="0" KEYWORDS="~amd64" -IUSE="bounties calc crowdfunding home qrcode revuo tickers xmrig" +IUSE="bounties calc crowdfunding home qrcode revuo tickers xmrig wayland" DEPEND=" dev-libs/libsodium:= media-gfx/qrencode:= @@ -26,10 +26,10 @@ DEPEND=" ~dev-libs/polyseed-1.0.0 dev-libs/libzip:= dev-libs/boost:=[nls] - >=dev-qt/qtbase-6.7.3:6 - >=dev-qt/qtsvg-6.7.3:6 - >=dev-qt/qtmultimedia-6.7.3:6 - >=dev-qt/qtwebsockets-6.7.3:6 + >=dev-qt/qtbase-6.9.1:6[wayland=] + >=dev-qt/qtsvg-6.9.1:6 + >=dev-qt/qtmultimedia-6.9.1:6 + >=dev-qt/qtwebsockets-6.9.1:6 dev-libs/libgcrypt:= sys-libs/zlib dev-libs/openssl:= @@ -53,6 +53,9 @@ src_prepare() { default echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || die + if ! use wayland; then + eapply "${FILESDIR}/feather-no-wayland.patch" + fi cmake_src_prepare } diff --git a/net-p2p/feather/feather-2.8.1.ebuild b/net-p2p/feather/feather-2.8.1.ebuild deleted file mode 100644 index f1e6d8384d..0000000000 --- a/net-p2p/feather/feather-2.8.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# RavFX (2025) Bump version and remove deprecated plugins - -EAPI=8 - -inherit cmake desktop verify-sig xdg - -DESCRIPTION="A free, open-source Monero wallet" -HOMEPAGE="https://featherwallet.org"; -SRC_URI=" - https://featherwallet.org/files/releases/source/${P}.tar.gz - verify-sig? ( https://featherwallet.org/files/releases/source/${P}.tar.gz.asc ) -" - -# 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="bounties calc crowdfunding home qrcode revuo tickers xmrig" -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/qtbase-6.7.3:6 - >=dev-qt/qtsvg-6.7.3:6 - >=dev-qt/qtmultimedia-6.7.3:6 - >=dev-qt/qtwebsockets-6.7.3:6 - dev-libs/libgcrypt:= - sys-libs/zlib - dev-libs/openssl:= - net-dns/unbound:=[threads] - net-libs/czmq:= - qrcode? ( media-libs/zxing-cpp ) -" -RDEPEND=" - ${DEPEND} - net-vpn/tor - xmrig? ( net-misc/xmrig ) -" -BDEPEND=" - virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-featherwallet ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/featherwallet.asc - -src_prepare() { - default - echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${P}/src/config-feather.h || die - echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${P}/src/config-feather.h || 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 - -DWITH_PLUGIN_HOME=$(usex home) - -DWITH_PLUGIN_TICKERS=$(usex tickers) - -DWITH_PLUGIN_CROWDFUNDING=$(usex crowdfunding) - -DWITH_PLUGIN_BOUNTIES=$(usex bounties) - -DWITH_PLUGIN_REVUO=$(usex revuo) - -DWITH_PLUGIN_CALC=$(usex calc) - -DWITH_PLUGIN_XMRIG=$(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}"/${P}/src/assets/images/appicons/256x256.png feather.png - newicon -s 128 "${WORKDIR}"/${P}/src/assets/images/appicons/128x128.png feather.png - newicon -s 96 "${WORKDIR}"/${P}/src/assets/images/appicons/96x96.png feather.png - newicon -s 64 "${WORKDIR}"/${P}/src/assets/images/appicons/64x64.png feather.png - newicon -s 48 "${WORKDIR}"/${P}/src/assets/images/appicons/48x48.png feather.png - newicon -s 32 "${WORKDIR}"/${P}/src/assets/images/appicons/32x32.png feather.png - domenu "${WORKDIR}"/${P}/src/assets/feather.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "Ensure that Tor is running with 'rc-service tor start' before" - einfo "using Feather." - einfo "" - einfo "Donation popup has been disabled in this build." - einfo "Consider donating to upstream developers here:" - einfo "https://docs.featherwallet.org/guides/donate"; -} diff --git a/net-p2p/feather/files/feather-no-wayland.patch b/net-p2p/feather/files/feather-no-wayland.patch new file mode 100644 index 0000000000..36e2ec0f22 --- /dev/null +++ b/net-p2p/feather/files/feather-no-wayland.patch @@ -0,0 +1,43 @@ +diff '--color=auto' -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt 2025-04-12 18:06:53.000000000 -0600 ++++ b/src/CMakeLists.txt 2025-09-17 13:30:45.000000000 -0600 +@@ -18,10 +18,6 @@ + MultimediaWidgets) + endif() + +-IF (UNIX AND NOT APPLE) +- list(APPEND QT_COMPONENTS WaylandClient) +-endif() +- + find_package(Qt6 REQUIRED COMPONENTS ${QT_COMPONENTS}) + + if (CHECK_UPDATES) +@@ -309,17 +305,12 @@ + ) + endif() + +-if(UNIX AND NOT APPLE) +- target_link_libraries(feather PRIVATE Qt::WaylandClient) +-endif() +- + if(STATIC AND APPLE) + target_link_libraries(feather PRIVATE Qt6::QDarwinCameraPermissionPlugin) + endif() + + if(STATIC AND UNIX AND NOT APPLE) + target_link_libraries(feather PRIVATE Qt6::QComposePlatformInputContextPlugin) +- target_link_libraries(feather PRIVATE Qt6::QWaylandIntegrationPlugin) + endif() + + if(DEPENDS AND UNIX AND NOT APPLE) +@@ -328,10 +319,8 @@ + message(STATUS "libXau: libraries at ${LIBXAU_LIBRARY}") + target_link_libraries(XCB::XCB INTERFACE ${LIBXAU_LIBRARY}) + +- # make sure Wayland::Client links to libffi + find_library(LIBFFI_LIBRARY ffi REQUIRED) + message(STATUS "libffi: libraries at ${LIBFFI_LIBRARY}") +- target_link_libraries(Wayland::Client INTERFACE ${LIBFFI_LIBRARY}) + endif() + + if(STACK_TRACE AND CMAKE_C_COMPILER_ID STREQUAL "GNU")
