commit: 7c9ecbd8e61ffc70646581bb512fa2b596931aa4 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Tue Dec 19 06:33:11 2023 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Tue Dec 19 06:35:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c9ecbd8
app-misc/fastfetch: sync live ebuilds Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-misc/fastfetch/fastfetch-0.1.9999.ebuild | 23 ++++++++++------ app-misc/fastfetch/fastfetch-0.2.9999.ebuild | 20 ++++++++++---- .../files/fastfetch-2.0.0-dont-fetch-yyjson.patch | 31 ---------------------- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild index 950efaa60c13..4af72e9b74c7 100644 --- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake flag-o-matic -DESCRIPTION="Fast system information tool" +DESCRIPTION="Fast neofetch-like system information tool" HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"; if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -15,21 +15,24 @@ if [[ ${PV} == *9999 ]]; then [[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch" else SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="MIT" SLOT="0" -IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" +IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr" +RESTRICT="!test? ( test )" # note - qa-vdb will always report errors because fastfetch loads the libs dynamically +# make sure to crank yyjson minimum version to match bundled version RDEPEND=" - dev-libs/yyjson + >=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) + drm? ( x11-libs/libdrm ) gnome? ( dev-libs/glib gnome-base/dconf @@ -42,7 +45,10 @@ RDEPEND=" pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) - vulkan? ( media-libs/vulkan-loader ) + vulkan? ( + media-libs/vulkan-loader + sys-apps/pciutils + ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) @@ -56,8 +62,6 @@ REQUIRED_USE=" chafa? ( imagemagick ) " -PATCHES=( "${FILESDIR}"/${PN}-2.0.0-dont-fetch-yyjson.patch ) - src_configure() { local fastfetch_enable_imagemagick7=no local fastfetch_enable_imagemagick6=no @@ -69,11 +73,13 @@ src_configure() { local mycmakeargs=( -DENABLE_RPM=no -DENABLE_ZLIB=yes + -DENABLE_SYSTEM_YYJSON=yes -DENABLE_CHAFA=$(usex chafa) -DENABLE_DBUS=$(usex dbus) - -DENABLE_DDCUTIL=$(usex ddcutil) -DENABLE_DCONF=$(usex gnome) + -DENABLE_DDCUTIL=$(usex ddcutil) + -DENABLE_DRM=$(usex drm) -DENABLE_EGL=$(usex opengl) -DENABLE_GIO=$(usex gnome) -DENABLE_GLX=$(usex opengl) @@ -92,6 +98,7 @@ src_configure() { -DENABLE_XCB_RANDR=$(usex xcb) -DENABLE_XFCONF=$(usex xfce) -DENABLE_XRANDR=$(usex xrandr) + -DBUILD_TESTS=$(usex test) ) append-cppflags -DNDEBUG diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild index f7fd71b82868..4af72e9b74c7 100644 --- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit cmake flag-o-matic -DESCRIPTION="Fast system information tool" +DESCRIPTION="Fast neofetch-like system information tool" HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"; if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -15,20 +15,24 @@ if [[ ${PV} == *9999 ]]; then [[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch" else SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi LICENSE="MIT" SLOT="0" -IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" +IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr" +RESTRICT="!test? ( test )" # note - qa-vdb will always report errors because fastfetch loads the libs dynamically +# make sure to crank yyjson minimum version to match bundled version RDEPEND=" + >=dev-libs/yyjson-0.8.0:= sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) + drm? ( x11-libs/libdrm ) gnome? ( dev-libs/glib gnome-base/dconf @@ -41,7 +45,10 @@ RDEPEND=" pci? ( sys-apps/pciutils ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) - vulkan? ( media-libs/vulkan-loader ) + vulkan? ( + media-libs/vulkan-loader + sys-apps/pciutils + ) wayland? ( dev-libs/wayland ) xcb? ( x11-libs/libxcb ) xfce? ( xfce-base/xfconf ) @@ -66,11 +73,13 @@ src_configure() { local mycmakeargs=( -DENABLE_RPM=no -DENABLE_ZLIB=yes + -DENABLE_SYSTEM_YYJSON=yes -DENABLE_CHAFA=$(usex chafa) -DENABLE_DBUS=$(usex dbus) - -DENABLE_DDCUTIL=$(usex ddcutil) -DENABLE_DCONF=$(usex gnome) + -DENABLE_DDCUTIL=$(usex ddcutil) + -DENABLE_DRM=$(usex drm) -DENABLE_EGL=$(usex opengl) -DENABLE_GIO=$(usex gnome) -DENABLE_GLX=$(usex opengl) @@ -89,6 +98,7 @@ src_configure() { -DENABLE_XCB_RANDR=$(usex xcb) -DENABLE_XFCONF=$(usex xfce) -DENABLE_XRANDR=$(usex xrandr) + -DBUILD_TESTS=$(usex test) ) append-cppflags -DNDEBUG diff --git a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch b/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch deleted file mode 100644 index e235cf3a6f00..000000000000 --- a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch +++ /dev/null @@ -1,31 +0,0 @@ -fastfetch 2.0.0 tries to fetch yyjson at build time. - -This is not allowed in Gentoo. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,24 +36,6 @@ - - include(CheckIncludeFile) - --include(FetchContent) --function(ff_fetch_dep package repo tag) -- FetchContent_Declare( -- "${package}" -- GIT_REPOSITORY "${repo}" -- GIT_TAG "${tag}" -- GIT_PROGRESS TRUE -- ) -- FetchContent_GetProperties("${package}") -- if(NOT ${package}_POPULATED) -- message("-- Fetching dependency ${package}@${tag} from ${repo}") -- FetchContent_Populate(${package}) -- add_subdirectory(${${package}_SOURCE_DIR} ${${package}_BINARY_DIR} EXCLUDE_FROM_ALL) -- endif() --endfunction() -- --ff_fetch_dep(yyjson "https://github.com/ibireme/yyjson"; "0.7.0") -- - ##################### - # Configure options # - #####################
