From 96844d790e8b830158cd916f2e8aa79407767675 Mon Sep 17 00:00:00 2001 From: Kyle Elbert Date: Thu, 28 Nov 2024 02:14:00 -0600 Subject: [PATCH 01/13] dev-python/cloudflare: adjust pydantic dep again Closes: https://bugs.gentoo.org/945173 Signed-off-by: Kyle Elbert --- .../{cloudflare-3.1.0-r1.ebuild => cloudflare-3.1.0-r2.ebuild} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename dev-python/cloudflare/{cloudflare-3.1.0-r1.ebuild => cloudflare-3.1.0-r2.ebuild} (97%) diff --git a/dev-python/cloudflare/cloudflare-3.1.0-r1.ebuild b/dev-python/cloudflare/cloudflare-3.1.0-r2.ebuild similarity index 97% rename from dev-python/cloudflare/cloudflare-3.1.0-r1.ebuild rename to dev-python/cloudflare/cloudflare-3.1.0-r2.ebuild index daf24820b0..4cdbcce734 100644 --- a/dev-python/cloudflare/cloudflare-3.1.0-r1.ebuild +++ b/dev-python/cloudflare/cloudflare-3.1.0-r2.ebuild @@ -27,12 +27,11 @@ LICENSE="MIT test? ( ISC Apache-2.0 MIT BSD CC0-1.0 0BSD )" SLOT="3" RDEPEND=" ${DEPEND} >=dev-python/httpx-0.23.0[${PYTHON_USEDEP}] - >=dev-python/pydantic-1.9.0[${PYTHON_USEDEP}] + =dev-python/pydantic-2.9*[${PYTHON_USEDEP}] >=dev-python/typing-extensions-4.7.0[${PYTHON_USEDEP}] >=dev-python/anyio-4.3.0[${PYTHON_USEDEP}] >=dev-python/distro-1.7.0[${PYTHON_USEDEP}] >=dev-python/sniffio-1.3.1[${PYTHON_USEDEP}] - - - - - - WoeUSB/WoeUSB-ng - - diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild deleted file mode 100644 index 9322d4ed8f..0000000000 --- a/sys-boot/woeusb-ng/woeusb-ng-0.2.10.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="Create Windows installer USB from ISO (rewrite of WoeUSB)" -HOMEPAGE="https://github.com/WoeUSB/WoeUSB-ng" -SRC_URI="https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/WoeUSB-ng-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - dev-python/wxpython -" -RDEPEND=" - app-arch/p7zip - sys-boot/grub[grub_platforms_pc] -" diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild deleted file mode 100644 index 0197c9b82a..0000000000 --- a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit desktop distutils-r1 optfeature xdg - -MY_PN="WoeUSB-ng" -DESCRIPTION="Create Windows installer USB from ISO (rewrite of WoeUSB)" -HOMEPAGE="https://github.com/WoeUSB/WoeUSB-ng" -SRC_URI="https://github.com/WoeUSB/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_PN}-${PV}" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gui" - -RDEPEND=" - !sys-boot/woeusb - app-arch/p7zip - $(python_gen_cond_dep ' - dev-python/termcolor[${PYTHON_USEDEP}] - gui? ( dev-python/wxpython:4.0[${PYTHON_USEDEP}] ) - ') -" - -PATCHES=( "${FILESDIR}"/${PN}-0.2.12-postinstall.patch ) - -src_prepare() { - distutils-r1_src_prepare - python_fix_shebang WoeUSB -} - -src_install() { - distutils-r1_src_install - - if use gui; then - dobin WoeUSB/woeusbgui - - insinto /usr/share/polkit-1/actions - doins miscellaneous/com.github.woeusb.woeusb-ng.policy - - doicon -s 256 WoeUSB/data/woeusb-logo.png - make_desktop_entry woeusbgui WoeUSB-ng woeusb-logo Utility - fi -} - -pkg_postinst() { - optfeature "Legacy PC bootmode support" "sys-boot/grub[grub_platforms_pc]" - - xdg_pkg_postinst -} From 031f539a0c44839d5c3c9228e0a0914a4e2f8235 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 28 Nov 2024 17:25:25 +0900 Subject: [PATCH 03/13] dev-python/pytest-click: treeclean, moved to ::gentoo https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c55d6d481b4d9f1e06da95a1448f084d5ff068cc Signed-off-by: Takuya Wakazono --- dev-python/pytest-click/Manifest | 1 - dev-python/pytest-click/metadata.xml | 13 --------- .../pytest-click/pytest-click-1.1.0.ebuild | 27 ------------------- 3 files changed, 41 deletions(-) delete mode 100644 dev-python/pytest-click/Manifest delete mode 100644 dev-python/pytest-click/metadata.xml delete mode 100644 dev-python/pytest-click/pytest-click-1.1.0.ebuild diff --git a/dev-python/pytest-click/Manifest b/dev-python/pytest-click/Manifest deleted file mode 100644 index b447dd25bb..0000000000 --- a/dev-python/pytest-click/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pytest_click-1.1.0.tar.gz 5054 BLAKE2B ad14c214ff767293d75a02930cc9852b97145c5554b6c4aa112e523a6d3e95fa967931c0a3b0beee3e2a69cd8df0d1c2c1bf33f351c3585cb446e1cd6efa5cad SHA512 49ab5fd3499cc519172f364505f1884596c0b45ebc1b64245cfc235f70d2c4765d133d69615300429b4010f28ab725941f53219f4f0ae6520b452a22503886a1 diff --git a/dev-python/pytest-click/metadata.xml b/dev-python/pytest-click/metadata.xml deleted file mode 100644 index 4196cc854b..0000000000 --- a/dev-python/pytest-click/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - pytest-click - Stranger6667/pytest-click - - dadygalo@gmail.com - Dmitry Dygalo - - - diff --git a/dev-python/pytest-click/pytest-click-1.1.0.ebuild b/dev-python/pytest-click/pytest-click-1.1.0.ebuild deleted file mode 100644 index 3b2332fbc2..0000000000 --- a/dev-python/pytest-click/pytest-click-1.1.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) -inherit distutils-r1 pypi - -DESCRIPTION="Pytest plugin for Click" -HOMEPAGE=" - https://pypi.org/project/pytest-click/ - https://github.com/Stranger6667/pytest-click -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/click[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] -" - -DOCS=( CHANGELOG.md README.rst ) - -distutils_enable_tests pytest From d1f1cfc8ecd1fbb6490eea0ee892341fd2a0b080 Mon Sep 17 00:00:00 2001 From: Quincy Fleming Date: Thu, 28 Nov 2024 03:06:09 -0600 Subject: [PATCH 04/13] app-admin/hardinfo2: remove optimization flag Bug: https://bugs.gentoo.org/945174 Signed-off-by: Quincy Fleming --- .../files/remove-optimization-flag.patch | 12 ++++ app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild | 64 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 app-admin/hardinfo2/files/remove-optimization-flag.patch create mode 100644 app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild diff --git a/app-admin/hardinfo2/files/remove-optimization-flag.patch b/app-admin/hardinfo2/files/remove-optimization-flag.patch new file mode 100644 index 0000000000..30d0fb8407 --- /dev/null +++ b/app-admin/hardinfo2/files/remove-optimization-flag.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -aur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-11-28 02:48:17.057740689 -0600 ++++ b/CMakeLists.txt 2024-11-28 02:51:56.721795566 -0600 +@@ -495,7 +495,7 @@ + modules/benchmark/md5.c + modules/benchmark/sha1.c + PROPERTIES +- COMPILE_FLAGS "-O0 -Wall -Wextra -Werror=implicit-function-declaration" ++ COMPILE_FLAGS "-Wall -Wextra -Werror=implicit-function-declaration" + ) + + set_source_files_properties( diff --git a/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild b/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild new file mode 100644 index 0000000000..8876afe929 --- /dev/null +++ b/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild @@ -0,0 +1,64 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake flag-o-matic xdg-utils + +DESCRIPTION="System Information and Benchmark for Linux Systems" +HOMEPAGE="https://www.hardinfo2.org" +SRC_URI="https://github.com/hardinfo2/hardinfo2/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" + +S="${WORKDIR}/${PN}-release-${PV}" + +LICENSE="GPL-2+ GPL-3+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="benchmark fwupd +gtk3" + +DEPEND=" + gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) + >=dev-libs/glib-2.24 + sys-libs/zlib + dev-libs/json-glib + net-libs/libsoup:3.0 + x11-libs/cairo + x11-libs/gdk-pixbuf + x11-libs/libX11 + x11-libs/pango +" +RDEPEND=" + ${DEPEND} + dev-util/vulkan-tools + net-misc/iperf:3 + sys-apps/dmidecode + sys-apps/lm-sensors + sys-fs/lsscsi + sys-fs/udisks:2 + x11-apps/mesa-progs + x11-apps/xrandr + x11-misc/xdg-utils + benchmark? ( app-benchmarks/sysbench ) + fwupd? ( sys-apps/fwupd ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/remove-optimization-flag.patch" ) + +src_configure() { + filter-flags -O* + + local mycmakeargs=( + -DHARDINFO2_GTK3=$(usex gtk3) + -DHARDINFO2_QT5=0 + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} From b273b8ad3b7e3c071594a1454a57a146a07b4c2f Mon Sep 17 00:00:00 2001 From: Quincy Fleming Date: Thu, 28 Nov 2024 03:07:49 -0600 Subject: [PATCH 05/13] app-admin/hardinfo2: drop 2.2.4-r1 Closes: https://bugs.gentoo.org/945174 Signed-off-by: Quincy Fleming --- app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild | 62 ------------------- 1 file changed, 62 deletions(-) delete mode 100644 app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild diff --git a/app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild b/app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild deleted file mode 100644 index e875366547..0000000000 --- a/app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="System Information and Benchmark for Linux Systems" -HOMEPAGE="https://www.hardinfo2.org" -SRC_URI="https://github.com/hardinfo2/hardinfo2/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${PN}-release-${PV}" - -LICENSE="GPL-2+ GPL-3+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="benchmark fwupd +gtk3" - -DEPEND=" - gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) - >=dev-libs/glib-2.24 - sys-libs/zlib - dev-libs/json-glib - net-libs/libsoup:3.0 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/libX11 - x11-libs/pango -" -RDEPEND=" - ${DEPEND} - dev-util/vulkan-tools - net-misc/iperf:3 - sys-apps/dmidecode - sys-apps/lm-sensors - sys-fs/lsscsi - sys-fs/udisks:2 - x11-apps/mesa-progs - x11-apps/xrandr - x11-misc/xdg-utils - benchmark? ( app-benchmarks/sysbench ) - fwupd? ( sys-apps/fwupd ) -" -BDEPEND="virtual/pkgconfig" - -src_configure() { - filter-flags -O* - - local mycmakeargs=( - -DHARDINFO2_GTK3=$(usex gtk3) - -DHARDINFO2_QT5=0 - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} From 3eb1fbaf19130710a7dddf65b41e3519fa952996 Mon Sep 17 00:00:00 2001 From: David Roman Date: Thu, 28 Nov 2024 10:55:00 +0100 Subject: [PATCH 06/13] dev-python/ahocorasick: fix build with < gcc-15 Closes: https://bugs.gentoo.org/945171 Signed-off-by: David Roman --- dev-python/ahocorasick/ahocorasick-2.1.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev-python/ahocorasick/ahocorasick-2.1.0.ebuild b/dev-python/ahocorasick/ahocorasick-2.1.0.ebuild index 6ba8b52d3c..e602ee9942 100644 --- a/dev-python/ahocorasick/ahocorasick-2.1.0.ebuild +++ b/dev-python/ahocorasick/ahocorasick-2.1.0.ebuild @@ -23,5 +23,7 @@ distutils_enable_tests pytest src_prepare() { default - sed -i '/typedef char bool/d' src/common.h || die + if tc-is-gcc && ver_test $(gcc-version) -ge 15 ; then + sed -i '/typedef char bool/d' src/common.h || die + fi } From ed8cc455706cc13592aa66bbe8750d451797cb22 Mon Sep 17 00:00:00 2001 From: Quincy Fleming Date: Thu, 28 Nov 2024 04:04:28 -0600 Subject: [PATCH 07/13] app-admin/hardinfo2: remove patch Signed-off-by: Quincy Fleming --- .../hardinfo2/files/remove-optimization-flag.patch | 12 ------------ app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild | 5 ++++- 2 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 app-admin/hardinfo2/files/remove-optimization-flag.patch diff --git a/app-admin/hardinfo2/files/remove-optimization-flag.patch b/app-admin/hardinfo2/files/remove-optimization-flag.patch deleted file mode 100644 index 30d0fb8407..0000000000 --- a/app-admin/hardinfo2/files/remove-optimization-flag.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff '--color=auto' -aur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2024-11-28 02:48:17.057740689 -0600 -+++ b/CMakeLists.txt 2024-11-28 02:51:56.721795566 -0600 -@@ -495,7 +495,7 @@ - modules/benchmark/md5.c - modules/benchmark/sha1.c - PROPERTIES -- COMPILE_FLAGS "-O0 -Wall -Wextra -Werror=implicit-function-declaration" -+ COMPILE_FLAGS "-Wall -Wextra -Werror=implicit-function-declaration" - ) - - set_source_files_properties( diff --git a/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild b/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild index 8876afe929..1dbabd61d7 100644 --- a/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild +++ b/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild @@ -43,7 +43,10 @@ RDEPEND=" " BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/remove-optimization-flag.patch" ) +src_prepare() { + sed -i -e 's:-O0 ::' CMakeLists.txt || die + cmake_src_prepare +} src_configure() { filter-flags -O* From 3ea657b97867275c824987876c95dc53eb0ce4fe Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 28 Nov 2024 14:26:28 +0500 Subject: [PATCH 08/13] crystal-utils.eclass: enable full error trace Signed-off-by: Anna (cybertailor) Vyalkova --- eclass/crystal-utils.eclass | 1 + 1 file changed, 1 insertion(+) diff --git a/eclass/crystal-utils.eclass b/eclass/crystal-utils.eclass index 57325a9939..fa57f3b801 100644 --- a/eclass/crystal-utils.eclass +++ b/eclass/crystal-utils.eclass @@ -96,6 +96,7 @@ crystal_configure() { local args=( --link-flags="\"${LDFLAGS}\"" + --error-trace --release --progress $(_crystal_get_debug_opt) From 6a2cdc166aa675cec86d18e72cfa22d46ef1149a Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 28 Nov 2024 14:36:04 +0500 Subject: [PATCH 09/13] dev-crystal/protodec: install protodec binary Signed-off-by: Anna (cybertailor) Vyalkova --- dev-crystal/protodec/Manifest | 1 - .../{protodec-0.1.4.ebuild => protodec-0.1.5-r1.ebuild} | 7 ++++++- 2 files changed, 6 insertions(+), 2 deletions(-) rename dev-crystal/protodec/{protodec-0.1.4.ebuild => protodec-0.1.5-r1.ebuild} (87%) diff --git a/dev-crystal/protodec/Manifest b/dev-crystal/protodec/Manifest index 8e9ba1cb48..29399c9907 100644 --- a/dev-crystal/protodec/Manifest +++ b/dev-crystal/protodec/Manifest @@ -1,2 +1 @@ -DIST protodec-0.1.4.tar.gz 18008 BLAKE2B e3154c4901df523e8a914a23006030448ffc8c926701d5a072f1f0278b1e17969d83049bf4c49037af1f05eb1ececb0e79d5080e47e181ed944690daffa75957 SHA512 0211c7b165946d2779808a43893703bf0138ff601e0e3b4aa54024b5eed317d692547822dc42ec6b320f75798ffa4334c4217fd1ee5c11b1eb6dab6db20ce7a8 DIST protodec-0.1.5.tar.gz 18246 BLAKE2B ba2a95f07ddc0d94c9b1c66d59d624d5aaf62bbb1bd20c294329d67e9d9b11048f565ca33f3fc7e54c7ee857453249dfa2bccc91d5c1e22caf87ba25355a2557 SHA512 6235864397bd90a482be4bd19736982da9d60a4229b3256224d9985fa70a0529aaaeeb3fb5285d692e3a5441895c09b37e887cec4f125726935e6764a047bb46 diff --git a/dev-crystal/protodec/protodec-0.1.4.ebuild b/dev-crystal/protodec/protodec-0.1.5-r1.ebuild similarity index 87% rename from dev-crystal/protodec/protodec-0.1.4.ebuild rename to dev-crystal/protodec/protodec-0.1.5-r1.ebuild index f299a6362e..9986432763 100644 --- a/dev-crystal/protodec/protodec-0.1.4.ebuild +++ b/dev-crystal/protodec/protodec-0.1.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,3 +28,8 @@ src_prepare() { -e 's/\(CURRENT_COMMIT \) = .*/\1 = "gentoo"/' \ -e "s/\(CURRENT_VERSION\) = .*/\1 = \"v${PV}\"/" || die } + +src_install() { + dobin protodec + shards_src_install +} From 1bd27e66fe4d201154a8b8afdd1e9c367303e95e Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Thu, 28 Nov 2024 14:48:46 +0500 Subject: [PATCH 10/13] dev-crystal/spectator: remove a test It mysterioiusly fails to build in Tinderbox. Closes: https://bugs.gentoo.org/945172 Signed-off-by: Anna (cybertailor) Vyalkova --- dev-crystal/spectator/spectator-0.12.1.ebuild | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dev-crystal/spectator/spectator-0.12.1.ebuild b/dev-crystal/spectator/spectator-0.12.1.ebuild index 3945c75dac..949b583c33 100644 --- a/dev-crystal/spectator/spectator-0.12.1.ebuild +++ b/dev-crystal/spectator/spectator-0.12.1.ebuild @@ -15,6 +15,13 @@ KEYWORDS="~amd64" DOCS=( {ARCHITECTURE,CHANGELOG,CONTRIBUTING,README}.md ) +src_prepare() { + default + + # remove a test that might fail to build (bug 945172) + rm spec/issues/github_issue_48_spec.cr || die +} + src_test() { # adopted from .gitlab-ci.yml shards_src_test spec/matchers/ spec/spectator/*.cr @@ -26,7 +33,7 @@ src_test() { # Build failure #shards_src_test spec/spectator/dsl/ - # Compile each test individually because otherwise + # Compile each test individually, because otherwise # up to 3G of RAM is eaten by compilation. local t for t in spec/spectator/mocks/*; do From 30e320d2770bd110cdc80177fefaf24cb5485376 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Thu, 28 Nov 2024 21:20:34 +0900 Subject: [PATCH 11/13] gui-apps/mpvpaper: fix build with GCC 15 Closes: https://bugs.gentoo.org/945227 Signed-off-by: Takuya Wakazono --- .../mpvpaper/files/mpvpaper-1.7-gcc15.patch | 148 ++++++++++++++++++ gui-apps/mpvpaper/mpvpaper-1.7.ebuild | 5 + 2 files changed, 153 insertions(+) create mode 100644 gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch diff --git a/gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch b/gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch new file mode 100644 index 0000000000..a112a7fb3d --- /dev/null +++ b/gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch @@ -0,0 +1,148 @@ +https://bugs.gentoo.org/945227 +https://github.com/GhostNaN/mpvpaper/pull/90 +--- a/src/holder.c ++++ b/src/holder.c +@@ -45,8 +45,6 @@ static struct { + int start_time; + } halt_info = {NULL, NULL, false, 0}; + +-static void nop() {} +- + static void revive_mpvpaper() { + // Get the "real" cwd + char exe_dir[1024]; +@@ -197,6 +195,16 @@ static void create_layer_surface(struct display_output *output) { + wl_surface_commit(output->surface); + } + ++static void output_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, ++ int32_t physical_height, int32_t subpixel, const char *make, const char *model, int32_t transform) { ++ // NOP ++} ++ ++static void output_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, ++ int32_t refresh) { ++ // NOP ++} ++ + static void output_name(void *data, struct wl_output *wl_output, const char *name) { + (void)wl_output; + +@@ -221,6 +229,10 @@ static void output_done(void *data, struct wl_output *wl_output) { + destroy_display_output(output); + } + ++static void output_scale(void *data, struct wl_output *wl_output, int32_t scale) { ++ // NOP ++} ++ + static void output_description(void *data, struct wl_output *wl_output, const char *description) { + (void)wl_output; + +@@ -238,10 +250,10 @@ static void output_description(void *data, struct wl_output *wl_output, const ch + } + + static const struct wl_output_listener output_listener = { +- .geometry = nop, +- .mode = nop, ++ .geometry = output_geometry, ++ .mode = output_mode, + .done = output_done, +- .scale = nop, ++ .scale = output_scale, + .name = output_name, + .description = output_description, + }; +--- a/src/main.c ++++ b/src/main.c +@@ -88,8 +88,6 @@ static uint SLIDESHOW_TIME = 0; + static bool SHOW_OUTPUTS = false; + static int VERBOSE = 0; + +-static void nop() {} +- + static void exit_cleanup() { + + // Give mpv a chance to finish +@@ -123,7 +121,7 @@ static void exit_mpvpaper(int reason) { + exit(reason); + } + +-static void *exit_by_pthread() { ++static void *exit_by_pthread(void *_) { + exit_mpvpaper(EXIT_SUCCESS); + pthread_exit(NULL); + } +@@ -262,7 +260,7 @@ static char *check_watch_list(char **list) { + return NULL; + } + +-static void *monitor_pauselist() { ++static void *monitor_pauselist(void *_) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + bool list_paused = 0; + +@@ -286,7 +284,7 @@ static void *monitor_pauselist() { + pthread_exit(NULL); + } + +-static void *monitor_stoplist() { ++static void *monitor_stoplist(void *_) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + + while (halt_info.stoplist) { +@@ -303,7 +301,7 @@ static void *monitor_stoplist() { + pthread_exit(NULL); + } + +-static void *handle_auto_pause() { ++static void *handle_auto_pause(void *_) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + + while (halt_info.auto_pause) { +@@ -327,7 +325,7 @@ static void *handle_auto_pause() { + pthread_exit(NULL); + } + +-static void *handle_auto_stop() { ++static void *handle_auto_stop(void *_) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + + while (halt_info.auto_stop) { +@@ -344,7 +342,7 @@ static void *handle_auto_stop() { + pthread_exit(NULL); + } + +-static void *handle_mpv_events() { ++static void *handle_mpv_events(void *_) { + pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); + int mpv_paused = 0; + time_t start_time = time(NULL); +@@ -710,6 +708,16 @@ static void create_layer_surface(struct display_output *output) { + wl_surface_commit(output->surface); + } + ++static void output_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, ++ int32_t physical_height, int32_t subpixel, const char *make, const char *model, int32_t transform) { ++ // NOP ++} ++ ++static void output_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, ++ int32_t refresh) { ++ // NOP ++} ++ + static void output_name(void *data, struct wl_output *wl_output, const char *name) { + (void)wl_output; + +@@ -771,8 +779,8 @@ static void output_description(void *data, struct wl_output *wl_output, const ch + } + + static const struct wl_output_listener output_listener = { +- .geometry = nop, +- .mode = nop, ++ .geometry = output_geometry, ++ .mode = output_mode, + .done = output_done, + .scale = output_scale, + .name = output_name, diff --git a/gui-apps/mpvpaper/mpvpaper-1.7.ebuild b/gui-apps/mpvpaper/mpvpaper-1.7.ebuild index 79f997313d..2f7face777 100644 --- a/gui-apps/mpvpaper/mpvpaper-1.7.ebuild +++ b/gui-apps/mpvpaper/mpvpaper-1.7.ebuild @@ -32,6 +32,11 @@ DEPEND=" " BDEPEND="dev-util/wayland-scanner" +PATCHES=( + # bug #945227 + "${FILESDIR}/${P}-gcc15.patch" +) + src_install() { meson_src_install newman mpvpaper.man mpvpaper.1 From b86d5253231abb35cc3c495e6b6853a91fe84456 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Thu, 28 Nov 2024 12:39:49 +0000 Subject: [PATCH 12/13] net-misc/wlvncc: Re-name live ebuild By definition the live ebuild should have a version number higher than the snapshots Signed-off-by: Aidan Harris --- net-misc/wlvncc/{wlvncc-9999.ebuild => wlvncc-99999999.ebuild} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename net-misc/wlvncc/{wlvncc-9999.ebuild => wlvncc-99999999.ebuild} (100%) diff --git a/net-misc/wlvncc/wlvncc-9999.ebuild b/net-misc/wlvncc/wlvncc-99999999.ebuild similarity index 100% rename from net-misc/wlvncc/wlvncc-9999.ebuild rename to net-misc/wlvncc/wlvncc-99999999.ebuild From 76903a1b438bde15116dfea597b834a2f3f30db9 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Thu, 28 Nov 2024 12:48:00 +0000 Subject: [PATCH 13/13] net-misc/wlvncc: Update DOCS Signed-off-by: Aidan Harris --- net-misc/wlvncc/wlvncc-99999999.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net-misc/wlvncc/wlvncc-99999999.ebuild b/net-misc/wlvncc/wlvncc-99999999.ebuild index 5d5a2d5469..f3eb352537 100644 --- a/net-misc/wlvncc/wlvncc-99999999.ebuild +++ b/net-misc/wlvncc/wlvncc-99999999.ebuild @@ -11,6 +11,8 @@ EGIT_REPO_URI="https://github.com/any1/wlvncc" LICENSE="GPL-2" SLOT="0" +DOCS=("README.md" "scripts/auth-script.sh") + DEPEND=" dev-libs/wayland-protocols "