diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-14 12:12:48 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-14 12:12:48 +0100 |
commit | b6323af2602e6a5cd4920d4af06b5c2f3949b9d0 (patch) | |
tree | 7d427f015930068f8d06e8f5aa622635ac3b61ca /app-misc | |
parent | 4b61f038fc5ecca26609a997fcc662c7cf9e0498 (diff) |
gentoo auto-resync : 14:08:2023 - 12:12:48
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/Manifest.gz | bin | 49760 -> 49765 bytes | |||
-rw-r--r-- | app-misc/fastfetch/Manifest | 9 | ||||
-rw-r--r-- | app-misc/fastfetch/fastfetch-0.1.9999.ebuild | 8 | ||||
-rw-r--r-- | app-misc/fastfetch/fastfetch-0.2.9999.ebuild | 8 | ||||
-rw-r--r-- | app-misc/fastfetch/fastfetch-2.0.0.ebuild | 106 | ||||
-rw-r--r-- | app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch | 31 | ||||
-rw-r--r-- | app-misc/fastfetch/metadata.xml | 1 | ||||
-rw-r--r-- | app-misc/jq/Manifest | 1 | ||||
-rw-r--r-- | app-misc/jq/files/jq-1.7-warnings-r1.patch | 37 |
9 files changed, 156 insertions, 45 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz Binary files differindex 764c229b16a4..c2d0e69bf965 100644 --- a/app-misc/Manifest.gz +++ b/app-misc/Manifest.gz diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest index 2ac4d2b50904..462ea9eefbf9 100644 --- a/app-misc/fastfetch/Manifest +++ b/app-misc/fastfetch/Manifest @@ -1,5 +1,8 @@ +AUX fastfetch-2.0.0-dont-fetch-yyjson.patch 843 BLAKE2B dc37cb21096ea415fa806265081f33fc48e735fe29b7ff5b742368aac6218bc9345145a81394d2936ca23c0e7fee05dd50a32ca3feb7182c3e11b8a833a6017d SHA512 c3a41cd0ed3b33b9ebc3bc9876c7db6ae9c71b8dfac7e92259a09372d059fcb032c6a34c10791758583b810de0f6db21c1ba8426e3611ae67ee97836329109cf DIST fastfetch-1.12.2.tar.gz 538194 BLAKE2B bc6badbc7f690dacbe1408479286a0d42ec687526f776ff4d2ec7b0eb767032e5781cbbe37778f4dc03a5d386979a9ae2aab84c466be997b82d9a9a6c81ea78f SHA512 a82a7c7ae365335c20d659a82215cf320c4c6b07ff127c4dad322a0a01f7ec57e34d229f4953108daadcd0d243c84f8504a3b4367df5e255e5a06e685fd6739a -EBUILD fastfetch-0.1.9999.ebuild 2831 BLAKE2B 1e74286945d764fd2824c3f70cd576bd75c1d13823c4ca4b0a49ecb9d238f7c25411865db0b2b96d6f63d0f43a6a7f10acf8534cfa2994129dc0ccf03f6b783f SHA512 d42746335e3f2ea08309660499e2139d1a214bf36d9f1044d1c96c715a24b4e68b01d3d5920455f4cfd71f8c1af3562ed3977efc40fb4375ada41ec1e38cddea -EBUILD fastfetch-0.2.9999.ebuild 2831 BLAKE2B 1e74286945d764fd2824c3f70cd576bd75c1d13823c4ca4b0a49ecb9d238f7c25411865db0b2b96d6f63d0f43a6a7f10acf8534cfa2994129dc0ccf03f6b783f SHA512 d42746335e3f2ea08309660499e2139d1a214bf36d9f1044d1c96c715a24b4e68b01d3d5920455f4cfd71f8c1af3562ed3977efc40fb4375ada41ec1e38cddea +DIST fastfetch-2.0.0.tar.gz 663049 BLAKE2B 5836a04bd0cec14321810e5512d136b02b1aea68eb5a481a79426b9eef75dcf2c93008a6ac9b7877ce1a3b2758b4d53ddc52bd7b2fca0faad26834281f5da954 SHA512 bdd440130314b7865391b74105871842fb5241d858b5808a5e2e9091f1a2f7cdad4ff485d92bb6108dd4b3d09a847adbf4c90493623c974902d8d9bcf2abbc81 +EBUILD fastfetch-0.1.9999.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028 +EBUILD fastfetch-0.2.9999.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028 EBUILD fastfetch-1.12.2.ebuild 2838 BLAKE2B 1185a5c20a06bf6e6112f4cc8942eb10ff403f7db2a4edabc1264db19448cfd992da044619b767751bd3d25d1759a6e6a8440aa529e058226adfec8cbfc400b8 SHA512 47b8b945db6391ba18a7fd93c0a9c6d53ccf1d0ede37538dbcb5ed95975f3691bd3f87492860e5e61727aa020ba42acd18ef4e27ffa9b21dfaae10fea9e94752 -MISC metadata.xml 1072 BLAKE2B 91bd3ea6312ec3d312f617167c844a24b3b43dcd30cb8bd050d27e1e69dec85ed14abf4198741b21765ee08d3320920dca6877bb17dc7f4cc7e699729ac7f739 SHA512 a3efd1937db95fd42b447d559668b06cc1cdef7e67e8f6bec19f71b944d41628f2a1a68fc55f72ea1fa1319b25a960b660c6450ebf4509f3e21cad99505c4779 +EBUILD fastfetch-2.0.0.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028 +MISC metadata.xml 1159 BLAKE2B 967449a1aa6e5baae193e105181c750b35eba83ab0a9586e6ce461e158e59a1184f67d765e19ea3a4f0602b7be17f777fb2d30d11d123dae26163f7fc9440d57 SHA512 595cf9a0b99e97fcb4396807473545c4f59cb129013dfe0adc6885c60d7ea47e72cf4aef1df01f7bd8328ec6e89918980a2ecc69700923f099b1a7e573a83731 diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild index 7a1c4c649c9a..950efaa60c13 100644 --- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild @@ -20,14 +20,16 @@ fi LICENSE="MIT" SLOT="0" -IUSE="X chafa dbus gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" +IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" # note - qa-vdb will always report errors because fastfetch loads the libs dynamically RDEPEND=" + dev-libs/yyjson sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) + ddcutil? ( app-misc/ddcutil:= ) gnome? ( dev-libs/glib gnome-base/dconf @@ -54,6 +56,8 @@ 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 @@ -63,12 +67,12 @@ src_configure() { fi local mycmakeargs=( - -DENABLE_LIBCJSON=no -DENABLE_RPM=no -DENABLE_ZLIB=yes -DENABLE_CHAFA=$(usex chafa) -DENABLE_DBUS=$(usex dbus) + -DENABLE_DDCUTIL=$(usex ddcutil) -DENABLE_DCONF=$(usex gnome) -DENABLE_EGL=$(usex opengl) -DENABLE_GIO=$(usex gnome) diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild index 7a1c4c649c9a..950efaa60c13 100644 --- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild @@ -20,14 +20,16 @@ fi LICENSE="MIT" SLOT="0" -IUSE="X chafa dbus gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" +IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" # note - qa-vdb will always report errors because fastfetch loads the libs dynamically RDEPEND=" + dev-libs/yyjson sys-libs/zlib X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) + ddcutil? ( app-misc/ddcutil:= ) gnome? ( dev-libs/glib gnome-base/dconf @@ -54,6 +56,8 @@ 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 @@ -63,12 +67,12 @@ src_configure() { fi local mycmakeargs=( - -DENABLE_LIBCJSON=no -DENABLE_RPM=no -DENABLE_ZLIB=yes -DENABLE_CHAFA=$(usex chafa) -DENABLE_DBUS=$(usex dbus) + -DENABLE_DDCUTIL=$(usex ddcutil) -DENABLE_DCONF=$(usex gnome) -DENABLE_EGL=$(usex opengl) -DENABLE_GIO=$(usex gnome) diff --git a/app-misc/fastfetch/fastfetch-2.0.0.ebuild b/app-misc/fastfetch/fastfetch-2.0.0.ebuild new file mode 100644 index 000000000000..950efaa60c13 --- /dev/null +++ b/app-misc/fastfetch/fastfetch-2.0.0.ebuild @@ -0,0 +1,106 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic + +DESCRIPTION="Fast system information tool" +HOMEPAGE="https://github.com/fastfetch-cli/fastfetch" +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git" + [[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master + [[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev + [[ "${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" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr" + +# note - qa-vdb will always report errors because fastfetch loads the libs dynamically +RDEPEND=" + dev-libs/yyjson + sys-libs/zlib + X? ( x11-libs/libX11 ) + chafa? ( media-gfx/chafa ) + dbus? ( sys-apps/dbus ) + ddcutil? ( app-misc/ddcutil:= ) + gnome? ( + dev-libs/glib + gnome-base/dconf + ) + imagemagick? ( media-gfx/imagemagick:= ) + networkmanager? ( net-misc/networkmanager ) + opencl? ( virtual/opencl ) + opengl? ( media-libs/libglvnd[X] ) + osmesa? ( media-libs/mesa[osmesa] ) + pci? ( sys-apps/pciutils ) + pulseaudio? ( media-libs/libpulse ) + sqlite? ( dev-db/sqlite:3 ) + vulkan? ( media-libs/vulkan-loader ) + wayland? ( dev-libs/wayland ) + xcb? ( x11-libs/libxcb ) + xfce? ( xfce-base/xfconf ) + xrandr? ( x11-libs/libXrandr ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +REQUIRED_USE=" + xrandr? ( X ) + chafa? ( imagemagick ) +" + +PATCHES=( "${FILESDIR}"/${PN}-2.0.0-dont-fetch-yyjson.patch ) + +src_configure() { + local fastfetch_enable_imagemagick7=no + local fastfetch_enable_imagemagick6=no + if use imagemagick; then + fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no) + fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no) + fi + + local mycmakeargs=( + -DENABLE_RPM=no + -DENABLE_ZLIB=yes + + -DENABLE_CHAFA=$(usex chafa) + -DENABLE_DBUS=$(usex dbus) + -DENABLE_DDCUTIL=$(usex ddcutil) + -DENABLE_DCONF=$(usex gnome) + -DENABLE_EGL=$(usex opengl) + -DENABLE_GIO=$(usex gnome) + -DENABLE_GLX=$(usex opengl) + -DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6} + -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7} + -DENABLE_LIBNM=$(usex networkmanager) + -DENABLE_LIBPCI=$(usex pci) + -DENABLE_OPENCL=$(usex opencl) + -DENABLE_OSMESA=$(usex osmesa) + -DENABLE_PULSE=$(usex pulseaudio) + -DENABLE_SQLITE3=$(usex sqlite) + -DENABLE_VULKAN=$(usex vulkan) + -DENABLE_WAYLAND=$(usex wayland) + -DENABLE_X11=$(usex X) + -DENABLE_XCB=$(usex xcb) + -DENABLE_XCB_RANDR=$(usex xcb) + -DENABLE_XFCONF=$(usex xfce) + -DENABLE_XRANDR=$(usex xrandr) + ) + + append-cppflags -DNDEBUG + + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -r "${ED}"/usr/share/licenses || die +} 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 new file mode 100644 index 000000000000..e235cf3a6f00 --- /dev/null +++ b/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch @@ -0,0 +1,31 @@ +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 # + ##################### diff --git a/app-misc/fastfetch/metadata.xml b/app-misc/fastfetch/metadata.xml index 1c1ff32e0ceb..6bd2aac4ccf3 100644 --- a/app-misc/fastfetch/metadata.xml +++ b/app-misc/fastfetch/metadata.xml @@ -10,6 +10,7 @@ </upstream> <use> <flag name="chafa">Enables text/graphics renderer with <pkg>media-gfx/chafa</pkg></flag> + <flag name="ddcutil">Use <pkg>app-misc/ddcutil</pkg> to query monitor settings</flag> <flag name="opencl">Enables OpenCL support</flag> <flag name="osmesa">Enables offscreen rendering support from <pkg>media-libs/mesa</pkg></flag> <flag name="pci">Enables reading GPU via <pkg>sys-apps/pciutils</pkg></flag> diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index 506621a14e87..6bc26363ceae 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -3,7 +3,6 @@ AUX jq-1.6-runpath.patch 563 BLAKE2B 9b7600e9673fd0a34dedd2c3c7a672b26d146778f92 AUX jq-1.6-segfault-fix.patch 868 BLAKE2B 922960b595f84447c8a4b0c70a414dfd26104a30dc317cade0e0034b86dcf21296b7ed29c7e239204d9ab063d0418e3b8389ff7a39d688c3279c78fc4b22a126 SHA512 0c5b3f82cc6bb98413c7adf5a12e3cdeae7c611417853f3e9c5026e54d237c4f32ef47f6347b09d2cc63f0efa12b7790a588da98cf752d2d4cc0fa50978cab8b AUX jq-1.7-runpath.patch 572 BLAKE2B 31daf5c3062a446c9e745f065b90add1d23fb6738076becbb67cc3412bdff6b062a66502e453900366d0c4feef90925ffe220acd4d8672c96b611895185a3808 SHA512 00958a570efdc54af7105299576cf528d8091fac0a9aa63bb362a9852d0923d7c0d5207e9349eea29dc7d782547b192554c36b9cd1b50dfdcdbf622c46f7d1e0 AUX jq-1.7-visible-null.patch 1428 BLAKE2B 109f45fc72bb927fb67202aadbcb61869d427f3598e2dd14eb47ab1983cf5a9978c873d1357e6ba3a23b931ce0b10dbe67498ee83b3375c2c67a3f97980cdfbf SHA512 39067401436538d85c65a51de3bcad99868d4c0b50d27717ccbfdbd7fbb8b011447fd6a326b4849ef94f57422692f032c8fab2974f8ca888b69a316616c26498 -AUX jq-1.7-warnings-r1.patch 1173 BLAKE2B 61e7859e3b5167a86fb5160751cd724bd934d4fa4365523893c204aa585a057da3f465e18c5f81d7ff688bd40775961688c7e8eaa9e60c81eadeac8d0865191d SHA512 b68289acbc4b875e7c12570b107db0ebd9cc318a058eeed2d262ae7005ae1411b4b56ba6741a6a13eb1d67054c101377b67ba0eb25d6f53bf11501dc7926f32f AUX jq-1.7-warnings.patch 1302 BLAKE2B a38e9df57a74b8a19d70fe7d5aeb191e60bfb118f42f2ed3126626d601bd87549aa5c310c825687310e2eddb708e8c32a557f89f8073ac88ab8113cec3bb3468 SHA512 d5796a30684091aeeb0faa26170b675d9827a662299b122d0026e9ae237135636806aea5638e9b7d2dd5508cdd0726767f70d840e33894a8865f4acbb31ec14d AUX jq-1.7_pre20201109-fix-configure-test.patch 2324 BLAKE2B daccf3a6ea7868bdb85264528139ae44ba41321fe3dfd2667efc9e3343d14d8b5f1da45b996091a58ee83be863a24c7fd120f054dcbf7842df4fd9aef6642927 SHA512 ec9570e741ee996befcc4fcc411fa08fb569bf6b9cb1aa10ccbbe5a59d755f9ccc535c46dc2eb055955a4f142653184dcaa9142f0a2962c484a062231d3bd0d9 AUX jq-1.7_pre20201109-no-git-bdep.patch 540 BLAKE2B 745496f01bbc19ede3f5c17be4a7384664ab990eca053d0b4521f1c863af97f9f64afeeb600109ba0f44f155497954c48c6907df198c24d503006c42aada2a97 SHA512 64cc678b5d0850aa9ffc4cd4ef340fa22b3ce120a8b302757528633a7dd785aad1559a0b0abd3e0b1fe3b0d92cfcc388910c84f7cdefca876c864b01358ac04f diff --git a/app-misc/jq/files/jq-1.7-warnings-r1.patch b/app-misc/jq/files/jq-1.7-warnings-r1.patch deleted file mode 100644 index 4d0182493056..000000000000 --- a/app-misc/jq/files/jq-1.7-warnings-r1.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/builtin.c b/src/builtin.c -index 1c6b08c..407df2a 100644 ---- a/src/builtin.c -+++ b/src/builtin.c -@@ -1,5 +1,6 @@ - #define _BSD_SOURCE - #define _GNU_SOURCE -+#define _DEFAULT_SOURCE - #ifndef __sun__ - # define _XOPEN_SOURCE - # define _XOPEN_SOURCE_EXTENDED 1 -diff --git a/src/jv_dtoa.c b/src/jv_dtoa.c -index 33feb99..fcbd902 100644 ---- a/src/jv_dtoa.c -+++ b/src/jv_dtoa.c -@@ -2327,7 +2327,7 @@ retlow1: - jvp_strtod - (struct dtoa_context* C, const char *s00, char **se) - { -- int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1, test_scale; -+ int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, e, e1; - int esign, i, j, k, nd, nd0, nf, nz, nz0, nz1, sign; - CONST char *s, *s0, *s1; - double aadj, aadj1; -diff --git a/src/jv_dtoa_tsd.c b/src/jv_dtoa_tsd.c -index cfccd40..d39911e 100644 ---- a/src/jv_dtoa_tsd.c -+++ b/src/jv_dtoa_tsd.c -@@ -31,7 +31,7 @@ void jv_tsd_dtoa_ctx_fini() { - static - #endif - void jv_tsd_dtoa_ctx_init() { -- if (pthread_key_create(&dtoa_ctx_key, tsd_dtoa_ctx_dtor) != 0) { -+ if (pthread_key_create(&dtoa_ctx_key, (void (*)(void *))tsd_dtoa_ctx_dtor) != 0) { - fprintf(stderr, "error: cannot create thread specific key"); - abort(); - } |