From 74828867aa2663519d6cd3b2821366bd53764fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Wed, 3 Jan 2024 13:51:12 -0600 Subject: [PATCH 1/7] gui-apps/wbg: sync live MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonardo Hernández Hernández --- gui-apps/wbg/wbg-9999.ebuild | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gui-apps/wbg/wbg-9999.ebuild b/gui-apps/wbg/wbg-9999.ebuild index ad79bd0c9f..581321b89a 100644 --- a/gui-apps/wbg/wbg-9999.ebuild +++ b/gui-apps/wbg/wbg-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021-2023 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,24 +17,23 @@ fi DESCRIPTION="Super simple wallpaper application" HOMEPAGE="https://codeberg.org/dnkl/wbg" -LICENSE="MIT" +# ZLIB for nanosvg +LICENSE="MIT ZLIB" SLOT="0" IUSE="png jpeg webp" -REQUIRED_USE="|| ( png jpeg webp )" - -DEPEND=" - x11-libs/pixman - dev-libs/wayland -" RDEPEND=" - ${DEPEND} - png? ( media-libs/libpng:= ) + dev-libs/wayland + x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo:= ) + png? ( media-libs/libpng:= ) webp? ( media-libs/libwebp:= ) " -BDEPEND=" +DEPEND=" + ${RDEPEND} dev-libs/tllist +" +BDEPEND=" dev-libs/wayland-protocols dev-util/wayland-scanner virtual/pkgconfig @@ -45,7 +44,13 @@ src_configure() { $(meson_feature png) $(meson_feature jpeg) $(meson_feature webp) + -Dsvg=true ) meson_src_configure } + +src_install() { + meson_src_install + dodoc README.md CHANGELOG.md +} From e9af3bd3d1738573bcd11aa7395fa75f13e23171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Wed, 3 Jan 2024 13:52:27 -0600 Subject: [PATCH 2/7] gui-apps/wbg: add codeberg upstream metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Leonardo Hernández Hernández --- gui-apps/wbg/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/gui-apps/wbg/metadata.xml b/gui-apps/wbg/metadata.xml index e8807b1057..62f781961d 100644 --- a/gui-apps/wbg/metadata.xml +++ b/gui-apps/wbg/metadata.xml @@ -13,5 +13,6 @@ https://codeberg.org/dnkl/wbg/issues https://codeberg.org/dnkl/wbg/src/branch/master/README.md + dnkl/wbg From 14c6088d3f5b399441f27905cbe231b3cc619cb3 Mon Sep 17 00:00:00 2001 From: Moritz Brunner Date: Wed, 3 Jan 2024 20:49:54 +0100 Subject: [PATCH 3/7] games-emulation/yuzu: Replace inih with simpleini inih was replaced upstream with simpleini for config file support. Closes: https://bugs.gentoo.org/920675 Closes: https://bugs.gentoo.org/918648 Signed-off-by: Moritz Brunner --- games-emulation/yuzu/yuzu-9999.ebuild | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 56db5e9755..8e4293715c 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -54,6 +54,7 @@ DEPEND="${RDEPEND} " BDEPEND=" >=dev-cpp/nlohmann_json-3.8.0 + dev-cpp/simpleini dev-cpp/robin-map dev-util/glslang discord? ( >=dev-libs/rapidjson-1.1.0 ) @@ -91,12 +92,6 @@ src_prepare() { # temporary fix sed -i -e '/Werror/d' src/CMakeLists.txt || die - # Unbundle inih - sed -i -e '/^if.*inih/,/^endif()/d' externals/CMakeLists.txt || die - sed -i -e '1afind_package(PkgConfig REQUIRED)\npkg_check_modules(INIH REQUIRED INIReader)' \ - src/yuzu_cmd/CMakeLists.txt || die - sed -i -e 's:inih/cpp/::' src/yuzu_cmd/config.cpp || die - # Unbundle mbedtls sed -i -e '/mbedtls/d' -e '/^if (NOT MSVC)/,/endif()/d' externals/CMakeLists.txt || die sed -i -e 's/mbedtls/& mbedcrypto mbedx509/' \ From 360ea775e40cc4110d30b62db6bec7e0a7d6b997 Mon Sep 17 00:00:00 2001 From: Moritz Brunner Date: Wed, 3 Jan 2024 20:51:08 +0100 Subject: [PATCH 4/7] games-emulation/yuzu: Increase needed Vulkan version The minimum required upstream version of Vulkan is 1.3.274 now. At this time, this version is not yet available in Gentoo. Using -9999 is required. Also include libX11 in dependencies, since the headers are required by Vulkan. Signed-off-by: Moritz Brunner --- games-emulation/yuzu/yuzu-9999.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild index 8e4293715c..b562223aa9 100644 --- a/games-emulation/yuzu/yuzu-9999.ebuild +++ b/games-emulation/yuzu/yuzu-9999.ebuild @@ -8,7 +8,8 @@ inherit cmake git-r3 toolchain-funcs xdg DESCRIPTION="An emulator for Nintendo Switch" HOMEPAGE="https://yuzu-emu.org" EGIT_REPO_URI="https://github.com/yuzu-emu/yuzu-mainline" -EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) +EGIT_SUBMODULES=( '-*' 'dynarmic' 'sirit' 'xbyak' 'tzdb_to_nx' + 'externals/nx_tzdb/tzdb_to_nx/externals/tz/tz' 'VulkanMemoryAllocator' ) # Dynarmic is not intended to be generic, it is tweaked to fit emulated processor # TODO wait 'xbyak' waiting version bump. see #860816 @@ -28,7 +29,7 @@ RDEPEND=" app-arch/lz4:= dev-libs/boost:=[context] media-libs/opus - media-libs/vulkan-loader + >=media-libs/vulkan-loader-1.3.274 sys-libs/zlib virtual/libusb:1 cubeb? ( media-libs/cubeb ) @@ -48,8 +49,10 @@ RDEPEND=" DEPEND="${RDEPEND} dev-cpp/cpp-httplib dev-cpp/cpp-jwt - system-vulkan? ( >=dev-util/vulkan-headers-1.3.250 - dev-util/spirv-headers ) + system-vulkan? ( >=dev-util/vulkan-headers-1.3.274 + dev-util/spirv-headers + x11-libs/libX11 + ) test? ( >dev-cpp/catch-3:0 ) " BDEPEND=" From 01a17dc4c481c1de2ee8f31d3809f973973b2441 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Wed, 3 Jan 2024 18:55:54 -0500 Subject: [PATCH 5/7] dev-python/persistent: drop 5.0 Closes: https://bugs.gentoo.org/893384 Signed-off-by: Julien Roy --- dev-python/persistent/Manifest | 1 - dev-python/persistent/persistent-5.0.ebuild | 47 --------------------- 2 files changed, 48 deletions(-) delete mode 100644 dev-python/persistent/persistent-5.0.ebuild diff --git a/dev-python/persistent/Manifest b/dev-python/persistent/Manifest index 6a8bc19514..e86a484487 100644 --- a/dev-python/persistent/Manifest +++ b/dev-python/persistent/Manifest @@ -1,2 +1 @@ -DIST persistent-5.0.gh.tar.gz 115137 BLAKE2B 6d84cc1e81f033349b9943bb02376f58baccffebe1d7747da687dde6ad0a15f225c0f45c80aacd4de4dc15009f6502e0c0ea5e90d6697c5d1eaa0528dca2691a SHA512 561c339574817f70d1e5b091d77e3cd7a876a49742938591cfffdf4ec5a6ae23b4a7b4e7ff7d90d15763ce9485c093ff019699364952974e9ffe4da88bcf293f DIST persistent-5.1.gh.tar.gz 115547 BLAKE2B a7793f6af1ee975db0fffc9c41b7d2394cf9e02f9c012be28538db8356510b52c89fe41bccd6abba296f6c2915633dccbbe4d534fb9a3bfebcc891e6afc532d1 SHA512 1dfeefa0437d37b075b9fdbec7a2e7cc8e7bb665b46e384204bf922fe13fc4280a6e0b419d97c9899725db478ac8589ed7f22887f267e58f418baa26f921e318 diff --git a/dev-python/persistent/persistent-5.0.ebuild b/dev-python/persistent/persistent-5.0.ebuild deleted file mode 100644 index 13865178d7..0000000000 --- a/dev-python/persistent/persistent-5.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -DESCRIPTION="automatic persistence for Python objects" -HOMEPAGE="https://github.com/zopefoundation/persistent" -SRC_URI="https://github.com/zopefoundation/persistent/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="ZPL" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - doc? ( dev-python/repoze-sphinx-autointerface[${PYTHON_USEDEP}] ) - test? ( - dev-python/manuel[${PYTHON_USEDEP}] - dev-python/zope-testrunner[${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND}" - -distutils_enable_sphinx docs -distutils_enable_tests unittest - -src_unpack() { - default - # Fix broken test - sed -i -e 's/from \.\./from persistent/' "${S}/src/persistent/tests/test_ring.py" || die - # Disable tests that fail - sed -z -i -e "s/def test__p_repr_exception.*_p_repr failed')>\")//g" \ - "${S}/src/persistent/tests/test_persistence.py" || die - sed -z -i -e "s/def test__p_repr_in_instance_ignored.*repr(p)//g" \ - "${S}/src/persistent/tests/test_persistence.py" || die -} - -src_test() { - cd "${S}/src/persistent" || die - distutils-r1_src_test -} From bde0f81e7fab14b87ff280d2d94f1268283a4b6c Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Wed, 3 Jan 2024 20:01:18 -0500 Subject: [PATCH 6/7] dev-python/signalstickers-client: enable py3.12, restrict tests Closes: https://bugs.gentoo.org/913602 Signed-off-by: Julien Roy --- .../signalstickers-client-3.3.0.ebuild | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dev-python/signalstickers-client/signalstickers-client-3.3.0.ebuild b/dev-python/signalstickers-client/signalstickers-client-3.3.0.ebuild index 1fe33bd41e..45e1bcde6c 100644 --- a/dev-python/signalstickers-client/signalstickers-client-3.3.0.ebuild +++ b/dev-python/signalstickers-client/signalstickers-client-3.3.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 pypi @@ -15,11 +15,19 @@ HOMEPAGE="https://github.com/signalstickers/signalstickers-client" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64" +# https://github.com/signalstickers/signalstickers-client/issues/22 +RESTRICT="test" + +distutils_enable_tests pytest RDEPEND=" dev-python/anyio[${PYTHON_USEDEP}] dev-python/httpx[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] dev-python/protobuf-python[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-httpx[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + ) " DEPEND="${RDEPEND}" From 8451aeae680afc8eed2ebe79c1cbcb9e802ef172 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Thu, 4 Jan 2024 02:11:19 +0100 Subject: [PATCH 7/7] profiles: mask app-misc/uwufetch due to yet unfixed security problems Signed-off-by: Lucio Sauer --- profiles/package.mask | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index c7e80d81c8..5f1e89d471 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Andrew Ammerlaan (2021-03-29) @@ -14,6 +14,11 @@ # New entries go on top. +# Lucio Sauer (2024-01-04) +# Known security bugs. Masked until somone updates it. +# https://github.com/TheDarkBug/uwufetch/issues/249 +app-misc/uwufetch + # David Roman (2023-10-19) # Known security bugs. Masked until somone updates it. # See https://bugs.gentoo.org/915891