diff options
Diffstat (limited to 'x11-wm')
59 files changed, 149 insertions, 2490 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex f739270a7a4a..625935e3e2de 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest index 63d9f23e29d9..af739ca0007e 100644 --- a/x11-wm/enlightenment/Manifest +++ b/x11-wm/enlightenment/Manifest @@ -1,3 +1,3 @@ DIST enlightenment-0.26.0.tar.xz 409678784 BLAKE2B e03cb4485fafd3b03a69ca20b5910fc5b0d7070b625a5f9f6c365d57b62b6be00f7c370f38e127e92f29e430045c3502e7868219cb246f84f044d418808a3ae1 SHA512 52a656b397348a4f6baa28b9da4b42c81160b06d28dba58c22bdf00bf749aed3a9b194e171a5ac349745a4c11afc8ae8c38f9bf8c31bacbc0d196cfb24b15a1e -EBUILD enlightenment-0.26.0.ebuild 3194 BLAKE2B 4a84b31b9d8e058f471d629f32226a59272b9ea732a21d4e88b058c8c6a29ded0bcb859f2babd2b5c8c227c4f937213118c70a22c3e219fd297556f0c818282b SHA512 3b6dc0c548bb09376a7772e58c1a0eb39c2fdd27031e48624812278a4bf814e813282dcfebd28d5cd931439908e4cc230f39c318bd9216258ad61ab362491e2c +EBUILD enlightenment-0.26.0.ebuild 3121 BLAKE2B e2872b38157a0c608573b6f14bb1dc442ee127dc7eaaa7c098c1b7846a652b347194f71c67382942e60d1f195beaaf3192a899c91fdb7f19a71899f15b105559 SHA512 d4bc01af1cb1f7064cc5b9d5af91e3bc0908336159e4d796045950427e111941ecf917bfcb3199c2dc8a6cddb64b95e4ea58f56b41289c5b46ff1583883ed85e MISC metadata.xml 722 BLAKE2B 5d52b9e4ce352b7f16f10d3488b1c8e5f515190ef030606cbaaa69142b1b9da5c7eaecbdf8b4c7921878fe23a7de2c22ac2afdc4b06358dbbddd783e6690f755 SHA512 33810b7b0b22fe24bd1e1448cb4ca1a12d9e41dc0b25d09b94b94847ec590944513ccdc93f1bd4030f400a314ae76a60de04543ac2aa45b4ebcaec6dccf47fb9 diff --git a/x11-wm/enlightenment/enlightenment-0.26.0.ebuild b/x11-wm/enlightenment/enlightenment-0.26.0.ebuild index 9c218bcdccf0..17af202323f1 100644 --- a/x11-wm/enlightenment/enlightenment-0.26.0.ebuild +++ b/x11-wm/enlightenment/enlightenment-0.26.0.ebuild @@ -112,7 +112,6 @@ pkg_postinst() { optfeature "image viewer" media-gfx/entice optfeature "image viewer" media-gfx/ephoto optfeature "a media player" media-video/rage - optfeature "ConnMan user interface for Enlightenment" net-misc/econnman optfeature "system and process monitor" sys-process/evisum optfeature "feature rich terminal emulator" x11-terms/terminology optfeature "a matching GTK theme" x11-themes/e-gtk-theme diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest index 7ece99b905d4..37b26412aa93 100644 --- a/x11-wm/evilwm/Manifest +++ b/x11-wm/evilwm/Manifest @@ -1,4 +1,6 @@ AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288 DIST evilwm-1.4.2.tar.gz 73716 BLAKE2B dbdeb914efe1002a3d3e97942d9b8ee22a3506aec4232cc59d5cb7fe61ee2bcbf08eaa5cc1d55151acd2c41f5fe7128cf0238ac844e91d61fc6afcb9162792e1 SHA512 07f1d82a611b95606ef137bb76599f8eef4bc27bf90eae9f5aa15bc806808c3bc4e1d7e821cebe1651b134d03f2b129e336b95e9659f0509d9711faab9bd00ba +DIST evilwm-1.4.3.tar.gz 74386 BLAKE2B 59a8aa3167f6c15c41251d58958496147f76283486345191f2d2d1ad429f0e8d4fe9df3f986ce0c11e0c0f8217365b2fb32cb6fa96566e625333e3eb5f3b58d9 SHA512 3e2d4207b401261bce3ec2a185a1fb2385bb7d79595c0a61a13aeb3238d7ebb5502efb2121d00599af53ce98cdc5cf291751e6ac3a6fb0d623c06628a302047e EBUILD evilwm-1.4.2.ebuild 1042 BLAKE2B d162ff70c09f6172480fab79fbf0877bc59e2de7e0510d937e4a6d06f628a051c549b78246b67d1e282329b520b797fa9fdf175b533d5064669591bcafa18ab9 SHA512 10473f3cd8b2649786c0ad42b5425f4d2b96b4799615b21541543cad17d37f839f4d59fa8308632df201ecf9dd511bca7658afeabdb3e3345a5db2ff1c10cc12 +EBUILD evilwm-1.4.3.ebuild 1048 BLAKE2B 73c422ef055e0cacd9681dd1e12368cea10bd4e654104f57788edd06296a9ec33a46b0252f39d929ac3078db51c98661e071d08dbe74e226dbca51b2d6691848 SHA512 f38fb679c6d382ededc2eb5152e196f27023da5fa206e4f2364fa9ed58ac4e4bd0644a0205da8438249fa94df13c318d26fd002cba444debec945b317f9728b2 MISC metadata.xml 584 BLAKE2B 3dfdb1220cc0b3805d4c2b7e7256d178cf96b64853b4f2acbb7e563d09a3b4da046cc2c078158d3d801e24e7eea208ff54842f8cf5ac34b9312b5f0a8f9db3ab SHA512 a09e6f2213ec18853e320e273800b6d8a09d99c60c2e91a12196a2dd683d156b303e7ac38445c062b0ac998f2f4ae6ca6c4a28326cc2aed2fc3f88bb7177f2c8 diff --git a/x11-wm/evilwm/evilwm-1.4.3.ebuild b/x11-wm/evilwm/evilwm-1.4.3.ebuild new file mode 100644 index 000000000000..c995191f1567 --- /dev/null +++ b/x11-wm/evilwm/evilwm-1.4.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="A minimalist, no frills window manager for X" +HOMEPAGE="https://www.6809.org.uk/evilwm/" +SRC_URI="https://www.6809.org.uk/evilwm/dl/${P}.tar.gz" + +LICENSE="MIT 9wm" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="x11-libs/libXext + x11-libs/libXrandr + x11-libs/libX11" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +src_prepare() { + default + sed -e 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' \ + -i evilwm.h || die "sed font failed" +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" INSTALL_STRIP="" install + + einstalldocs + + echo -e "#!${EPREFIX}/bin/sh\nexec \"${EPREFIX}/usr/bin/${PN}\"" > "${T}/${PN}" || die + exeinto /etc/X11/Sessions + doexe "${T}/${PN}" + + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" + domenu "${FILESDIR}"/evilwm.desktop +} diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index d7a64179b13e..cf5257c00c9a 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -9,5 +9,5 @@ AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 -EBUILD fluxbox-1.3.7-r5.ebuild 3275 BLAKE2B f304fc44efbbafa29be30d8b24822f17aa18a4c1f4357c067a4c9719dccc2955b012aee757424a54dc99b6511203cff2198577bca2880edb2807848cffe8744c SHA512 038edcf4046a281d0632e95b43ad2dfb3c848794b91abf480bac2436d85fad25452cfece69b3f51cc442bddbd5bcf70ddde31f96d6c39e4545e16c669ab8fda4 +EBUILD fluxbox-1.3.7-r5.ebuild 3269 BLAKE2B 3767225d357bbcb0c3aa779742cfc36aa2a88fc137db650ca3c040d81183707818b9dd04333ccc523fb273e781a5dcc674785b25a1980b293ef989e8094d0324 SHA512 af58444a00a6d8673bbd94ae5c491dc9e0e1dbba189ae3e839ec1b4cb74854fac1a474501f56512393d5b4eb23d80fed8f613eac9cf16ccaf0ad01316dde8730 MISC metadata.xml 812 BLAKE2B 789750598a53d46a63c50238107634a0f4fa4512b20084ee47800d162c8c40eb727f22a85d5145857fa4a8df5ff6bc36d17b1d8990ca45c7839aa34a1f6845c6 SHA512 7b045f41556db0f63199aacd5ab171c904009aa8d0271b1a84a144d204ba71ba5d1ca4d76db7b03d18ec6d708b01be83a7f1eb3e5d430c3ab1656c74f862556c diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild index e379d3b4cd9e..acad11e9b390 100644 --- a/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.3.7-r5.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/fluxbox/${P}.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux" IUSE="nls xinerama bidi +truetype +imlib +slit +systray test +toolbar vim-syntax" REQUIRED_USE="systray? ( toolbar )" # Tests are all manual and throw an exception on launch. diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 5e7feb461b6c..df220bb78f71 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,14 +1,8 @@ AUX README.translucency 3723 BLAKE2B aae37e9dbdf8f7b730b6947d55f0e286c1269d5cacc9ce6d2481562b054c2fa9010acf6ee0d6c994ea3cee64d3df99ef6d08dfa8c6b58706bc9bb8b477095e1b SHA512 a64ef5147e52e07d4cec8a2f3ebd1340827d0139031ef7ddaf27fc144fcc58858c3ec40eee854034423f853b2c7bdd813f66236c8a9679977084f4a2176a8ffa -AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa1045b91ef76101ccf8cc6fdf4854c1675b397715977efafb174e340c487bafed12677a1cacb83e201424a9fed43bdfa7f8475 SHA512 92f78b624ea2bfddb88f825f40930a0a7e4bb1d284276e62985f189cd5b72ee8a92131f7d2a91efdbf508fc8ef002f5b4168188b12b0e23e28fb1ebec471969d -AUX fvwm-2.6.5-ar.patch 1077 BLAKE2B ebd3226a706087c7e7f7935a9862c59e628551e19be66d110441075839484b6bb26667104090258267b3e484c6fc0b0650349488902d216f3cf841c23e45b59e SHA512 fc66ee5c79b96860705d72b18aab3f8c8f8ad84fead47c4f8f944474a6bfbe0569ee08aa51e8a4d7982541eecd5c302499f99ebf8568f4b4fb1c9e2369233e45 -AUX fvwm-2.6.5-mouse-buttons.patch 519 BLAKE2B 23b31933e9dcc456d73be15573226017fc213da59156040136ff447b208b45691fca00b5d16cdaf57ab8411e2834d759b3bb7e53550b13ec72de4b7f70486abb SHA512 d28a9724697859ca7beac1cc2813c12413654e1c0749297c34fb0ef8bbf97369ac8039d2a82ec673d885b39e1544259b70cecf292639caa9ff99c1b42d34c196 -AUX fvwm-2.6.8-perl528.patch 515 BLAKE2B 44df7b8aef71d85c3aefefb40ab45b9e6227ef6a13aaab60cec8956db669013b4ee4dc869216972e1a443d1f69e6550e7f80dc81cdf8b7642d6c49ae46793b2a SHA512 ab35b8aef3c6d8a07f1e03290c209736ee892729d98fece3d0134fd9994f8c57bdd5703492b405a6eb52cfcd67cd9cd72c16bc25a729a46560eb6e21f2d7918f AUX fvwm-2.7.0-ar.patch 1243 BLAKE2B 5d01137c867629e05f7a2c5c600b4b21d06b2c061e05a4389ad2c9ba456459020a972153594800c62e68c4411e1de1012ca32ccfe4feaa1233e90d65fa6c19c2 SHA512 533fd933c180e753e482684bfd68a0f6a95b71c622336be6080f09d4d354d16c4f7c758e79529ee873f2a39d0a6adbf73a586a3709dd8ad182c67ae5d8b50c1c AUX fvwm-2.7.0-c99.patch 3294 BLAKE2B 930615bfde3168ca47c865badab133de33ad127c648f1a29424076b61e194a6dcf2b411e5198185acc057d49fc7fd4539397270f6610a7d80abb929dd50547cc SHA512 affc46823a1e2756b72819a08976496319a10fa43eb1089f57ac0630d3d919ba9f3a8c86c62a932be989b4f7b17dbbb3712da55d188af806396c2c18175b8cdb AUX fvwm-2.7.0-fix-docdir.patch 361 BLAKE2B aefce92389f7ba8b8a85d67c9144e0ae6c4df6eb7ea9195ae1683a0be453e9eeaff1ad64fd1e4de174ee419c9636897639863d5d0f3f8e7fde8ade84b05358e4 SHA512 c21d5ded3ee488efc0595f44a09c9833189c5159494e96cf3c4f310aa5dfc9aba3f78452d4e9105e839e57a8a2361c9dc5840bc89e8ae67f5cf2209b6a3ab142 AUX fvwm-2.7.0-translucent-menus.diff 15303 BLAKE2B 9689b136bf17aff87bf9b2b872a8d746268849333d06595a5147be7dbc2b6e2a9f75643c67d28564663cf0571378612ebc96e1eff22e315305501cca438c9947 SHA512 34714e25ca5a30479174c1a75ef6441e9dd7e9506e52edced1c8658979059d03b07f5373b82178c2871034155e74a0bf16b55db30784575bc7e6f06555a321fd -DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e DIST fvwm-2.7.0.tar.gz 3933529 BLAKE2B b4be7083c2946cb2a0c48673271d490a49aba5aec8407169bedc5a35f55fe8cd2724a9f6570c5e7ea110652c04956570c874256f96fa5d920a2a1ede152c0c25 SHA512 fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808 -EBUILD fvwm-2.6.9.ebuild 4034 BLAKE2B 603b739468c0c94f41348b62014245fd465da01622079f0bbaa68f4f3c736bce79b716ad8a3d7d6787bcbf3245340827e6308f7a5e0948afaffc0c2566676a5b SHA512 2e30f69354c6070e8b47992435a8368bc636d50498cb90f4413328703b79c9f69d5e633df9c6056c2ef7e019db1d9e020e14bf0d2e6f254c1a96c94912a440f5 -EBUILD fvwm-2.7.0-r5.ebuild 4134 BLAKE2B d8b014976240387e30255b6a15b0242c57df5a75dda356eb4d679682d3f75ef0127bdbc4aa3e316b57758dc4732b7194ef64d6cbec10f8086cbc2f1854144095 SHA512 8ff8ed5024d074f579b80f82d4de66c92f7dd4917ea226ba7ce2ea0adf8aa229040ce5d22ff508ccb5127623c1403321a28ac6f0c581c1088c73452c3e50eb14 +EBUILD fvwm-2.7.0-r5.ebuild 4128 BLAKE2B c0d6f488559d3bf7859b0da9a93964010fb35232a7994dbe10dc3ede85547d5702d09be0146673a3a3c84f11aca86b37fe37ac31f4ee09a9fc7c955d10e3132f SHA512 918792dc7b63098a67689467108ca85faba3a80e2925a98a19c6bcba6d1ad5d6c2a687b27ea8cd6caa879b0437cca04df1be1788562a581a3682907ba0bcd51e MISC metadata.xml 736 BLAKE2B c9ff0661b5a87747a83a9d0f88f2a994e23e9e741e669fab4bd42351f74eb9dd8d55ae7d9a56d3a865eef344484a489f08359cc0e44874787fed0538f977c159 SHA512 5b06fe1d24d811fe7c408f38849c06360a5e59d98e5076214cdf041f95f5ed5ae4b625331337ce7c0d00db62fd4db6ca78f6cb2902409f340ba47d8204ab5692 diff --git a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff deleted file mode 100644 index 1c49f69007d0..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff +++ /dev/null @@ -1,528 +0,0 @@ -Index: fvwm/colorset.c -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/fvwm/colorset.c,v -retrieving revision 1.52 -diff -u -r1.52 colorset.c ---- fvwm/colorset.c 27 Jan 2007 11:33:15 -0000 1.52 -+++ fvwm/colorset.c 5 Feb 2007 19:15:51 -0000 -@@ -164,6 +164,8 @@ - "NoIconTint", - "IconAlpha", - -+ "Translucent", -+ "NoTranslucent", - NULL - }; - -@@ -625,6 +627,7 @@ - char *fg_tint = NULL; - char *bg_tint = NULL; - char *icon_tint = NULL; -+ char *translucent_tint = NULL; - Bool have_pixels_changed = False; - Bool has_icon_pixels_changed = False; - Bool has_fg_changed = False; -@@ -637,6 +640,7 @@ - Bool has_fg_tint_changed = False; - Bool has_bg_tint_changed = False; - Bool has_icon_tint_changed = False; -+ Bool has_translucent_tint_changed = False; - Bool has_pixmap_changed = False; - Bool has_shape_changed = False; - Bool has_image_alpha_changed = False; -@@ -763,6 +767,10 @@ - case 21: /* Plain */ - has_pixmap_changed = True; - free_colorset_background(cs, True); -+ cs->is_translucent = False; -+ cs->translucent_tint_percent = 0; -+ cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED; -+ has_translucent_tint_changed = True; - break; - case 22: /* NoShape */ - has_shape_changed = True; -@@ -929,6 +937,24 @@ - cs->icon_alpha_percent = tmp; - } - break; -+ case 42: /* Translucent */ -+ cs->is_translucent = True; -+ parse_simple_tint( -+ cs, args, &translucent_tint, -+ TRANSLUCENT_TINT_SUPPLIED, -+ &has_translucent_tint_changed, &percent, -+ "Translucent"); -+ if (has_translucent_tint_changed) -+ { -+ cs->translucent_tint_percent = percent; -+ } -+ break; -+ case 43: /* NoTranslucent */ -+ cs->is_translucent = False; -+ cs->translucent_tint_percent = 0; -+ cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED; -+ has_translucent_tint_changed = True; -+ break; - default: - /* test for ?Gradient */ - if (option[0] && StrEquals(&option[1], "Gradient")) -@@ -1615,6 +1641,27 @@ - } - - /* -+ * ---------- change the translucent tint colour ---------- -+ */ -+ if (has_translucent_tint_changed) -+ { -+ /* user specified colour */ -+ if (translucent_tint != NULL) -+ { -+ PictureFreeColors( -+ dpy, Pcmap, &cs->translucent_tint, 1, 0, True); -+ cs->translucent_tint = GetColor(translucent_tint); -+ } -+ else -+ { -+ /* default */ -+ PictureFreeColors( -+ dpy, Pcmap, &cs->translucent_tint, 1, 0, True); -+ cs->translucent_tint = GetColor(black); -+ } -+ } -+ -+ /* - * ---------- send new colorset to fvwm and clean up ---------- - */ - /* make sure the server has this to avoid races */ -@@ -1710,6 +1757,7 @@ - ncs->fgsh = GetColor(white); - ncs->tint = GetColor(black); - ncs->icon_tint = GetColor(black); -+ ncs->translucent_tint = GetColor(black); - ncs->pixmap = XCreatePixmapFromBitmapData( - dpy, Scr.NoFocusWin, - &g_bits[4 * (nColorsets % 3)], 4, 4, -@@ -1727,6 +1775,7 @@ - ncs->fgsh = GetForeShadow(ncs->fg, ncs->bg); - ncs->tint = GetColor(black); - ncs->icon_tint = GetColor(black); -+ ncs->translucent_tint = GetColor(black); - } - ncs->fg_tint = ncs->bg_tint = GetColor(black); - /* set flags for fg contrast, bg average */ -@@ -1738,6 +1787,7 @@ - ncs->icon_alpha_percent = 100; - ncs->tint_percent = 0; - ncs->icon_tint_percent = 0; -+ ncs->translucent_tint_percent = 0; - ncs->fg_tint_percent = ncs->bg_tint_percent = 0; - ncs->dither = (PictureDitherByDefault())? True:False; - nColorsets++; -Index: fvwm/menuroot.h -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/fvwm/menuroot.h,v -retrieving revision 1.3 -diff -u -r1.3 menuroot.h ---- fvwm/menuroot.h 13 Jan 2007 15:07:14 -0000 1.3 -+++ fvwm/menuroot.h 5 Feb 2007 19:17:37 -0000 -@@ -146,6 +146,9 @@ - int d_npixels; - } stored_pixels; - /* alloc pixels when dithering is used for gradients */ -+ /* x,y XMapRaise */ -+ int x; -+ int y; - } MenuRootDynamic; - - /* access macros to dynamic menu members */ -Index: fvwm/menus.c -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.c,v -retrieving revision 1.409 -diff -u -r1.409 menus.c ---- fvwm/menus.c 27 Jan 2007 11:51:15 -0000 1.409 -+++ fvwm/menus.c 5 Feb 2007 19:17:50 -0000 -@@ -75,6 +75,19 @@ - - /* ---------------------------- local macros ------------------------------- */ - -+#define MENU_IS_TRANSLUCENT(mr,cs) \ -+ (!MR_IS_TEAR_OFF_MENU(mr) && CSET_IS_TRANSLUCENT(cs)) -+#define MENU_IS_TRANSPARENT(mr,cs) \ -+ (MENU_IS_TRANSLUCENT(mr,cs) || CSET_IS_TRANSPARENT(cs)) -+#define MR_IS_TRANSLUCENT_MENU(mr) \ -+ (!MR_IS_TEAR_OFF_MENU(mr) && MR_STYLE(mr) && \ -+ ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSLUCENT( \ -+ ST_CSET_MENU(MR_STYLE(mr)))) -+#define MR_IS_TRANSPARENT_MENU(mr) \ -+ (MR_IS_TRANSLUCENT_MENU(mr) || (MR_STYLE(mr) && \ -+ ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSPARENT( \ -+ ST_CSET_MENU(MR_STYLE(mr))))) -+ - /* ---------------------------- imports ------------------------------------ */ - - /* This external is safe. It's written only during startup. */ -@@ -188,6 +201,8 @@ - } mloop_static_info_t; - - /* ---------------------------- forward declarations ----------------------- */ -+static MenuRoot *seek_submenu_instance( -+ MenuRoot *parent_menu, MenuItem *parent_item); - - /* ---------------------------- local variables ---------------------------- */ - -@@ -353,12 +368,22 @@ - Bool transparent_bg = False; - - /* move it back */ -- if (ST_HAS_MENU_CSET(MR_STYLE(mr)) && -- CSET_IS_TRANSPARENT(ST_CSET_MENU(MR_STYLE(mr)))) -+ if (MR_IS_TRANSPARENT_MENU(mr)) - { - transparent_bg = True; - get_menu_repaint_transparent_parameters( - &mrtp, mr, fw); -+ if (MR_IS_TRANSLUCENT_MENU(mr) && MR_SUBMENU_ITEM(mr)) -+ { -+ MenuRoot *smr; -+ smr = seek_submenu_instance( -+ mr, MR_SUBMENU_ITEM(mr)); -+ if (smr) -+ { -+ /* just unmap it here, popdown later */ -+ XUnmapWindow(dpy, MR_WINDOW(smr)); -+ } -+ } - } - AnimatedMoveOfWindow( - MR_WINDOW(mr), act_x, act_y, act_x - MR_XANIMATION(mr), -@@ -1779,6 +1804,7 @@ - /* Doh. Use the standard display instead. */ - MR_CREATE_DPY(mr) = dpy; - } -+ MR_IS_TEAR_OFF_MENU(mr) = 1; - } - else - { -@@ -2594,7 +2620,37 @@ - } - MR_IS_PAINTED(mr) = 1; - /* paint the menu background */ -- if (ms && ST_HAS_MENU_CSET(ms)) -+ if (MR_IS_TRANSLUCENT_MENU(mr)) -+ { -+ Pixmap trans = None; -+ FvwmRenderAttributes fra; -+ colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)]; -+ -+ fra.mask = 0; -+ if (colorset->translucent_tint_percent > 0) -+ { -+ fra.mask = FRAM_HAVE_TINT; -+ fra.tint = colorset->translucent_tint; -+ fra.tint_percent = colorset->translucent_tint_percent; -+ } -+ if (MR_IS_BACKGROUND_SET(mr) == False) -+ { -+ trans = PGraphicsCreateTranslucent( -+ dpy, MR_WINDOW(mr), &fra, -+ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), -+ MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr)); -+ XMapRaised(dpy, MR_WINDOW(mr)); -+ if (trans != None) -+ { -+ XSetWindowBackgroundPixmap( -+ dpy, MR_WINDOW(mr), trans); -+ MR_IS_BACKGROUND_SET(mr) = True; -+ clear_expose_menu_area(MR_WINDOW(mr), pevent); -+ XFreePixmap(dpy, trans); -+ } -+ } -+ } -+ else if (ms && ST_HAS_MENU_CSET(ms)) - { - if (MR_IS_BACKGROUND_SET(mr) == False) - { -@@ -3401,10 +3457,7 @@ - MR_HAS_POPPED_UP_RIGHT(mr) = 0; - } - MR_XANIMATION(parent_menu) += end_x - prev_x; -- if (ST_HAS_MENU_CSET(MR_STYLE(parent_menu)) && -- CSET_IS_TRANSPARENT( -- ST_CSET_MENU( -- MR_STYLE(parent_menu)))) -+ if (MR_IS_TRANSPARENT_MENU(parent_menu)) - { - transparent_bg = True; - get_menu_repaint_transparent_parameters( -@@ -3583,10 +3636,21 @@ - */ - - XMoveWindow(dpy, MR_WINDOW(mr), x, y); -+ MR_X(mr) = x; -+ MR_Y(mr) = y; - XSelectInput(dpy, MR_WINDOW(mr), event_mask); -- XMapRaised(dpy, MR_WINDOW(mr)); -- if (popdown_window) -- XUnmapWindow(dpy, popdown_window); -+ if (MR_IS_TRANSLUCENT_MENU(mr)) -+ { -+ if (popdown_window) -+ XUnmapWindow(dpy, popdown_window); -+ paint_menu(mr, NULL, fw); -+ } -+ else -+ { -+ XMapRaised(dpy, MR_WINDOW(mr)); -+ if (popdown_window) -+ XUnmapWindow(dpy, popdown_window); -+ } - XFlush(dpy); - MR_MAPPED_COPIES(mr)++; - MST_USAGE_COUNT(mr)++; -@@ -6123,16 +6187,122 @@ - { - last = True; - } -- if (!last && CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms))) -+ if (!last && -+ (CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)) || -+ MR_IS_TRANSLUCENT_MENU(mr))) - { - /* too slow ... */ - return; - } -- SetWindowBackgroundWithOffset( -- dpy, MR_WINDOW(mr), step_x - current_x, step_y - current_y, -- MR_WIDTH(mr), MR_HEIGHT(mr), -- &Colorset[ST_CSET_MENU(ms)], Pdepth, -- FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False); -+ if (MR_IS_TRANSLUCENT_MENU(mr)) -+ { -+ Pixmap trans, tmp; -+ FvwmRenderAttributes fra; -+ colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)]; -+ -+ fra.mask = 0; -+ if (colorset->translucent_tint_percent > 0) -+ { -+ fra.mask = FRAM_HAVE_TINT; -+ fra.tint = colorset->translucent_tint; -+ fra.tint_percent = colorset->translucent_tint_percent; -+ } -+ if (current_x == step_x) -+ { -+ /* Reuse the old pixmap for the part of the menu -+ * that has not moved. (This can be extended to get -+ * two new rectangles, one in each direction) -+ * -+ * It saves the unmapping of the window and makes -+ * Things less flickering. -+ */ -+ GC my_gc; -+ unsigned long valuemask = GCSubwindowMode; -+ XGCValues values; -+ int out_y=0; -+ values.subwindow_mode = IncludeInferiors; -+ if (step_y < 0) -+ { -+ out_y = -step_y; -+ } -+ trans = XCreatePixmap(dpy, MR_WINDOW(mr), MR_WIDTH(mr), -+ MR_HEIGHT(mr), Pdepth); -+ my_gc = fvwmlib_XCreateGC(dpy, MR_WINDOW(mr), 0, NULL); -+ XChangeGC(dpy, my_gc, valuemask, &values); -+ -+ XClearWindow(dpy, MR_WINDOW(mr)); -+ -+ if (current_y < step_y) -+ { -+ XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0, -+ step_y-current_y, MR_WIDTH(mr), -+ MR_HEIGHT(mr)-(step_y-current_y), -+ 0,0); -+ tmp = PGraphicsCreateTranslucent( -+ dpy, MR_WINDOW(mr), &fra, -+ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), -+ current_x, current_y+MR_HEIGHT(mr), -+ MR_WIDTH(mr), step_y-current_y); -+ -+ XCopyArea(dpy, tmp, trans, my_gc, 0, 0, -+ MR_WIDTH(mr), step_y-current_y,0, -+ MR_HEIGHT(mr)-(step_y-current_y)); -+ } -+ else -+ { -+ XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0, -+ 0, MR_WIDTH(mr), -+ MR_HEIGHT(mr)-(current_y-step_y), 0, -+ current_y-step_y); -+ tmp = PGraphicsCreateTranslucent( -+ dpy, MR_WINDOW(mr), &fra, -+ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), -+ current_x,step_y, MR_WIDTH(mr), -+ current_y-step_y); -+ XCopyArea(dpy, tmp, trans, my_gc, 0, 0, -+ MR_WIDTH(mr), current_y-step_y,0, -+ out_y); -+ } -+ MR_X(mr) = step_x; -+ MR_Y(mr) = step_y; -+ XFreePixmap(dpy, tmp); -+ XFreeGC(dpy,my_gc); -+ } -+ else -+ { -+ XUnmapWindow(dpy, MR_WINDOW(mr)); -+ MR_X(mr) = step_x; -+ MR_Y(mr) = step_y; -+ trans = PGraphicsCreateTranslucent( -+ dpy, MR_WINDOW(mr), &fra, -+ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), -+ step_x, step_y, MR_WIDTH(mr), -+ MR_HEIGHT(mr)); -+ XMapRaised(dpy, MR_WINDOW(mr)); -+ } -+ XSetWindowBackgroundPixmap( -+ dpy, MR_WINDOW(mr), trans); -+ XFreePixmap(dpy, trans); -+ if (current_x == step_x) -+ { -+ /* Redraw the border */ -+ RelieveRectangle( -+ dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1, -+ MR_HEIGHT(mr) - 1, (Pdepth < 2) ? -+ SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) : -+ HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)), -+ SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), -+ MST_BORDER_WIDTH(mr)); -+ } -+ } -+ else -+ { -+ SetWindowBackgroundWithOffset( -+ dpy, MR_WINDOW(mr), step_x - current_x, -+ step_y - current_y, MR_WIDTH(mr), MR_HEIGHT(mr), -+ &Colorset[ST_CSET_MENU(ms)], Pdepth, -+ FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False); -+ } - } - - -@@ -6173,10 +6343,7 @@ - } - if (!is_bg_set) - { -- SetWindowBackground( -- dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr), -- &Colorset[ST_CSET_MENU(ms)], Pdepth, -- FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False); -+ update_transparent_menu_bg(prtm, x, y, x, y, end_x, end_y); - } - /* redraw the background of non active item */ - for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi)) -@@ -6813,10 +6980,12 @@ - SetWindowBackground( - dpy, MR_WINDOW(mr), MR_WIDTH(mr), - MR_HEIGHT(mr), -- &Colorset[ST_CSET_MENU(ms)], -- Pdepth, -+ &Colorset[ST_CSET_MENU(ms)], Pdepth, - FORE_GC(MST_MENU_INACTIVE_GCS(mr)), -- True); -+ False); -+ XClearArea( -+ dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr), -+ MR_HEIGHT(mr), True); - } - else if ((ST_HAS_ACTIVE_CSET(ms) && - ST_CSET_ACTIVE(ms) == cset) || -Index: fvwm/menus.h -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/fvwm/menus.h,v -retrieving revision 1.111 -diff -u -r1.111 menus.h ---- fvwm/menus.h 27 Jan 2007 11:51:15 -0000 1.111 -+++ fvwm/menus.h 5 Feb 2007 19:17:50 -0000 -@@ -15,6 +15,9 @@ - #define IS_MENU_RETURN(x) \ - ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF) - -+#define MR_X(m) ((m)->d->x) -+#define MR_Y(m) ((m)->d->y) -+ - struct MenuRoot; - struct MenuStyle; - struct MenuReturn; -Index: libs/Colorset.h -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/libs/Colorset.h,v -retrieving revision 1.38 -diff -u -r1.38 Colorset.h ---- libs/Colorset.h 10 Jan 2007 00:34:27 -0000 1.38 -+++ libs/Colorset.h 5 Feb 2007 19:19:00 -0000 -@@ -51,6 +51,10 @@ - Bool dither; - Bool allows_buffered_transparency; - Bool is_maybe_root_transparent; -+ /* only use by fvwm menu (non tear-off) */ -+ Bool is_translucent; -+ Pixel translucent_tint; -+ unsigned int translucent_tint_percent : 7; - #endif - } colorset_t; - -@@ -78,6 +82,7 @@ - #define FG_TINT_SUPPLIED 0x100 - #define BG_TINT_SUPPLIED 0x200 - #define ICON_TINT_SUPPLIED 0x400 -+#define TRANSLUCENT_TINT_SUPPLIED 0x800 - #endif - - /* colorsets are stored as an array of structs to permit fast dereferencing */ -@@ -153,6 +158,11 @@ - (cset != NULL && cset->pixmap == ParentRelative && \ - cset->tint_percent > 0) - -+#define CSET_IS_TRANSLUCENT(cset) \ -+ (cset >= 0 && Colorset[cset].is_translucent) -+#define CSETS_IS_TRANSLUCENT(cset) \ -+ (cset && cset->is_translucent) -+ - #ifndef FVWM_COLORSET_PRIVATE - /* Create n new colorsets, fvwm/colorset.c does its own thing (different size) - */ -Index: libs/PictureGraphics.c -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.c,v -retrieving revision 1.29 -diff -u -r1.29 PictureGraphics.c ---- libs/PictureGraphics.c 27 Jan 2007 11:33:16 -0000 1.29 -+++ libs/PictureGraphics.c 5 Feb 2007 19:19:49 -0000 -@@ -1340,7 +1340,7 @@ - } - } - --#if 0 /* humm... maybe useful one day with menus */ -+#if 1 /* humm... maybe useful one day with menus */ - Pixmap PGraphicsCreateTranslucent( - Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc, - int x, int y, int width, int height) -Index: libs/PictureGraphics.h -=================================================================== -RCS file: /home/cvs/fvwm/fvwm/libs/PictureGraphics.h,v -retrieving revision 1.13 -diff -u -r1.13 PictureGraphics.h ---- libs/PictureGraphics.h 9 May 2006 20:46:29 -0000 1.13 -+++ libs/PictureGraphics.h 5 Feb 2007 19:19:49 -0000 -@@ -122,7 +122,9 @@ - Display *dpy, Window win, Pixel tint, int tint_percent, - Drawable dest, Bool dest_is_a_window, GC gc, GC mono_gc, GC alpha_gc, - int dest_x, int dest_y, int dest_w, int dest_h); -- -+Pixmap PGraphicsCreateTranslucent( -+ Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc, -+ int x, int y, int width, int height); - /* never used ! */ - Pixmap PGraphicsCreateDitherPixmap( - Display *dpy, Window win, Drawable src, Pixmap mask, int depth, GC gc, diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch b/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch deleted file mode 100644 index b1d62006967f..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.6.5-ar.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- configure.ac 2012-04-20 12:58:29.000000000 +0200 -+++ configure_new.ac 2013-07-21 18:26:17.513904607 +0200 -@@ -209,6 +209,10 @@ - # optional libraries. - AC_PROG_CC - AC_PROG_CPP -+AN_MAKEVAR([AR], [AC_PROG_AR]) -+AN_PROGRAM([ar], [AC_PROG_AR]) -+AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) -+AC_PROG_AR - - # added -Wall for gcc, what about for others? - if test "x$GCC" = "xyes"; then ---- libs/Makefile.in 2012-04-20 13:03:55.000000000 +0200 -+++ libs/Makefile_new.in 2013-07-21 18:27:17.443992505 +0200 -@@ -48,7 +48,7 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LIBRARIES = $(noinst_LIBRARIES) --AR = ar -+AR = @AR@ - ARFLAGS = cru - libfvwm_a_AR = $(AR) $(ARFLAGS) - libfvwm_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ ---- modules/FvwmScript/Widgets/Makefile.in 2012-04-20 13:03:56.000000000 +0200 -+++ modules/FvwmScript/Widgets/Makefile_new.in 2013-07-21 18:27:23.844001892 +0200 -@@ -46,7 +46,7 @@ - CONFIG_CLEAN_FILES = - CONFIG_CLEAN_VPATH_FILES = - LIBRARIES = $(noinst_LIBRARIES) --AR = ar -+AR = @AR@ - ARFLAGS = cru - libWidgets_a_AR = $(AR) $(ARFLAGS) - libWidgets_a_LIBADD = diff --git a/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch b/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch deleted file mode 100644 index 7eaa3e20b7c7..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.6.5-mouse-buttons.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/defaults.h 2011-08-15 18:25:40.000000000 +0200 -+++ libs/defaults.h 2012-04-12 21:13:47.000000000 +0200 -@@ -25,7 +25,7 @@ - /* The "extended" buttons do not provide the full functionality because X has - * no bit mask value for them. Things like dragging windows don't work with - * them. */ --#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS 9 -+#define NUMBER_OF_EXTENDED_MOUSE_BUTTONS 15 - #if NUMBER_OF_EXTENDED_MOUSE_BUTTONS > 31 - #error No more than 31 mouse buttons can be supported on 32 bit platforms - #endif diff --git a/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch b/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch deleted file mode 100644 index 5735fb1f89b7..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.6.8-perl528.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- modules/FvwmPerl/FvwmPerl.in 2018-04-28 07:46:28.000000000 -0400 -+++ modules/FvwmPerl/FvwmPerl.in 2019-01-06 20:44:59.035950968 -0500 -@@ -319,11 +319,11 @@ - $FVWM_DATADIR = $FVWM_DATADIR || $module->site_data_dir; - $FVWM_USERDIR = $FVWM_USERDIR || $module->user_data_dir; - } - - # perl code substitution first -- $$text_ref =~ s/\Q$quote1\E { ( .*? ) } \Q$quote2\E/ -+ $$text_ref =~ s/\Q$quote1\E \{ ( .*? ) \} \Q$quote2\E/ - my $result = eval " - no strict; - package PreprocessNamespace; - $1 - "; diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild deleted file mode 100644 index 6f87f6d062cb..000000000000 --- a/x11-wm/fvwm/fvwm-2.6.9.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic desktop - -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" -HOMEPAGE="https://www.fvwm.org/" -SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+ FVWM" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86" -IUSE="bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock" - -COMMON_DEPEND=" - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - virtual/libiconv - bidi? ( dev-libs/fribidi ) - nls? ( virtual/libintl ) - png? ( media-libs/libpng:0= ) - readline? ( - sys-libs/ncurses:0= - sys-libs/readline:0= - ) - stroke? ( dev-libs/libstroke ) - svg? ( gnome-base/librsvg ) - truetype? ( - media-libs/fontconfig - x11-libs/libXft - ) - xinerama? ( x11-libs/libXinerama ) -" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl - sys-apps/debianutils - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( dev-libs/libxslt ) -" - -src_prepare() { - if ! use vanilla; then - # Enables fast translucent menus; patch from fvwm-user mailing list. - eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff" - - # Allow more mouse buttons, bug #411811 - eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch" - fi - - eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 - - # Fix for Perl 5.28 - eapply -p0 "${FILESDIR}/${PN}-2.6.8-perl528.patch" - - default - eautoreconf -} - -src_configure() { - local myeconfargs=( - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-iconv - --enable-package-subdirs - --without-rplay-library - $(use_enable bidi) - $(use_enable debug debug-msgs) - $(use_enable debug command-log) - $(use_enable doc htmldoc) - $(use_enable nls) - $(use_enable perl perllib) - $(use_enable png) - $(use_with readline readline-library) - $(use_with stroke stroke-library) - $(use_enable svg rsvg) - $(use_enable truetype xft) - $(use_enable xinerama) - ) - - # Non-upstream email where bugs should be sent; used in fvwm-bug. - export FVWM_BUGADDR="maintainer-needed@gentoo.org" - - # Recommended by upstream, reference ???? - append-flags -fno-strict-aliasing - - # Signed chars are required. - use ppc && append-flags -fsigned-char - - use readline && myeconfargs+=( --without-termcap-library ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - make_session_desktop fvwm /usr/bin/fvwm - - if ! use lock; then - find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null - fi - - if use perl; then - if ! use tk; then - rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die - rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die - find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null - fi - else - # Completely wipe it if ! use perl - rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1 - fi - - # Utility for testing FVWM behaviour by creating a simple window with - # configurable hints. - if use debug; then - dobin "${S}"/tests/hints/hints_test - newdoc "${S}"/tests/hints/README README.hints - fi - - dodir /etc/X11/Sessions - echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die - fperms a+x /etc/X11/Sessions/${PN} - - dodoc docs/{COMMANDS,DEVELOPERS.md} - - # README file for translucent menus patch. - if ! use vanilla; then - dodoc "${FILESDIR}"/README.translucency - ewarn "You are using a patched build, so, please, don't" - ewarn "report bugs at the fvwm-workers list unless you are" - ewarn "also able to reproduce them with a vanilla build (USE=vanilla)." - fi -} diff --git a/x11-wm/fvwm/fvwm-2.7.0-r5.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r5.ebuild index 36cb5394a2dc..b8739f3a1562 100644 --- a/x11-wm/fvwm/fvwm-2.7.0-r5.ebuild +++ b/x11-wm/fvwm/fvwm-2.7.0-r5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2+ FVWM" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~riscv ~sparc x86" IUSE="bidi debug doc netpbm nls perl png readline stroke svg tk truetype +vanilla xinerama lock" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest index 454dba7ea747..ec2878b0292c 100644 --- a/x11-wm/fvwm3/Manifest +++ b/x11-wm/fvwm3/Manifest @@ -5,5 +5,5 @@ DIST fvwm3-1.1.0-docs.tar.xz 230964 BLAKE2B f431011a63a8d190e01e34301e74fd40750d DIST fvwm3-1.1.0.tar.gz 4527424 BLAKE2B ee9a3f190ae7fa1f1dd703e17b0e12f04da63212cade30facdbc8339ded7f598de143d18f17dde39d3af8e24ff2b34855ad3e5b2b6c5ffe466072a7353895cd8 SHA512 47eea05cbdecf4da3313b9183fa938544b451b9f133d7a68062feb222c3c1af3873402f80b60485d603afe8cd23a03f3e86a503fc1f2070e1ad2e6e64d012341 EBUILD fvwm3-1.0.9-r1.ebuild 4808 BLAKE2B 522e96330ee3730704e2544ab34a71816b5616e8565790cabacbb3a0ccfbebcf09d7b0e74acd289b1d092c9e828e58d995d6986257d32db55b58310b6aea866e SHA512 9a10669c760d02ac45339259c8d4c836dcb3cfcfaf368363838ba16bf415afc83bb20db326999d4a45c237771b0c617691d3639292517475b45961fe37174380 EBUILD fvwm3-1.1.0-r1.ebuild 4759 BLAKE2B 562730695d29ac3f1d587ad37803719614107e8332ac96b8faab71e20186d961bd39155057875346aca7bf2c2588db6c104f2b4c84fda52752ef75c85f933176 SHA512 8740a4d2bc9a67d9f1b190f846ab07ce5fc0fb210348450bd9f120ae224d79fb6a1a9e7bb04dc6787dcb25779c760902f90416f9afa7355b01e77668eb01e0c7 -EBUILD fvwm3-9999.ebuild 4716 BLAKE2B f7a1be00bfeb6e7fc6ed8e2dea7d55a25ba9a57998dea8e2b6a95477412b301c1f9d236609217b74f822807b834e808e80aef7777e5081d4a16144182f3c2ecf SHA512 ac53c1eb13bf03a68a0a9f2103cda7928a01939798c553d0eed8050966da8286c4abab617cee31eda8248698d7affc7383de86c7ac209e42ffe91eded5a18317 +EBUILD fvwm3-9999.ebuild 4302 BLAKE2B 2bf0eddd7bdbb748712905cd0f8734d213e04ca4d372a571cf73bdc605a4bbb224c9ba84f0bcddf329394632df265419536316a195df6cb447cb4e547c8d5bbc SHA512 18234690e78758d80c3eaeb94c5e69d974e27c6c86f16b43db935435027f66e4d50a2cc6f6182799298ce103a041e594edc4b5c1c8b9f2f023bbd15aee833f7f MISC metadata.xml 1012 BLAKE2B 5c5d08f16521594e1425ca8efbe5162c72ce6aff0557c0c79f1e2717dfc77ba855f90c493b45ff361d2e75f00b17e549b6853ee660c77c57cdeadce1df223f32 SHA512 a53bdde33366823f867bcff8b6c90e3cae6e0808945278fd02928502fd38df9d699fa4ace2fe66c1524e74d256242202a2b3139deb1331b67ac72f2fd0e9608f diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index 9a9eba17220d..f4eabc6cad94 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -8,9 +8,9 @@ EAPI=8 # Scripting for this is in sam-gentoo-scripts. : ${FVWM3_DOCS_PREBUILT:=1} -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs +inherit flag-o-matic go-module meson python-single-r1 DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" HOMEPAGE="https://www.fvwm.org/" @@ -31,9 +31,8 @@ fi LICENSE="GPL-2+ FVWM go? ( Apache-2.0 BSD MIT )" SLOT="0" -IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" +IUSE="bidi +go netpbm nls perl readline svg" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DOCS=( NEWS ) @@ -83,20 +82,15 @@ RDEPEND="${PYTHON_DEPS} x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender + x11-misc/xlockmore + dev-lang/tk + dev-perl/Tk + >=dev-perl/X11-Protocol-0.56 bidi? ( dev-libs/fribidi ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) readline? ( sys-libs/ncurses:= sys-libs/readline:= ) - stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg:2 x11-libs/cairo @@ -105,14 +99,6 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${COMMON_DEPEND} x11-base/xorg-proto" -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - src_configure() { # Recommended by upstream for release. Doesn't really matter for live ebuilds. append-flags -fno-strict-aliasing @@ -122,68 +108,57 @@ src_configure() { use $arch && append-flags -fsigned-chars done - local myconf=( - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - $(use_enable bidi) - $(use_enable go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png + local emesonargs=( + "-Dpng=enabled" + "-Dsm=enabled" + "-Dxcursor=enabled" + "-Dxkbcommon=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} == 0 ]]; then - myconf+=( - --enable-mandoc - --enable-htmldoc + emesonargs+=( + "-Dhtmldoc=true" + "-Dmandoc=true" ) else # Probably not required, but let's be safe - myconf+=( - --disable-mandoc - --disable-htmldoc + emesonargs+=( + "-Dhtmldoc=false" + "-Dmandoc=false" ) fi - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" + 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 via emake + # 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/* - else - HTML_DOCS="${S}"/doc/*.html - doman "${S}"/doc/*.[0-8] fi - einstalldocs - emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - python_scriptinto "/usr/bin" - python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" - - make_session_desktop fvwm3 /usr/bin/fvwm3 + meson_src_install + if ! use go; then + python_scriptinto "/usr/bin" + python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" + fi } pkg_postinst() { diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest index f9d500959304..8992f0b2e19a 100644 --- a/x11-wm/marco/Manifest +++ b/x11-wm/marco/Manifest @@ -1,5 +1,3 @@ -DIST marco-1.26.2.tar.xz 1865248 BLAKE2B 86933230f11a9342009d79bd836ab09272a335cc7e0e8c84c4ac1c300fd4b604a97424c76d371450a46be0c2a588902c17791fe1ee752e06207046bbddc055a4 SHA512 326ed378be891806a9750021626863e00d80f29af8fe920eeb0910d9eb2ece534babf012e1aced6b071b6c0fdd8a77ea8c948d68a70f9280822b30231aa934b9 DIST marco-1.28.1.tar.xz 1800320 BLAKE2B 6594095cb7b038c3107513229f81cfb8e71f437b1f716a108169ddb8c792c4ab06979f57cd2c3a11c3de65e07550f8fcd246911a7ccff2f1e89fe20de3836b59 SHA512 3642e3fab967baef35b0e02d3e4b63e3ef97e5e44d01dbde2a7557a5ced41e73f7f8a1e63860aa9bcebe1ea1c8e1f6fd8740d853bf3996c32977b65091364ac3 -EBUILD marco-1.26.2-r1.ebuild 1616 BLAKE2B a1dc6b482f0035e81b33e9bec99344e70ea9f7bc54308c90b2c52293ee6eeb1699741c5f3c8d26cf338f22b75c1eb5ff1f36cfa6a5c8dbbdd04ed3a8366f8361 SHA512 82d9628cebe96efc396a360029abbda8708c83d4359ff1ec9c9e3526aaddca25bb33cf3c1aa04c285e4ddf21d4146db66908c5e2e58ddef38239c5c06f808219 -EBUILD marco-1.28.1-r1.ebuild 1678 BLAKE2B 8ed673ef7b52190c67acc5dbd7aac2072dfe193498a7412375db1808378dd4d0093d0605f33afd4c1a39eb0f08120fa50754a0824e1d4790a9c7bdc1c92e7d92 SHA512 382d0c1cd2ac155b784cfabedc26abb085d7e52788de318875beca561772d7fd8a9e8855aedee65881e6112457e5dfe62003ec8b68504ca1119361433004b3e8 +EBUILD marco-1.28.1-r2.ebuild 1729 BLAKE2B c5f3715d0179d3f4c3fa3cc1a766f66623376b6a3eca6b3c1b648594ac8acf5c946252717b29e6a3dcf035cccd446498d0d70e19e31b4694dabcf500e9df69b2 SHA512 669147ab564cb15dd6f5132ae325dc90c5ffac9e2a87733fd837186b47da3f974a8ef5dee38c2de27482bc1b90f5c95eddeb10715a3b612f789d921f51c16524 MISC metadata.xml 484 BLAKE2B 9ba0475c983500a353feb2ed117c564c267d45451068f56cfb50bfa5656f9e8eef53213c588550d6ec9f3eb6ed92ac011a764473e63b716999413aaa1fe4be85 SHA512 c9c1ed68be07a06b27dd5bd5d404d1d7c7086a5f16b1a30a58eae457f9c9df2d13a8d3bfe384fbebc5f553a2fcc9cd289d02fa60f02695279465c1917c76c6ea diff --git a/x11-wm/marco/marco-1.26.2-r1.ebuild b/x11-wm/marco/marco-1.26.2-r1.ebuild deleted file mode 100644 index bd1e415ad436..000000000000 --- a/x11-wm/marco/marco-1.26.2-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MATE2_LA_PUNT="yes" -# For script meson_post_install.py -# Bug 906826, tracker bug 762406 -PYTHON_COMPAT=( python3_{10..13} ) - -inherit mate meson python-any-r1 - -KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" - -DESCRIPTION="MATE default window manager" -LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT" -SLOT="0/2" - -IUSE="startup-notification test xinerama" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-core-2.46.0:2 - >=dev-libs/glib-2.58:2 - >=gnome-base/libgtop-2:2= - media-libs/libcanberra[gtk3] - x11-libs/cairo - >=x11-libs/pango-1.2[X] - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libXcomposite-0.3 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXpresent - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXres - >=x11-libs/startup-notification-0.7 - xinerama? ( x11-libs/libXinerama ) -" - -DEPEND="${PYTHON_DEPS}" - -RDEPEND="${COMMON_DEPEND} - gnome-extra/zenity - >=mate-base/mate-desktop-1.20.0 - virtual/libintl -" - -BDEPEND="${COMMON_DEPEND} - app-text/yelp-tools - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - test? ( app-text/docbook-xml-dtd:4.5 ) - xinerama? ( x11-base/xorg-proto ) -" - -src_configure() { - local emesonargs=( - -Dcompositor=true - -Drender=true - -Dshape=true - -Dsm=true - -Dxsync=true - $(meson_use startup-notification) - $(meson_use xinerama) - ) - meson_src_configure -} - -src_install() { - meson_src_install - dodoc doc/*.txt -} diff --git a/x11-wm/marco/marco-1.28.1-r1.ebuild b/x11-wm/marco/marco-1.28.1-r2.ebuild index 6240ace59fd1..b4b18d3de582 100644 --- a/x11-wm/marco/marco-1.28.1-r1.ebuild +++ b/x11-wm/marco/marco-1.28.1-r2.ebuild @@ -26,8 +26,11 @@ COMMON_DEPEND=" >=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.58:2 >=gnome-base/libgtop-2:2= - >=mate-base/mate-desktop-1.27.1 - media-libs/libcanberra[gtk3] + >=mate-base/mate-desktop-$(ver_cut 1-2) + || ( + media-libs/libcanberra-gtk3 + media-libs/libcanberra[gtk3(-)] + ) x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 9a2393643519..5871a8f6b5d9 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -1,7 +1,5 @@ -DIST metacity-3.46.1.tar.xz 1959060 BLAKE2B 84dbe09dd8d6c7ce1894ed806cdc6cc5cc6c302ddf3aae5f7ef479f6c02ef6c2091bb1d815603f5d6e52d583192d43f47d835327e9e75cd626081becbf84bd8e SHA512 f0d8424868edf8209eb4cbd003de68ab892a5b515a1aca7b3626bf52eb8451cb0477ab35f702177c9654604e06adce46471897edcb54931d95e60b36bef92b20 -DIST metacity-3.50.0.tar.xz 1959172 BLAKE2B a697bb0d820211abdd212a250d0ea6a698962b37b9e200c54dab51ca11bb1c9a65708dd8f098211d3d451da83f484d549f5fc33c63f391f42744a8046849ccd7 SHA512 2fd66f96b0603dfea652ad21f9749c3dbd68c847cda884a0e16f23766c9b61fcdfa693dcb83beb33c909487a7d9f7f5eb796096cfc772cc44c4b267ef1b08699 DIST metacity-3.52.0.tar.xz 1960156 BLAKE2B e8d078f08c4d3a40a98b5d95aa0286adc4da518ca6a495768d9e31626862b03a3ad5da26928ccc3f337b9811fd5ffa927a37e5f9ab6a7b7c256052842207b5cf SHA512 e49c8a45a26b9b43700e50787fef9e02a6c5abc5d8a809542acaf32f6e15ea756bf8398883e3c69707908e8556ae726d9764fc09f07b0beaa40f79a1490c361e -EBUILD metacity-3.46.1.ebuild 1294 BLAKE2B a7bf0e45f6ff90cbf944ae34bb7d6cdd8bd047ce58d7ebfdd4e2a59dc495fc042453518d4243494430bd05b74226f133fec9f842e3be6999b8b3fc163cf8b51f SHA512 778aaeae01a372aaa9c907323f3959c3f90cce06e622c20ae0f6493843078015978f8c0d9dacdb0245f91ef53ddb226f7b63862a0e210e5279e337f972644709 -EBUILD metacity-3.50.0.ebuild 1294 BLAKE2B b54f901a1fa0a3eb6d4b536764039e966b8f1225f335a8c21141ca3147d4aa27fd14d27e17be12771ebcad61fa778f616f5b808904081d56f3666e21b30b4aad SHA512 c9f68f9b0edccde5c84db81615f067f572fdfa1e50a8484a78f18463981c94140811ba7fc41df902c3d3341466f0d21a438fb7352a2c3490306b39135446cad3 -EBUILD metacity-3.52.0.ebuild 1294 BLAKE2B b54f901a1fa0a3eb6d4b536764039e966b8f1225f335a8c21141ca3147d4aa27fd14d27e17be12771ebcad61fa778f616f5b808904081d56f3666e21b30b4aad SHA512 c9f68f9b0edccde5c84db81615f067f572fdfa1e50a8484a78f18463981c94140811ba7fc41df902c3d3341466f0d21a438fb7352a2c3490306b39135446cad3 +DIST metacity-3.54.0.tar.xz 1796756 BLAKE2B d1bb961feaa76486ae866e8e719e3c4443cb7f76f4fbe407ba0821b8db309a7890c6d88a2853a850de2a5df605b6d2a433bad1470677e953afdc9a9e3e62efee SHA512 81029997b9024bb8075dec0e4184a33697ce3c597c3eb686d30536fbe09db619667f3379f995553ff201850910ab7533739c97126e4cbc4f5066a8bb1e2b143f +EBUILD metacity-3.52.0-r1.ebuild 1337 BLAKE2B eba15b863a3b052a383fd4eb4fedacdf1cffb7a378971cd2b85356185b68c05b7a30b3e2dfae048a65c7d50b023f5b723791e37b5540a33391cf997cc4269a4a SHA512 76c3c69eb531acd2258f7ef48686b15a2f003295650c23d4a0a702d30fa8d3e2df9d6655b6cbc65f04d930a8501cfab99cda6ae2072015c8df59b914a4e176c4 +EBUILD metacity-3.54.0-r1.ebuild 1338 BLAKE2B 9f8d6f3b27cc3526c3b7f18e458e5fa2aeef44f481ee3600da3ac4663ab603a9b0095aa818580df18a978d0a5d4e1dd737c1ab99b29cce024a35c6f0c6ac203c SHA512 e9d22b15c20aad9d61eb567629203d292fbd34e6861042088d8ef1f8ab77fbe981e05c84c4d47774ee3d5524097f4175a999b9614462bc7804fc377117c449ce MISC metadata.xml 700 BLAKE2B b921242ee748e52852815f6e3dae860cce3f8342af61c48de070b4228ee08967838c083f9bc6a21c88d16179ebdeddf46b97f4dc5af5ad923d15df87d742f895 SHA512 62541ce5a5b768fc4eed973ee46002865005efb23a51f6b725c7d7f6bfe952d2e86b42e8f6dd27a42f23c106cdc35ebfd14507737bc8a2c8c2b39f12953f7f49 diff --git a/x11-wm/metacity/metacity-3.46.1.ebuild b/x11-wm/metacity/metacity-3.46.1.ebuild deleted file mode 100644 index 4c6c94dbe9e4..000000000000 --- a/x11-wm/metacity/metacity-3.46.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnome2 - -DESCRIPTION="GNOME Flashback window manager" -HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+libcanberra vulkan xinerama" -KEYWORDS="amd64 ~riscv" - -# TODO: libgtop could be optional, but no knob -RDEPEND=" - >=dev-libs/glib-2.67.3:2 - >=x11-libs/gtk+-3.24.6:3[X] - >=x11-libs/pango-1.2.0 - >=x11-libs/libXcomposite-0.3 - >=x11-libs/libXres-1.2 - >=gnome-base/gsettings-desktop-schemas-3.3.0 - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXdamage - x11-libs/libXpresent - libcanberra? ( media-libs/libcanberra[gtk3] ) - >=x11-libs/startup-notification-0.7 - x11-libs/libXcursor - gnome-base/libgtop:2= - x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) - x11-libs/libXrandr - x11-libs/libXext - x11-libs/libICE - x11-libs/libSM - gnome-extra/zenity - vulkan? ( media-libs/vulkan-loader ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - vulkan? ( dev-util/vulkan-headers ) - dev-util/glib-utils - >=sys-devel/gettext-0.19.6 - virtual/pkgconfig -" # autoconf-archive for eautoreconf - -src_configure() { - gnome2_src_configure \ - --disable-static \ - $(use_enable libcanberra canberra) \ - $(use_enable xinerama) \ - $(use_enable vulkan) -} diff --git a/x11-wm/metacity/metacity-3.52.0.ebuild b/x11-wm/metacity/metacity-3.52.0-r1.ebuild index 60f7ad76a4f2..583b92f2fc9c 100644 --- a/x11-wm/metacity/metacity-3.52.0.ebuild +++ b/x11-wm/metacity/metacity-3.52.0-r1.ebuild @@ -9,8 +9,8 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/" LICENSE="GPL-2+" SLOT="0" -IUSE="+libcanberra vulkan xinerama" KEYWORDS="amd64 ~riscv" +IUSE="+libcanberra vulkan xinerama" # TODO: libgtop could be optional, but no knob RDEPEND=" @@ -24,7 +24,10 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXdamage x11-libs/libXpresent - libcanberra? ( media-libs/libcanberra[gtk3] ) + libcanberra? ( || ( + media-libs/libcanberra-gtk3 + media-libs/libcanberra[gtk3(-)] + ) ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= diff --git a/x11-wm/metacity/metacity-3.50.0.ebuild b/x11-wm/metacity/metacity-3.54.0-r1.ebuild index 60f7ad76a4f2..c4fe2a31b2f5 100644 --- a/x11-wm/metacity/metacity-3.50.0.ebuild +++ b/x11-wm/metacity/metacity-3.54.0-r1.ebuild @@ -9,8 +9,8 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/" LICENSE="GPL-2+" SLOT="0" +KEYWORDS="~amd64 ~riscv" IUSE="+libcanberra vulkan xinerama" -KEYWORDS="amd64 ~riscv" # TODO: libgtop could be optional, but no knob RDEPEND=" @@ -24,7 +24,10 @@ RDEPEND=" x11-libs/libXrender x11-libs/libXdamage x11-libs/libXpresent - libcanberra? ( media-libs/libcanberra[gtk3] ) + libcanberra? ( || ( + media-libs/libcanberra-gtk3 + media-libs/libcanberra[gtk3(-)] + ) ) >=x11-libs/startup-notification-0.7 x11-libs/libXcursor gnome-base/libgtop:2= diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index d3351caf31f8..90755dcc55a8 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,6 +1,3 @@ -AUX 38919a88b2b8381f5b24b69742d1b9db32029c61.patch 724 BLAKE2B aa7739b0e333d887b39e89f7774b016b6aa9339b37682861f852d354554ccdbe52cc9c9bc50bb612731e4f9a371b749729758d9ab8072ab0d5f282f46c4c697f SHA512 5f96534e613356453a9e060c0145d55db3737812e5094568819c031ced6e2c8c41583ac208b38a664d42302cb94031d20154764628cae05348d20362b91d0ffe -DIST muffin-6.0.1.tar.gz 4521556 BLAKE2B e3f28dea9f66b30805f9b98bc79f2e4a08e9e5eb6501f455f0e3c42c5d9ed14c48be75b07a97da7b671156d14ed61f3b882d8ede4f9b83dac5496fac5a0f0348 SHA512 94aa767db3677116094cb0d9a63d1a446b6ec426b4b38576fcdb17259ef92d81f1a14c0e93dadd2bc4dfaca522531ed177bb0af895b3df7abf20d0e9a77d71af DIST muffin-6.2.0.tar.gz 4522979 BLAKE2B d2cf508eeea77e22c79c65404e90beced72b9eca87542dc38abbf8a411464b4afce4d48e73cddf284a4cb86d9eca420edf95e3cb0ad7a0bc6b2c93a4bd1df257 SHA512 0711370323cd29627f312fbd2208daa5bca3be391f9454524f34447dc31f6e8dae63617af790843a2d84fd63340a6db476783b5eadb27b95fe2503f51323d193 -EBUILD muffin-6.0.1-r2.ebuild 4400 BLAKE2B 3a0acd85ae136f7bc78a6fbe4362a94b251b2ed860e8200024ac4b2af2c1e7c25384d0a8ecb82ae38045517725965c9b9fa1910f294fa3d53d1b965c5d0aab66 SHA512 6697ac6e9cd504538e2830d58fa1451e4fa5367b693278304b2a850a90867f743a88b8f4aa0d219ae7fa49eeeb545cf9b5c3a73c199a9290dcfa7e2e692eec5d -EBUILD muffin-6.2.0.ebuild 4207 BLAKE2B 0fd1e8390653e7cee50af5a5c7f45d33a0e4b2fcc3e7dd40f05bada17be9951e3080aedd90662ddce2b72e005ddd6b9ca491e43a3be4f805c1c243a43f00264c SHA512 0322e44c9667f3ae1820bb32923ba39715edaaaeae9cde5c6913d2a2063562a6029d874f79e143d6750caedd35f6d69b763afd26f828466db811819012e0a189 +EBUILD muffin-6.2.0.ebuild 4205 BLAKE2B 7aac37fd22320b6fcc8bd3a5b0e8d09bbcd306d1f92b3674fb7eb569cc90e5b297eaeb70327d1c30b96cb61e591b77ca4d1e490cac3549bdd54cf1b6704e3dd7 SHA512 4116cb1af166337d88263dfdb13153d868ff4a0ea4411dc3b3298b0ecf446b84e940711e602da26602e350dbe98e10897bf65f2b44801e602f0cce25b5bdea0d MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf diff --git a/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch b/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch deleted file mode 100644 index a2472ec9f212..000000000000 --- a/x11-wm/muffin/files/38919a88b2b8381f5b24b69742d1b9db32029c61.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 38919a88b2b8381f5b24b69742d1b9db32029c61 Mon Sep 17 00:00:00 2001 -From: Leigh Scott <leigh123linux@fedoraproject.org> -Date: Mon, 5 Feb 2024 16:06:14 +0000 -Subject: [PATCH] Fix compile issue (#683) - -(warning becomes an error due to gcc 14 changes.) ---- - src/core/prefs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/prefs.c b/src/core/prefs.c -index c07359abc..3161e4be9 100644 ---- a/src/core/prefs.c -+++ b/src/core/prefs.c -@@ -2258,7 +2258,7 @@ meta_prefs_add_keybinding (const char *name, - } - else - { -- strokes = g_strdupv (bindings); -+ strokes = g_strdupv((gchar **)bindings); - } - - queue_changed (META_PREF_KEYBINDINGS); diff --git a/x11-wm/muffin/muffin-6.0.1-r2.ebuild b/x11-wm/muffin/muffin-6.0.1-r2.ebuild deleted file mode 100644 index 881c52c194a2..000000000000 --- a/x11-wm/muffin/muffin-6.0.1-r2.ebuild +++ /dev/null @@ -1,188 +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 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" -IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" -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.61.1:2 - >=dev-libs/json-glib-0.12.0[introspection?] - >=gnome-extra/cinnamon-desktop-5.8: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 - ) -" - -PATCHES=( - # -Werror=incompatible-pointer-types - # https://bugs.gentoo.org/919091 - # https://github.com/linuxmint/muffin/pull/683 - "${FILESDIR}"/38919a88b2b8381f5b24b69742d1b9db32029c61.patch -) - -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/muffin/muffin-6.2.0.ebuild b/x11-wm/muffin/muffin-6.2.0.ebuild index 30fc4b7ff295..bb0ec7b73f0d 100644 --- a/x11-wm/muffin/muffin-6.2.0.ebuild +++ b/x11-wm/muffin/muffin-6.2.0.ebuild @@ -13,7 +13,7 @@ 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" +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 )" diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index e55bc591aefa..3beff9ea358b 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,13 +1,7 @@ -AUX 45.2-fix-X-only.patch 1566 BLAKE2B 93304e6e743c58430e70c9a76a1989bfa57610dc9b275d7ef5b5db04150f7689d7e90fc2add81c19bd565734c42f20a14aec805b41332e943ba6bbf84ff1e9c3 SHA512 c3d02d60016b1179dc29b8fd8aa9f3f41ae778c0a29f0300cb1b844bfd30c6f36e9cb2ee00e0d39251c4986a53f3fcc505254ec7d8e5d3123ab7946429e908a3 AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b -DIST mutter-45.2-r1-patchset.tar.xz 21864 BLAKE2B c09566f75a816f6599ac4bf99879cc0e3bb78220c56cc4bd64edabf00e533a5feb4decdaa75ef5ae7ade911ec266ba6dd4641f1cbcd2c3145c10d5a8d327d653 SHA512 dd953afb97c4cdd9e24b2eab6636472e526042eb768c23e0d5bd49cd3ceb3a5cebd3ff396d014bdf168de81f810cef754efbb1739350fc09f6d196461de41ea4 -DIST mutter-45.2.tar.xz 2884940 BLAKE2B c4107840b8bd0f75a9c76300f324bfff6aac3195f526ab88102c831df693cb8dfa5b55bb1590a54e68f41eab392e69bb833221480578a2fba4b1e4bdc5ed030d SHA512 2111ad0645d2da58dedb30d94e99b52045f38b31a9de7314a5d8b41a5525612d88d2fbaafd3658eb6f734c143ad12176367c26533237199d9a5c1ad3dea743c7 -DIST mutter-45.4.tar.xz 2886300 BLAKE2B 62fe0c08e92f8cab0bcf64a52a9d1bdf16754deae5fb00018f29c596ab2e26a5b75eee46f1c0206ae1773fe5b7ed48abc755b6070d35dc22536dcb11e8955e95 SHA512 3fdd44dfcb504a84d402065987fb8bdec84d639260c66c0cb2e88ef2deb56fadf2ae91bdeae782793728e54803a455ab38943b68693124d728b0c52ba8698e3c 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 -EBUILD mutter-45.2-r1.ebuild 7271 BLAKE2B 47dd9d2e527a3ec275ddfb30f03bc32dbac84d3f1311fdb7a703269db8950aa401b6939f3a471d19da2d3b6c1173ec402b33573bd94d5e436d958b01598f20fb SHA512 8c6908307c82c6e542cdc8e87616fc9e9581e50cf31a2b85bf5dc4741b3d8b119b5b77d171f90774ba85e0209fedf58cb49fe33a6e557d092b19206086bc8e83 -EBUILD mutter-45.4.ebuild 7068 BLAKE2B 48a72d702edf822680a340ff739a6a779f10adf245a5aaff21463f50aa220c8949cfe5d33952eda85ebb1f1f21d9537af41009d870e38b53336b75b70dfab6da SHA512 162014d375b4dd556bc8fb853ae40b82eb7883eeb26e3d3ecf552226eb37886a946d27dd0976378129a2541179f5f9ae866b2c548c6413b5457d717b1c54da6b EBUILD mutter-45.5.ebuild 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7 EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6 EBUILD mutter-46.4.ebuild 7001 BLAKE2B e59f591d7f9ea67368c68de0d67e7b5b286c1d3928eca87c1d7876272e3d2f17402c12446f5aed32a293d054c01b57047ca9e6cebc7a12c669591ad805021b7b SHA512 84333dbb2d47a65d0e559012d00b644ee3056b29a95098e455ac228b250b117bde7e2f20da37c9caccd29d55dd9193eb67f540d49644038b979b9ea15ee56722 diff --git a/x11-wm/mutter/files/45.2-fix-X-only.patch b/x11-wm/mutter/files/45.2-fix-X-only.patch deleted file mode 100644 index 2e76277e2607..000000000000 --- a/x11-wm/mutter/files/45.2-fix-X-only.patch +++ /dev/null @@ -1,48 +0,0 @@ -From e2ef4e1504a40d62b45167d7cacfea0322a78134 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Mon, 25 Dec 2023 14:51:46 +0200 -Subject: [PATCH] build: Fix building without wayland headers - -Fixes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3046 ---- - src/backends/x11/nested/meta-backend-x11-nested.c | 2 ++ - src/core/meta-context-main.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/backends/x11/nested/meta-backend-x11-nested.c b/src/backends/x11/nested/meta-backend-x11-nested.c -index 17e6f7e47..0d99078ea 100644 ---- a/src/backends/x11/nested/meta-backend-x11-nested.c -+++ b/src/backends/x11/nested/meta-backend-x11-nested.c -@@ -25,7 +25,9 @@ - #include "backends/x11/nested/meta-cursor-renderer-x11-nested.h" - #include "backends/x11/nested/meta-renderer-x11-nested.h" - -+#ifdef HAVE_WAYLAND - #include "wayland/meta-wayland.h" -+#endif - - typedef struct _MetaBackendX11NestedPrivate - { -diff --git a/src/core/meta-context-main.c b/src/core/meta-context-main.c -index 9c94183b5..a0ac7c823 100644 ---- a/src/core/meta-context-main.c -+++ b/src/core/meta-context-main.c -@@ -33,7 +33,6 @@ - #include "backends/meta-virtual-monitor.h" - #include "backends/x11/cm/meta-backend-x11-cm.h" - #include "meta/meta-backend.h" --#include "wayland/meta-wayland.h" - #include "x11/session.h" - - #ifdef HAVE_NATIVE_BACKEND -@@ -42,6 +41,7 @@ - - #ifdef HAVE_WAYLAND - #include "backends/x11/nested/meta-backend-x11-nested.h" -+#include "wayland/meta-wayland.h" - #endif - - typedef struct _MetaContextMainOptions --- -2.43.0 - diff --git a/x11-wm/mutter/mutter-45.2-r1.ebuild b/x11-wm/mutter/mutter-45.2-r1.ebuild deleted file mode 100644 index fa99dc7a1251..000000000000 --- a/x11-wm/mutter/mutter-45.2-r1.ebuild +++ /dev/null @@ -1,240 +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/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz" -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 >=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 -" -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=( - "${WORKDIR}"/patches # Upstream branch up to commit 5f777c90b79a - "${FILESDIR}"/${PV}-fix-X-only.patch #914571, upstream #3046, !3471 - "${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() { - use debug && EMESON_BUILDTYPE=debug - - 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 - - -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.4.ebuild b/x11-wm/mutter/mutter-45.4.ebuild deleted file mode 100644 index aeed10b04dac..000000000000 --- a/x11-wm/mutter/mutter-45.4.ebuild +++ /dev/null @@ -1,236 +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 >=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 -" -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/qtile/Manifest b/x11-wm/qtile/Manifest index f9444d3bfc36..9ddfd7473b43 100644 --- a/x11-wm/qtile/Manifest +++ b/x11-wm/qtile/Manifest @@ -1,15 +1,6 @@ -AUX qtile-0.23.0-keyring.patch 1974 BLAKE2B 9184942042daf256fa746ccd2f1ce820538c6a8a136e2ebdfc2604d68fd62fb15fb491a225ee4952a9d83a696e2fa740ccbd4cbb3f8d5d4a7cc69daa42c57c34 SHA512 5df4557c316993c8aa16a82f570bb4dbf375389663f9cff928dc4d3e73ccf581487be0b428d10d98cbeef28e94737b6d305b7f5f28cbc3481ef39e68e10cb482 AUX qtile-session-r1 1860 BLAKE2B fb9345d3acc5e0fc5694065f12e2759e02aebc765925cb0ffcb1a776ec82e959503d8a8039238e4e48a5045a3118f2e37201a88d5255fd0a0782d2f8291d8a77 SHA512 41b37ba034b5dd7f3126142d2cfc5cf8986b521fc419d47e420582fc8b516df87249bd8e14c12d77691b93205ec3cd1249bfa040ef0691e0751c669f742570ee -DIST qtile-0.23.0.tar.gz 524536 BLAKE2B 9cf5b0cdffd7bc95ab7649827c221b20718f9dcc19b8ae2a50ceac5df3d71b117eef493a40523d81e60c8bc54b2103bc2a93775fcb20c025ec1dd84f9d809a19 SHA512 d6886df8efefacf90b1a5ec487c9a5a90414593900159213a218d638ef4f018b69284fe2cea707da12655a9736aad3df74a338a60344536e4d7eebcc9fc1090b -DIST qtile-0.25.0.tar.gz 569312 BLAKE2B 3841ca41755f37191c659c039da45279393b5bbe94b3d532651548ba51d6dc62f3ac94cc5f3b02aa2b6c806e6bf97c9651756579b77938d133bdb1a697150626 SHA512 afd3267c70681d3656569f8ea88d02f35ab5d6baaa28b3d90f1b7552b5ed32c7d2f1f4f17272458ff2c39d0ca8f4fdb87748c9d7b4eb41031f3079126096c7d0 -DIST qtile-0.26.0.tar.gz 593712 BLAKE2B c7f43813b42d1009f0f542ef0964e07cbb3286af6af058e168d62d1e32c7dfaf51fe537568b77d5b21a1701c1ce159b63f86b6ba4ae3bf5482125562c91c5d3a SHA512 0b28125e3111493a90c5ae993a516dccf984f794ba9c0424c9366a3b04073fdf06deba42e59e8b1e33b60e5686730e0ed010161943a4a77ab4b36e4c7c710a61 -DIST qtile-0.27.0.tar.gz 598603 BLAKE2B 79f876d290398839e83b14304956f7bbe5a5bb70faccae6e090dd37477728c9067fc9d6797b498b5a8cd1a35f08fb4bc85ee3609a244f955d2b15b79f30d96c4 SHA512 62daa4ec51239506e2a860b9d021e2838edba887c7ff45bbede36428a399343470b9357f4aab373d13279c933ae19c3bd2b03bb520862386298a1258fe505127 -DIST qtile-0.28.0.tar.gz 601157 BLAKE2B c2ec5ac92484ad8124a2eeb0aa57050ff529f0223cb889a6da81291a2c52002e989d94667cc3b34449284ca52ca50186379619c05bf83adeb6dc5dfa8c4a6dc1 SHA512 aad0f260ab8f8e974e12f385324e7eadab6a314c9eb1b3114bbfc928819f7a764eb8243e7ed6545ca87f38b223e00d525cba5e8b2430c35aa93370c9fecd0947 DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e -EBUILD qtile-0.23.0-r1.ebuild 2528 BLAKE2B f9ce358fc66266d64df063c0ec40cb1041355a21174a79b3276c9a12fee46cf9f49220cbb0aad288fac824c2d3f6c89e374b85847534de093169e3c277fd02bd SHA512 8a37e0dafd9c02da3994dde2dd148ba27851af8c2494801cdd68d3f1a3f283f5b47407d9ca5a0f8feb60d13bf8fd7bcd5133d8261c85342d068cd6108f1ff41d -EBUILD qtile-0.25.0.ebuild 2519 BLAKE2B 41b5a877fcdb39dc2990d5dd444e4e751c6316db038450f7f312d42f4c9f106fb2c80adf634856336e33630ad0974913caad095a4eebbfce3f8d0cd7ae9d6b40 SHA512 e4648a579f66c63c94f52ef7c50965e03e51dd7531c72ce1525556222174254e98c34bfa17aa84c53603cb399e0a522540f4fc6414464a62a3b63956919f71b1 -EBUILD qtile-0.26.0.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 -EBUILD qtile-0.27.0.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 -EBUILD qtile-0.28.0.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 -EBUILD qtile-0.28.1.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 +DIST qtile-0.29.0.tar.gz 607026 BLAKE2B 71a282b08b6d15e08f616e28a59a632a76ef4a180788177606873dec7870d715fa96403ece6745de8898716e863b7462a745426f59fb13fd40ba87207be30d24 SHA512 745a9a79209c0dbac5e49b8ee90d567204fd022c63e9321afbb6a3a064f8e9376fdbbe67a5115e50b251d28129f4907761cbbd3e0b3d2e0676e047ef8369c92c +EBUILD qtile-0.28.1.ebuild 2622 BLAKE2B 693eab081037d8b368495fd7959e04fba1da29a2bbdf3b1c9cc4e340a34252771bcb2626fe6fe7950b2227c7d03f22d4f3e77be74f3f755b3a038d33d39b81c7 SHA512 9c3520cf721e9a6fb940bb82b62f158a2b2c908698ae273d46b47cb03b7266706595c5c333ef9683cc0b9b197e4a4f97b573b4c6bc19a8fb49239d8f09717181 +EBUILD qtile-0.29.0.ebuild 2670 BLAKE2B f9b187e16ac3a18ec370814ed6018c30b2dfbe02e27d53a8364f7f9658165d1096c4482b1cfb41abb32feff929ea1e974f3e97e5e00a9a7d20071acacc220a3b SHA512 52f82c218efb70b4ce75cf04e26fbb8fe0e6ecfc18b1fdd1190a201d2322833c261561c84d3e41f6c78e074a392c8e6b277b24c2eacacbfb2a4abd1de2193f61 MISC metadata.xml 422 BLAKE2B 10ddda5d4485b4a3c76ff658a41e2b4ea6004413ea3d2d9d4b088a7a25de36e167ae70505c195467c2401df0396a40e2301cc29a25e7e4097ed20cc6335e8956 SHA512 5f5aeecab841345abe98b87180644e60f8e52a12fc2c354cdd3678d8ad5c8c1ba13790a1bc6fa5662587714f3af9566f6adbdbc355b18d632d0ffa3eb4e83106 diff --git a/x11-wm/qtile/files/qtile-0.23.0-keyring.patch b/x11-wm/qtile/files/qtile-0.23.0-keyring.patch deleted file mode 100644 index c4a44efd8791..000000000000 --- a/x11-wm/qtile/files/qtile-0.23.0-keyring.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 84eaf6b70f9569c88534dc8054e19f05fa3137e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 2 Dec 2023 17:40:50 +0100 -Subject: [PATCH] imapwidget: Do not pass None as username to - keyring.get_password() - -Ensure not to pass `None` as the username to `keyring.get_password()`, -as the API requires it to always be a `str` and some backends -(particularly `keyrings-alt`) crash on `None`. - -Fixes #4609 ---- - libqtile/widget/imapwidget.py | 3 +++ - test/widgets/test_widget_init_configure.py | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/libqtile/widget/imapwidget.py b/libqtile/widget/imapwidget.py -index 3f84d9e7..c8a6ec0e 100644 ---- a/libqtile/widget/imapwidget.py -+++ b/libqtile/widget/imapwidget.py -@@ -24,6 +24,7 @@ import re - - import keyring - -+from libqtile.confreader import ConfigError - from libqtile.log_utils import logger - from libqtile.widget import base - -@@ -75,6 +76,8 @@ class ImapWidget(base.ThreadPoolText): - def __init__(self, **config): - base.ThreadPoolText.__init__(self, "", **config) - self.add_defaults(ImapWidget.defaults) -+ if self.user is None: -+ raise ConfigError("You must set the 'user' parameter for the IMAP widget.") - password = keyring.get_password("imapwidget", self.user) - if password is not None: - self.password = password -diff --git a/test/widgets/test_widget_init_configure.py b/test/widgets/test_widget_init_configure.py -index 83a9cb9a..aa7a1f9b 100644 ---- a/test/widgets/test_widget_init_configure.py -+++ b/test/widgets/test_widget_init_configure.py -@@ -58,6 +58,7 @@ extras = [ - - # To skip a test entirely, list the widget class here - no_test = [widgets.Mirror, widgets.PulseVolume] # Mirror requires a reflection object -+no_test += [widgets.ImapWidget] # Requires a configured username - - # To test a widget only under one backend, list the widget class here - exclusive_backend = { --- -2.43.0 - diff --git a/x11-wm/qtile/qtile-0.23.0-r1.ebuild b/x11-wm/qtile/qtile-0.23.0-r1.ebuild deleted file mode 100644 index 3c59d06e2004..000000000000 --- a/x11-wm/qtile/qtile-0.23.0-r1.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A full-featured, hackable tiling window manager written in Python" -HOMEPAGE=" - https://qtile.org/ - https://github.com/qtile/qtile/ - https://pypi.org/project/qtile/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~riscv ~x86" -IUSE="pulseaudio wayland" - -RDEPEND=" - >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] - >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] - dev-python/dbus-next[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] - x11-libs/cairo[X,xcb(+)] - x11-libs/libnotify[introspection] - x11-libs/pango - pulseaudio? ( - dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] - media-sound/pulseaudio - ) - wayland? ( - >=dev-python/pywlroots-0.16[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - media-gfx/imagemagick[X] - x11-base/xorg-server[xephyr,xvfb] - ) - wayland? ( - >=dev-python/pywlroots-0.16[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - # https://github.com/qtile/qtile/pull/4610 - "${FILESDIR}/${P}-keyring.patch" - ) - - sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ - -i setup.py || die - - # some tests expect bin/qtile - mkdir bin || die - cat >> bin/qtile <<-EOF || die - #!/bin/sh - exec qtile "\${@}" - EOF - chmod +x bin/qtile || die - - distutils-r1_python_prepare_all -} - -src_compile() { - local -x CFFI_TMPDIR=${T} - distutils-r1_src_compile -} - -python_test() { - local EPYTEST_DESELECT=( - # mocking doesn't seem to work - test/widgets/test_mpd2widget.py - # checks fail with mypy errors - test/test_check.py - # migration tests require intact source tree - test/test_migrate.py - # no clue ("ExistingWMException") - test/test_restart.py::test_restart_hook_and_state - ) - - # force usage of built module - rm -rf libqtile || die - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || - die -n "Tests failed with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGELOG README.rst ) - distutils-r1_python_install_all - - insinto /usr/share/xsessions - doins resources/qtile.desktop - - insinto /usr/share/wayland-sessions - doins resources/qtile-wayland.desktop - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session-r1 ${PN} -} diff --git a/x11-wm/qtile/qtile-0.25.0.ebuild b/x11-wm/qtile/qtile-0.25.0.ebuild deleted file mode 100644 index 3fe2733dd15e..000000000000 --- a/x11-wm/qtile/qtile-0.25.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 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} ) - -inherit distutils-r1 pypi virtualx - -DESCRIPTION="A full-featured, hackable tiling window manager written in Python" -HOMEPAGE=" - https://qtile.org/ - https://github.com/qtile/qtile/ - https://pypi.org/project/qtile/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="pulseaudio wayland" - -RDEPEND=" - >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] - >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] - dev-python/dbus-next[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] - x11-libs/cairo[X,xcb(+)] - x11-libs/libnotify[introspection] - x11-libs/pango - pulseaudio? ( - dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] - media-sound/pulseaudio - ) - wayland? ( - >=dev-python/pywlroots-0.16[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-python/libcst[${PYTHON_USEDEP}] - media-gfx/imagemagick[X] - x11-base/xorg-server[xephyr,xvfb] - ) - wayland? ( - >=dev-python/pywlroots-0.16[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ - -i setup.py || die - - # some tests expect bin/qtile - mkdir bin || die - cat >> bin/qtile <<-EOF || die - #!/bin/sh - exec qtile "\${@}" - EOF - chmod +x bin/qtile || die - - distutils-r1_python_prepare_all -} - -src_compile() { - local -x CFFI_TMPDIR=${T} - distutils-r1_src_compile -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # mypy stuff - test/test_check.py - test/migrate/test_check_migrations.py - # TODO: this test clearly requires x11 — so why is wayland - # variant being run? - 'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]' - ) - - # force usage of built module - rm -rf libqtile || die - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x TZ=UTC - nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || - die -n "Tests failed with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGELOG README.rst ) - distutils-r1_python_install_all - - insinto /usr/share/xsessions - doins resources/qtile.desktop - - insinto /usr/share/wayland-sessions - doins resources/qtile-wayland.desktop - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session-r1 ${PN} -} diff --git a/x11-wm/qtile/qtile-0.26.0.ebuild b/x11-wm/qtile/qtile-0.26.0.ebuild deleted file mode 100644 index e8473373841c..000000000000 --- a/x11-wm/qtile/qtile-0.26.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 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} ) - -inherit distutils-r1 pypi virtualx - -DESCRIPTION="A full-featured, hackable tiling window manager written in Python" -HOMEPAGE=" - https://qtile.org/ - https://github.com/qtile/qtile/ - https://pypi.org/project/qtile/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="pulseaudio wayland" - -RDEPEND=" - >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] - >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] - dev-python/dbus-next[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] - x11-libs/cairo[X,xcb(+)] - x11-libs/libnotify[introspection] - x11-libs/pango - pulseaudio? ( - dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] - media-sound/pulseaudio - ) - wayland? ( - >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] - >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-python/libcst[${PYTHON_USEDEP}] - media-gfx/imagemagick[X] - x11-base/xorg-server[xephyr,xvfb] - ) - wayland? ( - >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] - >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ - -i setup.py || die - - # some tests expect bin/qtile - mkdir bin || die - cat >> bin/qtile <<-EOF || die - #!/bin/sh - exec qtile "\${@}" - EOF - chmod +x bin/qtile || die - - distutils-r1_python_prepare_all -} - -src_compile() { - local -x CFFI_TMPDIR=${T} - distutils-r1_src_compile -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # mypy stuff - test/test_check.py - test/migrate/test_check_migrations.py - # TODO: this test clearly requires x11 — so why is wayland - # variant being run? - 'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]' - ) - - # force usage of built module - rm -rf libqtile || die - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x TZ=UTC - nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || - die -n "Tests failed with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGELOG README.rst ) - distutils-r1_python_install_all - - insinto /usr/share/xsessions - doins resources/qtile.desktop - - insinto /usr/share/wayland-sessions - doins resources/qtile-wayland.desktop - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session-r1 ${PN} -} diff --git a/x11-wm/qtile/qtile-0.27.0.ebuild b/x11-wm/qtile/qtile-0.27.0.ebuild deleted file mode 100644 index e8473373841c..000000000000 --- a/x11-wm/qtile/qtile-0.27.0.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2024 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} ) - -inherit distutils-r1 pypi virtualx - -DESCRIPTION="A full-featured, hackable tiling window manager written in Python" -HOMEPAGE=" - https://qtile.org/ - https://github.com/qtile/qtile/ - https://pypi.org/project/qtile/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="pulseaudio wayland" - -RDEPEND=" - >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] - >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] - dev-python/dbus-next[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] - x11-libs/cairo[X,xcb(+)] - x11-libs/libnotify[introspection] - x11-libs/pango - pulseaudio? ( - dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] - media-sound/pulseaudio - ) - wayland? ( - >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] - >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] - ) -" -BDEPEND=" - dev-python/cffi[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/setuptools-scm[${PYTHON_USEDEP}] - test? ( - dev-python/libcst[${PYTHON_USEDEP}] - media-gfx/imagemagick[X] - x11-base/xorg-server[xephyr,xvfb] - ) - wayland? ( - >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] - >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ - -i setup.py || die - - # some tests expect bin/qtile - mkdir bin || die - cat >> bin/qtile <<-EOF || die - #!/bin/sh - exec qtile "\${@}" - EOF - chmod +x bin/qtile || die - - distutils-r1_python_prepare_all -} - -src_compile() { - local -x CFFI_TMPDIR=${T} - distutils-r1_src_compile -} - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - local EPYTEST_DESELECT=( - # mypy stuff - test/test_check.py - test/migrate/test_check_migrations.py - # TODO: this test clearly requires x11 — so why is wayland - # variant being run? - 'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]' - ) - - # force usage of built module - rm -rf libqtile || die - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x TZ=UTC - nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || - die -n "Tests failed with ${EPYTHON}" -} - -python_install_all() { - local DOCS=( CHANGELOG README.rst ) - distutils-r1_python_install_all - - insinto /usr/share/xsessions - doins resources/qtile.desktop - - insinto /usr/share/wayland-sessions - doins resources/qtile-wayland.desktop - - exeinto /etc/X11/Sessions - newexe "${FILESDIR}"/${PN}-session-r1 ${PN} -} diff --git a/x11-wm/qtile/qtile-0.28.1.ebuild b/x11-wm/qtile/qtile-0.28.1.ebuild index e8473373841c..7bd2f780e08e 100644 --- a/x11-wm/qtile/qtile-0.28.1.ebuild +++ b/x11-wm/qtile/qtile-0.28.1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" IUSE="pulseaudio wayland" RDEPEND=" @@ -32,7 +32,7 @@ RDEPEND=" x11-libs/pango pulseaudio? ( dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] - media-sound/pulseaudio + media-libs/libpulse ) wayland? ( >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] diff --git a/x11-wm/qtile/qtile-0.28.0.ebuild b/x11-wm/qtile/qtile-0.29.0.ebuild index e8473373841c..a8b28b2ac25a 100644 --- a/x11-wm/qtile/qtile-0.28.0.ebuild +++ b/x11-wm/qtile/qtile-0.29.0.ebuild @@ -21,9 +21,12 @@ SLOT="0" KEYWORDS="~amd64 ~riscv" IUSE="pulseaudio wayland" -RDEPEND=" +DEPEND=" >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] +" +RDEPEND=" + ${DEPEND} dev-python/dbus-next[${PYTHON_USEDEP}] dev-python/pygobject[${PYTHON_USEDEP}] >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] @@ -32,7 +35,7 @@ RDEPEND=" x11-libs/pango pulseaudio? ( dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] - media-sound/pulseaudio + media-libs/libpulse ) wayland? ( >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] @@ -40,7 +43,6 @@ RDEPEND=" ) " BDEPEND=" - dev-python/cffi[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/setuptools-scm[${PYTHON_USEDEP}] test? ( @@ -54,21 +56,16 @@ BDEPEND=" ) " +: ${EPYTEST_TIMEOUT:=180} distutils_enable_tests pytest python_prepare_all() { + distutils-r1_python_prepare_all + sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ -i setup.py || die - # some tests expect bin/qtile mkdir bin || die - cat >> bin/qtile <<-EOF || die - #!/bin/sh - exec qtile "\${@}" - EOF - chmod +x bin/qtile || die - - distutils-r1_python_prepare_all } src_compile() { @@ -88,14 +85,20 @@ python_test() { # TODO: this test clearly requires x11 — so why is wayland # variant being run? 'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]' + # TODO + test/test_hook.py::test_net_wm_icon_change ) # force usage of built module rm -rf libqtile || die + # some tests expect bin/qtile + ln -fs "$(type -P qtile)" bin/qtile || die + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 local -x TZ=UTC - nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || + nonfatal epytest -p rerunfailures --reruns=5 \ + --backend=x11 $(usev wayland '--backend=wayland') || die -n "Tests failed with ${EPYTHON}" } diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest index 1cf61948f26d..3f5ecf544287 100644 --- a/x11-wm/spectrwm/Manifest +++ b/x11-wm/spectrwm/Manifest @@ -3,5 +3,5 @@ AUX spectrwm-3.6.0-fix-cflags-ldflags.patch 1177 BLAKE2B 4ce9f4d94734e64c6bc92d4 DIST spectrwm-3.5.1.tar.gz 196431 BLAKE2B 4de0240353dd0b0066e68148b02aed68b037fda5b5d5fa2a979621ba6b3f029d3c341768929cd8cc7d7aebd1e44594bfb31617078cf83c0179c395a7212d50eb SHA512 9a5b9bee6debd395b6b5f706d12dbb80a848e4f5f02405a54cf9a47b2bcceb407bf14fce64a9cc4ff9205ed7e688adeefb0280289b73a0cf9927b44cfaec02fa DIST spectrwm-3.6.0.tar.gz 205957 BLAKE2B b6fb72031a4ee7110465b5f55773d623210b4f8f74113381d061c593c9d7ef408e651061601402be82ff774355611a1f939af5edc251e361dc75a70ffc715c5e SHA512 70ae19d792ae8b9fcbaaf15d9e1a13b83e992c06ac77333712eca4178270b431adb13125ed316c129aadb2d8243abd9f5b1b6a91505f1b7a04feaf78c6f3d85d EBUILD spectrwm-3.5.1.ebuild 1244 BLAKE2B 916a4a2f24f0d3a6f143e3c03f9ab93ace7656069952c5bde9c77300f725f10ff3197f0f7cf252ed3c9950949b85982b126c2eeb0370ca56732fe080dd78fe0e SHA512 c26146aae0a497bdf99d78098f83bbe12c455c4a3596e86bff9c2d7d34a8c4b3edb729c3deff143608da00f18ce9dacfc63587b00cb13fbd1fe91e33d3709682 -EBUILD spectrwm-3.6.0.ebuild 1263 BLAKE2B df17a35970d6d6a7c44f64c33947f371e84856eaa6976e88b89bf5116df554efbc298a1d18b49b8780a89f8faccf344781cb5d1c0a0a2f356b2c82bd36ba22e8 SHA512 f3f3cdca512df88af1077b4bd7eb3b9026f40ff4f5dd64d668005536bbd3ae8abd7a9294a945e638ace10800845f7206dd5702545a73ed69fd1006f06b66b565 +EBUILD spectrwm-3.6.0.ebuild 1261 BLAKE2B ec39941cd9f723985ee0d390452b7cbdaa9795f59357fb767d77a5f8c10c048474473fa8f6b1b2213a380d041b396b9d656039d5229fe31be669b9453cbe19ad SHA512 ace71dd6c051523fffc3d5d9e4f59c8921d338c00fcbedbf6aa17d1f6ceda8e1148acb4ae7ea0e3e22095760c63a94258a9b9cb6375ac18b6b9008c38afd243d MISC metadata.xml 328 BLAKE2B 4f82bd35cf47d6791ea543bec20f7e510abba33f9de8bc8e0fe8176b0d3e908c30581a6083e90e6f0a2947ad3ffb6ff93d0e11030e68b8056451a017debfb377 SHA512 97e6057c3043db295d56ffd208c189cb5b575cf48f1cc9b78475f8055e59801fa8f7c8c1b8c9c090beb85e00365438c33831c87d9499e95495ee6287ecf7e4c4 diff --git a/x11-wm/spectrwm/spectrwm-3.6.0.ebuild b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild index 40dd1a4780be..a66b2bf7cdc2 100644 --- a/x11-wm/spectrwm/spectrwm-3.6.0.ebuild +++ b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}" LICENSE="ISC" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" elibc_musl? ( sys-libs/queue-standalone ) diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest index b596c8f2cbb0..cdaa9dd08f4a 100644 --- a/x11-wm/treewm/Manifest +++ b/x11-wm/treewm/Manifest @@ -1,4 +1,4 @@ AUX treewm-0.4.5-gcc43.patch 568 BLAKE2B 481b948412109a7febbf97dbab7681b7ff33c3f603885755103cff663288b97925d8122ee3eb18ce2b0c448830c73b92db4162c02c992781f9ee07955e925de5 SHA512 db7bede71787693a561072ad2fd89a8a5a9c46918d4f98021d587ec447318adaf76235db189990597eba36db44f720b5ab486ee7b4aae529fb0a4fed26eeebc4 DIST treewm-0.4.5.tar.bz2 87098 BLAKE2B 4ec890573aa32fafef99590f12b1e5491759ece65347339654844f077e9fdf794a96322d62066196eb3c50be271e8f16e842344a755411f3914a347b8cf2835e SHA512 96eb8eec11cec992daa4492b5a9243db5cc80b23d3827169d223d81b9ff289b62dbe6c8c3ea9da5da2e32435d98cc4552038c26e975cddec795de3b88f9db9cf -EBUILD treewm-0.4.5-r2.ebuild 1605 BLAKE2B dcb559a85d632909cbf6b3f4fb190d818055f3bc1dba8b869c22fb4fa4be7da8af077d8e4f308a429c25aef333386daf3d4ecea4830bc8c07bbc0c7529a77479 SHA512 3ffb7e9ee6bffc84e6614e88fe2c1b347eb7a98edccd8dfece42e937c9f8af472e7d0f1d6ced8e8fa35e1e5d11a522574a269d74e7396a139e39871a08af49ca +EBUILD treewm-0.4.5-r2.ebuild 1593 BLAKE2B eeb5e07ccf1fe796af0b9fd0af1f2720f1a68932ffcfefa4a4ae44c3bc3bd55e128568b5c037315919312f7743a4fcc50d143c2c40b0d09418ead395d647b398 SHA512 684def1635ce245ba84e350d8dba174290385d9be70dcfa627cb22bc1e4f06b8f36bd40deee379c7101bea5068017d91df9d473664d59c9cb4ffdca01d13cb23 MISC metadata.xml 339 BLAKE2B c1f72ded8fc3cb1849fe389a5cab29c5de091110583c26d365c8884fcff8d8100a424ff02706a35a04767480a227cb8f5c828f93af5d43aef6699c882fa9b0f7 SHA512 68b2a14a5e788b2f35a371df60b55f4c38327c97932e89329f400a4169f5848235e252b7f3844ac624e206d04f691f8097699d1b8e1ed16871b0af19e5fe5823 diff --git a/x11-wm/treewm/treewm-0.4.5-r2.ebuild b/x11-wm/treewm/treewm-0.4.5-r2.ebuild index d6e75741168c..375ab4e49479 100644 --- a/x11-wm/treewm/treewm-0.4.5-r2.ebuild +++ b/x11-wm/treewm/treewm-0.4.5-r2.ebuild @@ -38,7 +38,7 @@ src_compile() { CXX="$(tc-getCXX)" \ CCOPTIONS="${CFLAGS}" \ EXTRA_LDOPTIONS="${LDFLAGS}" \ - PREFIX="/usr" ROOT="${D}" + PREFIX="/usr" } src_install() { diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest index 6bc7f54c2d34..eda2846ddda9 100644 --- a/x11-wm/twm/Manifest +++ b/x11-wm/twm/Manifest @@ -1,3 +1,3 @@ DIST twm-1.0.12.tar.xz 262624 BLAKE2B 4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f SHA512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260 -EBUILD twm-1.0.12.ebuild 560 BLAKE2B 44e3b97ed9457f8d9e4c10e8e2b9c299d71a62402729241e83dd801df58f697a044ce8fe879aa7c7c0764db5a36a968701420f627d62b802ba13c7ddfe196d97 SHA512 3a393fcef98929d0275c3416614937df2c0c4cc9b768f7fc7d3645b18d51bd9ac1bd40b420e1350626f006177a987fba02ff75078d8d74b93d7e6a72f3abd523 +EBUILD twm-1.0.12.ebuild 554 BLAKE2B 59e94a63003e926d54bf802ccd1149b3cdedc4e0c4ed7f85c8700658dad85d69446155d062a50d1908aa8092f44bc4bc438abae6096e6edfb277c55bf029bc94 SHA512 8349dae382cb4681d147d877dfe7c8449fc5e5f67a8780dcf4baf1c627765a06e8011c7f5e8a3f22025bd56b2368f85a40c16759494e83c5bff2c0cd3c2000ee MISC metadata.xml 334 BLAKE2B faf8f80fe08fd298ce3e83bf79d42386a1fcc7c3f39b96fd023421cbfe9b217853d08a429b5bb4dffbd9bf5f18544680722561321c155dee9150520201ce16f6 SHA512 57538809af528b541e14533c9ef5a9b3d09cdb8b90f09e859784a5ea56910b6fee3f2251b6e7201f4c2117b9e3ba0eedd3aa47b418f5f473266a842e7be2848a diff --git a/x11-wm/twm/twm-1.0.12.ebuild b/x11-wm/twm/twm-1.0.12.ebuild index 2c841c72a7f8..13559271b10f 100644 --- a/x11-wm/twm/twm-1.0.12.ebuild +++ b/x11-wm/twm/twm-1.0.12.ebuild @@ -8,7 +8,7 @@ inherit xorg-3 DESCRIPTION="X.Org Tab Window Manager" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" x11-libs/libICE diff --git a/x11-wm/wmfs/Manifest b/x11-wm/wmfs/Manifest index b0cd256d83a0..2d29dc5061ad 100644 --- a/x11-wm/wmfs/Manifest +++ b/x11-wm/wmfs/Manifest @@ -4,5 +4,4 @@ AUX wmfs-99999999-fno-common.patch 1986 BLAKE2B 096becca88a23b15e3fee115640b50ba AUX wmfs-99999999-strncat.patch 598 BLAKE2B e80fd233e895162e24f7264cf152c9a570665d5f6ff48ea1ec9212963c2b786b5707c8052d33a1a354b283042af0c2b7d5ac45f34e8dc57a68abd517d7e410aa SHA512 9141bd044a122fbe0aa10189f38d02e127c453665ae7d926dee852bb16ec7812450357e86ab6dfc8f48a41ce16891759a8229bb4a67f1bb5a970c7e6452298fd DIST wmfs-20180520.tar.xz 56364 BLAKE2B 23530193ba2c37ae4129fd23dda2ff8cd301b0bd92d32e06b264efd990b7957b38170de31f04afca6fd9875d2e0450c8bede416e5f49d6e19962718fe2e240a3 SHA512 bcff251397d8483db49c037c51eef7b3dcc87a6d94650ae9e9cabc7104177216e0efa7e67bfb34978bae67dc4853884673ce288bb8087e95cb2993d519ab4f2f EBUILD wmfs-20180520.ebuild 1199 BLAKE2B 9822d972e8ebd97d50566b3e6c452c3e7528af1cd8a80bba83fffaf4ff8d4edf9776cc83d5a7a854428056778e1ec72e6108b8adb75bc4c40e255a9cb5ce52fa SHA512 014684c78806d9a6defb014bff5c4a3955862ad72e241aebb6b33524ba8b9f247ba39a4238b420260fb7c6011ca93bde0051848e0e4867abadeaef51a00048c3 -EBUILD wmfs-99999999.ebuild 1183 BLAKE2B ed14f271d256a72a15e4d7d56650d9fa6cc64df42b8fa78caaf338182363dd38c594a4edeff6ed9cc9c4c124d1088396d70a76ac646ad930540488f47aab9255 SHA512 1ed7d1c59715c48918fbd6be8aaf18a8007ffc2c05282f58376f6ead217801a08571305a7364b53bf86525608acd07ae8d64a911e6c2af04eb9860abf18e3015 MISC metadata.xml 337 BLAKE2B 37cbcce41705581321945fb5883880d4b03fa675814722af9e5e3175ccd757fa35670ba3feb7832009833db42ab5b59f066ce8cacbed090039bace82f5f53e71 SHA512 93086638f6017c646bcf1a99ada107baa3c43d997677c818445894fbe55c10c97cdd882f51c872ac6acfde0f34ce982d5ee54efdc4221ef3ae166d3f8501b6e4 diff --git a/x11-wm/wmfs/wmfs-99999999.ebuild b/x11-wm/wmfs/wmfs-99999999.ebuild deleted file mode 100644 index 4d856eab612c..000000000000 --- a/x11-wm/wmfs/wmfs-99999999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit git-r3 toolchain-funcs - -DESCRIPTION="Window Manager From Scratch, A tiling window manager highly configurable" -HOMEPAGE="https://github.com/xorg62/wmfs" -EGIT_REPO_URI="https://github.com/xorg62/wmfs" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="+imlib2 +xinerama" - -RDEPEND=" - media-libs/freetype - media-libs/imlib2[X] - x11-libs/libX11 - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - elibc_musl? ( sys-libs/queue-standalone ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-99999999-Debian.patch - "${FILESDIR}"/${PN}-99999999-desktop.patch - "${FILESDIR}"/${PN}-99999999-fno-common.patch - "${FILESDIR}"/${PN}-99999999-strncat.patch -) -DOCS=( - README - scripts/keybind_help.sh - scripts/status.sh -) - -src_configure() { - tc-export CC - # not autotools based - local ECHO - for ECHO in echo ''; do - ${ECHO} sh configure \ - $(usex xinerama '' --without-xinerama) \ - $(usex imlib2 '' --without-imlib2) \ - --prefix /usr \ - --man-prefix /usr/share/man \ - --xdg-config-dir /etc/xdg \ - || die - done -} diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest index 72cb3e0ad9e9..3ef4d8f35497 100644 --- a/x11-wm/wmii/Manifest +++ b/x11-wm/wmii/Manifest @@ -1,7 +1,5 @@ AUX wmii-3.9.2-libdir.patch 261 BLAKE2B b131312959eb8883ea60a64cad8f37c60b8bc5f4097ed00e74754a3443d040f2ec425a53952ad1990ed32c8b7b139e51a499244558c31e0de7fc2c7458366b7d SHA512 075f08ceb1e339c65af423b043560d84ba856133c3f750145acff6cf8d42e647a952f86826d4dbdb934c7f04e7cba9c9d767dc25768211cea5e5dc98819829a0 AUX wmii.desktop 106 BLAKE2B b92235ce6a4f21648baf326952bf7dd0cc9f76670b97a41316d9763889c91b64defa067c0b07a93c2547e477fdac29b4f4050cc9954210b98788ea34ad3eac54 SHA512 4c2ce08f692996c20f3f8d3d7884ac82644e8d1782b3895a0e75ecfe6c8ee9faf68a7621226d3cd9fb75cee0942d46cc55373dd74832508368a7c9760a18b143 DIST wmii+ixp-3.9.2.tbz 432032 BLAKE2B 176b0cee20de3bac6eb23584650fc9beed793cfce1b2af9d47fc7be675da094d90670e8566b1dce264a8715711aa0d3cd207d9b8ef243bd48343fd5fe3c645f7 SHA512 c75d6d3f80e2b263c8d7b9eb6d0e700a1ad642209fc0984908e9399d22372c6c0572f47ab61881d5d56c4cc4eeb2914a545f6af1bbb936b65848764577d75761 -EBUILD wmii-3.9.2-r6.ebuild 1644 BLAKE2B 8d1aadc39751bc8e85d6745e57dc8c2342d7dea5b897357ef62fbd86c3669b5c0e1cac912f90865e0339cbc2b882828a6ce83ddc2478318496788ad4fcc722e4 SHA512 ad857a5e68236dc3d8669b21d9aac5d03ca52a442044a2a1a40c16fcb4f0d03d80a15cb1e3d9596c339990e4e28190da35f3c65d1320838194f87ba0c78ee00d -EBUILD wmii-3.9.2-r7.ebuild 1702 BLAKE2B 38225c543b840fc99c41254f279cb75710e7242e4189efe169b29d17cfb93897045ac74d4fea00f59e89cec245986afa1ac98278a86f2e8d2681f1b2b0553ac2 SHA512 72b6264ddc4257e5e188c0b4409f2589325d69a8b0d528aae016370496cc65d369264c597279814a045bb3a2309feac60ffc7a2d46664ebaa2ad037298cea9e4 EBUILD wmii-3.9.2-r8.ebuild 1694 BLAKE2B 77b592bbb85c40bcc8c54a0f75970801b02e3b06f3e8eff5ab1547a03cae33f1a14ea6d0bfe44149378bfd77ac84dd60bfbc173e88de59393105b38795d055d4 SHA512 a5d88358f615cc22fb8e07b432bcd2980332c4915dcbc9a1aeb39b1399aaafdb71387906df9c087374fbf7479a6a9cf787e87198acf2c174ae64b9add86dc395 MISC metadata.xml 679 BLAKE2B f10995eaa362f8bc6d6a5a3a8f071c70f0dab13cb5ea3a757a32344e3a3368d73bfb14005ed0c6aafb72e3025734ab0cadc57424a960e92e57b994fe71933e83 SHA512 4bc28ee099e43d8f7a5d4efdf55b8b09b23c12cd03bb53f112dbfca94e480cd501fe13cf8a71cf0056f6e2b6ed13f89c06e992a950794463be1b2a72a3b56856 diff --git a/x11-wm/wmii/wmii-3.9.2-r6.ebuild b/x11-wm/wmii/wmii-3.9.2-r6.ebuild deleted file mode 100644 index 1199ba5c7cad..000000000000 --- a/x11-wm/wmii/wmii-3.9.2-r6.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib toolchain-funcs - -MY_P="wmii+ixp-${PV}" - -DESCRIPTION="A dynamic window manager for X11" -HOMEPAGE="https://github.com/0intro/wmii" -SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" - -DEPEND=" - media-libs/freetype - >=sys-libs/libixp-0.5_p20110208-r3 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libX11" -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - x11-apps/xmessage - x11-apps/xsetroot" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -DOCS=( NEWS NOTES README TODO ) - -# Force dynamic linking, bug #273332 -MAKEOPTS="${MAKEOPTS} STATIC= -j1" - -src_prepare() { - default - mywmiiconf=( - PREFIX=/usr - DOC=/usr/share/doc/${PF} - ETC=/etc - LIBDIR=/usr/$(get_libdir) - CC="$(tc-getCC) -c" - LD="$(tc-getCC)" - AR="$(tc-getAR) crs" - DESTDIR="${D}" - LIBIXP=/usr/$(get_libdir)/libixp.so - ) - - # punt internal copy of sys-libs/libixp #323037 - rm include/ixp{,_srvutil}.h || die - sed -i -e '/libixp/d' Makefile || die - - sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083 - sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115 -} - -src_configure() { - append-flags -fcommon - default -} - -src_compile() { - append-flags -I/usr/include/freetype2 - emake "${mywmiiconf[@]}" -} - -src_install() { - emake "${mywmiiconf[@]}" install - - echo "${PN}" > "${T}/${PN}" || die - exeinto /etc/X11/Sessions - doexe "${T}/${PN}" - - insinto /usr/share/xsessions - doins "${FILESDIR}"/${PN}.desktop -} diff --git a/x11-wm/wmii/wmii-3.9.2-r7.ebuild b/x11-wm/wmii/wmii-3.9.2-r7.ebuild deleted file mode 100644 index b4c0c4b776be..000000000000 --- a/x11-wm/wmii/wmii-3.9.2-r7.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -MY_P="wmii+ixp-${PV}" - -DESCRIPTION="A dynamic window manager for X11" -HOMEPAGE="https://github.com/0intro/wmii" -SRC_URI="https://dl.suckless.org/wmii/${MY_P}.tbz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" - -DEPEND=" - media-libs/freetype - >=sys-libs/libixp-0.5_p20110208-r3 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libX11" -RDEPEND="${DEPEND} - media-fonts/font-misc-misc - x11-apps/xmessage - x11-apps/xsetroot" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -DOCS=( NEWS NOTES README TODO ) - -# Force dynamic linking, bug #273332 -MAKEOPTS="${MAKEOPTS} STATIC= -j1" - -PATCHES=( - "${FILESDIR}"/${PN}-3.9.2-libdir.patch -) - -src_prepare() { - default - - mywmiiconf=( - PREFIX=/usr - DOC=/usr/share/doc/${PF} - ETC=/etc - LIBDIR=/usr/$(get_libdir) - CC="$(tc-getCC) -c" - LD="$(tc-getCC)" - AR="$(tc-getAR) crs" - LIBIXP="${ESYSROOT}/usr/$(get_libdir)/libixp.so" - ) - - # Punt internal copy of sys-libs/libixp, bug #323037 - rm include/ixp{,_srvutil}.h || die - sed -i -e '/libixp/d' Makefile || die - - # bug #335083 - sed -i -e "/BINSH \!=/d" mk/hdr.mk || die - # bug #369115 - sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die -} - -src_compile() { - append-flags -I"${ESYSROOT}"/usr/include/freetype2 - append-flags -fcommon - - emake "${mywmiiconf[@]}" -} - -src_install() { - emake "${mywmiiconf[@]}" DESTDIR="${D}" install - - echo ${PN} > "${T}"/${PN} || die - exeinto /etc/X11/Sessions - doexe "${T}"/${PN} - - insinto /usr/share/xsessions - doins "${FILESDIR}"/${PN}.desktop -} diff --git a/x11-wm/xmonad-contrib/Manifest b/x11-wm/xmonad-contrib/Manifest index 0a4235bcdf10..03e8231458f8 100644 --- a/x11-wm/xmonad-contrib/Manifest +++ b/x11-wm/xmonad-contrib/Manifest @@ -1,5 +1,5 @@ DIST xmonad-contrib-0.17.0.tar.gz 615173 BLAKE2B d2e2724a3103502cafeddfdafe5b19cd3f2eb66fe26d49afe4b64c0c78bb3b18432e44fc8233aac951b20969013fa580f0af36d4da627f3c03145b647bff5a44 SHA512 357ef80565690a1e652f79c877964181134c7f02a5d325dbf3890246588ce8a545e91126041bcc2af3d9ebf5b3be28f4866ee9ede76ddbf0fc0387871319a900 DIST xmonad-contrib-0.17.1.tar.gz 646843 BLAKE2B 0949a616f6c5aaac5d5ccb8eacaf743898b8da6d0c99605ce2f7a85f8ce7747f5442843b524470d51300539126f25066b50906a92952129a9e264f18f7aa9873 SHA512 07f989623f4d9affae564ba36a180721910c1a0acf3d23e0e548fc48bb4dcd9864987c521c28251f6443cdd5134ded8e8bb18c6f78d06cb00c386ff6ad59c97e -EBUILD xmonad-contrib-0.17.0.ebuild 1124 BLAKE2B e75600d9e3ad56643536d3e1e404506329343aa3532e02740c8c58f090a2eef7e50bf8b0b96d6572fc337345e895ab196634d968fc4d1db89b578b95e03814e2 SHA512 362d93e136d0bf3c672f9b6997a54970b37b1d3ffc17bfe3f44fd4157add2b5da5ac87ec1a154497d50b58bfb50f70b6ac4cf5ebc829c0d24c26ab5e074f311a +EBUILD xmonad-contrib-0.17.0.ebuild 1125 BLAKE2B da816dbe80c2baed7dddce7dacfd4d6fd665271de9398c88241382c8cdf7e42210b654d07549ea3aecc95076cab64b9386598ed7b210fb17a047a3c7ac7fcd9c SHA512 b58a04922848aa32c1cc71c9945eeffa6e5be787413d5b027ef43345f9981acc8073706419cbc0a89ff1f7bfc3f8c9a820e5346ccc0a39f3a1bdd7b81517ef99 EBUILD xmonad-contrib-0.17.1.ebuild 986 BLAKE2B a10bf789f7d5f7b589e6ec1ac4998137c0e883eaaf6eb96762fa37bc89c098ce0bea48997651363ec25535d50a32f3bf76b74241c23220e3df5c8d375c2eba95 SHA512 ceb0516254037f38891515dabfc0138264fabd5c4698a3b94c425486fd07c80f427b83bca1a7251d6f675de0b216afa7117688444d6cb2f7ed2948321c41e3c8 MISC metadata.xml 455 BLAKE2B 74b7a119dee001759e3cf38a2677606fd9b2fce09356a3a0345d22f4c60c46dc3777e13bdc125e9b18696996c2a518eb25257a205b89be545e4d50d41d028206 SHA512 b1c1b58049f38c780d8da27e31bb5c56e3240531060c720d4246b900d87eec8b4010655c7b08191747614c9aac00cb55cf729258debfc99daeb1f42d40a74574 diff --git a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild index 880dcc26bd9f..84ee028eb4f6 100644 --- a/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild +++ b/x11-wm/xmonad-contrib/xmonad-contrib-0.17.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="+xft" RDEPEND=">=dev-haskell/mtl-1:=[profile?] <dev-haskell/mtl-3:=[profile?] diff --git a/x11-wm/xmonad/Manifest b/x11-wm/xmonad/Manifest index 2ddfdc17f253..b768720c67e1 100644 --- a/x11-wm/xmonad/Manifest +++ b/x11-wm/xmonad/Manifest @@ -2,6 +2,6 @@ AUX xmonad-0.14-check-repeat.patch 2393 BLAKE2B 1b173ab0598c650645af4286c5c6f7ed AUX xmonad.desktop 270 BLAKE2B dce8e606b7b1008dd77c74feb0ce96f7d7d59de299adc4b61b164cdcf9057eb2a4119bfd97c5f67a660d0810cd7a43d5ee580d9935b623c9dd877543de2adffe SHA512 b858edfb6fd6004f8ca0f95e97f298140ab489e246f7f09b1fdab3fe899dba66f3f150fe67981f7b5fd8f3a268df7dab2ee60db6d3f96bd874fab2b670435b4e DIST xmonad-0.17.0.tar.gz 93489 BLAKE2B 6990bc408194c99378f949b28f2115b7096e6474b5305f935be2c8af1eba4bff3e3c05477af9f833d1b52422e4fb95f857398b05f7f1081e3a2cc5dd8c50fc3a SHA512 1ec46ee61f4bf1879ea638e9be83378273050670ed2ee0f00e7d43b188cc29a874aa5b40076162a1ef0038802cc43f675773951f9b7d1f26329f9d105c28b3f7 DIST xmonad-0.17.2.tar.gz 94730 BLAKE2B 4e65472830694048d051394222ceb889b1997d1dec37b8d1773fecee9385292448acda3c5a9b7e99a7de1582e8a403d976ef357dc474531e6166905d1129c3a2 SHA512 8d02422f473499516acf3cfe920b15df1d24a1fbf47f8cded5eb465186427e82cd43d65a63936993016797680335e59380931e9bad82b2181ecdef6b63d9bfd9 -EBUILD xmonad-0.17.0.ebuild 2271 BLAKE2B 9cd9faf8dcea563ac1e34d9820e04a6878975d1d2d9c86593d9dc1a5cdee99ebf2e7ceb6e69f7bc1f82874125d2c8d02a73d92544525507c5310f29554aad267 SHA512 231ccd4b9ba706e6511869b47bb79fdbd008bbed796352e12340ece39d761104d2f5ff834a10398ad6c41ec77c85e84815c457f9e65b08419eb3c51eb710da25 +EBUILD xmonad-0.17.0.ebuild 2272 BLAKE2B 3f4b74e0433dce76650a2f4f1bc1b97ba31e86550daf28b8d788f4eb53e031f0b9ff051ce544770ab4e6a095cede369887635c7c06d1930e22f1e711e3197f2a SHA512 faa0e9abab03786941188aef40bd27b3fd5b000cf1160fde391bf071a2c4b15592938e6d51b2d92fba595a91f6a3015ec714a617200e57dbf8245ddd7edead45 EBUILD xmonad-0.17.2.ebuild 2179 BLAKE2B 97e0c497e550fab963cfe317706891f46115b4b55bf46f448a6237983d24d11faf4a8afd4f75ae80010931838a0393633db4bc03219683356d2fc42f464c8cae SHA512 888683d27e7511fc965cecc9bad26f87fc1b3097c136c31c8bf858c40e6a18aed53c86199a7eb5305ac1cb12d3e9109fb8ec9d19a6a5972a24da73be2c7c15d0 MISC metadata.xml 470 BLAKE2B 4fa46cd62eb0ba1ad4ea83ada35cb40d6c77863d8f3a583c8002b011de541698670304b795251729140c27b60e727107533b4ebdb89b189e89a218b06863761a SHA512 c7c73415db89e72688bdcee76ad1c599cc9bec8bf72f38d85d5d6d2f90d094ecf517c10f9b56644a8516a81983ef3846691ef54be09616e0cb55e5f7f6f85828 diff --git a/x11-wm/xmonad/xmonad-0.17.0.ebuild b/x11-wm/xmonad/xmonad-0.17.0.ebuild index f1e68a065661..f305410ea033 100644 --- a/x11-wm/xmonad/xmonad-0.17.0.ebuild +++ b/x11-wm/xmonad/xmonad-0.17.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="no-autorepeat-keys" RDEPEND="dev-haskell/data-default-class:=[profile?] diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index dc8fbc81d6c1..dffdb5e19dea 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -3,8 +3,8 @@ AUX xpra-4.4.6_minimal-features.patch 766 BLAKE2B a27634a600d6431a2812a61bff854e AUX xpra-9999-pep517.patch 282 BLAKE2B 5e94bc5c882ae768bc1e8f89e2077b551b2841801448cba3883e63954bb2cefcf21c8a631623590039670eac32c2d717ff38f60efa96200421684151b96e72d2 SHA512 62a4ca3e26141417dc928b1d06e852a7118143555af43ca3af05087f01bb1a6ca319835dd6c2dc6ac339f7f8742a004b4fe9e041903c6bd55d1259d388413605 DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8 SHA512 273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b8aaaa0a75cd5a90f4858419 DIST xpra-6.0.1.tar.gz 17214848 BLAKE2B 81a26cd9aa9a61241ba47bc6712cd225499a82a8743c4f5655f4529d525788789452daaa0894a2cb9292caa7fd9aa64f82ce5b347c9c168815198e18145629b9 SHA512 3520dec19bb6999fc19ffcd3c385545f4a61f7cf50d4d6930eb39dec1341c79f6c4c8c45d526f43b33ed78d5359524103fcf1608dc705b40e330a7eb53de2475 -EBUILD xpra-4.4.6-r2.ebuild 5811 BLAKE2B 2ae6c3eee1bbd1a72881b4a4c0d7057d14784543850cae09d339fd69145f81abfceb5c6f9bc1d087ead8949217d0f795398d2e218334322495a6486187e906a4 SHA512 6b453de91ec1d28b7e1cb589aeae2833501456837cf08c4a8572f1afa07b22de13fb6a0b4d3704e6ea05f7b5acad269963d311469b16f0bc98c4323ef1e4b952 -EBUILD xpra-6.0.1-r1.ebuild 9779 BLAKE2B 03709a86587a56f715d53b74d51d5dd9d5af56ac8fb1a49e8e1252532319fa0971dfc371028729df2162ea317372adaf64b4c07b02892016ba0e04fe552a9bab SHA512 d00d7faa160211d0c8475bf5f9963cc49c4fc258749d39eb4a944214c6b7d627a8e6c1456c7f7b576560a65e12f04ecd59000751fbbda7b364740a0e839f1f37 -EBUILD xpra-6.9999.ebuild 9779 BLAKE2B 03709a86587a56f715d53b74d51d5dd9d5af56ac8fb1a49e8e1252532319fa0971dfc371028729df2162ea317372adaf64b4c07b02892016ba0e04fe552a9bab SHA512 d00d7faa160211d0c8475bf5f9963cc49c4fc258749d39eb4a944214c6b7d627a8e6c1456c7f7b576560a65e12f04ecd59000751fbbda7b364740a0e839f1f37 -EBUILD xpra-9999.ebuild 9779 BLAKE2B 03709a86587a56f715d53b74d51d5dd9d5af56ac8fb1a49e8e1252532319fa0971dfc371028729df2162ea317372adaf64b4c07b02892016ba0e04fe552a9bab SHA512 d00d7faa160211d0c8475bf5f9963cc49c4fc258749d39eb4a944214c6b7d627a8e6c1456c7f7b576560a65e12f04ecd59000751fbbda7b364740a0e839f1f37 +EBUILD xpra-4.4.6-r2.ebuild 5811 BLAKE2B c47a7182b585b91dc7455e77dce0b3bdc869a260afdc3aacea1ec0ff2a324e5445dc593ba862ac7b9459792a26d573e69d614ef870c17e21ce8b8e4adbad2f30 SHA512 9626e51677b3019a48cafbf00af037af765e617406d91442e87f143eb8576b0475e0e90d9a175ce978e28d91777224a6c7ada146b0e1409f445edc887e929da1 +EBUILD xpra-6.0.1-r1.ebuild 9779 BLAKE2B 7b3a24979aa779c08e36eef354f41845926079f7b0a1369d0b86399ee14e1119b00ef5135722b4ee222bd173e72c49d47ef6a1947f9e76a5262880875c20a333 SHA512 d7a6623903fd5d5cf4a8230e1648182847817e211619d38167d076994e80a7e588ffed0245b50fd27768729a0bff84fb38563f855c2a17a94950d4a4e4cae0a4 +EBUILD xpra-6.9999.ebuild 9779 BLAKE2B 7b3a24979aa779c08e36eef354f41845926079f7b0a1369d0b86399ee14e1119b00ef5135722b4ee222bd173e72c49d47ef6a1947f9e76a5262880875c20a333 SHA512 d7a6623903fd5d5cf4a8230e1648182847817e211619d38167d076994e80a7e588ffed0245b50fd27768729a0bff84fb38563f855c2a17a94950d4a4e4cae0a4 +EBUILD xpra-9999.ebuild 9779 BLAKE2B 7b3a24979aa779c08e36eef354f41845926079f7b0a1369d0b86399ee14e1119b00ef5135722b4ee222bd173e72c49d47ef6a1947f9e76a5262880875c20a333 SHA512 d7a6623903fd5d5cf4a8230e1648182847817e211619d38167d076994e80a7e588ffed0245b50fd27768729a0bff84fb38563f855c2a17a94950d4a4e4cae0a4 MISC metadata.xml 1568 BLAKE2B c794d61c51c7b638bdd8338ea7209eb6a3dd4c03ff0051250828860b082dd2e3f1710621e19213c07f173279b298fb6c30c8bafeb3b6d5d75fe8029312a64239 SHA512 dc8996bbc124dd2e2e6b627ed432c387d611c80d92e0ca148c110e2c2c61bc530db6b0039266c6aaca2625d7a483abb83143e795c49df483d6fabd5a6d95c42e diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild index d65933d2b255..1b5d002d34a8 100644 --- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild +++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild @@ -88,7 +88,7 @@ RDEPEND=" lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl-accelerate[${PYTHON_USEDEP}] ) webcam? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pyinotify[${PYTHON_USEDEP}] diff --git a/x11-wm/xpra/xpra-6.0.1-r1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild index fef6cb43651c..b71df2518d5a 100644 --- a/x11-wm/xpra/xpra-6.0.1-r1.ebuild +++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild @@ -108,7 +108,7 @@ RDEPEND=" lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl-accelerate[${PYTHON_USEDEP}] ) webcam? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pyinotify[${PYTHON_USEDEP}] diff --git a/x11-wm/xpra/xpra-6.9999.ebuild b/x11-wm/xpra/xpra-6.9999.ebuild index fef6cb43651c..b71df2518d5a 100644 --- a/x11-wm/xpra/xpra-6.9999.ebuild +++ b/x11-wm/xpra/xpra-6.9999.ebuild @@ -108,7 +108,7 @@ RDEPEND=" lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl-accelerate[${PYTHON_USEDEP}] ) webcam? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pyinotify[${PYTHON_USEDEP}] diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index fef6cb43651c..b71df2518d5a 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -108,7 +108,7 @@ RDEPEND=" lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl-accelerate[${PYTHON_USEDEP}] ) webcam? ( dev-python/numpy[${PYTHON_USEDEP}] dev-python/pyinotify[${PYTHON_USEDEP}] |