diff --git a/app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild b/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild similarity index 90% rename from app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild rename to app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild index e875366547..1dbabd61d7 100644 --- a/app-admin/hardinfo2/hardinfo2-2.2.4-r1.ebuild +++ b/app-admin/hardinfo2/hardinfo2-2.2.4-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake xdg-utils +inherit cmake flag-o-matic xdg-utils DESCRIPTION="System Information and Benchmark for Linux Systems" HOMEPAGE="https://www.hardinfo2.org" @@ -43,6 +43,11 @@ RDEPEND=" " BDEPEND="virtual/pkgconfig" +src_prepare() { + sed -i -e 's:-O0 ::' CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { filter-flags -O* 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 +} 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 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 } 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}] - - - - - - 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 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) 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 diff --git a/net-misc/wlvncc/wlvncc-9999.ebuild b/net-misc/wlvncc/wlvncc-99999999.ebuild similarity index 90% rename from net-misc/wlvncc/wlvncc-9999.ebuild rename to net-misc/wlvncc/wlvncc-99999999.ebuild index 5d5a2d5469..f3eb352537 100644 --- a/net-misc/wlvncc/wlvncc-9999.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 " diff --git a/sys-boot/woeusb-ng/Manifest b/sys-boot/woeusb-ng/Manifest deleted file mode 100644 index 88a05b9e00..0000000000 --- a/sys-boot/woeusb-ng/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST woeusb-ng-0.2.10.tar.gz 213600 BLAKE2B 384d4e93eff97c3b953770247b18409c8f611c9fe72a3292ed69e1d4ba12bf02018336adc5fcceeb8a59b494380816bfe75a571818ec44b1311f6ce02afa478b SHA512 3fd3ad3c725aabf86ead18cde7a812d97dee81ada5830e91548bd4033bba94a2b77085d00b1972d999e5cc9978ee58d74d8b376a04fd7d6ce47c44c749c9d6a8 -DIST woeusb-ng-0.2.12.tar.gz 219102 BLAKE2B d146697ce4143adc62b489a5dbd09bd2dd02d910a51357a27b1a92663eee279c6fa3bdd39b0f01e46f445cb0170c3b0dbf37ed7fdc442386247ff2acb85791e8 SHA512 3323d1f33f3c009652555ca20827d3ab902a59c21b4e57725ac7efb702c60c8ab8a572f77c7f5e4da91713ea5412811358870d6100e13e5828421645b7464c38 diff --git a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-postinstall.patch b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-postinstall.patch deleted file mode 100644 index 6151cf7213..0000000000 --- a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-postinstall.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -68,6 +68,5 @@ setup( - ], - cmdclass={ - 'develop': PostDevelopCommand, -- 'install': PostInstallCommand - } - ) diff --git a/sys-boot/woeusb-ng/metadata.xml b/sys-boot/woeusb-ng/metadata.xml deleted file mode 100644 index 2a8bac6d8a..0000000000 --- a/sys-boot/woeusb-ng/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - 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 -}