diff options
Diffstat (limited to 'x11-wm')
34 files changed, 619 insertions, 883 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex dabc7f0e3c43..56b46587a50b 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 79a02a6b2759..9554f295ffd6 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1,5 +1,5 @@ DIST enlightenment-0.26.0.tar.xz 409678784 BLAKE2B e03cb4485fafd3b03a69ca20b5910fc5b0d7070b625a5f9f6c365d57b62b6be00f7c370f38e127e92f29e430045c3502e7868219cb246f84f044d418808a3ae1 SHA512 52a656b397348a4f6baa28b9da4b42c81160b06d28dba58c22bdf00bf749aed3a9b194e171a5ac349745a4c11afc8ae8c38f9bf8c31bacbc0d196cfb24b15a1e DIST enlightenment-0.27.0.tar.xz 409707052 BLAKE2B 9ba22bc619eaf424794dfd34304be9fca205d27b3e318d0dc1d8a126c72174e4a4d71923bdd63076d8984641041bc69fe50b0646299c112f9ce221eb8afe7ff2 SHA512 cd4cad76a4a7e63d4f5f05fb4664580dbb4fb19b2aff059a3c2b32bdcd2495a87eea0a373ed67bc844aa4e4600ad62a0a0de995896a0eda8fb5857590a2affc5 EBUILD enlightenment-0.26.0.ebuild 3121 BLAKE2B e2872b38157a0c608573b6f14bb1dc442ee127dc7eaaa7c098c1b7846a652b347194f71c67382942e60d1f195beaaf3192a899c91fdb7f19a71899f15b105559 SHA512 d4bc01af1cb1f7064cc5b9d5af91e3bc0908336159e4d796045950427e111941ecf917bfcb3199c2dc8a6cddb64b95e4ea58f56b41289c5b46ff1583883ed85e -EBUILD enlightenment-0.27.0.ebuild 3098 BLAKE2B 41e13a713b1c6c7f7150686c84c7f3dac8da76ba6330dde69a9f6f8ed591207f17c7ee7414dc547abbdfecf006fe771018f6382271cbf6734cf62bab6c818652 SHA512 fedf2fc4bacba4b585877a089c7b09e8da1b09dfdf7be1ad0e5f06576effe4397ab861df737d218b77faa2ede35fab36c170aa647722f6a5796f8a530d4847c7 +EBUILD enlightenment-0.27.0.ebuild 3096 BLAKE2B 65cfa8fdf081c99fd7b039d055fb6fc8dcf6080e070125bcb013172e0396e710818b939a1643bfd2ec364474d81b37104bf662bb6e1a34c78a8e39469ecd77b1 SHA512 94d7ebde248a4e20c4e6f1db7c831c1a843c11b1eb42e7a4ce4b5f62518a1f0460f03921bef5adea0270bc51f6a0b5757a58cb64a72516fd50bce338cb74c2d2 MISC metadata.xml 722 BLAKE2B 5d52b9e4ce352b7f16f10d3488b1c8e5f515190ef030606cbaaa69142b1b9da5c7eaecbdf8b4c7921878fe23a7de2c22ac2afdc4b06358dbbddd783e6690f755 SHA512 33810b7b0b22fe24bd1e1448cb4ca1a12d9e41dc0b25d09b94b94847ec590944513ccdc93f1bd4030f400a314ae76a60de04543ac2aa45b4ebcaec6dccf47fb9 diff --git a/x11-wm/enlightenment/enlightenment-0.27.0.ebuild b/x11-wm/enlightenment/enlightenment-0.27.0.ebuild index 3aa941e8b51f..3f7a4fb10d82 100644 --- a/x11-wm/enlightenment/enlightenment-0.27.0.ebuild +++ b/x11-wm/enlightenment/enlightenment-0.27.0.ebuild @@ -15,7 +15,7 @@ LICENSE="BSD-2" # packaged as x11-wm/e16, but the slot is kept because it's more complicated to # reset it rather than just to keep it. SLOT="0.17/${PV%%_*}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" IUSE="bluetooth connman doc exif geolocation nls pam policykit systemd udisks wayland xwayland" REQUIRED_USE="xwayland? ( wayland )" diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest index 42e29119b0f9..162eefa97f8f 100644 --- a/x11-wm/fvwm3/Manifest +++ b/x11-wm/fvwm3/Manifest @@ -1,6 +1,9 @@ AUX fvwm3-1.1.1-desk-init.patch 1237 BLAKE2B f25ed4ba7cf2b5a5bc9bb4973d123d7afdcfc824f7eee64747534d8407f456fec5b2a3ec3f78fb80a0c81718cb11f216ca575b47fee9018d7a5667219c1f7f02 SHA512 c528fd645390bb5caa941a09f0d3fc19a932a332f45d568a00674c8cf4958145689bf05612dcacb0ec3109954ca07882cbbadf7f01610c6b6ac59b3ed74ddbd2 DIST fvwm3-1.1.1-docs.tar.xz 241608 BLAKE2B fbdc789dce9e36a94a4b6c2541b4474548bd961e333d14507788a70e1e4103f0ae5df8223259670cd2aeaec43d3088f1b600b371d03543c2bbb4bce47c37815c SHA512 92385ff188269f85dfda0f079135d651973b1556ac13112cff087a2294256edd7dc2b99aa2c220f9f361df6a3a4d820c56e061dd5d818e58755b1f94df9b4e03 DIST fvwm3-1.1.1.tar.gz 4016926 BLAKE2B 5654554d8bd6593f30cb5bdd05e424abd7fd3f298d12073d419d18967f17d2df58de797392af0b15a0bcf05d09c8fe7b3c273734d17cb97b617dcb9a5e7f4091 SHA512 66b044a2c463d56573c68f4cdd222a39a667a4acf3425d448c7e1c105e67a9d00abafff1e94c066f0781b4546d1b2b84bc9c20798a0b9ef4b0f673e743a2d4d0 -EBUILD fvwm3-1.1.1-r1.ebuild 4240 BLAKE2B f5c018f46162a8d613e59277b3710a354318c1ee503165e2129085601f7f8259d47e10f955edec495f396b1091d29552693d865ebff6278f0fd0accdbc40d286 SHA512 b88ade30176e196019aa8ace45879c5438280d61cf5331d5a6ea3efed94fb477c645f6173ed2aa2090f83209a75a1cf5138a059ce6cde3b46930859ea030c0ad -EBUILD fvwm3-9999.ebuild 4178 BLAKE2B b46f2fafcd6a593289cc499aa4e3abf8ed89162ccc813624a5ebd32de00689039b8e63b40aa2e71440babc9ba49284887ede3553233edc952cba0d59265f1821 SHA512 b5fbf1773846d309c0d161d87ac2a98f47cfffdcade4c9af42bf1bf9e7f1b979a5eb480698e766fec6a734ad67e8cdb583f530d2bb5fa4ff2707b3886c5eab6d +DIST fvwm3-1.1.2-docs.tar.xz 248024 BLAKE2B fbc182f3a5ea38135f487f75c9b4e399855faf46807da1cce9b3a7ccc163268a3e60349ac22e34615c9bc804a1e44b6fdbf39e1c73542103da94c8deabf9c788 SHA512 5a62cc11fa04dec958dc0b8ea899f20e4db5af2d69e8da311d7b9c9bf2286980396ed94ab7d9bd0b9158b3b7d7de4a74d59be3f11651f0c85fb4c683887d7565 +DIST fvwm3-1.1.2.tar.gz 4019330 BLAKE2B 1bf8b82c060e6724375758838dd4b91b189cb1263c510b323a673ea3eb83c8b5e3eb358965a89c3c205ed04c8a90e50a07e4690d9746d54abcafd4cf15a879bd SHA512 1b9473ebde6e9a6399fd185f83c0fc403e84f6e7d3648d141f6418e4b6489d0955d384bb2249b85b8372b8731ab205a99dcd64b0aeb697129b1164fb33090f56 +EBUILD fvwm3-1.1.1-r1.ebuild 4264 BLAKE2B 3e2f10870beb225387604491924234a62daf31b6116ca7701ecc23f8044efce5c0a6af6a6f01ac37eebc4eeb8864b0b45abe4fb7047e6de2f25e286e45fe99b3 SHA512 56f8aef19306b12129b80e8c7bede78e2fe9b48be44c5de506fd85aa0a94330c814237f2a87a52a6e5378c60ff3fba738031eab0330227a432bd1e7a87d25150 +EBUILD fvwm3-1.1.2.ebuild 4202 BLAKE2B c8fc48727695f4fa3f918152c259276f0546e40cb74b57f73daf385864d7f73e692bce02147d084887713722ccd07ac65f735a1e9eb1226a7cdb72d483e4bf53 SHA512 9692e7825bd3f4c96bf3c10bda1c5e4cfb6de25e6e2f3e2087ac02998598b9a382190edec65ce87d81f3c54b72b6d63f0362577781e846a26d1c392c7930efbe +EBUILD fvwm3-9999.ebuild 4202 BLAKE2B c8fc48727695f4fa3f918152c259276f0546e40cb74b57f73daf385864d7f73e692bce02147d084887713722ccd07ac65f735a1e9eb1226a7cdb72d483e4bf53 SHA512 9692e7825bd3f4c96bf3c10bda1c5e4cfb6de25e6e2f3e2087ac02998598b9a382190edec65ce87d81f3c54b72b6d63f0362577781e846a26d1c392c7930efbe MISC metadata.xml 829 BLAKE2B 23828052466446a55db8d718ce60120ab06213bd53cd0a0e6d2be3b76d1ae39d629cd49236aeaf5c28b9493ef10854d2845281c88cbe0e7cdec4cce5d9368259 SHA512 f05606a0aaac1b7d7cda86991fc8b49d778d4fbc73c52ab19741e5f51dd62b07cef6bb7d32df7baad025b7654d0fe85c7a337a31fa9f254326f59b6eda7adb64 diff --git a/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild index 26fbf0f7969b..e4224f75b8a0 100644 --- a/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild +++ b/x11-wm/fvwm3/fvwm3-1.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ else if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" fi - KEYWORDS="~amd64 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2+ FVWM diff --git a/x11-wm/fvwm3/fvwm3-1.1.2.ebuild b/x11-wm/fvwm3/fvwm3-1.1.2.ebuild new file mode 100644 index 000000000000..0d6939978835 --- /dev/null +++ b/x11-wm/fvwm3/fvwm3-1.1.2.ebuild @@ -0,0 +1,171 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs +# for release ebuilds. +# Scripting for this is in sam-gentoo-scripts. +: ${FVWM3_DOCS_PREBUILT:=1} + +PYTHON_COMPAT=( python3_{10..13} ) +GO_OPTIONAL=1 +inherit go-module meson optfeature python-single-r1 + +DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" +HOMEPAGE="https://www.fvwm.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" + EGIT_BRANCH="main" + FVWM3_DOCS_PREBUILT=0 +else + SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" + if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then + SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2+ FVWM + go? ( Apache-2.0 BSD MIT )" +SLOT="0" +IUSE="bidi +go nls readline svg" +# Strictly speaking readline is not required for go, +# but as most systems already have it installed we don't users to stub their toe on REQUIRED_USE +REQUIRED_USE="${PYTHON_REQUIRED_USE} !go? ( readline )" + +DOCS=( NEWS ) + +if [[ ${PV} == 9999 ]]; then + DOCS+=( + dev-docs/COMMANDS + dev-docs/DEVELOPERS.md + dev-docs/INSTALL.md + dev-docs/PARSING.md + dev-docs/TODO.md + dev-docs/NEW-COMMANDS.md + ) +fi + +BDEPEND=" + virtual/pkgconfig + app-arch/unzip + go? ( >=dev-lang/go-1.20 ) +" + +if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then + BDEPEND+=" + dev-libs/libxslt + dev-ruby/asciidoctor + " +fi + +COMMON_DEPEND=" + dev-lang/perl + dev-libs/glib:2 + dev-libs/libevent:= + media-libs/fontconfig + media-libs/libpng:= + x11-base/xorg-proto + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libxkbcommon + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/xtrans + bidi? ( dev-libs/fribidi ) + readline? ( + sys-libs/readline:= + ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + ${PYTHON_DEPS} + !x11-wm/fvwm +" + +DEPEND="${COMMON_DEPEND}" + +src_configure() { + local emesonargs=( + "-Dpng=enabled" + "-Dsm=enabled" + "-Dxcursor=enabled" + "-Dxfixes=enabled" + "-Dxpm=enabled" + "-Dxrender=enabled" + $(meson_feature bidi) + $(meson_feature go golang) + $(meson_feature nls iconv) + $(meson_feature nls) + $(meson_feature readline) # not required for go but it won't hurt to enable it + $(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency + $(meson_feature svg) + "-Dcairo-svg=disabled" + "-Dlibsvg-cairo=disabled" + "-Ddocdir=${EPREFIX}/usr/share/doc/${PF}" + ) + + if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then + emesonargs+=( + "-Dhtmldoc=true" + "-Dmandoc=true" + ) + else + # Probably not required, but let's be safe + emesonargs+=( + "-Dhtmldoc=false" + "-Dmandoc=false" + ) + fi + + meson_src_configure +} + +src_install() { + # Since we're manually handling docs installation, let's do that first + # and then install the rest of the files "normally". + local HTML_DOCS + if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] + HTML_DOCS="${WORKDIR}"/${P}-docs/html/* + fi + einstalldocs + + meson_src_install + + python_scriptinto "/usr/bin" + python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" +} + +pkg_postinst() { + + einfo "For compatibility with existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." + + if use go; then + einfo "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." + einfo "If you need FvwmConsole, install ${PN} with USE=\"-go\"; however FvwmPrompt will not be installed." + else + einfo "FvwmConsole has been installed, hovever it is a legacy tool." + einfo "Consider installing with USE=\"go\" which will have FvwmPrompt replace FvwmConsole to" + einfo "provide the same functionality in a more flexible way." + fi + + optfeature_header "Useful optional features:" + optfeature "Screen locking" x11-misc/xlockmore + optfeature "NetPBM support (used by FvwmScript-ScreenDump)" media-libs/netpbm +} diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index 618c04e64e74..0d6939978835 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -25,7 +25,7 @@ else if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" fi - KEYWORDS="~amd64 ~riscv" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2+ FVWM diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest index aeda404d4d1e..718201b51972 100644 --- a/x11-wm/herbstluftwm/Manifest +++ b/x11-wm/herbstluftwm/Manifest @@ -1,4 +1,5 @@ +AUX herbstluftwm-0.9.5-gcc15.patch 1021 BLAKE2B d8e11cf87d455ea5b1843987c987edf349c8b04041a57c1e1c440048b2a0581088ecea47653ad949ba4db370fbe5e16cc563219cfcda758f4a8b6b8ff933bfff SHA512 1b3214b7ca3c0753986b2437bff49b9c66e92c3b2c5ce6dee411970e97f5c3825d3ffa207bb747f2b151665f2d8fdb7dc746db9c58eb7562c7c216db441ca316 DIST herbstluftwm-0.9.5.tar.gz 556773 BLAKE2B db851f02ce249be74f0104dd0b335fb1ed50b4a19e5f7de17cdc34b7eba99ac2f348c5a4a4e0afd2c68576f650029203c735ccb293a60d321769d56f746d6593 SHA512 a85fd1ab16b873f512d6965cc4a93524e3ed4a15079d0d4ee54012e217bd41db3b54729c1b30ee361c34b38799f95bc537099056ba7a5f791bf2be6724bc92c3 -EBUILD herbstluftwm-0.9.5-r2.ebuild 3129 BLAKE2B 801cbd28dc490f4b1b2d544366de59025bb05b628455a8385f9ee8d3dad7bf4356afcf0b1ceb7d35ac298127e7af35599695cecd33e95193d40edbb68a2aa2e0 SHA512 2d46ccb585c1d3928f3851586483847774df44cfad11460c3ae910c013dcc8d3e31f9d6903148f4dd304fc9ba00818e4968b2cecd9aa46ada59a1bc0dec94f4f +EBUILD herbstluftwm-0.9.5-r2.ebuild 3182 BLAKE2B a755f00622b66009d6c953da3c09d76d8bc9bec4b16b2865e92141ab35a09ff7058d157281c818483670656197f66c1b4d672777b21f2fb0abfa5e2b02d4de20 SHA512 40956fc50ef6377b51062ce94a1c476fcf1f4a8cd1f56836bedb4736b6bd0afdcd551342d98944bead973cda77d49a5733237e9a97dbc40f87bd1a29b0373082 EBUILD herbstluftwm-9999.ebuild 3564 BLAKE2B 2552a4c51bd03a5942c02afe7b80a93e172b3696ab9c18727bc5c2d366c220ce211cd670cfbca7434f6a6f382820efe1948445769f0ad1dc4ad7cebdc3ad75fe SHA512 3325cffdbd92cb2878ddc767631b43ff7d7a0a2281567246dc8e232b35989966c468fcd3ca311c7ada05321cd80ddc1338512c6db73cdeef8236059d4aa68981 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333 diff --git a/x11-wm/herbstluftwm/files/herbstluftwm-0.9.5-gcc15.patch b/x11-wm/herbstluftwm/files/herbstluftwm-0.9.5-gcc15.patch new file mode 100644 index 000000000000..7b02ff122c96 --- /dev/null +++ b/x11-wm/herbstluftwm/files/herbstluftwm-0.9.5-gcc15.patch @@ -0,0 +1,32 @@ +https://github.com/herbstluftwm/herbstluftwm/issues/1612 +https://bugs.gentoo.org/937529 + +From 5e4941c2aa12102cf86c8a69b65c7fa9086f50d6 Mon Sep 17 00:00:00 2001 +From: Kostadin Shishmanov <kostadinshishmanov@protonmail.com> +Date: Tue, 11 Mar 2025 01:13:33 +0200 +Subject: [PATCH] Add #include <stdint.h> to fix building with gcc 15 + +With gcc 15, the C++ Standard Library no longer includes other headers +that were internally used by the library. In herbstluftwm's case the +missing header is <stdint.h> + +Downstream Gentoo bug: https://bugs.gentoo.org/937529 + +Closes: #1612 +Signed-off-by: Kostadin Shishmanov <kostadinshishmanov@protonmail.com> +--- + src/xconnection.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/xconnection.cpp b/src/xconnection.cpp +index e2129db35..df77571e6 100644 +--- a/src/xconnection.cpp ++++ b/src/xconnection.cpp +@@ -7,6 +7,7 @@ + #include <X11/extensions/Xrender.h> + #include <fcntl.h> + #include <unistd.h> ++#include <stdint.h> + #include <climits> + #include <cstring> + #include <iostream> diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild index ceda002ab268..244d8babb450 100644 --- a/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild +++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.5-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -65,6 +65,10 @@ if [[ -n "${EGIT_REPO_URI}" ]]; then BDEPEND+=" doc? ( app-text/asciidoc )" fi +PATCHES=( + "${FILESDIR}"/${PN}-0.9.5-gcc15.patch +) + src_prepare() { # Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR. sed -i \ diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest index e21e91022c76..c9d63c682b5b 100644 --- a/x11-wm/i3/Manifest +++ b/x11-wm/i3/Manifest @@ -1,6 +1,6 @@ DIST i3-4.23.tar.xz 1354628 BLAKE2B 3a5179d5b468ae66f81e53ee8376eb82d4f5d9441d1488f3f761fcad9d68b739fa963f4985db7448e5049983b8cf26ae3fa6bdac32c8677f0384f059cd9db507 SHA512 342bd6e9ff952dd2408c9af6e79e0279cb5e7388a510dd461be84a82a5fbedb92fa35065d4b76fd88e392026f2eb4979160891ae468f421935fe5922f58a66ba DIST i3-4.24.tar.xz 1358292 BLAKE2B 83565232e38c7a1fe87c0473857508ac1e02b1a9a40f0195ab6e6b55a05d27d79cfaf592176a7ca6ccd0bc82c6aed0666ecb0d82b6219b68c62334af257fea00 SHA512 0fddf0f73025ed784b82d274f147f730abb42a00e70684567943acbe941a3329919c76e9f08888c9ee71cc3aaf55e5be3104682481711a5c6aa112d53e511a23 EBUILD i3-4.23.ebuild 1923 BLAKE2B 7dbb15ecd70f7b610910cb281a295d89faa5b9232fc8f3728dac6386d52cd5e1d93c3f28986fd56ea63ffe4353ddf3afb84d01a439ded83d0533148c213aaa78 SHA512 9c1fc7bd5fc054e39b730b69cc2523d6d1460c3068cde44ea2a392bfeaa91b328b641afc3e233b3394d15709d8b2030ecbfc95ed85a1438a371100dfd84063cb -EBUILD i3-4.24.ebuild 1924 BLAKE2B 11018092dd397690f8439f57c24c3170b073973298216f74887e486a13a221c1a08867e63a1e01c9417ead9c9c077d58af9d129cb3e6135b9b3ec254e96e70bd SHA512 4141b07308dbe53a4dc5521de565404678dc10b98cc5c70a02bbcfe9507fe6bcc173460bdb23f06b8e00ea0752152fb99ae268be32508e4d51d55748eeb5cd12 +EBUILD i3-4.24.ebuild 1923 BLAKE2B 285eb502cdf6809d8ed61a3f0d0d69f2115a30460054a534446026b50f719114c6dbdd6a58894c571907685f35780223a421fb96d9d01d6ffccbabf22676f27a SHA512 59d026d90dcbf0366961c3cdc853a9a10a9a0279a51ba82b67d3c6af3e473208534b9fbec66ffc0353ffbbfaddfd0eba4f7bccb8156fd89552fdcc30c162d137 EBUILD i3-9999.ebuild 1910 BLAKE2B 2f72a17e79d873e4cf15cfeadf23ff87654caa5dd2ca1bd3f08c56212f8d349d264b30cd806873b06f04158cab755df967e6ae420442d9f91c9e5e06afa1184e SHA512 a71e6f9cb7e4ac7fbf35d0f6ba20b97d3d6b23c07bd5223ebb47e3cd3ff375be10eb9285b09d1ee777f0c05b76d821f3c580e8eaec9236b56c005e9d983e0eb5 MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be diff --git a/x11-wm/i3/i3-4.24.ebuild b/x11-wm/i3/i3-4.24.ebuild index 4f6536be9bce..ac80d5118951 100644 --- a/x11-wm/i3/i3-4.24.ebuild +++ b/x11-wm/i3/i3-4.24.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" = *9999 ]]; then inherit git-r3 else SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" fi LICENSE="BSD" diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest index 24b1d44dc40a..fcdbb13ecda0 100644 --- a/x11-wm/jwm/Manifest +++ b/x11-wm/jwm/Manifest @@ -1,6 +1,4 @@ AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b -DIST jwm-2.4.2.tar.xz 316000 BLAKE2B 7a0a1c5f60cb3554c999ce3d00d94af4d58ac4bdfcbaaa13a7b675273b4c5d0058c7c85bec950fa91d33a46a89f0b83faf2ab2cda0430a741884e2fdfd8116a7 SHA512 2669c3e2ab2d9a5539d02559108a2bc601bb2209de03dc15057a65c14b5e1268cc58009f4102c4d90302c0705ada5578997a3644c736a46a7e8cf13766cc92fe DIST jwm-2.4.3.tar.xz 317192 BLAKE2B d0b0ff1088ab3390a90c054162ea2c2fe782b61f28b3fdb28464ace362143fdc94e25ec82f7f4178b86a26c9315cdfcf9a81bff2e76bb5e3d62f88968a4ee80b SHA512 35b8a6da9614f11881013aa77c36ee88ce9a213f056e797231b772132beb841d54094809b6a476383999bddeccf61451f72cd166309dd79c223b634cf5d1e69e -EBUILD jwm-2.4.2.ebuild 1884 BLAKE2B 240ba73e91284900e9d5d9563f05ed9b889538d47f98d9aa2e12eaacebd34ae17ae6d4174dd273f12966dc01b51fcb396779714f9ef573cf43ff642355ac0b4e SHA512 7a59a11194af79d0637f094530a512adfd548c4c474afffafb4bb46be3625b12e91d82c7dd1ec971e9513b74d6734cc56000f754fb7d1efc3dd49e8ac614dbad EBUILD jwm-2.4.3.ebuild 1899 BLAKE2B 7e63ef889ec001aa6d07a5e09a78ebd235f8ce6e38b0dc0c1619851f31326005d1c16c982ec1e148319f884e0029b30993f5719dd217ea7674de37795e987c67 SHA512 d4b0b20476e0b9056fa55ceaaa0855b07aee135219a3994e0dd11d6b4f3d747540d2a5f8b6cebf172c436c892ae5d0baedf414328e659b75bec08a51a0c280b3 MISC metadata.xml 1001 BLAKE2B 7de37c67352cdcfc0e6b9527d7261703aec667f0c132b39896d35d5fc8ef128ae4a2a2ba7f31b4b6ab97e8fbf971f072090195a261728e27a7e5c4b2adcf67af SHA512 b4b5482ff6b945d6d6b4b9c29848ab907cae120395503af409252f7aa4a718716ded380c2c0eb950fef2d65cb2cebfa908eb4448097d94d449ee24feac9b86ec diff --git a/x11-wm/jwm/jwm-2.4.2.ebuild b/x11-wm/jwm/jwm-2.4.2.ebuild deleted file mode 100644 index 1a89b8050f20..000000000000 --- a/x11-wm/jwm/jwm-2.4.2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit wrapper - -DESCRIPTION="Very fast and lightweight still powerful window manager for X" -HOMEPAGE="https://joewing.net/projects/jwm/" -SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" -IUSE="svg debug iconv jpeg nls png pango truetype xinerama xpm" - -RDEPEND="dev-libs/expat - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXrender - svg? ( - x11-libs/cairo - gnome-base/librsvg - ) - iconv? ( virtual/libiconv ) - jpeg? ( media-libs/libjpeg-turbo ) - nls? ( sys-devel/gettext - virtual/libintl ) - pango? ( x11-libs/pango ) - png? ( media-libs/libpng:0= ) - truetype? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" - -src_configure() { - econf \ - $(use_enable svg cairo) \ - $(use_enable svg rsvg) \ - $(use_enable debug) \ - $(use_enable jpeg) \ - $(use_enable nls) \ - $(use_enable pango) \ - $(use_enable png) \ - $(use_enable truetype xft) \ - $(use_enable xinerama) \ - $(use_enable xpm) \ - $(use_with iconv libiconv-prefix /usr) \ - $(use_with nls libintl-prefix /usr) \ - --enable-shape \ - --enable-xrender \ - --disable-rpath -} - -src_install() { - dodir /etc - dodir /usr/bin - dodir /usr/share/man - - default - - make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions" - - insinto "/usr/share/xsessions" - doins "${FILESDIR}"/jwm.desktop - - dodoc README.md README.upgrading example.jwmrc CONTRIBUTING.md -} - -pkg_postinst() { - einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc" - einfo "or per-user by creating a configuration file in ~/.jwmrc" - einfo - einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/" -} diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest index 63cdfed81566..194ee2cf7a9d 100644 --- a/x11-wm/lumina/Manifest +++ b/x11-wm/lumina/Manifest @@ -1,6 +1,6 @@ AUX desktop-files.patch 1727 BLAKE2B df568ed9a5b9b70448864e113fb031e90c0d40deb5912b41007131cc8b36c88b4c7a1c3c973e6685fd1ae44bbe38a9ab5993408db002cb2ca5943d1f2ac413ac SHA512 639ee4bdfab4184dde9f025a4375ff740f1f99dea584a4aee2c8a007ed493bb2d0727c32eb7b7847ab246c3dca41ef105362792a326a23c5d7e31c4c2738cffe AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db +AUX manpages.patch 6594 BLAKE2B 47d65862e57231f7e138415d0a15ccab8227f79a1851c12eb6edf4b0450d01d23dd0e5b34cd626cb2be42646993fad2afaa0ee2d399bd97080bfa68b0c8831db SHA512 006291e5472c13fd504d4b843a784fe0163cd0efc26d9cc1b0fc1107bda5d77e1b2aaa0e923c48f116fca653576db70253c53d9404ab0367fd142aa931b0f556 DIST lumina-1.6.2.tar.gz 20818383 BLAKE2B ecb2d4c1f3ce94f247cd86640bd6394807ed5d9a34b2256d333894e6528c0d3dac1ddcab8c790a63df67c2738ab7af8dd2ef0cae67c534e10c4b2edd8919ad8c SHA512 0bebdc89644af49232ad9a0b753dee501f3e99d6615ce926c71790932d228e3c6676ca4835aeaf6badf5455102278261e48bed0d3004fe9209aca68d620cae02 -EBUILD lumina-1.6.2-r1.ebuild 1988 BLAKE2B 4ddb06b378759d9ca060d9d420c0ebfc761647a1ac79c63b92b85adbe39563cd8c719aadf144686fe13bc191e1d368689401ab2e4c197835a8a8531bba653ce5 SHA512 77f62ca44c7a25c411b45b6bcb15fc3cb2254ae5a91b12e3ce16f34737bc44cc4642a80f7674725f7afbefd75e5d9763ef83830d29cdb9e7cc61b3527aa598a9 -EBUILD lumina-1.6.2-r3.ebuild 2095 BLAKE2B 8b5367a59f8db8ec7035a9a4b978cde4a8dc6c0618884dccf577863feea1f042904a226075b7c68649a5c1d0c1259856a87b6b08ac398e79e7d628bd0429f3c1 SHA512 de2dabdd5eb72e2fd783f81f52bce5500cdfc4bd6d5b08daa5bbf17529a8ca5fe981030b5485b55e3886acdbe301ecd23a579fb583cd9b4a6f03d3fd4439fa26 +EBUILD lumina-1.6.2-r4.ebuild 2237 BLAKE2B ee56cafeeddc14ec2791f573d85e68ea42cca674a0c7710d9d4f37edeb700837da099403ac119ada843d12f45cbcac18294ee09a15a7fea9329939ae7eaf2491 SHA512 131f5d1f69d3b1c34122b7b1fee835cde8f9684aaf7e5a3ab94e71c2edbf43ecc83094cbe4585f4056a347b7631cdaec58eee9c7f453e96d070b0bb9489dd4e8 MISC metadata.xml 1993 BLAKE2B 3aecadf1e1e139a45ffd6f68941ac6f6609679ea34092e091daea5d736ed75178c3680e2dff87c98e0e5f77fa9336f8fde04c7279af67cdbf85bd537af230e0c SHA512 0e51fd432836ee7e4450baa1cf8d1aa80e6fc7bcf30f0c6bf75e564d8e882a170d538ac64b4479047b9dda15b1fa4ceabdabe393caa50a08a0daee5787c5556c diff --git a/x11-wm/lumina/files/manpages.patch b/x11-wm/lumina/files/manpages.patch new file mode 100644 index 000000000000..62291387c421 --- /dev/null +++ b/x11-wm/lumina/files/manpages.patch @@ -0,0 +1,155 @@ +Bug: https://bugs.gentoo.org/743094 + +--- a/src-qt5/core/lumina-desktop/lumina-desktop.pro ++++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro +@@ -171,7 +171,7 @@ + dotrans.extra=cd $$PWD/i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-desktop.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-desktop.1.gz" ++manpage.extra=cp $$PWD/lumina-desktop.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-desktop.1 + + INSTALLS += target desktop icons defaults conf fluxconf manpage + +--- a/src-qt5/core/lumina-info/lumina-info.pro ++++ b/src-qt5/core/lumina-info/lumina-info.pro +@@ -98,7 +98,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-info.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-info.1.gz" ++manpage.extra=cp $$PWD/lumina-info.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-info.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/core/lumina-open/lumina-open.pro ++++ b/src-qt5/core/lumina-open/lumina-open.pro +@@ -90,7 +90,7 @@ + dotrans.extra=cd $$PWD/i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-open.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-open.1.gz" ++manpage.extra=cp $$PWD/lumina-open.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-open.1 + + INSTALLS += target manpage + +--- a/src-qt5/core/lumina-session/lumina-session.pro ++++ b/src-qt5/core/lumina-session/lumina-session.pro +@@ -17,6 +17,6 @@ + HEADERS += session.h + + manpage.path=$${L_MANDIR}/man8/ +-manpage.extra="$${MAN_ZIP} $$PWD/start-lumina-desktop.8 > $(INSTALL_ROOT)$${L_MANDIR}/man8/start-lumina-desktop.8.gz" ++manpage.extra=cp $$PWD/start-lumina-desktop.8 $(INSTALL_ROOT)$${L_MANDIR}/man8/start-lumina-desktop.8 + + INSTALLS += target manpage +--- a/src-qt5/core-utils/lumina-config/lumina-config.pro ++++ b/src-qt5/core-utils/lumina-config/lumina-config.pro +@@ -121,7 +121,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-config.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-config.1.gz" ++manpage.extra=cp $$PWD/lumina-config.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-config.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/core-utils/lumina-search/lumina-search.pro ++++ b/src-qt5/core-utils/lumina-search/lumina-search.pro +@@ -99,7 +99,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-search.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-search.1.gz" ++manpage.extra=cp $$PWD/lumina-search.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-search.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro ++++ b/src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro +@@ -95,7 +95,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-xconfig.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-xconfig.1.gz" ++manpage.extra=cp $$PWD/lumina-xconfig.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-xconfig.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/desktop-utils/lumina-archiver/lumina-archiver.pro ++++ b/src-qt5/desktop-utils/lumina-archiver/lumina-archiver.pro +@@ -96,7 +96,7 @@ + #link.extra=ln -sf lumina-archiver $(INSTALL_ROOT)$${L_BINDIR}/lpac + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-archiver.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-archiver.1.gz" ++manpage.extra=cp $$PWD/lumina-archiver.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-archiver.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro ++++ b/src-qt5/desktop-utils/lumina-fileinfo/lumina-fileinfo.pro +@@ -95,7 +95,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-fileinfo.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-fileinfo.1.gz" ++manpage.extra=cp $$PWD/lumina-fileinfo.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-fileinfo.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro ++++ b/src-qt5/desktop-utils/lumina-fm/lumina-fm.pro +@@ -131,7 +131,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-fm.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-fm.1.gz" ++manpage.extra=cp $$PWD/lumina-fm.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-fm.1 + + INSTALLS += target desktop icons manpage + +--- a/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro ++++ b/src-qt5/desktop-utils/lumina-mediaplayer/lumina-mediaplayer.pro +@@ -100,7 +100,7 @@ + #link.extra=ln -sf lumina-mediaplayer $(INSTALL_ROOT)$${L_BINDIR}/lplay + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-mediaplayer.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-mediaplayer.1.gz" ++manpage.extra=cp $$PWD/lumina-mediaplayer.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-mediaplayer.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/desktop-utils/lumina-photo/lumina-photo.pro ++++ b/src-qt5/desktop-utils/lumina-photo/lumina-photo.pro +@@ -99,7 +99,7 @@ + #link.extra=ln -sf lumina-photo $(INSTALL_ROOT)$${L_BINDIR}/lplay + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-photo.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-photo.1.gz" ++manpage.extra=cp $$PWD/lumina-photo.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-photo.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro ++++ b/src-qt5/desktop-utils/lumina-screenshot/lumina-screenshot.pro +@@ -96,7 +96,7 @@ + desktop.path=$${L_SHAREDIR}/applications/ + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-screenshot.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-screenshot.1.gz" ++manpage.extra=cp $$PWD/lumina-screenshot.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-screenshot.1 + + INSTALLS += target desktop manpage + +--- a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro ++++ b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro +@@ -106,7 +106,7 @@ + syntax.files=syntax_rules/* + + manpage.path=$${L_MANDIR}/man1/ +-manpage.extra="$${MAN_ZIP} $$PWD/lumina-textedit.1 > $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-textedit.1.gz" ++manpage.extra=cp $$PWD/lumina-textedit.1 $(INSTALL_ROOT)$${L_MANDIR}/man1/lumina-textedit.1 + + INSTALLS += target desktop link syntax manpage + diff --git a/x11-wm/lumina/lumina-1.6.2-r1.ebuild b/x11-wm/lumina/lumina-1.6.2-r1.ebuild deleted file mode 100644 index 552669231790..000000000000 --- a/x11-wm/lumina/lumina-1.6.2-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu" -inherit plocale qmake-utils xdg - -DESCRIPTION="Lumina desktop environment" -HOMEPAGE="https://lumina-desktop.org/" -SRC_URI="https://github.com/trueos/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P/_/-}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="desktop-utils" - -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libxcb - x11-libs/libXdamage - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-wm - desktop-utils? ( app-text/poppler[qt5] )" - -RDEPEND="${DEPEND} - app-admin/sysstat - media-sound/alsa-utils - sys-fs/inotify-tools - sys-power/acpi - || ( - x11-apps/xbacklight - sys-power/acpilight - ) - x11-misc/numlockx - x11-wm/fluxbox" - -BDEPEND=" - dev-qt/linguist-tools:5" - -PATCHES=( - "${FILESDIR}/1.6.1-desktop-files.patch" -) - -DOCS=( README.md ) - -src_prepare() { - default - - if ! use desktop-utils ; then - rm -rf src-qt5/desktop-utils || die - sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die - fi - - plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts' -} - -src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" LIBPREFIX="${EPREFIX}/usr/$(get_libdir)" \ - CONFIG+=WITH_I18N QMAKE_CFLAGS_ISYSTEM= -} - -src_install() { - emake install INSTALL_ROOT="${D}" - einstalldocs - exeinto /etc/X11/Sessions - newexe "${FILESDIR}/lumina-session" lumina ||die - - remove_locale() { - rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm - - } - plocale_for_each_disabled_locale remove_locale -} diff --git a/x11-wm/lumina/lumina-1.6.2-r3.ebuild b/x11-wm/lumina/lumina-1.6.2-r4.ebuild index 848e0aadbdcd..2c7d206baf40 100644 --- a/x11-wm/lumina/lumina-1.6.2-r3.ebuild +++ b/x11-wm/lumina/lumina-1.6.2-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu" -inherit plocale qmake-utils xdg +inherit plocale qmake-utils xdg optfeature DESCRIPTION="Lumina desktop environment" HOMEPAGE="https://lumina-desktop.org/" @@ -13,7 +13,7 @@ S="${WORKDIR}/${P/_/-}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="desktop-utils" DEPEND=" @@ -50,7 +50,6 @@ RDEPEND="${DEPEND} x11-apps/xrandr x11-misc/numlockx x11-misc/xcompmgr - x11-misc/xscreensaver x11-wm/fluxbox" BDEPEND=" @@ -58,6 +57,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/desktop-files.patch" + "${FILESDIR}/manpages.patch" ) DOCS=( README.md ) @@ -90,3 +90,8 @@ src_install() { } plocale_for_each_disabled_locale remove_locale } + +pkg_postinst() { + optfeature_header "Additional runtime features:" + optfeature "screensaver support" x11-misc/xscreensaver +} diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 90755dcc55a8..070a552c2306 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,3 +1,5 @@ DIST muffin-6.2.0.tar.gz 4522979 BLAKE2B d2cf508eeea77e22c79c65404e90beced72b9eca87542dc38abbf8a411464b4afce4d48e73cddf284a4cb86d9eca420edf95e3cb0ad7a0bc6b2c93a4bd1df257 SHA512 0711370323cd29627f312fbd2208daa5bca3be391f9454524f34447dc31f6e8dae63617af790843a2d84fd63340a6db476783b5eadb27b95fe2503f51323d193 +DIST muffin-6.4.1.tar.gz 4523777 BLAKE2B bc77af9f56fce5c50cfa28e468a260876520a3d9e5bfa445af2b16e118b9306973a0632dadf3b7456a2131a6fd01616e2056a5f1799e787ae10777577ffe0ae3 SHA512 7c582c561ba02c197aff56f0346ff4c5e35e0467c494125d8cef2c65e2321d547132f48aa57cea34910c3c442a6cb883b478f037090416f21f652c69be4c239d EBUILD muffin-6.2.0.ebuild 4205 BLAKE2B 7aac37fd22320b6fcc8bd3a5b0e8d09bbcd306d1f92b3674fb7eb569cc90e5b297eaeb70327d1c30b96cb61e591b77ca4d1e490cac3549bdd54cf1b6704e3dd7 SHA512 4116cb1af166337d88263dfdb13153d868ff4a0ea4411dc3b3298b0ecf446b84e940711e602da26602e350dbe98e10897bf65f2b44801e602f0cce25b5bdea0d +EBUILD muffin-6.4.1.ebuild 4207 BLAKE2B 93be9cde3f45f4f357529c4f6f0d4e6a35a89a487a2e87dd3ba5f443b5a1e86cf134f670e8212aae8737303a107d175baa0b6984ed6518a17cd0c1b388ec09b4 SHA512 973afbfb878ca512cbac37f04ce6cd2ae3830cddaf21a65993abcc8daf538c93e1f3b42fc7293dd2081c18eb7696693167aa89635c0ea901e3b086763cfe1352 MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf diff --git a/x11-wm/muffin/muffin-6.4.1.ebuild b/x11-wm/muffin/muffin-6.4.1.ebuild new file mode 100644 index 000000000000..6abd05105e7a --- /dev/null +++ b/x11-wm/muffin/muffin-6.4.1.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +inherit flag-o-matic gnome2-utils meson python-any-r1 virtualx + +DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin" +SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" +IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" +REQUIRED_USE="wayland? ( udev )" + +# Dependencies listed in meson order +COMDEPEND=" + x11-libs/libX11 + >=media-libs/graphene-1.9.3[introspection?] + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + x11-libs/gdk-pixbuf:2[introspection?] + >=x11-libs/pango-1.20.0[introspection?] + >=x11-libs/cairo-1.10.0[X] + >=dev-libs/fribidi-1.0.0 + >=dev-libs/glib-2.67.3:2 + >=dev-libs/json-glib-0.12.0[introspection?] + >=gnome-extra/cinnamon-desktop-6.4:0= + >=x11-libs/libXcomposite-0.4 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + >=x11-libs/libXfixes-3 + >=x11-libs/libXi-1.7.4 + x11-libs/libXtst + x11-libs/libxkbfile + x11-misc/xkeyboard-config + >=x11-libs/libxkbcommon-0.4.3[X] + x11-libs/libXrender + >=x11-libs/libXrandr-1.5.0 + x11-libs/libxcb:= + x11-libs/libXinerama + x11-libs/libXau + x11-libs/libICE + >=app-accessibility/at-spi2-core-2.46.0:2[introspection?] + >=media-libs/libcanberra-0.26 + sys-apps/dbus + media-libs/libglvnd[X] + media-libs/mesa[X(+),egl(+)] + x11-libs/libSM + >=x11-libs/startup-notification-0.7 + media-libs/fontconfig + + input_devices_wacom? ( + >=dev-libs/libwacom-0.13:= + ) + introspection? ( + >=dev-libs/gobject-introspection-1.41.3:= + ) + screencast? ( + >=media-video/pipewire-0.3.0:= + ) + sysprof? ( + >=dev-util/sysprof-capture-3.35.2:3 + ) + udev? ( + >=virtual/libudev-228:= + >=dev-libs/libgudev-232 + ) + wayland? ( + >=dev-libs/libinput-1.7:= + >=dev-libs/wayland-1.13.0 + >=dev-libs/wayland-protocols-1.19 + || ( + >=media-libs/mesa-24.1.0_rc1[opengl] + <media-libs/mesa-24.1.0_rc1[gbm(+),gles2] + ) + x11-base/xwayland + x11-libs/libdrm + + systemd? ( + sys-apps/systemd + ) + !systemd? ( + sys-auth/elogind + ) + video_cards_nvidia? ( + gui-libs/egl-wayland + ) + ) +" +RDEPEND="${COMDEPEND} + gnome-extra/zenity +" +DEPEND="${COMDEPEND} + x11-base/xorg-proto + + sysprof? ( + dev-util/sysprof-common + ) +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig + + wayland? ( + dev-util/wayland-scanner + >=sys-kernel/linux-headers-4.4 + x11-libs/libxcvt + ) +" + +src_prepare() { + default + python_fix_shebang src/backends/native/gen-default-modes.py +} + +# Wayland is not supported upstream. +src_configure() { + local emesonargs=( + -Dopengl=true + #opengl_libname + #gles2_libname + $(meson_use wayland gles2) + -Degl=true + -Dglx=true + $(meson_use wayland) + $(meson_use wayland native_backend) + $(meson_use screencast remote_desktop) + $(meson_use udev) + $(meson_use input_devices_wacom libwacom) + -Dpango_ft2=true + -Dstartup_notification=true + -Dsm=true + $(meson_use introspection) + $(meson_use test cogl_tests) + $(meson_use test clutter_tests) + # Wayland/Core tests cause issues. They attempt to access video hardware + # and leave /tmp/.X#-lock files behind. + -Dcore_tests=false # wayland + $(meson_use test tests) + $(meson_use sysprof profiler) + -Dinstalled_tests=false + #verbose + ) + + if use wayland; then + emesonargs+=( + $(meson_use video_cards_nvidia egl_device) + $(meson_use video_cards_nvidia wayland_eglstream) + ) + fi + + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/933879 + use wayland && filter-lto + + meson_src_configure +} + +src_test() { + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed + glib-compile-schemas "${BUILD_DIR}"/data + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_schemas_update +} diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 1640e837145b..3f43c9e510cc 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,11 +1,7 @@ AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b -DIST mutter-45.5.tar.xz 2886412 BLAKE2B b5534943d41500a165de5242f73b9da145dd52a4b5168e863843ca5b08a6d726be9b7a94b94763e6b4c10b48355ed845accd9ae63704aefaf3f8e2bb361855b8 SHA512 15fb5589e2b971ac94b3d8f549643f2998375943c419114907c317761c8250089751dea65c35be44435350e6bb02bb238fcf2eef17bf7d6a5b41053a64ffba05 -DIST mutter-45.6.tar.xz 2886844 BLAKE2B f5658d0667cac04f290040e26cf8326d6d30130d0500b18b318269bae152b18a1e4867b9c749269e14b31fb8d7af7fb7a1d72f94df1dad1da0bd98462b9a29f0 SHA512 bfd918469450dd287b58c5e8c55969d9d3bb737898a5823175c15841e2d483faf2900f6c0d4b2bcdcbdb4e58fa16d4dee836084f1f4307fbbce3e7a8d6343738 -DIST mutter-46.4.tar.xz 6752800 BLAKE2B 330c8fd1537c6eea93af4413ec7ccf8c0ea478c5d11d8666b80c93e86eb3135782d365f5f7b449379e211f12d4172fc74b0c39026ab45064dbf18b50fe30a894 SHA512 b8d952da069230b2e10d82aaf87c7acca2a1436b0cc2e19b64012dc535690fdded931d905496dd668948330e553f863505c1aafb36b4ff4724f5ac0e9012f7db DIST mutter-46.7.tar.xz 6755308 BLAKE2B 69cb8457ec9ab905c8764ffa8fbd44050431b359e349697615b90d201402dffd2bd850e3fb0f393ab75800d148c2805ac791f69d356c6bfb26007a2394cbbd48 SHA512 0d9b159805b79f90d2cb06582c859b10e56bc22001d1e1b0090821914e18085749a54eb117b94788578b17894e4d28ec408144a09b29f94b7785f7538c4613a8 -EBUILD mutter-45.5.ebuild 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7 -EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6 -EBUILD mutter-46.4-r1.ebuild 7034 BLAKE2B ee9c601e6fa869252814fbd0a029e28c57a0db7a104b9763d15e6f655fac0c8c26a9e9431980a1df37dfd78e4a60fce2844ecffb0220b5a4cd747e33aa9ed280 SHA512 f45fd2fe82970f3e588c68dc786676a71eccc4dd47c7672b1866bc9d8f2b8ca5723344fe1fd6101b607e6e85a921b9ddf3697a885b7c475573399cda96f821ea -EBUILD mutter-46.7-r1.ebuild 7031 BLAKE2B 95fef7af3e152829d3fee048a2ec6d9b5af29f5799b3d6f96a5bf3917eeb0ea2576812d21c1005bbcf3a8e3c0fa550ea5f168d191b71a2b9417c845c913119ae SHA512 3a728e3a716b3f8435eac52466fd0a551fc9592ac66be1bd6e990f367d9adaff5132885bc7e3e11251d1b835ba91b0d8d081b22a12f5a7b96f3ef1bfecb62eaa -EBUILD mutter-9999.ebuild 7036 BLAKE2B de86caf656aef1a8011ad176ce2e3188ddeeb3022e1ad528e4c4b40acb596dc9e069217e8fbe4618d8fc743c129af9430edbc32b030e0bc024f57ed1162b9b8a SHA512 dd526988d2a9de6c9f975e0f6ccbfff241a04e2d9613f21a1f301b4a88b816c8bc497893c31968028d3ad752c05bbb7093db05e10f005705e4c23a8786b9f361 -MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 +DIST mutter-47.4.tar.xz 6857716 BLAKE2B 752e83e5d0e89eb31e577543619d3039c720a358cbad77e2be1abd7eabedd333ce86673b31e23cbeea446e335f64f83bd68ce12ed37c48eae22a4be6123f14b2 SHA512 f1d3c16830a5fd8225f62d37f583931d582ed1d09631b1d44321a162c14b4d99b2487f322a4c95954b154cdc205b0d20d5d12663f89675baff211e49067ef1ee +EBUILD mutter-46.7-r1.ebuild 7030 BLAKE2B 11b58e9a9400b2c44b3ff065f5217292ff3111788abe333c9d578474a8173ebfb54ca107d3db6fd05432c51648b6608beedfed1ae41ed7e79f805a59cb008b81 SHA512 0b271da8bc182c98dc45a5f5fdaf061f586314cdc4cb0f8969d870666b2b092850169fc2fbb98632cb985f32eca8752c5a3f20c6f8ec2fa82c4700ac9c8d21b1 +EBUILD mutter-47.4.ebuild 7103 BLAKE2B 0d7a9a7eac3c66e80d90e39bd455cfd650d19eae64b5d81481cc38595722a1f918fedf6501d4b2c488c172ffce2abf00cb6260bceb14ec2b7241d76a39813166 SHA512 df21fe8d2a3a6c51bdc449b78aa6cf905ac8cbf9f126a8e46d5013e06ecb326806eac54b96e98a08c8257229196b7f6db1d337937b832b87470830da2965f117 +EBUILD mutter-9999.ebuild 7103 BLAKE2B 0d7a9a7eac3c66e80d90e39bd455cfd650d19eae64b5d81481cc38595722a1f918fedf6501d4b2c488c172ffce2abf00cb6260bceb14ec2b7241d76a39813166 SHA512 df21fe8d2a3a6c51bdc449b78aa6cf905ac8cbf9f126a8e46d5013e06ecb326806eac54b96e98a08c8257229196b7f6db1d337937b832b87470830da2965f117 +MISC metadata.xml 689 BLAKE2B 3b0c44fcf959b671938bb12f0361d57714e2f6d1bc2618482f60c0c3a5dc3ea573371d62839d1304164cfcd2033b49a19a13e4ead64361469b61f5788c126295 SHA512 4eebf7db2174e91ee55b8abc051a7b1c00f1a773c754979f6613e14b0d6b195e581aca8a2614b88b971f30c2ef4090601059bf2bc8ea4a0e7cfaae4c66070997 diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml index ce29c97748be..887778a18ca5 100644 --- a/x11-wm/mutter/metadata.xml +++ b/x11-wm/mutter/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as logind provider for Wayland sessions</flag> + <flag name="libdisplay">Enable EDID and DisplayID using <pkg>media-libs/libdisplay-info</pkg></flag> <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> </use> <upstream> diff --git a/x11-wm/mutter/mutter-45.5.ebuild b/x11-wm/mutter/mutter-45.5.ebuild deleted file mode 100644 index 4f7520c33542..000000000000 --- a/x11-wm/mutter/mutter-45.5.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit gnome.org gnome2-utils meson python-any-r1 udev xdg - -DESCRIPTION="GNOME compositing window manager based on Clutter" -HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" -LICENSE="GPL-2+" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git" - SRC_URI="" - SLOT="0/13" # This can get easily out of date, but better than 9967 -else - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" - SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot -fi - -IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider -REQUIRED_USE=" - gtk-doc? ( introspection ) - wayland? ( ^^ ( elogind systemd ) udev ) - test? ( wayland )" -RESTRICT="!test? ( test )" - -# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema -# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with -# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future; -# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off -# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's -# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). -# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order -DEPEND=" - >=media-libs/graphene-1.10.2[introspection?] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.46[introspection?] - >=x11-libs/cairo-1.14[X] - >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.75.1:2 - gnome-base/gnome-settings-daemon - >=dev-libs/json-glib-0.12.0[introspection?] - >=x11-libs/libxkbcommon-0.4.3 - x11-libs/libICE - >=app-accessibility/at-spi2-core-2.46:2[introspection?] - sys-apps/dbus - >=x11-misc/colord-1.4.5:= - >=media-libs/lcms-2.6:2 - >=media-libs/harfbuzz-2.6.0:= - >=dev-libs/libei-1.0.901 - - gnome? ( gnome-base/gnome-desktop:4= ) - - >=media-libs/libcanberra-0.26 - - media-libs/libglvnd[X] - - wayland? ( - >=dev-libs/wayland-protocols-1.32 - >=dev-libs/wayland-1.21.0 - - x11-libs/libdrm - media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.19.0:= - - elogind? ( sys-auth/elogind ) - >=x11-base/xwayland-23.2.1[libei(+)] - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( - >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 - ) - systemd? ( sys-apps/systemd ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.33:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 >=dev-util/sysprof-3.46.0 ) -" -# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. -# X? ( -DEPEND+=" - >=gui-libs/gtk-4.0.0:4[X,introspection?] - >=x11-libs/libX11-1.7.0 - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-6 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libXrender - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb:= - x11-libs/libXinerama - x11-libs/libXau -" -# )" - -RDEPEND="${DEPEND} - !<gui-libs/gtk-4.6.4:4 - sys-auth/rtkit -" -DEPEND="${DEPEND} - x11-base/xorg-proto - sysprof? ( >=dev-util/sysprof-common-3.38.0 ) - test? ( - >=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland] - gnome-extra/zenity - ) -" -BDEPEND=" - dev-util/wayland-scanner - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}] - ') - app-text/docbook-xml-dtd:4.5 - x11-misc/xvfb-run - ) - wayland? ( - >=sys-kernel/linux-headers-4.4 - x11-libs/libxcvt - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch -) - -python_check_deps() { - if use test; then - python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]" - fi -} - -src_configure() { - local emesonargs=( - # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass - # - # -Dopengl_libname=libOpenGL.so.0 - # - # while we build the x11 renderer, as we currently enable gles2 only - # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols - # in a configuration where wayland is disabled, as libOpenGL doesn't - # include them. - # - # See - # - https://bugs.gentoo.org/835786 - # - https://forums.gentoo.org/viewtopic-p-8695669.html - - -Dbuildtype=$(usex debug debug plain) - -Dopengl=true - $(meson_use wayland gles2) - #gles2_libname - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use wayland xwayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - $(meson_use gnome libgnome_desktop) - $(meson_use udev) - -Dudev_dir=$(get_udevdir) - $(meson_use input_devices_wacom libwacom) - -Dsound_player=true - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use gtk-doc docs) - $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false - $(meson_use test clutter_tests) - $(meson_use test tests) - -Dkvm_tests=false - -Dtty_tests=false - $(meson_use sysprof profiler) - -Dinstalled_tests=false - - #verbose # Let upstream choose default for verbose mode - #xwayland_path - # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) - #xwayland_grab_default_access_rules - ) - - if use wayland && use video_cards_nvidia; then - emesonargs+=( - -Degl_device=true - -Dwayland_eglstream=true - ) - else - emesonargs+=( - -Degl_device=false - -Dwayland_eglstream=false - ) - fi - - meson_src_configure -} - -src_test() { - # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file - gnome2_environment_reset - export XDG_DATA_DIRS="${EPREFIX}"/usr/share - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI -} - -pkg_postinst() { - use udev && udev_reload - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - use udev && udev_reload - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-wm/mutter/mutter-45.6.ebuild b/x11-wm/mutter/mutter-45.6.ebuild deleted file mode 100644 index 9df346bc0a68..000000000000 --- a/x11-wm/mutter/mutter-45.6.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) -inherit gnome.org gnome2-utils meson python-any-r1 udev xdg - -DESCRIPTION="GNOME compositing window manager based on Clutter" -HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/" -LICENSE="GPL-2+" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git" - SRC_URI="" - SLOT="0/13" # This can get easily out of date, but better than 9967 -else - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" - SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot -fi - -IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider -REQUIRED_USE=" - gtk-doc? ( introspection ) - wayland? ( ^^ ( elogind systemd ) udev ) - test? ( wayland )" -RESTRICT="!test? ( test )" - -# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema -# USE=libei was first introduced in xwayland-23.2.1; we min dep on that to ensure the [libei(+)] works right, as missing USE flag with -# previous versions meant that it's not there, while the intention seems to be to make it always enabled without USE flag in the future; -# this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off -# in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's -# really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). -# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order -DEPEND=" - >=media-libs/graphene-1.10.2[introspection?] - x11-libs/gdk-pixbuf:2 - >=x11-libs/pango-1.46[introspection?] - >=x11-libs/cairo-1.14[X] - >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.75.1:2 - gnome-base/gnome-settings-daemon - >=dev-libs/json-glib-0.12.0[introspection?] - >=x11-libs/libxkbcommon-0.4.3 - x11-libs/libICE - >=app-accessibility/at-spi2-core-2.46:2[introspection?] - sys-apps/dbus - >=x11-misc/colord-1.4.5:= - >=media-libs/lcms-2.6:2 - >=media-libs/harfbuzz-2.6.0:= - >=dev-libs/libei-1.0.901 - - gnome? ( gnome-base/gnome-desktop:4= ) - - >=media-libs/libcanberra-0.26 - - media-libs/libglvnd[X] - - wayland? ( - >=dev-libs/wayland-protocols-1.32 - >=dev-libs/wayland-1.21.0 - - x11-libs/libdrm - media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.19.0:= - - elogind? ( sys-auth/elogind ) - >=x11-base/xwayland-23.2.1[libei(+)] - video_cards_nvidia? ( gui-libs/egl-wayland ) - ) - udev? ( - >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 - ) - systemd? ( sys-apps/systemd ) - x11-libs/libSM - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.33:= ) - introspection? ( >=dev-libs/gobject-introspection-1.54:= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) -" -# for now upstream has "have_x11 = true" in the meson.build, but sooner or later upstream is going to make X optional. -# X? ( -DEPEND+=" - >=gui-libs/gtk-4.0.0:4[X,introspection?] - >=x11-libs/libX11-1.7.0 - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-6 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb:= - x11-libs/libXinerama - x11-libs/libXau -" -# )" - -RDEPEND="${DEPEND} - !<gui-libs/gtk-4.6.4:4 - sys-auth/rtkit -" -# dev-util/sysprof just for sysprof-6.pc or sysprof-4.pc at build time: https://gitlab.gnome.org/GNOME/mutter/-/issues/3453 -# x11-libs/libXrender for an obsolete build dependency check: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3716 -DEPEND="${DEPEND} - x11-base/xorg-proto - x11-libs/libXrender - sysprof? ( >=dev-util/sysprof-common-3.38.0 >=dev-util/sysprof-3.46.0 ) - test? ( - >=x11-libs/gtk+-3.19.8:3[X,introspection?,wayland] - gnome-extra/zenity - ) -" -BDEPEND=" - dev-util/wayland-scanner - dev-util/gdbus-codegen - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) - test? ( - ${PYTHON_DEPS} - $(python_gen_any_dep ' - >=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}] - ') - app-text/docbook-xml-dtd:4.5 - x11-misc/xvfb-run - ) - wayland? ( - >=sys-kernel/linux-headers-4.4 - x11-libs/libxcvt - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-43.0-Disable-anonymous-file-test.patch -) - -python_check_deps() { - if use test; then - python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]" - fi -} - -src_configure() { - local emesonargs=( - # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass - # - # -Dopengl_libname=libOpenGL.so.0 - # - # while we build the x11 renderer, as we currently enable gles2 only - # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols - # in a configuration where wayland is disabled, as libOpenGL doesn't - # include them. - # - # See - # - https://bugs.gentoo.org/835786 - # - https://forums.gentoo.org/viewtopic-p-8695669.html - - -Dbuildtype=$(usex debug debug plain) - -Dopengl=true - $(meson_use wayland gles2) - #gles2_libname - -Degl=true - -Dglx=true - $(meson_use wayland) - $(meson_use wayland xwayland) - $(meson_use systemd) - $(meson_use wayland native_backend) - $(meson_use screencast remote_desktop) - $(meson_use gnome libgnome_desktop) - $(meson_use udev) - -Dudev_dir=$(get_udevdir) - $(meson_use input_devices_wacom libwacom) - -Dsound_player=true - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use gtk-doc docs) - $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false - $(meson_use test clutter_tests) - $(meson_use test tests) - -Dkvm_tests=false - -Dtty_tests=false - $(meson_use sysprof profiler) - -Dinstalled_tests=false - - #verbose # Let upstream choose default for verbose mode - #xwayland_path - # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops) - #xwayland_grab_default_access_rules - ) - - if use wayland && use video_cards_nvidia; then - emesonargs+=( - -Degl_device=true - -Dwayland_eglstream=true - ) - else - emesonargs+=( - -Degl_device=false - -Dwayland_eglstream=false - ) - fi - - meson_src_configure -} - -src_test() { - # Reset variables to avoid issues from /etc/profile.d/flatpak.sh file - gnome2_environment_reset - export XDG_DATA_DIRS="${EPREFIX}"/usr/share - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI -} - -pkg_postinst() { - use udev && udev_reload - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - use udev && udev_reload - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/x11-wm/mutter/mutter-46.7-r1.ebuild b/x11-wm/mutter/mutter-46.7-r1.ebuild index aac907e2ac69..8b89e1bc40e9 100644 --- a/x11-wm/mutter/mutter-46.7-r1.ebuild +++ b/x11-wm/mutter/mutter-46.7-r1.ebuild @@ -33,7 +33,7 @@ RESTRICT="!test? ( test )" # this ensures have_enable_ei_portal is always there in xwayland.pc, which affects how Xwayland is launched, thus if it were toggled off # in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's # really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). -# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via wdependency() call order +# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order RDEPEND=" >=media-libs/graphene-1.10.2[introspection?] x11-libs/gdk-pixbuf:2 diff --git a/x11-wm/mutter/mutter-46.4-r1.ebuild b/x11-wm/mutter/mutter-47.4.ebuild index c923d571f568..f5d1d2344111 100644 --- a/x11-wm/mutter/mutter-46.4-r1.ebuild +++ b/x11-wm/mutter/mutter-47.4.ebuild @@ -15,11 +15,11 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/14" # This can get easily out of date, but better than 9967 else - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot fi -IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X video_cards_nvidia" # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider REQUIRED_USE=" gtk-doc? ( introspection ) @@ -34,6 +34,7 @@ RESTRICT="!test? ( test )" # in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's # really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order +# dev-libs/wayland is always needed at build time due to https://bugs.gentoo.org/937632 RDEPEND=" >=media-libs/graphene-1.10.2[introspection?] x11-libs/gdk-pixbuf:2 @@ -41,9 +42,10 @@ RDEPEND=" >=x11-libs/cairo-1.14[X] >=x11-libs/pixman-0.42 >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] - >=dev-libs/glib-2.75.1:2 + >=gnome-base/gsettings-desktop-schemas-47_beta[introspection?] + >=dev-libs/glib-2.81.1:2 gnome-base/gnome-settings-daemon + >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=app-accessibility/at-spi2-core-2.46:2[introspection?] @@ -52,7 +54,6 @@ RDEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 - media-libs/libdisplay-info:= gnome? ( gnome-base/gnome-desktop:4= ) @@ -60,13 +61,13 @@ RDEPEND=" media-libs/libglvnd[X] + >=dev-libs/wayland-1.23.0 wayland? ( - >=dev-libs/wayland-protocols-1.33 - >=dev-libs/wayland-1.22.0 + >=dev-libs/wayland-protocols-1.36 >=x11-libs/libdrm-2.4.118 media-libs/mesa[gbm(+)] - >=dev-libs/libinput-1.19.0:= + >=dev-libs/libinput-1.26.0:= elogind? ( sys-auth/elogind ) >=x11-base/xwayland-23.2.1[libei(+)] @@ -74,14 +75,15 @@ RDEPEND=" ) udev? ( >=virtual/libudev-232-r1:= - >=dev-libs/libgudev-232 + >=dev-libs/libgudev-238 ) systemd? ( sys-apps/systemd ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) >=x11-libs/startup-notification-0.7 - screencast? ( >=media-video/pipewire-0.3.33:= ) + screencast? ( >=media-video/pipewire-1.2.0:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + libdisplay? ( media-libs/libdisplay-info ) test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] gnome-extra/zenity @@ -177,20 +179,20 @@ src_configure() { -Dudev_dir=$(get_udevdir) $(meson_use input_devices_wacom libwacom) -Dsound_player=true - -Dpango_ft2=true -Dstartup_notification=true + $(meson_feature libdisplay libdisplay_info) -Dsm=true $(meson_use introspection) $(meson_use gtk-doc docs) $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false $(meson_use test clutter_tests) - $(meson_use test tests) + $(meson_use test mutter_tests) + $(meson_feature test tests) -Dkvm_tests=false -Dtty_tests=false $(meson_use sysprof profiler) -Dinstalled_tests=false + $(meson_use X x11) #verbose # Let upstream choose default for verbose mode #xwayland_path @@ -218,7 +220,7 @@ src_test() { gnome2_environment_reset export XDG_DATA_DIRS="${EPREFIX}"/usr/share glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test } pkg_postinst() { diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 60a229a50d19..f5d1d2344111 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -15,11 +15,11 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/14" # This can get easily out of date, but better than 9967 else - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot fi -IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" +IUSE="debug elogind gnome gtk-doc input_devices_wacom +introspection +libdisplay screencast sysprof systemd test udev wayland X video_cards_nvidia" # native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider REQUIRED_USE=" gtk-doc? ( introspection ) @@ -34,6 +34,7 @@ RESTRICT="!test? ( test )" # in Xwayland after mutter is installed, Xwayland would fail to be started by mutter. mutter already hard-depends on libei, so there's # really no extra deps here (besides xdg-desktop-portal, but we want that too, anyhow). # v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order +# dev-libs/wayland is always needed at build time due to https://bugs.gentoo.org/937632 RDEPEND=" >=media-libs/graphene-1.10.2[introspection?] x11-libs/gdk-pixbuf:2 @@ -41,9 +42,10 @@ RDEPEND=" >=x11-libs/cairo-1.14[X] >=x11-libs/pixman-0.42 >=dev-libs/fribidi-1.0.0 - >=gnome-base/gsettings-desktop-schemas-47.0[introspection?] + >=gnome-base/gsettings-desktop-schemas-47_beta[introspection?] >=dev-libs/glib-2.81.1:2 gnome-base/gnome-settings-daemon + >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libxkbcommon-0.4.3 x11-libs/libICE >=app-accessibility/at-spi2-core-2.46:2[introspection?] @@ -52,7 +54,6 @@ RDEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 - >=media-libs/libdisplay-info-0.2:= gnome? ( gnome-base/gnome-desktop:4= ) @@ -60,9 +61,9 @@ RDEPEND=" media-libs/libglvnd[X] + >=dev-libs/wayland-1.23.0 wayland? ( - >=dev-libs/wayland-protocols-1.38 - >=dev-libs/wayland-1.23.0 + >=dev-libs/wayland-protocols-1.36 >=x11-libs/libdrm-2.4.118 media-libs/mesa[gbm(+)] @@ -82,6 +83,7 @@ RDEPEND=" >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-1.2.0:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + libdisplay? ( media-libs/libdisplay-info ) test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] gnome-extra/zenity @@ -177,20 +179,20 @@ src_configure() { -Dudev_dir=$(get_udevdir) $(meson_use input_devices_wacom libwacom) -Dsound_player=true - -Dpango_ft2=true -Dstartup_notification=true + $(meson_feature libdisplay libdisplay_info) -Dsm=true $(meson_use introspection) $(meson_use gtk-doc docs) $(meson_use test cogl_tests) - $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed - -Dnative_tests=false $(meson_use test clutter_tests) - $(meson_use test tests) + $(meson_use test mutter_tests) + $(meson_feature test tests) -Dkvm_tests=false -Dtty_tests=false $(meson_use sysprof profiler) -Dinstalled_tests=false + $(meson_use X x11) #verbose # Let upstream choose default for verbose mode #xwayland_path @@ -218,7 +220,7 @@ src_test() { gnome2_environment_reset export XDG_DATA_DIRS="${EPREFIX}"/usr/share glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test } pkg_postinst() { diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest index c47de23d0e45..4f1f526c7804 100644 --- a/x11-wm/pekwm/Manifest +++ b/x11-wm/pekwm/Manifest @@ -1,8 +1,3 @@ -DIST pekwm-0.1.18.tar.gz 441810 BLAKE2B 8c3e98490681eed68e0f127c38c1653f8d643ceca2ddf8388f6b434d16daeb376fc9337de71786a658e9d9e7a080de922207173edb624b78732bc14da5d42eeb SHA512 31fe291b245b6e13fdfe27878162fd405fd60a766e9a7e762e817391179e7f82c41b664fba568af91e009582729e4633d23f76db95302f6f702cb74c2571db15 -DIST pekwm-0.2.1.tar.gz 943072 BLAKE2B 61a278a42517de4b2924c6e0cffdd0b112c3a1a52b70e24d6ed852a8e5005f76b4eb9a342af073481404fae68265452b140ea19539723733ec860f7cbd615598 SHA512 cefb5abb43f88cff874f12586f0f2c0b88d30fd0ce22c6e18731b11055abea389819a08a4e85a9290021ffe30708ea210c66a0f3f8c263717c05abd798fdf297 DIST pekwm-0.3.0.tar.gz 1210295 BLAKE2B 2882d8f9103fbfdad12d3dc519b3468a3d85e622e1f4352ccf7849a02f9f7d2f6a1c039d0e9df75ffd58a063f866fe8998eb10bc7e1c2a1766a9056328b136de SHA512 7b59f6883cc449a4a4e11fa1d2629c76b26bac0ad12f7c7e02da2b79292dd5515915152e9955875d3335deca4cf590d7078645bcf59bdad7ce0f65929b315b43 -DIST pekwm-themes.tar.bz2 138599 BLAKE2B b0c103d7ade6f9bb1ed19b7e12cfcf00fb48be7e1ed141a4b52aee404ebf9c7af5d29af166ff7265a720ca8d122ad7eddb6eaf42a0a8e18b6c1ff3af7b5e12d0 SHA512 c95bc980b5aeeb4f4832cb2dbbf82adf72e4a784fcd46432fd6e6a6577ef02823ec1c4b861d07747c066050fc5040aca975e2cdc78342abab99a3d486888a25d -EBUILD pekwm-0.1.18.ebuild 1837 BLAKE2B 418ee2a366dae08d67db6ed821f0d6b6d8e0a24050953c4e92ed19eb4876b764ecff26ee9aadf6ad8e60f71671270e217cab1742cb20236332acfec25ace647b SHA512 2f6b1c478480a13bbf92b1db197355b66897d3e42bcd845b0f89706476959b3bbcb066b3ea85b01f0d0c72b4a219eaef3a3f5c6679b3b14b7c12a6874a58dfef -EBUILD pekwm-0.2.1.ebuild 2151 BLAKE2B 0e16f0775d5cb748714c496a6b8aae570425e955e418edc139acd46d782c0face2a63c64ba8d040b6625e581f68c03385e6f98f139b98621eba830a239a278fe SHA512 a2e6a51717b25fe1625162fcbc0804c25f3274277cf3c218e0e874bb0c3c0ccca08916e151e62a70779f0d111602390a71a6fc86557205eaf5cc4ef85cb6fb25 EBUILD pekwm-0.3.0.ebuild 1930 BLAKE2B 7337a4b51f05eb692719b3b3f8ca8031b8419debff943d285db10bad61e4e87df65beee8c4f07cb908f4560a750cd54c88de55d0ebe39584063388085de86fbd SHA512 cd82117254097a0623f95ac32a0672ae14535ebda6e43f516aef4d19236bc8d759393688974f3f5d34480948d3019099c8ecc037cbea656d9dd47aca278c306e -MISC metadata.xml 890 BLAKE2B 42517a2d6344f328f958247c357c2c8cb135f093ecd60d7f09edfb01559eff14de8de0b2d5adef44fc2d2758e1c799a6e91c6224bb048e3e037c30ac1d1c848e SHA512 89c0f8a6484dbe2256e367d2760513be54a6896ab3e85ef4c80175838e3eccd7acc1d5123daea01944e66346a9bbf7e6147acc1821e9b6e574e1f7a37f883a65 +MISC metadata.xml 750 BLAKE2B 6593f5850a222ada63066f51645f6eb146f193067cbc97b7028ecddcebf1975b11ba01c8e08010336dfd0421e648aa66279bc59ffacd89df7278c9b386195079 SHA512 9c86ea4c398e03af4a6f43e6d0e7087169eb4f9f2305a80499234c81b302ab22b6cd4bba3d186933d1851675a8e77f2e441d4ac76d1af0319cc021f3f9a1d149 diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml index 2a9cfd89dd02..b0db384fb227 100644 --- a/x11-wm/pekwm/metadata.xml +++ b/x11-wm/pekwm/metadata.xml @@ -11,9 +11,7 @@ support, pixmap theming, and dynamic menus. </longdescription> <use> - <flag name="contrib">Install optional extras in the documentation directory</flag> <flag name="pango">Pango font support</flag> - <flag name="themes">Install additional themes</flag> </use> <upstream> <remote-id type="github">pekwm/pekwm</remote-id> diff --git a/x11-wm/pekwm/pekwm-0.1.18.ebuild b/x11-wm/pekwm/pekwm-0.1.18.ebuild deleted file mode 100644 index 3b59911447b0..000000000000 --- a/x11-wm/pekwm/pekwm-0.1.18.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools desktop - -DESCRIPTION="A lightweight window manager initially based on aewm++" -HOMEPAGE=" - https://www.pekwm.se/ - https://github.com/pekwm/pekwm -" -SRC_URI=" - https://github.com/pekwm/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz - themes? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-themes.tar.bz2 ) -" -S="${WORKDIR}"/${PN}-release-${PV} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ppc x86" -IUSE="contrib debug themes truetype xinerama" - -RDEPEND="media-libs/libpng:0= - virtual/jpeg:0 - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - truetype? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - if use themes; then - rm "${WORKDIR}"/themes/Ace/.theme.swp || die - fi - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable truetype xft) \ - $(use_enable xinerama) \ - --enable-image-jpeg \ - --enable-image-png \ - --enable-image-xpm \ - --enable-shape \ - --enable-xrandr -} - -src_install() { - default - - # Install contributor scripts into doc folder - if use contrib; then - docinto contrib - dodoc contrib/lobo/{check.png,pekwm_autoprop.pl,pekwm_menu_config.pl} \ - contrib/lobo/{pekwm_menu_config.pl.vars,README,uncheck.png} - fi - - if use themes; then - insinto /usr/share/${PN}/themes - doins -r "${WORKDIR}"/themes/* - fi - - # Insert an Xsession - echo -e "#!/bin/sh\n\n/usr/bin/${PN}" > "${T}"/${PN} || die - exeinto /etc/X11/Sessions - doexe "${T}"/${PN} - - # Insert a GDM/KDM xsession file - make_session_desktop ${PN} ${PN} -} - -pkg_postinst() { - if use contrib ; then - elog "User contributed scripts have been installed into:" - elog "${EROOT}/usr/share/doc/${PF}/contrib" - fi -} diff --git a/x11-wm/pekwm/pekwm-0.2.1.ebuild b/x11-wm/pekwm/pekwm-0.2.1.ebuild deleted file mode 100644 index 9171b886da0a..000000000000 --- a/x11-wm/pekwm/pekwm-0.2.1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake desktop optfeature - -DESCRIPTION="A lightweight window manager initially based on aewm++" -HOMEPAGE=" - https://www.pekwm.se/ - https://github.com/pekwm/pekwm -" -SRC_URI=" - https://github.com/pekwm/${PN}/releases/download/release-${PV}/pekwm-${PV}.tar.gz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ~ppc x86" -IUSE="debug +jpeg +png truetype xinerama +xpm" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - jpeg? ( virtual/jpeg:0 ) - png? ( media-libs/libpng:0 ) - truetype? ( x11-libs/libXft ) - xinerama? ( x11-libs/libXinerama ) - xpm? ( x11-libs/libXpm )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local mycmakeargs=( - -DENABLE_IMAGE_JPEG=$(usex jpeg) - -DENABLE_IMAGE_PNG=$(usex png) - -DENABLE_IMAGE_XPM=$(usex xpm) - -DENABLE_XINERAMA=$(usex xinerama) - -DENABLE_XFT=$(usex truetype) - ) - - CMAKE_BUILD_TYPE=$(usex debug Debug) - - cmake_src_configure -} - -src_install() { - - cmake_src_install - - # Install contributor scripts into doc folder - docinto contrib - dodoc "${S}"/contrib/lobo/*.{pl,vars,png} "${S}"/contrib/lobo/README - - # Insert an Xsession - exeinto /etc/X11/Sessions - newexe - pekwm <<- _EOF_ - #!/bin/sh - /usr/bin/pekwm - _EOF_ - - # Insert a GDM/KDM xsession file - make_session_desktop ${PN} ${PN} -} - -pkg_postinst() { - - elog "Since pekwm 0.2.0 themes can be installed and maintained using " - elog "pekwm_theme [install|uninstall|show|search|new|update]." - elog "Check https://www.pekwm.se/themes/ for details." - - elog - - optfeature "themes management (pekwm_theme) support" dev-vcs/git - - elog - - elog "User contributed scripts have been installed into:" - elog "${EROOT}/usr/share/doc/${PF}/contrib" - - elog "If updated from previous versions remove '&' from the " - elog "'Exec ... &' in the menu configuration. Quote: " - elog "\"Exec no longer use sh -c to run commands which will cause " - elog "incompatabilites depending on /bin/sh configuration, if shell " - elog "variables have been used or the command ends with &. ShellExec has " - elog "been added implementing the legacy behaviour.\"" -} diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest index ee2c5af0a506..f6585ddb8072 100644 --- a/x11-wm/qtile/Manifest +++ b/x11-wm/qtile/Manifest @@ -1,8 +1,8 @@ AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e -DIST qtile-0.29.0.tar.gz 607026 BLAKE2B 71a282b08b6d15e08f616e28a59a632a76ef4a180788177606873dec7870d715fa96403ece6745de8898716e863b7462a745426f59fb13fd40ba87207be30d24 SHA512 745a9a79209c0dbac5e49b8ee90d567204fd022c63e9321afbb6a3a064f8e9376fdbbe67a5115e50b251d28129f4907761cbbd3e0b3d2e0676e047ef8369c92c DIST qtile-0.30.0.tar.gz 617632 BLAKE2B c26d51d7e31ef058a5a08ef8ef47ccce19bc59b9337d0dc1d874b2c4047ea2e1827cc694a9199ea808d22b7845a8bb019eb85a1912ddfb00801763b43e62b0f2 SHA512 218b7ba42315884faf11460c18a9fa8f34a3284d3fd4632c24997657e7ec659e337be9b0845e00dc7d4106828d7e5efcfd401ea7d031e0725598e60ad4172147 +DIST qtile-0.31.0.tar.gz 619301 BLAKE2B 0fb4cce53f986c7c427e9044e4ca99cab33b7722f178d5c9a6082f03b0b54ddb0696bd647a4d7c0ca8b853b5f9db38391e9bba2f28b81cd803e8622b81956602 SHA512 3a85bb9133427b74e3dcedd7c2f774387dc5b698d6e69923c282b98eb21c0d13a747dd77a0b30b86b73c94d2d525d11c65692bcc8bb83895bcadf99ea6e00ed2 EBUILD qtile-0.28.1.ebuild 2622 BLAKE2B 693eab081037d8b368495fd7959e04fba1da29a2bbdf3b1c9cc4e340a34252771bcb2626fe6fe7950b2227c7d03f22d4f3e77be74f3f755b3a038d33d39b81c7 SHA512 9c3520cf721e9a6fb940bb82b62f158a2b2c908698ae273d46b47cb03b7266706595c5c333ef9683cc0b9b197e4a4f97b573b4c6bc19a8fb49239d8f09717181 -EBUILD qtile-0.29.0.ebuild 2670 BLAKE2B f9b187e16ac3a18ec370814ed6018c30b2dfbe02e27d53a8364f7f9658165d1096c4482b1cfb41abb32feff929ea1e974f3e97e5e00a9a7d20071acacc220a3b SHA512 52f82c218efb70b4ce75cf04e26fbb8fe0e6ecfc18b1fdd1190a201d2322833c261561c84d3e41f6c78e074a392c8e6b277b24c2eacacbfb2a4abd1de2193f61 -EBUILD qtile-0.30.0.ebuild 2663 BLAKE2B df06748de3841f8a6b05d513e666d486aead0c94fda9bc81129b06b8d465dc85d19431a92e0e874130e5d1067aee21834c8253d7e6dbc617e6e712ed39e91cdc SHA512 24fa976082ac1e875aad86162f486c17c0cf964a323cdc2fd7be2569901b489a4fe26c1e70366985b94a155216e15c9ccd2df0211c70b6f3fce14f403b93e30b +EBUILD qtile-0.30.0.ebuild 2752 BLAKE2B d91dcdb92f695002c513177d3c8984784a24bec020e60d27a33191f98b6838aaac344d0e39ee69c17d0025e83d93578fdb001399de34622c96fa881adeede97e SHA512 143638bfa31baf05df4073635420ac9419f339b21dbc86c0b755403b474e88228a1c25ff9e839e2306e59612081058f32cfa5fffbcefbe9238f11ddf855317ff +EBUILD qtile-0.31.0.ebuild 2759 BLAKE2B 8df90794dca02612b82210565b726a06722dafae5c98a9fb16a1eca1458b2a17ff48fd980bcc00a43eb22bc1a6aee6efdf55438fac09374229910df3eee02214 SHA512 5868491172b160be909387a2bb422c8dd561fc83392f1e845eecd20dbb4df57ee4008023cb3b4acc6f38aa66e3f1ee049a9b915c2d9d7454a1874feb46938d49 MISC metadata.xml 422 BLAKE2B 10ddda5d4485b4a3c76ff658a41e2b4ea6004413ea3d2d9d4b088a7a25de36e167ae70505c195467c2401df0396a40e2301cc29a25e7e4097ed20cc6335e8956 SHA512 5f5aeecab841345abe98b87180644e60f8e52a12fc2c354cdd3678d8ad5c8c1ba13790a1bc6fa5662587714f3af9566f6adbdbc355b18d632d0ffa3eb4e83106 diff --git a/x11-wm/qtile/qtile-0.30.0.ebuild b/x11-wm/qtile/qtile-0.30.0.ebuild index 75008ae99ce6..c9d79701ae90 100644 --- a/x11-wm/qtile/qtile-0.30.0.ebuild +++ b/x11-wm/qtile/qtile-0.30.0.ebuild @@ -46,7 +46,9 @@ BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/setuptools-scm[${PYTHON_USEDEP}] test? ( + dev-python/isort[${PYTHON_USEDEP}] dev-python/libcst[${PYTHON_USEDEP}] + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] media-gfx/imagemagick[X] x11-base/xorg-server[xephyr,xvfb] ) diff --git a/x11-wm/qtile/qtile-0.29.0.ebuild b/x11-wm/qtile/qtile-0.31.0.ebuild index a8b28b2ac25a..233b693510ae 100644 --- a/x11-wm/qtile/qtile-0.29.0.ebuild +++ b/x11-wm/qtile/qtile-0.31.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 pypi virtualx @@ -27,7 +27,7 @@ DEPEND=" " RDEPEND=" ${DEPEND} - dev-python/dbus-next[${PYTHON_USEDEP}] + dev-python/dbus-fast[${PYTHON_USEDEP}] dev-python/pygobject[${PYTHON_USEDEP}] >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] x11-libs/cairo[X,xcb(+)] @@ -46,7 +46,9 @@ BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] dev-python/setuptools-scm[${PYTHON_USEDEP}] test? ( + dev-python/isort[${PYTHON_USEDEP}] dev-python/libcst[${PYTHON_USEDEP}] + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] media-gfx/imagemagick[X] x11-base/xorg-server[xephyr,xvfb] ) |