diff options
Diffstat (limited to 'x11-wm')
83 files changed, 1774 insertions, 2044 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex 892f78da0057..cb3c5e41dbc5 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest index 0629390ef7c3..eda8bc54ead4 100644 --- a/x11-wm/awesome/Manifest +++ b/x11-wm/awesome/Manifest @@ -10,4 +10,4 @@ AUX awesome-xsession.patch 291 BLAKE2B fb8ca929487ef45cd64c44bbb3db2b7c4a1be4f5a DIST awesome-4.3.tar.xz 1037816 BLAKE2B b4afc5e7bfb01ddc16b67776cc00dd7b0bcbefc9d17f9bec9c04256953858aef2bf0e4b15a525909029b7da771ade0d749758aba2878832f356d7b2c4f0363b7 SHA512 c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 EBUILD awesome-4.3-r103.ebuild 4030 BLAKE2B f876ae93b549bce7f6b1ba6342e36339f4a202cd09d7c1838bfa98524617f6612a7c78f25e790747828d5000770b7f30aa7f3a893c57ca6a37c1ee8bcb2b4605 SHA512 e09ed46f890782f720b153959357aa99a79090e7bcfb2a155ea0c86201de360407b61cbe2e92e2bbb1259848b05a65d1f8290bbaaa0bd93ec5eab7c7afd66b70 EBUILD awesome-9999.ebuild 4180 BLAKE2B 234ea3c041d9569a6b580ff8cdbc08fd48ea1b911f9bfda1c17bc5eee47bec1c0bb69a5317ce7b221d0e7d5b6c9ded48e352fa74acef2ee867a7f4d439d53219 SHA512 f1e0ea2bed09db79220ba04d08102ba25e913e7dfadd6c90976a74e80c41e35b7d85dd098b579579ceefcfb3bde74e291794f5b027329558006fd741b1e32a08 -MISC metadata.xml 328 BLAKE2B 6b2d1d1ba0a2a1f8d0a752e1e0bc7ca88fc6dc15e07ce4bd6c39b35c706d9bd8aba5a667e3a8ead36a3c49306d3e8e1bd0b59b5231b74b0040e9230c5f45a781 SHA512 e409529a09805a83eb88444dcc0011e26a006b99e4d5524ebb240338921e0cf0977743f9be44dd5c8c80314e2a78729a149b90e036cf66e89f6b106a417a6db7 +MISC metadata.xml 250 BLAKE2B c32f8d2cde4c015afbf5cf712ce0517a9a04fd9fdc696a76755a5ce6da5fe32d5e385eb4127605a1e767b7e422b5dc9e9ed23badaec5ae9ffcdbe9e11f671fd4 SHA512 a34a3e21ee0eb887bfe5adf0e74fa701ca8dcb1c9255c5c582da20103bcdebf68cf849637891b3946cbf2b0a6f9bf43236b2755a7d20837da8f782a93be4f604 diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml index 61e3bf3450ed..1ba78fbfb06c 100644 --- a/x11-wm/awesome/metadata.xml +++ b/x11-wm/awesome/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>marecki@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">awesomeWM/awesome</remote-id> </upstream> diff --git a/x11-wm/e16/Manifest b/x11-wm/e16/Manifest index 23bc0de86511..148e63d0dfec 100644 --- a/x11-wm/e16/Manifest +++ b/x11-wm/e16/Manifest @@ -1,3 +1,5 @@ DIST e16-1.0.25.tar.xz 1400004 BLAKE2B 34ef7be6896d04234b3a48675c185aa86d7a70e0e8b5db2cdf15bef4336a40575065713f9612b94dd29a490902f36f9eb08489a779160801e885a5635d896e56 SHA512 e5cc6b08ddad8eb3052dbafda2a0ab56134e90eb9cdf75da405ac853301eadf8348dc918218119117a1f96d08e562367ff60365deb790a14af5fbdaaf89684d3 +DIST e16-1.0.29.tar.xz 1410672 BLAKE2B 5b96a13ed6ec70d01772cade4d85caf39f6b156a48a6778a9312cce4c9ade95f5c77d991de4d9128fff27abb7cc78add08930615031117c6b0791ddb5743553d SHA512 930fd97c125e85cca6ee4cb1eae350219721d9e96824f2147fedfcd4050596e603ed174789faaf23b1265671e18d1717eba6a3dae7e4fa944bf7eff01b707a4c EBUILD e16-1.0.25-r1.ebuild 3492 BLAKE2B c5248b98ac0bbd8dc7ec1b9d81b81e054458c96987166674d5811e084a847887b0fc80c72921170ae5eb9c77cad3662f3b6ece1bf6cb15ee6ad4a95c9af9c5ed SHA512 4d553d0820e4802b745dc672e927ae624a718563e8a32e9734adb03adc47af1c5f386325e8836cd3c0dd212338399119593077a3fab824ba060d54fbb57c80e2 +EBUILD e16-1.0.29.ebuild 3508 BLAKE2B 4ad0db5d85f7e8cdf7ac726a13ed3a7ec6cf28ff6833c3f90df08ee943fa35aaf92ceb0dbebcaa55d3df24055eac73d898867dbcca000ac511a792a6c49a9e59 SHA512 c2f01b8ca087c471e7a60d6495336010e5138939b4493aece54dcf078014a6b9295f56a4d884a7f794cc9e18afa2fc680b38a1b4a59563510f9b581ceb0d4205 MISC metadata.xml 1803 BLAKE2B 1b08ff2455e9d92bbb9cc1d38fc45cb0b2882303aea5f53644b349b9fd9daa4392495d0803344b6de92ff4340df00a57078f8019885a6634556f294b3003442a SHA512 c77cce975a99010cfd1222e7d1d3b1729dff9799dbcc32844b8852eba941aaadd79a8cebed7b452af19de675313f8c249f9067e5d822ca753b61e3b9197d042e diff --git a/x11-wm/e16/e16-1.0.29.ebuild b/x11-wm/e16/e16-1.0.29.ebuild new file mode 100644 index 000000000000..ffa8ee7715a8 --- /dev/null +++ b/x11-wm/e16/e16-1.0.29.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Enlightenment Window Manager (E16)" +HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/" +SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa audiofile dbus debug +dialogs doc examples gnome +libhack modules nls no-container opengl +pango +poll player +pulseaudio select +sndfile sound +themes xcomposite +xft xi2 +xinerama xpresent +xrandr +xrender +xsm +xsync zoom" + +REQUIRED_USE=" + ^^ ( poll select ) + opengl? ( xcomposite ) + pango? ( xft ) + sound? ( + ^^ ( alsa player pulseaudio ) + alsa? ( ^^ ( sndfile audiofile ) ) + pulseaudio? ( ^^ ( sndfile audiofile ) ) + ) +" + +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" +COMMON_DEPEND=" + media-libs/freetype:2 + media-libs/imlib2[X] + virtual/libiconv + x11-libs/libX11 + x11-libs/libXext + x11-misc/xbitmaps + dbus? ( sys-apps/dbus ) + opengl? ( + media-libs/glu + media-libs/mesa + ) + pango? ( + dev-libs/glib:2 + x11-libs/pango[X] + ) + sound? ( + alsa? ( media-libs/alsa-lib ) + player? ( media-sound/alsa-utils ) + pulseaudio? ( || ( + media-libs/libpulse + media-sound/apulse[sdk] + ) ) + audiofile? ( media-libs/audiofile:= ) + sndfile? ( media-libs/libsndfile ) + ) + xcomposite? ( + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + ) + xft? ( x11-libs/libXft ) + xinerama? ( x11-libs/libXinerama ) + xpresent? ( x11-libs/libXpresent ) + xrandr? ( x11-libs/libXrandr ) + xrender? ( x11-libs/libXrender ) + xsm? ( + x11-libs/libICE + x11-libs/libSM + ) + zoom? ( x11-libs/libXxf86vm ) +" +RDEPEND="${COMMON_DEPEND} + doc? ( app-doc/e16-docs ) + nls? ( virtual/libintl ) + themes? ( x11-themes/e16-themes ) + !x11-wm/enlightenment:0 +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" + +src_configure() { + local myconf=( + $(use_enable dbus) + $(use_enable debug libtrip) + $(use_enable dialogs) + $(use_enable doc docs) + $(use_enable libhack) + $(use_enable modules) + $(use_enable nls) + $(use_enable no-container containerless) + $(use_enable opengl glx) + $(use_enable pango) + $(use_enable xcomposite composite) + $(use_enable xft) + $(use_enable xi2) + $(use_enable xinerama) + $(use_enable xpresent) + $(use_enable xrandr) + $(use_enable xrender) + $(use_enable xsm sm) + $(use_enable xsync) + $(use_enable zoom) + $(use_with gnome gnome gnome3) + --enable-mans + --disable-docs + --disable-esdtest + --disable-gcc-cpp + --disable-werror + --disable-xscrnsaver + ) + if use sound; then + use alsa && myconf+=( --enable-sound=alsa ) + use pulseaudio && myconf+=( --enable-sound=pulseaudio ) + use player && myconf+=( --enable-sound=player ) + + if use alsa || use pulseaudio; then + use sndfile && myconf+=( --with-sndldr=sndfile ) + use audiofile && myconf+=( --with-sndldr=audiofile ) + else + myconf+=( --without-sndldr ) + fi + else + myconf+=( --disable-sound --without-sndldr ) + fi + use poll && myconf+=( --with-evhan=poll ) + use select && myconf+=( --with-evhan=select ) + + econf "${myconf[@]}" +} + +src_install() { + default + docompress -x /usr/share/doc/${PF}/e16.html + dodoc COMPLIANCE docs/e16.html + use examples && dodoc -r sample-scripts +} + +pkg_postinst() { + einfo "In order to use custom fonts, put them into ~/.e16/fonts/ and use" + einfo "appropriate names in ~/.e16/fonts.cfg. \"Use theme font configuration\"" + einfo "in the Theme setting should be disabled for this to work." +} diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest index deffa20d4e0d..7ece99b905d4 100644 --- a/x11-wm/evilwm/Manifest +++ b/x11-wm/evilwm/Manifest @@ -1,6 +1,4 @@ AUX evilwm.desktop 167 BLAKE2B 6de59f5da259ce3615e2bea2112691e8fa28c07d03a5155deba64b8a2fab2aae3160a1f896e7dbde51ab0068e7ba0dd083e51f5615a8b632c62e6a67171c3937 SHA512 b4f4d2e237c4e7fa55a1eaab9e3aa3182b0d90eeb34cc5691707a1f4a4ae394553e4bf8231511c3bc0cb56bd3448153f8a7ed1dd6c0273535199df3fe11b8288 -DIST evilwm-1.3.1.tar.gz 64824 BLAKE2B 1145662c1907d27c39e55a4eddbc37c51a7b8d92dfa39b98c98eefdf419ebbee1bfc8889725ac38158f2b15e78e0d1a5a202584bc248cb93797c2ba05fbae5c2 SHA512 551ed96884792a6e607b0abb582bed68e583e7790773960a9f5ef6d974a7695752b4f2286d1549c2ca2d8f99b6401deb4e6da11e56bf6ce1fcf828370b072d75 DIST evilwm-1.4.2.tar.gz 73716 BLAKE2B dbdeb914efe1002a3d3e97942d9b8ee22a3506aec4232cc59d5cb7fe61ee2bcbf08eaa5cc1d55151acd2c41f5fe7128cf0238ac844e91d61fc6afcb9162792e1 SHA512 07f1d82a611b95606ef137bb76599f8eef4bc27bf90eae9f5aa15bc806808c3bc4e1d7e821cebe1651b134d03f2b129e336b95e9659f0509d9711faab9bd00ba -EBUILD evilwm-1.3.1.ebuild 1093 BLAKE2B 34afeb21a059a9423584fce42765c9a514c14a39a514ca6f8e42ded40d607f0ae33facc6cdc70933b211401f9fe9123b1dcdea7803c8bc7f8d77b0ead4ad7acb SHA512 772d86ac63e84b0a892fc95b6561d941d4d2c9ed6d6f6c3384ac3c93f7e7dadbe3ee0e8a291f971dba526756f5ac4dd1ac6f53e7b7563ac6f238304d9a54d9de -EBUILD evilwm-1.4.2.ebuild 1050 BLAKE2B 294f75532b09f449dc14731371758fa3a50ea839efe28df44b010406af0531953a160a1a7273a70075d29211a891df54504df3beb8a5c806d9eac83896113b18 SHA512 23acecd585e5cfa0f878ceadeade09a724c5dadd626d7a91bc5e8fcc0fc98d491739992cc72be8f718063beaebfd764c9dc59f011337e1e3e54e2b5715527b44 +EBUILD evilwm-1.4.2.ebuild 1042 BLAKE2B d162ff70c09f6172480fab79fbf0877bc59e2de7e0510d937e4a6d06f628a051c549b78246b67d1e282329b520b797fa9fdf175b533d5064669591bcafa18ab9 SHA512 10473f3cd8b2649786c0ad42b5425f4d2b96b4799615b21541543cad17d37f839f4d59fa8308632df201ecf9dd511bca7658afeabdb3e3345a5db2ff1c10cc12 MISC metadata.xml 584 BLAKE2B 3dfdb1220cc0b3805d4c2b7e7256d178cf96b64853b4f2acbb7e563d09a3b4da046cc2c078158d3d801e24e7eea208ff54842f8cf5ac34b9312b5f0a8f9db3ab SHA512 a09e6f2213ec18853e320e273800b6d8a09d99c60c2e91a12196a2dd683d156b303e7ac38445c062b0ac998f2f4ae6ca6c4a28326cc2aed2fc3f88bb7177f2c8 diff --git a/x11-wm/evilwm/evilwm-1.3.1.ebuild b/x11-wm/evilwm/evilwm-1.3.1.ebuild deleted file mode 100644 index a36b4f37779c..000000000000 --- a/x11-wm/evilwm/evilwm-1.3.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2021 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="http://www.6809.org.uk/evilwm/" -SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz" - -LICENSE="MIT 9wm" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -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" - sed -e '/Encoding/d' -i ${PN}.desktop || die -} - -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/evilwm/evilwm-1.4.2.ebuild b/x11-wm/evilwm/evilwm-1.4.2.ebuild index bdb39a2c480f..c3dccb57a8b6 100644 --- a/x11-wm/evilwm/evilwm-1.4.2.ebuild +++ b/x11-wm/evilwm/evilwm-1.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,6 @@ SRC_URI="https://www.6809.org.uk/evilwm/${P}.tar.gz" LICENSE="MIT 9wm" SLOT="0" KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" RDEPEND="x11-libs/libXext x11-libs/libXrandr 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 5a8cbaad349e..df220bb78f71 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -1,15 +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-clang16.patch 1821 BLAKE2B b8acc1740eb820128625a1aab94c00faf9ba22a911e1a570b61cfe5d59e63479a5555ae22c16c2f2ec0189b8c8f195f36447fec12fc64f73fbc7c4efa0d62410 SHA512 dfe16531733986b42600b682d9e7ea17db5e546f196476d0fdf97cbfb05733c9c37d36f51a0a77d0754c0b55374be15b8dd39966bf1e454bb338245c63235a5f AUX fvwm-2.7.0-fix-docdir.patch 361 BLAKE2B aefce92389f7ba8b8a85d67c9144e0ae6c4df6eb7ea9195ae1683a0be453e9eeaff1ad64fd1e4de174ee419c9636897639863d5d0f3f8e7fde8ade84b05358e4 SHA512 c21d5ded3ee488efc0595f44a09c9833189c5159494e96cf3c4f310aa5dfc9aba3f78452d4e9105e839e57a8a2361c9dc5840bc89e8ae67f5cf2209b6a3ab142 -DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e +AUX fvwm-2.7.0-translucent-menus.diff 15303 BLAKE2B 9689b136bf17aff87bf9b2b872a8d746268849333d06595a5147be7dbc2b6e2a9f75643c67d28564663cf0571378612ebc96e1eff22e315305501cca438c9947 SHA512 34714e25ca5a30479174c1a75ef6441e9dd7e9506e52edced1c8658979059d03b07f5373b82178c2871034155e74a0bf16b55db30784575bc7e6f06555a321fd 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-r1.ebuild 4207 BLAKE2B 9e5688558de8d59148f64192efb7af939b57196573fae988288aea1c7d083e9192e8abd659d580cf919166531218be5d1ad228501cefa347d808b0b0820341bd SHA512 45917c0c96c62574f88e8f8a95084a81df67360432e16a1f6edae99b297895108bf3b6ff42bdd350bf934a01d55e919ec3ecfc8254b94e769d0ccd8052fbcc79 -EBUILD fvwm-2.7.0-r4.ebuild 4212 BLAKE2B 73a82ecbfdd8597b40182c4832cfdacd11b9c1dd1dd6ed482716ea4b4c6fdc6ca90de6a3003f9c955a0b259ac57a8af0902b12b5b5744472ece94c1c00314f1f SHA512 02756d5f8e942e76cfd21fec70247af88f289c1b238497e08ae7f9575dfb05fb7f9b5767e5bcfa1ebe71a5edf28f4564e88bf5de85532186ce5ea076afa36499 -EBUILD fvwm-2.7.0.ebuild 4256 BLAKE2B b88389581da14df1c3328b439068d619ce071d1a847d7259babe787e65a9e2851b310795aa1c93b6ecec766f515ad0792b33747358fb04979b82a2a2a60c87d1 SHA512 3f5956ae078e98839a50f09aa70a43e6f732a7fb7a3749032a43166fd57405f7f9363e12315d3c03ce81d3098495906f8f8ba1b72b2089a9e3201b4a02c8645a +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.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/files/fvwm-2.7.0-ar.patch b/x11-wm/fvwm/files/fvwm-2.7.0-ar.patch new file mode 100644 index 000000000000..80ceca36f3b2 --- /dev/null +++ b/x11-wm/fvwm/files/fvwm-2.7.0-ar.patch @@ -0,0 +1,41 @@ +diff --git i/configure.ac w/configure.ac +index 97ab9e7..8cd2efb 100644 +--- i/configure.ac ++++ w/configure.ac +@@ -208,6 +208,10 @@ AC_MSG_RESULT($val) + # 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 +diff --git i/libs/Makefile.in w/libs/Makefile.in +index 28b6732..c66d3e4 100644 +--- i/libs/Makefile.in ++++ w/libs/Makefile.in +@@ -100,7 +100,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LIBRARIES = $(noinst_LIBRARIES) +-AR = ar ++AR = @AR@ + ARFLAGS = cru + AM_V_AR = $(am__v_AR_@AM_V@) + am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +diff --git i/modules/FvwmScript/Widgets/Makefile.in w/modules/FvwmScript/Widgets/Makefile.in +index 8bda02d..582b046 100644 +--- i/modules/FvwmScript/Widgets/Makefile.in ++++ w/modules/FvwmScript/Widgets/Makefile.in +@@ -100,7 +100,7 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + LIBRARIES = $(noinst_LIBRARIES) +-AR = ar ++AR = @AR@ + ARFLAGS = cru + AM_V_AR = $(am__v_AR_@AM_V@) + am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) diff --git a/x11-wm/fvwm/files/fvwm-2.7.0-clang16.patch b/x11-wm/fvwm/files/fvwm-2.7.0-clang16.patch deleted file mode 100644 index 025c6e6d10ec..000000000000 --- a/x11-wm/fvwm/files/fvwm-2.7.0-clang16.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://github.com/fvwmorg/fvwm/pull/100 - -From 0b4daddf6b88b696daf54714448b8d89a615abf2 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 24 Nov 2022 13:06:50 +0100 -Subject: [PATCH 1/2] configure: Do not require support for implicit ints - -Implicit ints have not been part of C since 1999, and future -compilers will disable support for them by default. Fortunatenly, -only one configure check needs adjusting. ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -30,7 +30,7 @@ if test "$ac_cv_func_select" = yes; then - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif], --[extern select ($ac_cv_type_fd_set_size_t, -+[extern int select ($ac_cv_type_fd_set_size_t, - $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, - $ac_type_timeval *);], - [ac_found=yes ; break 3],ac_found=no) ---- a/configure.ac -+++ b/configure.ac -@@ -220,7 +220,7 @@ AC_MINIX - - # catch -Werror and similar options when running configure - AC_TRY_COMPILE([#include <stdio.h>], --[int i; static j; int *p; char *c; -+[int i; int *p; char *c; - switch (*p = p = *c) { case 0: printf("%Q", c, p); } - *c = &i; c = p; - while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); - -From 6b9d100ae4e784821b5189474dc58e646417bcf6 Mon Sep 17 00:00:00 2001 -From: Florian Weimer <fweimer@redhat.com> -Date: Thu, 24 Nov 2022 13:07:56 +0100 -Subject: [PATCH 2/2] acinclude.m4: Add missing <unistd.h> to - AM_SAFETY_CHECK_MKSTEMP - -Otherwise, the check fails on a compiler which does not support -implicit function declarations (a language feature removed in 1999). ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1154,6 +1154,9 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif - int main(void) - { - char template[128]; - diff --git a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-2.7.0-translucent-menus.diff index 1c49f69007d0..67f0a3bf0cd5 100644 --- a/x11-wm/fvwm/files/fvwm-2.5.27-translucent-menus.diff +++ b/x11-wm/fvwm/files/fvwm-2.7.0-translucent-menus.diff @@ -1,11 +1,8 @@ -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 @@ +diff --git i/fvwm/colorset.c w/fvwm/colorset.c +index e10f1d1..0217cc3 100644 +--- i/fvwm/colorset.c ++++ w/fvwm/colorset.c +@@ -164,6 +164,8 @@ static char *csetopts[] = "NoIconTint", "IconAlpha", @@ -14,7 +11,7 @@ diff -u -r1.52 colorset.c NULL }; -@@ -625,6 +627,7 @@ +@@ -625,6 +627,7 @@ void parse_colorset(int n, char *line) char *fg_tint = NULL; char *bg_tint = NULL; char *icon_tint = NULL; @@ -22,7 +19,7 @@ diff -u -r1.52 colorset.c Bool have_pixels_changed = False; Bool has_icon_pixels_changed = False; Bool has_fg_changed = False; -@@ -637,6 +640,7 @@ +@@ -637,6 +640,7 @@ void parse_colorset(int n, char *line) Bool has_fg_tint_changed = False; Bool has_bg_tint_changed = False; Bool has_icon_tint_changed = False; @@ -30,7 +27,7 @@ diff -u -r1.52 colorset.c Bool has_pixmap_changed = False; Bool has_shape_changed = False; Bool has_image_alpha_changed = False; -@@ -763,6 +767,10 @@ +@@ -764,6 +768,10 @@ void parse_colorset(int n, char *line) case 21: /* Plain */ has_pixmap_changed = True; free_colorset_background(cs, True); @@ -41,7 +38,7 @@ diff -u -r1.52 colorset.c break; case 22: /* NoShape */ has_shape_changed = True; -@@ -929,6 +937,24 @@ +@@ -930,6 +938,24 @@ void parse_colorset(int n, char *line) cs->icon_alpha_percent = tmp; } break; @@ -66,10 +63,11 @@ diff -u -r1.52 colorset.c default: /* test for ?Gradient */ if (option[0] && StrEquals(&option[1], "Gradient")) -@@ -1615,6 +1641,27 @@ +@@ -1632,6 +1658,27 @@ void parse_colorset(int n, char *line) + } } - /* ++ /* + * ---------- change the translucent tint colour ---------- + */ + if (has_translucent_tint_changed) @@ -90,11 +88,10 @@ diff -u -r1.52 colorset.c + } + } + -+ /* + /* * ---------- send new colorset to fvwm and clean up ---------- */ - /* make sure the server has this to avoid races */ -@@ -1710,6 +1757,7 @@ +@@ -1728,6 +1775,7 @@ void alloc_colorset(int n) ncs->fgsh = GetColor(white); ncs->tint = GetColor(black); ncs->icon_tint = GetColor(black); @@ -102,7 +99,7 @@ diff -u -r1.52 colorset.c ncs->pixmap = XCreatePixmapFromBitmapData( dpy, Scr.NoFocusWin, &g_bits[4 * (nColorsets % 3)], 4, 4, -@@ -1727,6 +1775,7 @@ +@@ -1745,6 +1793,7 @@ void alloc_colorset(int n) ncs->fgsh = GetForeShadow(ncs->fg, ncs->bg); ncs->tint = GetColor(black); ncs->icon_tint = GetColor(black); @@ -110,7 +107,7 @@ diff -u -r1.52 colorset.c } ncs->fg_tint = ncs->bg_tint = GetColor(black); /* set flags for fg contrast, bg average */ -@@ -1738,6 +1787,7 @@ +@@ -1756,6 +1805,7 @@ void alloc_colorset(int n) ncs->icon_alpha_percent = 100; ncs->tint_percent = 0; ncs->icon_tint_percent = 0; @@ -118,14 +115,11 @@ diff -u -r1.52 colorset.c 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 @@ +diff --git i/fvwm/menuroot.h w/fvwm/menuroot.h +index d9f33d6..de5e2d6 100644 +--- i/fvwm/menuroot.h ++++ w/fvwm/menuroot.h +@@ -146,6 +146,9 @@ typedef struct MenuRootDynamic int d_npixels; } stored_pixels; /* alloc pixels when dithering is used for gradients */ @@ -135,16 +129,13 @@ diff -u -r1.3 menuroot.h } 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 ------------------------------- */ +diff --git i/fvwm/menus.c w/fvwm/menus.c +index 345ac06..6daf035 100644 +--- i/fvwm/menus.c ++++ w/fvwm/menus.c +@@ -78,6 +78,19 @@ + #define SCTX_GET_MR(ctx) ((ctx).type == SCTX_MENU_ROOT ? \ + (ctx).menu_root.menu_root : NULL) +#define MENU_IS_TRANSLUCENT(mr,cs) \ + (!MR_IS_TEAR_OFF_MENU(mr) && CSET_IS_TRANSLUCENT(cs)) @@ -162,7 +153,7 @@ diff -u -r1.409 menus.c /* ---------------------------- imports ------------------------------------ */ /* This external is safe. It's written only during startup. */ -@@ -188,6 +201,8 @@ +@@ -220,6 +233,8 @@ typedef struct mloop_static_info_t } mloop_static_info_t; /* ---------------------------- forward declarations ----------------------- */ @@ -171,7 +162,7 @@ diff -u -r1.409 menus.c /* ---------------------------- local variables ---------------------------- */ -@@ -353,12 +368,22 @@ +@@ -381,12 +396,22 @@ static void animated_move_back( Bool transparent_bg = False; /* move it back */ @@ -196,7 +187,7 @@ diff -u -r1.409 menus.c } AnimatedMoveOfWindow( MR_WINDOW(mr), act_x, act_y, act_x - MR_XANIMATION(mr), -@@ -1779,6 +1804,7 @@ +@@ -1912,6 +1937,7 @@ static void make_menu_window(MenuRoot *mr, Bool is_tear_off) /* Doh. Use the standard display instead. */ MR_CREATE_DPY(mr) = dpy; } @@ -204,7 +195,7 @@ diff -u -r1.409 menus.c } else { -@@ -2594,7 +2620,37 @@ +@@ -2716,7 +2742,37 @@ static void paint_menu( } MR_IS_PAINTED(mr) = 1; /* paint the menu background */ @@ -243,7 +234,7 @@ diff -u -r1.409 menus.c { if (MR_IS_BACKGROUND_SET(mr) == False) { -@@ -3401,10 +3457,7 @@ +@@ -3525,10 +3581,7 @@ static int pop_menu_up( MR_HAS_POPPED_UP_RIGHT(mr) = 0; } MR_XANIMATION(parent_menu) += end_x - prev_x; @@ -255,7 +246,7 @@ diff -u -r1.409 menus.c { transparent_bg = True; get_menu_repaint_transparent_parameters( -@@ -3583,10 +3636,21 @@ +@@ -3707,10 +3760,21 @@ static int pop_menu_up( */ XMoveWindow(dpy, MR_WINDOW(mr), x, y); @@ -280,7 +271,7 @@ diff -u -r1.409 menus.c XFlush(dpy); MR_MAPPED_COPIES(mr)++; MST_USAGE_COUNT(mr)++; -@@ -6123,16 +6187,122 @@ +@@ -6274,16 +6338,122 @@ void update_transparent_menu_bg( { last = True; } @@ -409,7 +400,7 @@ diff -u -r1.409 menus.c } -@@ -6173,10 +6343,7 @@ +@@ -6324,10 +6494,7 @@ void repaint_transparent_menu( } if (!is_bg_set) { @@ -421,7 +412,7 @@ diff -u -r1.409 menus.c } /* redraw the background of non active item */ for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi)) -@@ -6813,10 +6980,12 @@ +@@ -6951,10 +7118,12 @@ void UpdateMenuColorset(int cset) SetWindowBackground( dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr), @@ -437,13 +428,10 @@ diff -u -r1.409 menus.c } 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 +diff --git i/fvwm/menus.h w/fvwm/menus.h +index 28e9db3..6b620b2 100644 +--- i/fvwm/menus.h ++++ w/fvwm/menus.h @@ -15,6 +15,9 @@ #define IS_MENU_RETURN(x) \ ((x)==MENU_DONE || (x)==MENU_ABORTED || (x)==MENU_SUBMENU_TORN_OFF) @@ -454,14 +442,11 @@ diff -u -r1.111 menus.h 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 @@ +diff --git i/libs/Colorset.h w/libs/Colorset.h +index d610b52..6c1892e 100644 +--- i/libs/Colorset.h ++++ w/libs/Colorset.h +@@ -51,6 +51,10 @@ typedef struct Bool dither; Bool allows_buffered_transparency; Bool is_maybe_root_transparent; @@ -472,7 +457,7 @@ diff -u -r1.38 Colorset.h #endif } colorset_t; -@@ -78,6 +82,7 @@ +@@ -78,6 +82,7 @@ typedef struct #define FG_TINT_SUPPLIED 0x100 #define BG_TINT_SUPPLIED 0x200 #define ICON_TINT_SUPPLIED 0x400 @@ -480,7 +465,7 @@ diff -u -r1.38 Colorset.h #endif /* colorsets are stored as an array of structs to permit fast dereferencing */ -@@ -153,6 +158,11 @@ +@@ -153,6 +158,11 @@ extern colorset_t *Colorset; (cset != NULL && cset->pixmap == ParentRelative && \ cset->tint_percent > 0) @@ -492,14 +477,11 @@ diff -u -r1.38 Colorset.h #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 @@ +diff --git i/libs/PictureGraphics.c w/libs/PictureGraphics.c +index f861726..a2fdbea 100644 +--- i/libs/PictureGraphics.c ++++ w/libs/PictureGraphics.c +@@ -1360,7 +1360,7 @@ void PGraphicsTintRectangle( } } @@ -508,14 +490,11 @@ diff -u -r1.29 PictureGraphics.c 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 @@ +diff --git i/libs/PictureGraphics.h w/libs/PictureGraphics.h +index ec75601..5e0001d 100644 +--- i/libs/PictureGraphics.h ++++ w/libs/PictureGraphics.h +@@ -122,7 +122,9 @@ void PGraphicsTintRectangle( 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); 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-r1.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r1.ebuild deleted file mode 100644 index 775437b687c9..000000000000 --- a/x11-wm/fvwm/fvwm-2.7.0-r1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic python-single-r1 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" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -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 - $(python_gen_cond_dep ' - dev-python/pyxdg[${PYTHON_USEDEP}] - ') - 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} - ${PYTHON_DEPS} - 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} - x11-base/xorg-proto -" -BDEPEND=" - dev-lang/perl - dev-libs/libxslt - virtual/pkgconfig -" - -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 - - eapply "${FILESDIR}"/fvwm-2.7.0-clang16.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 - --enable-mandoc - --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 ) - - export ac_cv_path_PYTHON="${PYTHON}" - - 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 - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - 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-r4.ebuild b/x11-wm/fvwm/fvwm-2.7.0-r5.ebuild index 349ad4960c6c..b8739f3a1562 100644 --- a/x11-wm/fvwm/fvwm-2.7.0-r4.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}" @@ -49,7 +49,8 @@ COMMON_DEPEND=" ) xinerama? ( x11-libs/libXinerama ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} ${PYTHON_DEPS} dev-lang/perl perl? ( tk? ( @@ -61,7 +62,8 @@ RDEPEND="${COMMON_DEPEND} lock? ( x11-misc/xlockmore ) netpbm? ( media-libs/netpbm ) " -DEPEND="${COMMON_DEPEND} +DEPEND=" + ${COMMON_DEPEND} x11-base/xorg-proto " BDEPEND=" @@ -73,14 +75,10 @@ BDEPEND=" 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" + eapply "${FILESDIR}/${PN}-2.7.0-translucent-menus.diff" fi - eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528 - + eapply "${FILESDIR}"/fvwm-2.7.0-ar.patch # bug #474528 eapply "${FILESDIR}"/fvwm-2.7.0-c99.patch eapply "${FILESDIR}"/fvwm-2.7.0-fix-docdir.patch @@ -117,6 +115,9 @@ src_configure() { # Recommended by upstream, reference ???? append-flags -fno-strict-aliasing + # bug #864959 + filter-lto + # Signed chars are required. use ppc && append-flags -fsigned-char diff --git a/x11-wm/fvwm/fvwm-2.7.0.ebuild b/x11-wm/fvwm/fvwm-2.7.0.ebuild deleted file mode 100644 index b1f6bbd833aa..000000000000 --- a/x11-wm/fvwm/fvwm-2.7.0.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -inherit autotools flag-o-matic python-single-r1 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" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -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 - $(python_gen_cond_dep ' - dev-python/pyxdg[${PYTHON_USEDEP}] - ') - 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} - ${PYTHON_DEPS} - 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} - x11-base/xorg-proto -" -BDEPEND=" - dev-lang/perl - dev-libs/libxslt - virtual/pkgconfig -" - -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 - - eapply "${FILESDIR}"/fvwm-2.7.0-clang16.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 - --enable-mandoc - --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 ) - - export ac_cv_path_PYTHON="${PYTHON}" - - 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/i3/Manifest b/x11-wm/i3/Manifest index fe0811ff37c2..8e4068db8132 100644 --- a/x11-wm/i3/Manifest +++ b/x11-wm/i3/Manifest @@ -1,6 +1,4 @@ -DIST i3-4.22.tar.xz 1349276 BLAKE2B fa179f445ba4286bfeec98dc7a2e1dfad14bda6874e84878a48ee5890ed4cf3a90fc542e8e14aedaaba3abebc8d280284a3b00e838da70a783064a4bd271ca41 SHA512 4e4536fb4108e92a1c918b5869232c0f7eb0feca2d3a49ba87250b970df0614cfe256d1e41fbd825a81c43b82898651e5d3fc11ca8101978916754dfa885266a DIST i3-4.23.tar.xz 1354628 BLAKE2B 3a5179d5b468ae66f81e53ee8376eb82d4f5d9441d1488f3f761fcad9d68b739fa963f4985db7448e5049983b8cf26ae3fa6bdac32c8677f0384f059cd9db507 SHA512 342bd6e9ff952dd2408c9af6e79e0279cb5e7388a510dd461be84a82a5fbedb92fa35065d4b76fd88e392026f2eb4979160891ae468f421935fe5922f58a66ba -EBUILD i3-4.22.ebuild 1916 BLAKE2B 97f461a7efa127ae9626c98ac973653d49ba78ae671e8467f6c6688b0770ba2376eb5639e2b76f1c197ecb236aa1270d0841dc991b6731208b5e4e24eab5616e SHA512 77dce2ae4c13add87198f854654c9700a901d594df6079c04e86ae1ff86bcfa18589a6d34c8927e78babc5005b9010f1992e1f20bafbd4ea1aa21290b26f8c0a -EBUILD i3-4.23.ebuild 1916 BLAKE2B 95b6fe35c1ea792616cf57143c1f0d392a84dfee5f8f5e12f5794248a15467443201e6971403bccfd8bcbbb436dec56123d2edba57200bcb792716118ef601f3 SHA512 8c2a91819b327de11c9edcd81a3d2a34a6a06d45418b7134ce11bcbfdcbc0f27b9673dc1b1b17f7f426427b797a347b1e23fbfb516f611f6bbeafde217ec368e -EBUILD i3-9999.ebuild 1910 BLAKE2B 7b066fe5cc374d9419f88703690de0b50b6a0acf485efe897aad943d2fb0c99d2f2672a4379390bd9ff5bb41445b5b03efa8ff4eac1600af632647468ef7c2a9 SHA512 75d8425ce90a13c192c14e92e7ad04ded387318d0b3d7b5d3a63bb5b4466def25e3c8a042e0405267c27ea85be1c399a1ee6f5082b001a8c15700ac0f3b8b6a6 +EBUILD i3-4.23.ebuild 1923 BLAKE2B 7dbb15ecd70f7b610910cb281a295d89faa5b9232fc8f3728dac6386d52cd5e1d93c3f28986fd56ea63ffe4353ddf3afb84d01a439ded83d0533148c213aaa78 SHA512 9c1fc7bd5fc054e39b730b69cc2523d6d1460c3068cde44ea2a392bfeaa91b328b641afc3e233b3394d15709d8b2030ecbfc95ed85a1438a371100dfd84063cb +EBUILD i3-9999.ebuild 1910 BLAKE2B 2f72a17e79d873e4cf15cfeadf23ff87654caa5dd2ca1bd3f08c56212f8d349d264b30cd806873b06f04158cab755df967e6ae420442d9f91c9e5e06afa1184e SHA512 a71e6f9cb7e4ac7fbf35d0f6ba20b97d3d6b23c07bd5223ebb47e3cd3ff375be10eb9285b09d1ee777f0c05b76d821f3c580e8eaec9236b56c005e9d983e0eb5 MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be diff --git a/x11-wm/i3/i3-4.22.ebuild b/x11-wm/i3/i3-4.22.ebuild deleted file mode 100644 index be04e81b8a7d..000000000000 --- a/x11-wm/i3/i3-4.22.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson optfeature virtualx - -DESCRIPTION="An improved dynamic tiling window manager" -HOMEPAGE="https://i3wm.org/" - -if [[ "${PV}" = *9999 ]]; then - EGIT_REPO_URI="https://github.com/i3/i3" - EGIT_BRANCH="next" - inherit git-r3 -else - SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="doc test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/libev - dev-libs/libpcre2 - dev-libs/yajl - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:= - x11-libs/libxkbcommon[X] - x11-libs/pango[X] - x11-libs/startup-notification - x11-libs/xcb-util - x11-libs/xcb-util-cursor - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm - x11-misc/xkeyboard-config -" -DEPEND=" - ${COMMON_DEPEND} - test? ( - dev-perl/AnyEvent - dev-perl/ExtUtils-PkgConfig - dev-perl/Inline - dev-perl/Inline-C - dev-perl/IPC-Run - dev-perl/local-lib - dev-perl/X11-XCB - virtual/perl-Test-Simple - x11-base/xorg-server[xephyr] - x11-misc/xvfb-run - ) - doc? ( - app-text/asciidoc - app-text/xmlto - dev-lang/perl - ) -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl - dev-perl/AnyEvent-I3 - dev-perl/JSON-XS -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - - cat > "${T}"/i3wm <<- EOF || die - #!/bin/sh - exec /usr/bin/i3 - EOF -} - -src_configure() { - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - $(meson_use doc docs) - $(meson_use doc mans) - ) - - meson_src_configure -} - -src_test() { - virtx meson_src_test -} - -src_install() { - meson_src_install - - exeinto /etc/X11/Sessions - doexe "${T}"/i3wm -} - -pkg_postinst() { - optfeature_header "There are several packages that may be useful with i3:" - optfeature "application launcher" x11-misc/dmenu - optfeature "simple screen locker" x11-misc/i3lock - optfeature "status bar generator" x11-misc/i3status -} diff --git a/x11-wm/i3/i3-4.23.ebuild b/x11-wm/i3/i3-4.23.ebuild index f9e7d3d5321a..efd59f389c9f 100644 --- a/x11-wm/i3/i3-4.23.ebuild +++ b/x11-wm/i3/i3-4.23.ebuild @@ -14,7 +14,7 @@ if [[ "${PV}" = *9999 ]]; then inherit git-r3 else SRC_URI="https://i3wm.org/downloads/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" fi LICENSE="BSD" diff --git a/x11-wm/i3/i3-9999.ebuild b/x11-wm/i3/i3-9999.ebuild index 6d8b7839b4c5..d910065d4cda 100644 --- a/x11-wm/i3/i3-9999.ebuild +++ b/x11-wm/i3/i3-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson optfeature virtualx diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest index cc063453bc8a..4251cf10fede 100644 --- a/x11-wm/jwm/Manifest +++ b/x11-wm/jwm/Manifest @@ -1,4 +1,6 @@ AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b DIST jwm-2.4.2.tar.xz 316000 BLAKE2B 7a0a1c5f60cb3554c999ce3d00d94af4d58ac4bdfcbaaa13a7b675273b4c5d0058c7c85bec950fa91d33a46a89f0b83faf2ab2cda0430a741884e2fdfd8116a7 SHA512 2669c3e2ab2d9a5539d02559108a2bc601bb2209de03dc15057a65c14b5e1268cc58009f4102c4d90302c0705ada5578997a3644c736a46a7e8cf13766cc92fe -EBUILD jwm-2.4.2.ebuild 1883 BLAKE2B 92a596c5521817c7604a15dd68087526c75f8108cf6cb7e722e50570438eeeb4d671696450cd9b53f27044a0cf738295c54d7dab64b30aa743179960e4123694 SHA512 16110df3fe8a3208fcee4197bde8dab2133224229b2841224b8ac74759e24952fc1d8bd4f48a86aaa09720a0bd09cf54d4d0cace8ae3e82260cc4182d026fe0e -MISC metadata.xml 1013 BLAKE2B 08cfa3b5f80614ab15616889012d8c317bc7d8a50afc56f521ba56551782047b72f3e95229acd0a78b6c465deee065e2b2af4c472c347133106f2c5747483f00 SHA512 1940a6ef7330d7f8e4ee494c96cf5c23021b5eb952fa060619ac3985aa5d63b922b95ee6dbb761d4ca1b6cce4ef316263571503d83c120e1d42f576b835d3120 +DIST jwm-2.4.3.tar.xz 317192 BLAKE2B d0b0ff1088ab3390a90c054162ea2c2fe782b61f28b3fdb28464ace362143fdc94e25ec82f7f4178b86a26c9315cdfcf9a81bff2e76bb5e3d62f88968a4ee80b SHA512 35b8a6da9614f11881013aa77c36ee88ce9a213f056e797231b772132beb841d54094809b6a476383999bddeccf61451f72cd166309dd79c223b634cf5d1e69e +EBUILD jwm-2.4.2.ebuild 1884 BLAKE2B 240ba73e91284900e9d5d9563f05ed9b889538d47f98d9aa2e12eaacebd34ae17ae6d4174dd273f12966dc01b51fcb396779714f9ef573cf43ff642355ac0b4e SHA512 7a59a11194af79d0637f094530a512adfd548c4c474afffafb4bb46be3625b12e91d82c7dd1ec971e9513b74d6734cc56000f754fb7d1efc3dd49e8ac614dbad +EBUILD jwm-2.4.3.ebuild 1901 BLAKE2B e73cad7077dcb501be407f18caed251887940380c23b5abfc4ad34de33102c7a6c389422a007191fbcfcc74bd50d7f79f86a19a107d86e3fd3cf8aa0d735fb5f SHA512 8239b906348829cb1b2f2cedce072ad92a8a8245e9ea8b7e7612f193470cd623280f0bc31a7f52e88e2c2d948a7eeda0b853ecb5d54b98bf0dfa7c72c91cf6dc +MISC metadata.xml 1001 BLAKE2B 7de37c67352cdcfc0e6b9527d7261703aec667f0c132b39896d35d5fc8ef128ae4a2a2ba7f31b4b6ab97e8fbf971f072090195a261728e27a7e5c4b2adcf67af SHA512 b4b5482ff6b945d6d6b4b9c29848ab907cae120395503af409252f7aa4a718716ded380c2c0eb950fef2d65cb2cebfa908eb4448097d94d449ee24feac9b86ec diff --git a/x11-wm/jwm/jwm-2.4.2.ebuild b/x11-wm/jwm/jwm-2.4.2.ebuild index 0e9c3f44f9c4..1a89b8050f20 100644 --- a/x11-wm/jwm/jwm-2.4.2.ebuild +++ b/x11-wm/jwm/jwm-2.4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 inherit wrapper DESCRIPTION="Very fast and lightweight still powerful window manager for X" -HOMEPAGE="http://joewing.net/projects/jwm/" +HOMEPAGE="https://joewing.net/projects/jwm/" SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz" LICENSE="MIT" diff --git a/x11-wm/jwm/jwm-2.4.3.ebuild b/x11-wm/jwm/jwm-2.4.3.ebuild new file mode 100644 index 000000000000..08db4c809545 --- /dev/null +++ b/x11-wm/jwm/jwm-2.4.3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit wrapper + +DESCRIPTION="Very fast and lightweight still powerful window manager for X" +HOMEPAGE="https://joewing.net/projects/jwm/" +SRC_URI="https://github.com/joewing/${PN}/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +IUSE="svg debug iconv jpeg nls png pango truetype xinerama xpm" + +RDEPEND="dev-libs/expat + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXrender + svg? ( + x11-libs/cairo + gnome-base/librsvg + ) + iconv? ( virtual/libiconv ) + jpeg? ( media-libs/libjpeg-turbo ) + nls? ( sys-devel/gettext + virtual/libintl ) + pango? ( x11-libs/pango ) + png? ( media-libs/libpng:0= ) + truetype? ( x11-libs/libXft ) + xinerama? ( x11-libs/libXinerama ) + xpm? ( x11-libs/libXpm )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +src_configure() { + local myeconfargs=( + $(use_enable svg cairo) + $(use_enable svg rsvg) + $(use_enable debug) + $(use_enable jpeg) + $(use_enable nls) + $(use_enable pango) + $(use_enable png) + $(use_enable truetype xft) + $(use_enable xinerama) + $(use_enable xpm) + $(use_with iconv libiconv-prefix /usr) + $(use_with nls libintl-prefix /usr) + --enable-shape + --enable-xrender + --disable-rpath + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + dodir /etc + dodir /usr/bin + dodir /usr/share/man + + default + + make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions" + + insinto "/usr/share/xsessions" + doins "${FILESDIR}"/jwm.desktop + + dodoc README.md README.upgrading example.jwmrc CONTRIBUTING.md +} + +pkg_postinst() { + einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc" + einfo "or per-user by creating a configuration file in ~/.jwmrc" + einfo + einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/" +} diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml index 7d709d102326..745eaf8d5e4f 100644 --- a/x11-wm/jwm/metadata.xml +++ b/x11-wm/jwm/metadata.xml @@ -4,7 +4,7 @@ <!-- maintainer-needed --> <upstream> <remote-id type="github">joewing/jwm</remote-id> - <changelog>http://joewing.net/projects/jwm/snapshots/ChangeLog</changelog> + <changelog>https://github.com/joewing/jwm/releases</changelog> <bugs-to>https://github.com/joewing/jwm/issues</bugs-to> </upstream> <longdescription> diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest index 85087e791d03..444bd0a6cc06 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 1474 BLAKE2B b17345433d0ee60fc535986b53414087320eaf9fc6a655b731b95076b7c185b35db8f46579132417949159087224e17640df64300678eb3d0c6c30aedf42b429 SHA512 cb7f134d5103b8acb4e17a11bbeb8512e4a342ce2787efb427184e97d5d0a42d03f368206069078a085a9cb0517c5009712b97b059e58eae941ed5ced05a865b -EBUILD marco-1.28.1.ebuild 1538 BLAKE2B 76b1b85631d75e670908df8867d82b98172c83dc8b3943318b8e42e9d3880caed8efde16547c623e387c4b5e3f972fd8822f8e7887fda0cb92b72e78359a2d52 SHA512 b0b7ecf1bfad57579ecdda62f15ab893ee83756e906bffb25948cffe099693f8b1825f6d0d27f7a2f88d72c03d6afd9614b51a998768f01f88ab18978262b8af +EBUILD marco-1.28.1-r1.ebuild 1678 BLAKE2B 8ed673ef7b52190c67acc5dbd7aac2072dfe193498a7412375db1808378dd4d0093d0605f33afd4c1a39eb0f08120fa50754a0824e1d4790a9c7bdc1c92e7d92 SHA512 382d0c1cd2ac155b784cfabedc26abb085d7e52788de318875beca561772d7fd8a9e8855aedee65881e6112457e5dfe62003ec8b68504ca1119361433004b3e8 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 d0d40b051f8e..000000000000 --- a/x11-wm/marco/marco-1.26.2-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MATE2_LA_PUNT="yes" - -inherit mate meson - -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 ) -" - -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.ebuild b/x11-wm/marco/marco-1.28.1-r1.ebuild index b01a21857287..6240ace59fd1 100644 --- a/x11-wm/marco/marco-1.28.1.ebuild +++ b/x11-wm/marco/marco-1.28.1-r1.ebuild @@ -4,12 +4,15 @@ EAPI=8 MATE2_LA_PUNT="yes" +# For script meson_post_install.py +# Bug 906826, tracker bug 762406 +PYTHON_COMPAT=( python3_{10..13} ) -inherit mate meson +inherit mate meson python-any-r1 MINOR=$(($(ver_cut 2) % 2)) if [[ ${MINOR} -eq 0 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" fi DESCRIPTION="MATE default window manager" @@ -23,6 +26,7 @@ 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] x11-libs/cairo >=x11-libs/pango-1.2[X] @@ -45,9 +49,10 @@ COMMON_DEPEND=" xinerama? ( x11-libs/libXinerama ) " +DEPEND="${PYTHON_DEPS}" + RDEPEND="${COMMON_DEPEND} gnome-extra/zenity - >=mate-base/mate-desktop-1.20.0 virtual/libintl " diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index 24031d42ca16..8600cbe707d7 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -1,5 +1,3 @@ -DIST metacity-3.46.1.tar.xz 1959060 BLAKE2B 84dbe09dd8d6c7ce1894ed806cdc6cc5cc6c302ddf3aae5f7ef479f6c02ef6c2091bb1d815603f5d6e52d583192d43f47d835327e9e75cd626081becbf84bd8e SHA512 f0d8424868edf8209eb4cbd003de68ab892a5b515a1aca7b3626bf52eb8451cb0477ab35f702177c9654604e06adce46471897edcb54931d95e60b36bef92b20 -DIST metacity-3.50.0.tar.xz 1959172 BLAKE2B a697bb0d820211abdd212a250d0ea6a698962b37b9e200c54dab51ca11bb1c9a65708dd8f098211d3d451da83f484d549f5fc33c63f391f42744a8046849ccd7 SHA512 2fd66f96b0603dfea652ad21f9749c3dbd68c847cda884a0e16f23766c9b61fcdfa693dcb83beb33c909487a7d9f7f5eb796096cfc772cc44c4b267ef1b08699 -EBUILD metacity-3.46.1.ebuild 1294 BLAKE2B a7bf0e45f6ff90cbf944ae34bb7d6cdd8bd047ce58d7ebfdd4e2a59dc495fc042453518d4243494430bd05b74226f133fec9f842e3be6999b8b3fc163cf8b51f SHA512 778aaeae01a372aaa9c907323f3959c3f90cce06e622c20ae0f6493843078015978f8c0d9dacdb0245f91ef53ddb226f7b63862a0e210e5279e337f972644709 -EBUILD metacity-3.50.0.ebuild 1294 BLAKE2B b54f901a1fa0a3eb6d4b536764039e966b8f1225f335a8c21141ca3147d4aa27fd14d27e17be12771ebcad61fa778f616f5b808904081d56f3666e21b30b4aad SHA512 c9f68f9b0edccde5c84db81615f067f572fdfa1e50a8484a78f18463981c94140811ba7fc41df902c3d3341466f0d21a438fb7352a2c3490306b39135446cad3 +DIST metacity-3.52.0.tar.xz 1960156 BLAKE2B e8d078f08c4d3a40a98b5d95aa0286adc4da518ca6a495768d9e31626862b03a3ad5da26928ccc3f337b9811fd5ffa927a37e5f9ab6a7b7c256052842207b5cf SHA512 e49c8a45a26b9b43700e50787fef9e02a6c5abc5d8a809542acaf32f6e15ea756bf8398883e3c69707908e8556ae726d9764fc09f07b0beaa40f79a1490c361e +EBUILD metacity-3.52.0.ebuild 1294 BLAKE2B b54f901a1fa0a3eb6d4b536764039e966b8f1225f335a8c21141ca3147d4aa27fd14d27e17be12771ebcad61fa778f616f5b808904081d56f3666e21b30b4aad SHA512 c9f68f9b0edccde5c84db81615f067f572fdfa1e50a8484a78f18463981c94140811ba7fc41df902c3d3341466f0d21a438fb7352a2c3490306b39135446cad3 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.50.0.ebuild b/x11-wm/metacity/metacity-3.52.0.ebuild index 60f7ad76a4f2..60f7ad76a4f2 100644 --- a/x11-wm/metacity/metacity-3.50.0.ebuild +++ b/x11-wm/metacity/metacity-3.52.0.ebuild diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 486c3d837e61..90755dcc55a8 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,5 +1,3 @@ -DIST muffin-5.8.1.tar.gz 4519174 BLAKE2B 29269c641e28117f9dd0900dc129aca21c8834058e6b3168b2d44e0ecafba0b177ba214c82337f3120512f4433d6117781685f422a57a244edbfa8748a5ae661 SHA512 bf8e5cdc789ac8a2d1f616a751bf321209b13e3936b483d46370017c58a4b9ebd10b42a71e8691a42f013a0c44250e4a84549d9c5cf120d3382f61aa6040710b -DIST muffin-6.0.1.tar.gz 4521556 BLAKE2B e3f28dea9f66b30805f9b98bc79f2e4a08e9e5eb6501f455f0e3c42c5d9ed14c48be75b07a97da7b671156d14ed61f3b882d8ede4f9b83dac5496fac5a0f0348 SHA512 94aa767db3677116094cb0d9a63d1a446b6ec426b4b38576fcdb17259ef92d81f1a14c0e93dadd2bc4dfaca522531ed177bb0af895b3df7abf20d0e9a77d71af -EBUILD muffin-5.8.1.ebuild 3076 BLAKE2B 3deaa21d00b8cb78f8d7c29325f683e67ba8f3c5fdd0e49a7106765ec1710f59468dada59db1b96cd9d0e8b51d986ff27eb096c5b08d0db883d717cce7427b65 SHA512 7a3c6409c4b915c42a2b67f11426e5be6762365346093e9ba99b36d4f69279156e05cf1c04a62c5a44205e13bddaeb8adea5203cd32040a3b9c06e46c98612f5 -EBUILD muffin-6.0.1.ebuild 4039 BLAKE2B ed3456724b507f89b5b031ffb31a216a722ad6ff54671d1d5f8e79a8f6547f6c6b40635421aa7a6fedc5398b4fb64a294bdebb2ea29611462719748d623e11c4 SHA512 ac01f49eafe4eb470295860060a791cb95a82c8c42c268ff998727386a31a62f2dc586b3428dd8995dbc5862babf84ccabf2a4664cf8b59085132a848c0bb7ea +DIST muffin-6.2.0.tar.gz 4522979 BLAKE2B d2cf508eeea77e22c79c65404e90beced72b9eca87542dc38abbf8a411464b4afce4d48e73cddf284a4cb86d9eca420edf95e3cb0ad7a0bc6b2c93a4bd1df257 SHA512 0711370323cd29627f312fbd2208daa5bca3be391f9454524f34447dc31f6e8dae63617af790843a2d84fd63340a6db476783b5eadb27b95fe2503f51323d193 +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/muffin-5.8.1.ebuild b/x11-wm/muffin/muffin-5.8.1.ebuild deleted file mode 100644 index 085378b182d5..000000000000 --- a/x11-wm/muffin/muffin-5.8.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2-utils meson 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 test udev" -KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" - -# 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 ) -" -RDEPEND="${COMDEPEND} - gnome-extra/zenity -" -DEPEND="${COMDEPEND} - x11-base/xorg-proto - - sysprof? ( dev-util/sysprof-common ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig -" - -# Wayland is not supported upstream. -src_configure() { - local emesonargs=( - -Dopengl=true - #opengl_libname - #gles2_libname - -Dgles2=false # wayland - -Degl=true - -Dglx=true - $(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) - -Dcore_tests=false # wayland - $(meson_use test tests) - $(meson_use sysprof profiler) - -Dinstalled_tests=false - #verbose - ) - - 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.0.1.ebuild b/x11-wm/muffin/muffin-6.2.0.ebuild index 868e40c46497..bb0ec7b73f0d 100644 --- a/x11-wm/muffin/muffin-6.0.1.ebuild +++ b/x11-wm/muffin/muffin-6.2.0.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) -inherit gnome2-utils meson python-any-r1 virtualx +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" @@ -13,8 +13,8 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0" SLOT="0" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" REQUIRED_USE="wayland? ( udev )" # Dependencies listed in meson order @@ -28,7 +28,7 @@ COMDEPEND=" >=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= + >=gnome-extra/cinnamon-desktop-6.2:0= >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage @@ -74,7 +74,10 @@ COMDEPEND=" >=dev-libs/libinput-1.7:= >=dev-libs/wayland-1.13.0 >=dev-libs/wayland-protocols-1.19 - media-libs/mesa[gbm(+),gles2] + || ( + >=media-libs/mesa-24.1.0_rc1[opengl] + <media-libs/mesa-24.1.0_rc1[gbm(+),gles2] + ) x11-base/xwayland x11-libs/libdrm @@ -154,6 +157,10 @@ src_configure() { ) fi + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/933879 + use wayland && filter-lto + meson_src_configure } diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 8ff7393bcabc..e55bc591aefa 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -5,9 +5,11 @@ DIST mutter-45.2.tar.xz 2884940 BLAKE2B c4107840b8bd0f75a9c76300f324bfff6aac3195 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 7076 BLAKE2B de0ac32c8d68f73b4d5820f6f6619b23cb1930dcecc9788e711b04db7619ce5636952175f88d10957a5bb4f5c562c47a26634982cbb21b5310533884b88b43fc SHA512 7475b18a9a6872067f44a56b3e461443ca2b5a21dcf094c31f759a0386ab812b9001bfb009825957d874be322911e86e9ec16778cf2d5dd42d027bf0a81850e7 -EBUILD mutter-45.6.ebuild 7322 BLAKE2B 3dddfccc11c61c52aeb306507db8d0a3026b41a752d4e634cb552a7bfc8ee8bd2f09f50cf0f6c25749d3fe794a38f204f3cc2dbd5e09e78dad22e8de5e3ee3de SHA512 e975761ac57511c483b8997b9d607eba8bd575892dcec7a7d0bf6080dfd3f8980fc53521ab39692cbd6c8b4416b20e05099fccc0e72114b286aa3ced6203fcc6 -EBUILD mutter-9999.ebuild 7108 BLAKE2B a91ea047d22a4a79d164d30d5a5a0d966cb652061c1a97fa17762262e6736c45949993b5805ab90d63e07bcb5ba7a50d625783d1aa1a2e5c818347bbae4c5286 SHA512 f6490a571afc2c25b9c22d38858b9a02d0167f49f789d7f20ca4724580ed38b1bbaa794722a42e7141f49e44adac31cf4b77f374dd29dc703caed0d56e61e2a0 +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 +EBUILD mutter-9999.ebuild 7001 BLAKE2B e59f591d7f9ea67368c68de0d67e7b5b286c1d3928eca87c1d7876272e3d2f17402c12446f5aed32a293d054c01b57047ca9e6cebc7a12c669591ad805021b7b SHA512 84333dbb2d47a65d0e559012d00b644ee3056b29a95098e455ac228b250b117bde7e2f20da37c9caccd29d55dd9193eb67f540d49644038b979b9ea15ee56722 MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87 diff --git a/x11-wm/mutter/mutter-45.5.ebuild b/x11-wm/mutter/mutter-45.5.ebuild index 15c1c0068cc8..4f7520c33542 100644 --- a/x11-wm/mutter/mutter-45.5.ebuild +++ b/x11-wm/mutter/mutter-45.5.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/13" # This can get easily out of date, but better than 9967 else - KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot fi diff --git a/x11-wm/mutter/mutter-45.6.ebuild b/x11-wm/mutter/mutter-45.6.ebuild index ebbdabe366e2..9df346bc0a68 100644 --- a/x11-wm/mutter/mutter-45.6.ebuild +++ b/x11-wm/mutter/mutter-45.6.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then SRC_URI="" SLOT="0/13" # This can get easily out of date, but better than 9967 else - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + 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 diff --git a/x11-wm/mutter/mutter-46.4.ebuild b/x11-wm/mutter/mutter-46.4.ebuild new file mode 100644 index 000000000000..69fca7491985 --- /dev/null +++ b/x11-wm/mutter/mutter-46.4.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) +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/14" # 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] + >=x11-libs/pixman-0.42 + >=dev-libs/fribidi-1.0.0 + >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] + >=dev-libs/glib-2.75.1:2 + gnome-base/gnome-settings-daemon + >=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.33 + >=dev-libs/wayland-1.22.0 + + >=x11-libs/libdrm-2.4.118 + 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:= ) + test? ( + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + gnome-extra/zenity + ) + 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 +" +# )" + +DEPEND="${DEPEND} + x11-base/xorg-proto + sysprof? ( >=dev-util/sysprof-common-3.38.0 ) +" +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() { + 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-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 43f515815af1..69fca7491985 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit gnome.org gnome2-utils meson python-any-r1 udev xdg DESCRIPTION="GNOME compositing window manager based on Clutter" @@ -13,7 +13,7 @@ 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 + SLOT="0/14" # 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 @@ -52,7 +52,6 @@ DEPEND=" >=media-libs/lcms-2.6:2 >=media-libs/harfbuzz-2.6.0:= >=dev-libs/libei-1.0.901 - media-libs/libdisplay-info gnome? ( gnome-base/gnome-desktop:4= ) @@ -62,9 +61,9 @@ DEPEND=" wayland? ( >=dev-libs/wayland-protocols-1.33 - >=dev-libs/wayland-1.22 + >=dev-libs/wayland-1.22.0 - >=x11-libs/libdrm-2.4.95 + >=x11-libs/libdrm-2.4.118 media-libs/mesa[gbm(+)] >=dev-libs/libinput-1.19.0:= @@ -82,6 +81,10 @@ DEPEND=" >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.33:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) + test? ( + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + gnome-extra/zenity + ) 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. @@ -107,16 +110,9 @@ DEPEND+=" " # )" -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 @@ -151,7 +147,6 @@ python_check_deps() { src_configure() { use debug && EMESON_BUILDTYPE=debug - local emesonargs=( # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass # @@ -195,7 +190,6 @@ src_configure() { -Dtty_tests=false $(meson_use sysprof profiler) -Dinstalled_tests=false - -Dlibdisplay_info=enabled #verbose # Let upstream choose default for verbose mode #xwayland_path diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest index d120ea1d0192..6073b52329e3 100644 --- a/x11-wm/openbox/Manifest +++ b/x11-wm/openbox/Manifest @@ -4,7 +4,6 @@ AUX openbox-3.6.1-glib-2.76.patch 2227 BLAKE2B 5f7605d81d00e1222945467a688927a9f AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e -EBUILD openbox-3.6.1-r5.ebuild 2903 BLAKE2B 75ad51841c606570d9caa705aec928ed012456447f424249dfa71041925160846099f7c625a7cedbd132a1e86a99e8460a73ed36ac3b1a144021abc8f1208c1c SHA512 7f2ead2acc3777644f74786a4f95c7e1b35105485e6b0e3ff996730d916c9924c019e7ea8fabd4918d54fb03134841d64a5e814bd1e8b7937ef81c0506562e31 -EBUILD openbox-3.6.1-r8.ebuild 2860 BLAKE2B 64de05b63836238d89b35abc1a17c970ad98d6b50e335e168685ee09c28bb75b14d50e86c0b90ea12edb1864e97dfb3e36b720fe08335ed8fea178db41176f48 SHA512 48859b5b3967c59a0a32532f2b014eb330a3fd812644d5b630f9cc9a8c25520ee14c7cb61b529d0a6438b17cd66795ab0e0a23c69417c137d2e9c8e34e14996b -EBUILD openbox-9999.ebuild 2867 BLAKE2B 751d994dfafc391e26562663002bb86d64a2cddbaec90947099babde027967a81460225ad68b9dc93c25660989926771f25d63e14447ec2d21e385838d3e5e25 SHA512 d4939834921e2e850f5bdab99e9b443a05839801c803023e6be2c481c5bccb40a8d6640fca5c1f270d74971b2ff332bcf5bbeaa09b5a27f4b0ca8195778effa6 +EBUILD openbox-3.6.1-r9.ebuild 2860 BLAKE2B 9deb5bb785ee72a72f90d16114b231ef92b3ca503abbfd9456c4ec76e84a6f079ae084235e241a50a012a3633a2caf14acd36e823fae43587833786566321c84 SHA512 be6a2cf868b7e5ce864d97e4988bb1825153ce3338df745551abafbb655f97ab89de24626d71662c7c58240571ba39624519b6f13a5604b3d51a9326aff24e1b +EBUILD openbox-9999.ebuild 2867 BLAKE2B 7e5bc7d3fa89336dc8856765373248add99034f472bea52425f1087db317443c5d4b1b6b83adb764eac2bbbe050d7b4305a04954faab5cfb81e8da46df47b12d SHA512 08d6cca668b631c8de5a31e0611288dd2135ce35a66c3239f6f51691b42a803fa374c13586780f0c10e007f4640518155bfae7190f7e43ee3c772953e9384cd9 MISC metadata.xml 705 BLAKE2B 0df8e542b8837fb94e5f6fd289b0d5172c1d4d01bc88c550b6afd5307619a0dfdf5de2c2ba8838d63f8a8c29a378e6545a8932c77d6f0bef7cc898a4fd400206 SHA512 acf171ad8ccc7d07b533e4f5aef895b485050fa8fa39d8a6db798a15d9c5924d4f825573b77ddd8b755b8c0b34e8c3ab49cd0f56592854ae36462c3de448f4dc diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild b/x11-wm/openbox/openbox-3.6.1-r5.ebuild deleted file mode 100644 index 2805aebf7192..000000000000 --- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11}) -inherit autotools python-single-r1 - -DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager" -HOMEPAGE="http://openbox.org/wiki/Main_Page" - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/Mikachu/openbox.git" -else - SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~x86-linux" -fi - -SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" - -LICENSE="GPL-2" -SLOT="3" -IUSE="branding debug imlib nls session startup-notification svg xdg" -REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - >=dev-libs/libxml2-2.0 - >=media-libs/fontconfig-2 - x11-libs/cairo - x11-libs/libXau - x11-libs/libXcursor - x11-libs/libXext - x11-libs/libXft - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXt - >=x11-libs/pango-1.8[X] - imlib? ( media-libs/imlib2 ) - startup-notification? ( >=x11-libs/startup-notification-0.8 ) - svg? ( gnome-base/librsvg:2 ) - xdg? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pyxdg[${PYTHON_USEDEP}] - ') - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" - -PATCHES=( - "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" - # see https://github.com/danakj/openbox/pull/35 - "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch" - # https://bugs.gentoo.org/827227 - "${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch" - # https://bugs.gentoo.org/901777 - "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch" -) - -pkg_setup() { - use xdg && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-r3_src_unpack - fi - - default -} - -src_prepare() { - default - sed -i \ - -e "s:-O0 -ggdb ::" \ - -e 's/-fno-strict-aliasing//' \ - m4/openbox.m4 || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-static - --with-x - $(use_enable debug) - $(use_enable imlib imlib2) - $(use_enable nls) - $(use_enable session session-management) - $(use_enable startup-notification) - $(use_enable svg librsvg) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - dodir /etc/X11/Sessions - echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}" - fperms a+x /etc/X11/Sessions/${PN} - emake DESTDIR="${D}" install - if use branding; then - insinto /usr/share/themes - doins -r "${WORKDIR}"/Surreal_Gentoo - # make it the default theme - sed -i \ - -e "/<theme>/{n; s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \ - "${D}"/etc/xdg/openbox/rc.xml \ - || die "failed to set Surreal Gentoo as the default theme" - fi - find "${ED}" -name '*.la' -delete || die - if use xdg ; then - python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart - else - rm "${ED}"/usr/libexec/openbox-xdg-autostart || die - fi -} diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild b/x11-wm/openbox/openbox-3.6.1-r9.ebuild index 96e08a0e031c..fd6294555071 100644 --- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild +++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11}) +PYTHON_COMPAT=( python3_{9..12}) inherit autotools python-single-r1 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager" diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild index ee0aaca94942..aba60e39ae11 100644 --- a/x11-wm/openbox/openbox-9999.ebuild +++ b/x11-wm/openbox/openbox-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11}) +PYTHON_COMPAT=( python3_{9..12}) inherit autotools python-single-r1 DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager" diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest index b60179e17f47..c1b5603626c4 100644 --- a/x11-wm/qtile/Manifest +++ b/x11-wm/qtile/Manifest @@ -1,7 +1,4 @@ -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 -EBUILD qtile-0.23.0-r1.ebuild 2528 BLAKE2B f9ce358fc66266d64df063c0ec40cb1041355a21174a79b3276c9a12fee46cf9f49220cbb0aad288fac824c2d3f6c89e374b85847534de093169e3c277fd02bd SHA512 8a37e0dafd9c02da3994dde2dd148ba27851af8c2494801cdd68d3f1a3f283f5b47407d9ca5a0f8feb60d13bf8fd7bcd5133d8261c85342d068cd6108f1ff41d -EBUILD qtile-0.25.0.ebuild 2519 BLAKE2B 41b5a877fcdb39dc2990d5dd444e4e751c6316db038450f7f312d42f4c9f106fb2c80adf634856336e33630ad0974913caad095a4eebbfce3f8d0cd7ae9d6b40 SHA512 e4648a579f66c63c94f52ef7c50965e03e51dd7531c72ce1525556222174254e98c34bfa17aa84c53603cb399e0a522540f4fc6414464a62a3b63956919f71b1 +DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e +EBUILD qtile-0.28.1.ebuild 2625 BLAKE2B 2596ce6aaa668bed772fdd6f2a167245d2fca90b83dd575c57e5e2d88479d1f92702d9ced69497ee01646d0f2dd6a10560c25da64533feb3288319ce052fb028 SHA512 b8d76065f9aa7aadda26bcc45a27a8ed8a61208311c530f339d56343037661253f9f996897c89b2a02a0ef411287a25564c34eb9607c04318998a3a523686d0f 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.28.1.ebuild index 3fe2733dd15e..d54d02a7d1a4 100644 --- a/x11-wm/qtile/qtile-0.25.0.ebuild +++ b/x11-wm/qtile/qtile-0.28.1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~riscv" IUSE="pulseaudio wayland" RDEPEND=" @@ -35,7 +35,8 @@ RDEPEND=" media-sound/pulseaudio ) wayland? ( - >=dev-python/pywlroots-0.16[${PYTHON_USEDEP}] + >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] + >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] ) " BDEPEND=" @@ -48,7 +49,8 @@ BDEPEND=" x11-base/xorg-server[xephyr,xvfb] ) wayland? ( - >=dev-python/pywlroots-0.16[${PYTHON_USEDEP}] + >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] + >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] ) " diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest index df633011531e..3f5ecf544287 100644 --- a/x11-wm/spectrwm/Manifest +++ b/x11-wm/spectrwm/Manifest @@ -1,4 +1,7 @@ AUX spectrwm-3.5.0-fix-cflags-ldflags.patch 1149 BLAKE2B bedac9647ffca75f79d6ddfc66b13b3f6ddf0545df669cf79c8e1f5f18a2b3f9e5ac90abf69652c2954b3433e5071c6e627305bd8f06fa56bf2d99c315419d51 SHA512 915210bc84a4f563c6ddc5b05b3cf1dc5758d9060b2fb132dc25c41f08723b2e06c8baf443e23c27ced36ffbdf6e6ed28b7ffb5d83ce615e4ad2df33c633bbe2 +AUX spectrwm-3.6.0-fix-cflags-ldflags.patch 1177 BLAKE2B 4ce9f4d94734e64c6bc92d4cc6c59a55cb048072000943f70d158df46f323cc20bf8dd73c5e9919f90ba1558c7ce04b83e60b9358d33e89cfe47698a5d67c65b SHA512 88a2d148f349e349abe6357c9a01e8ce1c06b0e5133377f0c599cd1bf166acc41eb494660e53137f060cdf4f33889128abcb80890838fb62637c4b583f444bd4 DIST spectrwm-3.5.1.tar.gz 196431 BLAKE2B 4de0240353dd0b0066e68148b02aed68b037fda5b5d5fa2a979621ba6b3f029d3c341768929cd8cc7d7aebd1e44594bfb31617078cf83c0179c395a7212d50eb SHA512 9a5b9bee6debd395b6b5f706d12dbb80a848e4f5f02405a54cf9a47b2bcceb407bf14fce64a9cc4ff9205ed7e688adeefb0280289b73a0cf9927b44cfaec02fa -EBUILD spectrwm-3.5.1.ebuild 1228 BLAKE2B 0d4e6ccd72a37c285f27008170c4713ea01634311f14f604ba75efed502489bba18f50c3094d32bc4c34755410bb0a411746819eafa94af72ffda781a3cbf85f SHA512 ad558d5dea1dc1842584815a7e9eb0864b66ef5f740057d905fb5bc79a3007537845b96aff03ab89cfc8f104995b3e9251db6dc2c1a75b6e9930bc4459b64b07 +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 1261 BLAKE2B ec39941cd9f723985ee0d390452b7cbdaa9795f59357fb767d77a5f8c10c048474473fa8f6b1b2213a380d041b396b9d656039d5229fe31be669b9453cbe19ad SHA512 ace71dd6c051523fffc3d5d9e4f59c8921d338c00fcbedbf6aa17d1f6ceda8e1148acb4ae7ea0e3e22095760c63a94258a9b9cb6375ac18b6b9008c38afd243d MISC metadata.xml 328 BLAKE2B 4f82bd35cf47d6791ea543bec20f7e510abba33f9de8bc8e0fe8176b0d3e908c30581a6083e90e6f0a2947ad3ffb6ff93d0e11030e68b8056451a017debfb377 SHA512 97e6057c3043db295d56ffd208c189cb5b575cf48f1cc9b78475f8055e59801fa8f7c8c1b8c9c090beb85e00365438c33831c87d9499e95495ee6287ecf7e4c4 diff --git a/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch b/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch new file mode 100644 index 000000000000..53f05c4199bc --- /dev/null +++ b/x11-wm/spectrwm/files/spectrwm-3.6.0-fix-cflags-ldflags.patch @@ -0,0 +1,24 @@ +diff '--color=auto' -ur a/linux/Makefile b/linux/Makefile +--- a/linux/Makefile 2024-07-10 06:19:42.000000000 -0500 ++++ b/linux/Makefile 2024-07-17 08:16:22.559326147 -0500 +@@ -12,16 +12,16 @@ + LIBVERSION := $(shell . $(CURDIR)/../lib/shlib_version; echo $$major.$$minor) + LIBMAJORVERSION := $(shell . $(CURDIR)/../lib/shlib_version; echo $$major) + +-MAINT_CFLAGS := -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -g +-MAINT_LDFLAGS := -Wl,--as-needed ++MAINT_CFLAGS := -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow ++MAINT_LDFLAGS := + MAINT_CPPFLAGS := -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\" + + ifneq ("${BUILDVERSION}", "") + MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" + endif + +-BIN_CFLAGS := -fPIE +-BIN_LDFLAGS := -fPIE -pie ++BIN_CFLAGS := ++BIN_LDFLAGS := + BIN_CPPFLAGS := $(shell $(PKG_CONFIG) --cflags libbsd-overlay x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor fontconfig xft) + BIN_LDLIBS := $(shell $(PKG_CONFIG) --libs libbsd-overlay x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor fontconfig xft) + LIB_CFLAGS := -fPIC diff --git a/x11-wm/spectrwm/spectrwm-3.5.1.ebuild b/x11-wm/spectrwm/spectrwm-3.5.1.ebuild index 8e29591ba462..9bc5bf3223c5 100644 --- a/x11-wm/spectrwm/spectrwm-3.5.1.ebuild +++ b/x11-wm/spectrwm/spectrwm-3.5.1.ebuild @@ -20,6 +20,7 @@ DEPEND=" x11-libs/libXcursor x11-libs/libXft x11-libs/libXrandr + x11-libs/libXt x11-libs/xcb-util x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm diff --git a/x11-wm/spectrwm/spectrwm-3.6.0.ebuild b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild new file mode 100644 index 000000000000..a66b2bf7cdc2 --- /dev/null +++ b/x11-wm/spectrwm/spectrwm-3.6.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit toolchain-funcs + +DESCRIPTION="Small dynamic tiling window manager for X11" +HOMEPAGE="https://github.com/conformal/spectrwm" +SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + elibc_musl? ( sys-libs/queue-standalone ) + dev-libs/libbsd + x11-libs/libxcb + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXft + x11-libs/libXrandr + x11-libs/libXt + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm +" +RDEPEND=" + ${DEPEND} + x11-misc/dmenu +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/spectrwm-3.6.0-fix-cflags-ldflags.patch +) + +src_prepare() { + sed -i -e '/LICENSE.md/d' linux/Makefile || die + default +} + +src_compile() { + tc-export CC PKG_CONFIG + emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" +} + +src_install() { + emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \ + DESTDIR="${D}" install + + dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh +} diff --git a/x11-wm/stumpwm-contrib/Manifest b/x11-wm/stumpwm-contrib/Manifest index a91943cde0e2..b4c8b7c41bcd 100644 --- a/x11-wm/stumpwm-contrib/Manifest +++ b/x11-wm/stumpwm-contrib/Manifest @@ -1,3 +1,3 @@ DIST stumpwm-contrib-20180128.tar.bz2 575171 BLAKE2B 57f5cab26ecfd0721ae3c167ad09922920b171fc95250eb6e98936033623837d50d70179a2262093b4db978477da3ae0bc5e920ac0cfc1e291f60ef6b7c0c260 SHA512 76bc7bf0b5a752264f3719d38773362cf134edb8ce128d2213a0d636485d12ae86b52d111d07688ce0b2a97e1e4282b391491a738e77946d225ddc22c84e8156 -EBUILD stumpwm-contrib-20180128.ebuild 710 BLAKE2B 641abe779f09f27824fe13f509c4829b874155ad52bd1002447b038148feaad9b5973c800f41ce4ac7c1b3a1eea22fd24f8fd3e1622309bea63c64b966bb28c6 SHA512 7799e013eec065456ab40c9c4689d66d6baccbfe19468ef29f2336b3c295d4792d5272beec9ba3f443ab30a690a8d8b3fdad2d23e4c28d9edb1d0edb034f6b5e +EBUILD stumpwm-contrib-20180128-r1.ebuild 705 BLAKE2B afd8953bdde55dbc37f27eccf920573203680e48ba7e99ceea7f91c43bb5fb035a8ca9bda0a7545834aea0db0f61028e21229e92fe49e408fc0f5aebb95e2015 SHA512 b584a4fe1a69e1574e6883d4bae25eedb9ab721503a5c7efcb0b22a2e4292c176b7db7b8d616fcaa1fd7a6d005b89b2943bbcc10bb4a2094e066c2a1957644d0 MISC metadata.xml 256 BLAKE2B 5c5d443b476338ddb29a04d85b6fbd0638098ca2661b3851140cc0da7ec234d28d996cb2f8333307b1992b20ad3a0d100ed8bee13132399d614336d64af3cd5b SHA512 fc6331e5344eb96c1ef8bee63401af3600b95c2a3d0ed36d922f9da23afefb97dfb146fceb491e1e62b6bf5d4875d3d098cbb9d8eb5fb366bd071f96846e59e7 diff --git a/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild b/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128-r1.ebuild index 3277f2bf98cf..e8182170ab0b 100644 --- a/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128.ebuild +++ b/x11-wm/stumpwm-contrib/stumpwm-contrib-20180128-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit common-lisp-3 @@ -12,13 +12,12 @@ if [[ ${PV} == 9999* ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/stumpwm/stumpwm-contrib/" else - SRC_URI="mirror://gentoo/${P}.tar.bz2" + SRC_URI="mirror://gentoo/f8/${P}.tar.bz2" KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-2 GPL-3 BSD-2" SLOT="0" -IUSE="" RDEPEND=">=x11-wm/stumpwm-1.0.0" diff --git a/x11-wm/stumpwm/Manifest b/x11-wm/stumpwm/Manifest index d3860146bc63..6eac0f21e144 100644 --- a/x11-wm/stumpwm/Manifest +++ b/x11-wm/stumpwm/Manifest @@ -1,5 +1,5 @@ AUX 70stumpwm-gentoo.el 84 BLAKE2B 12ce0e9a1b53a1c1c84a9f350484b9620a2db9a30eaefb11bb409b89aae7f1226173930c52d018ec8a845c8e6ff69efd5570a369444537d070d21427a6960c09 SHA512 2e67f51dd6840f850aa1c0e3f2e8c2453203603f174f3ce97feacd2658cf6168bf557eb6ee83499b8c60fb107fdd527caccdda7ab5692646a33f96ad1350bcd1 AUX README.Gentoo 1894 BLAKE2B 23dd829621f92b2e5ab22bd3d54d9338d1034bd55d4adcfde24f6c0a780e41dddd747ee2baecdfd9b03a54de7e4acf08d903205dcdc68851afea5317401681aa SHA512 c187fcc12bbb4c10718e708a4b17a9adc89f1268270f231e8b5feeea881149482d8b70ac0f5eb78b7e0b93700d6cd5133bf7d844f97736bee793405de9a25a09 DIST stumpwm-740e945d742d85aef36e0ed9467de9bbbf5eafd2.tar.gz 273172 BLAKE2B 00756081aed915af18af4534414659e29856bc1a98df2cd35b48bb5bf4f06fe2dc76c4016cbc39e296ff19d51b3e959ef84dbc57972da0a634bc6cb3ca0b881e SHA512 313f430da8ecb7919940b37f2353969c8bf3a3be6a1d380e1655a7a6aebb83a3890cbd99a292a414f71f934adcae1350c24650fe5d5d35cf30788ff392feaac0 -EBUILD stumpwm-22.05_p20220818.ebuild 1740 BLAKE2B 5f47a5f705dc8fa9f617d74059f0fdaf5a3f48461a8507a65ea5af529561b3435e830ea8be3fb6703865e1425786bcf9ad3dd3da28b65f6ed088e81b2e244a3b SHA512 9515ea217df0e9ee04f790fa275ffe25cec7e4a6156b2e2dba80e533bd3a56681a7bbbb281dac868bd15b5c1754baf2568b8f4801b07275781ccd646181fe543 +EBUILD stumpwm-22.05_p20220818.ebuild 1900 BLAKE2B 4c8cb1a49e54b4720ba086097618454329212d9c595cfb043d132cbee35d3b2397759979f6dd65461434180a0ab7039e6d3163ec00002f783198a2fc45c3f029 SHA512 cea2c993e3721bd2f31c1bf83663082812abbf5341207707d3c752b064634d136490788efbcfd67e3df5a807c8001bf85bd76b845db2d74882ea5e7b09923534 MISC metadata.xml 2165 BLAKE2B 11cb1d12cc85d157776d6f67019adb7174653ae39f5dd1411f944c9f17ea6efc084803041ee9a994ac4f3c3fc8ca07f130f4fcb83cd947fdfbcc5e5f8d6eb977 SHA512 46757ef2bc9375990b304cef5591f39d8d72b465f8f55766a5f9707afe4db0876eba58be10e15f21cfb5a1860164a671b9a762ab40235743c96d7a8d7ba42cee diff --git a/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild b/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild index ec421ca8a134..17d1ace013a9 100644 --- a/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild +++ b/x11-wm/stumpwm/stumpwm-22.05_p20220818.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,15 +10,15 @@ MY_COMMIT="740e945d742d85aef36e0ed9467de9bbbf5eafd2" DESCRIPTION="A Window Manager written entirely in Common Lisp" HOMEPAGE="https://stumpwm.github.io/" SRC_URI="https://github.com/stumpwm/stumpwm/archive/${MY_COMMIT}.tar.gz -> ${PN}-${MY_COMMIT}.tar.gz" +S="${WORKDIR}/${PN}-${MY_COMMIT}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc emacs" -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -RESTRICT="strip" +# Test restriction because of missing "fiasco" tool which is not yet packaged +RESTRICT="strip test" RDEPEND="dev-lisp/alexandria dev-lisp/cl-ppcre @@ -27,13 +27,17 @@ RDEPEND="dev-lisp/alexandria emacs? ( >=app-editors/emacs-23.1:* )" DEPEND="${RDEPEND}" BDEPEND="sys-apps/texinfo - doc? ( virtual/texi2dvi )" + doc? ( + virtual/texi2dvi + dev-texlive/texlive-fontsrecommended + )" SITEFILE=70${PN}-gentoo.el CLPKGDIR="${CLSOURCEROOT}/${CLPACKAGE}" install_docs() { local pdffile="${PN}.pdf" + export VARTEXFONTS="${T}/fonts" texi2pdf -o "${pdffile}" "${PN}.texi.in" && dodoc "${pdffile}" || die cp "${FILESDIR}/README.Gentoo" . && sed -i "s:@VERSION@:${PV}:" README.Gentoo || die 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 17ba9c4ac8c5..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 568 BLAKE2B 5ec681257bda1fb9b0edaac06f41fa11cad6f91baa362c7476fef16b966a2bba00e8eeae327fa38dee288a59aec6d2737f2930c7b360caad17f40aa292756858 SHA512 90e66923fb95dca08ef6a66e8992c0dab75911c423ceffaa714db37af3a931c83c75ec0583125033630f30ea8320c78ea386bcb320a0c6257c02aa57d45de802 +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 f891b052eeaa..13559271b10f 100644 --- a/x11-wm/twm/twm-1.0.12.ebuild +++ b/x11-wm/twm/twm-1.0.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,8 +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" -IUSE="" +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/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index eed9ced27957..72cb844368ef 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -4,6 +4,6 @@ DIST WindowMaker-0.95.9.tar.gz 3397167 BLAKE2B ec751fe0139b359933f4388f8dac3f2bf DIST WindowMaker-0.96.0.tar.gz 3443048 BLAKE2B 75fd73cfcf7a57f68120bdc1ac50781bb460da54641b5f42e369008b9066b9183cb7ef60f436627edf8c241ea24ca5c44ef894c1ff0cae64f3a5b2d24df8db93 SHA512 cca1796722803922aa28ea20534f10566b594b7a69eba8c1da6bd1305654583f39ef67f10fd6a550730714e728d876f807aee50968e9392190bb9dc7ffe8409a DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 EBUILD windowmaker-0.95.9-r4.ebuild 3185 BLAKE2B a3d347ab62825cfe5acff5b3681663f5f738e942d9bc521715f2f450ad314f8dd31e5120d5b1e37fcc9f2144712b3e0226a83817445376aeafe1a36cc1b7a40d SHA512 5b54c83d1f94ecd5155650780db37f2cb1b98a2122ffa81cb5c0f83cacf334f4cbb612c1f6c6b77a89649b51064e63cfe16ca5b122d8c46a47d8fea2a9f16031 -EBUILD windowmaker-0.96.0.ebuild 3127 BLAKE2B 6e4b1fe9a805025f515e684344cbff8fc8d135c281f548cf632b6563218a73baa7aaa8a306d6339f58c30e5d6443a44238286621f146b59e8f2db7a39ae29c6e SHA512 2e56735004fb877e73eb59d64d51c3cccfa31497fc7d26aa07efdc814dcda5bfd7c63bce0aea723f37a0a81c3945fd3978fb2f10d5e8a0ff337ab4d6ca13d25a +EBUILD windowmaker-0.96.0.ebuild 3121 BLAKE2B b8f69c511ba37164c87957e42eaa425cdf818f76ddc471accb2c483458a2fcd88e40610a53655a3fefc845f59349253d5ef6133359991e25cfa277c8004bba6e SHA512 b54010c8a2c32f27118c75f3e997a21825c029c13e44e88904125a44a86886f3ced4c2e0f7abce95c10c0ef0c21f57e79261309839a427d17c0b372c6df050d8 EBUILD windowmaker-9999.ebuild 3039 BLAKE2B 871968913c724ddd9e58de6aa2a6c1f1df11915dd6a8501b7c8ba13d2b945105618600f0ad8a0aec40cf95a603a27357792fe4d5added8964b9540439c16ccfb SHA512 59231772170cb9cd34049199ca083d90ffbf108b80ab0fdce5468bb9235cc4edeed924a57592d2b3a08c996a055560044befaee33fd04732dce83e676e51383d MISC metadata.xml 575 BLAKE2B da6b670bef941ab36136768fafdf4dbbe1260ecd77e7879e0573c34ada0267f89fd6d2a321652638d8a724fc92d41d572100e1b68519ff623ffde5263c7179ba SHA512 9d8d3aff1bff83276f0dc0cb6439d4fcc53f00ff0c0b265aff75fee9238b5061738960b30aef0091b86699e53dc98996a9f86c713e144e6fc4db2909b3490a18 diff --git a/x11-wm/windowmaker/windowmaker-0.96.0.ebuild b/x11-wm/windowmaker/windowmaker-0.96.0.ebuild index 4ad6521dda07..da7ffca4c564 100644 --- a/x11-wm/windowmaker/windowmaker-0.96.0.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.96.0.ebuild @@ -13,7 +13,7 @@ https://github.com/window-maker/wmaker/releases/download/wmaker-${PV}/${P/window SLOT="0" LICENSE="GPL-2" IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 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 ed8bf2b3fe3a..dc8fbc81d6c1 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -1,9 +1,10 @@ AUX xpra-4.4-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a AUX xpra-4.4.6_minimal-features.patch 766 BLAKE2B a27634a600d6431a2812a61bff854e0d5dd5d296f0011c22e511cb438c899df096e3210972fa19ea3d47b3429873741075fd9a4bb6daeb1dece60527c60d156e SHA512 6d6f2c9718b12176b272582b3ab6b80f9dfe9c52e975925d24e529be1694aafc3bc340bd0afea164d169bb008c527bacffb36ada3ab59ebd8dab7df2763afcde -AUX xpra-9999-xdummy.patch 489 BLAKE2B 284d109be06fc68dc6567adab1c8e514a69a316e82041175dac530eb190ed2d42b9572ca8cd722dae1295b9c84f35ec750953a80dc0064d835de0d3cc0bf8447 SHA512 98daab5c16755564af06bf139e3b57e2f88dd2ce3503eb75d79f066f8ed3efab4c668e9dc00988267b3ca0f876a607df332a9fcfe7f00c1d54a0d84c01159c17 -DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a SHA512 6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f +AUX xpra-9999-pep517.patch 282 BLAKE2B 5e94bc5c882ae768bc1e8f89e2077b551b2841801448cba3883e63954bb2cefcf21c8a631623590039670eac32c2d717ff38f60efa96200421684151b96e72d2 SHA512 62a4ca3e26141417dc928b1d06e852a7118143555af43ca3af05087f01bb1a6ca319835dd6c2dc6ac339f7f8742a004b4fe9e041903c6bd55d1259d388413605 DIST xpra-4.4.6.tar.gz 4334932 BLAKE2B 0518c6807be85777bb67b0a3283a610c06a97813671bff6edc701533aaa8f26b96e423e56ba56491ede120697277f6935ee26976b49550dfd2d52bbcd2daebd8 SHA512 273ee959647c1281f18c7b1b24d3a5179c4b6ce81515cc34618c698e55bdc2a8e94f0e236d7ab41c7bf29fa7fde0b1a2a1432445b8aaaa0a75cd5a90f4858419 -EBUILD xpra-4.4.5-r2.ebuild 5457 BLAKE2B d2896d731465a657e0ff214b8c2f91173398956a430ddd5a5dc80bc00b3767e93adb406441d9320ef6ae5d39ca6ae363deac3660e4ebf5ba90b91e50e3ecbf61 SHA512 80e0960496bed8217eedae760d8aa561be4e650b67eee4672d4c3cf9558c52716ff7f280837e15fca59048573b8c6b3a845d46b48ec8689344002900826174a3 -EBUILD xpra-4.4.6-r2.ebuild 5791 BLAKE2B ca4a800fb7caad3be0135a685f94f55e617ff807a3f2103ca1b00454c3d06943976a09c7d1a4f092073916ec50a7636856321cd9a4c974402309371f942d3e89 SHA512 78280d7eb95fac1512d99cbdfaf6ff784b625917ad403320fb722a8ecd2f88d165090f3ff1ea525547f39deb100ad2d7e8d40df98dc329443d2c77c3fc8af861 -EBUILD xpra-9999.ebuild 5722 BLAKE2B ae1931be06a8218ffc7609931b1fc70d78c1d8d5e485120e5a2b65c5ba55d9aacdee146c4667269db6eb6d351d7f4563916b1f1c075032b6ca77af23a32575bf SHA512 0bbb2ec31c5d2294aac44b4766a83098b0c54b343ddf3afa46f092fe009a90d5bf561f8300048ce400f809c71c0a0c229bf805f58697ce805e432008f99f66bd -MISC metadata.xml 1356 BLAKE2B a07cdad84d1f185bc0d446426508c6f3468157dbdcffa53508c00cf35846b97681270719d77876380b39a048dbdb769b4954aa91abc8f7aa913aa785bd36d3b5 SHA512 ed737d072b0f5481e936d6a6ddc87c789f77d28a4ebcf7c4eb4ed33d84ca0fe22dfdacf0c65e01ea57c38993394ee79ac026e9a4dccc269ff95c03efa020ef36 +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 +MISC metadata.xml 1568 BLAKE2B c794d61c51c7b638bdd8338ea7209eb6a3dd4c03ff0051250828860b082dd2e3f1710621e19213c07f173279b298fb6c30c8bafeb3b6d5d75fe8029312a64239 SHA512 dc8996bbc124dd2e2e6b627ed432c387d611c80d92e0ca148c110e2c2c61bc530db6b0039266c6aaca2625d7a483abb83143e795c49df483d6fabd5a6d95c42e diff --git a/x11-wm/xpra/files/xpra-9999-pep517.patch b/x11-wm/xpra/files/xpra-9999-pep517.patch new file mode 100644 index 000000000000..48e355913b27 --- /dev/null +++ b/x11-wm/xpra/files/xpra-9999-pep517.patch @@ -0,0 +1,12 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 501829c18..842a2b962 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,7 @@ + [build-system] + requires = ["setuptools", "cython"] + build-backend = "setuptools.build_meta" ++backend-path = [ "" ] + + [project] + name = "xpra" diff --git a/x11-wm/xpra/files/xpra-9999-xdummy.patch b/x11-wm/xpra/files/xpra-9999-xdummy.patch deleted file mode 100644 index b86f0dda45fe..000000000000 --- a/x11-wm/xpra/files/xpra-9999-xdummy.patch +++ /dev/null @@ -1,14 +0,0 @@ -Avoid Xdummy version detection, assume 0.4.1. - -diff --git a/setup.py b/setup.py -index 529b591b1..b9431fea8 100755 ---- a/setup.py -+++ b/setup.py -@@ -793,6 +793,7 @@ def vernum(s): - return tuple(int(v) for v in s.split("-", 1)[0].split(".")) - - def get_dummy_driver_version(): -+ return "0.4.1" - #try various rpm names: - for rpm_name in ("xorg-x11-drv-dummy", "xf86-video-dummy"): - r, out, err = get_status_output(["rpm", "-q", "--queryformat", "%{VERSION}", rpm_name]) diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml index 2f4961963d03..c37f8a3fe432 100644 --- a/x11-wm/xpra/metadata.xml +++ b/x11-wm/xpra/metadata.xml @@ -9,10 +9,6 @@ <email>alexxy@gentoo.org</email> <name>Alexey Shvetsov</name> </maintainer> -<maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> -</maintainer> <upstream> <remote-id type="pypi">xpra</remote-id> <remote-id type="github">Xpra-org/xpra</remote-id> @@ -23,9 +19,13 @@ <flag name="clipboard">Enable clipboard support</flag> <flag name="csc">Enable csc softscaler support</flag> <flag name="html">Install the HTML5 client</flag> + <flag name="gtk3">Enable the GTK3 client</flag> <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> + <flag name="mdns">Enable Multicast DNS via <pkg>dev-libs/mdns</pkg></flag> <flag name="oauth">Enable OAuth2 authentication in the server</flag> + <flag name="openh264">Enable H.264 support using <pkg>media-libs/openh264</pkg></flag> <flag name="pinentry">Use <pkg>app-crypt/pinentry</pkg> for password entry</flag> + <flag name="qrcode">Enable generating QRCodes for server URL via <pkg>media-gfx/qrencode</pkg></flag> <flag name="trayicon">Enable system tray icon</flag> <flag name="server">Build server-side code</flag> <flag name="vpx">Enable vpx image format support</flag> diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild deleted file mode 100644 index 64f6dfde2400..000000000000 --- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" - inherit git-r3 -else - inherit pypi - KEYWORDS="amd64 x86" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_SETUPTOOLS=no -DISTUTILS_EXT=1 - -inherit xdg xdg-utils distutils-r1 tmpfiles udev - -DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" -HOMEPAGE="https://xpra.org/" -LICENSE="GPL-2 BSD" -SLOT="0" -IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client server ) - cups? ( dbus ) - oauth? ( server ) - opengl? ( client ) - test? ( client clipboard crypt dbus html server sound xdg xinerama ) -" - -TEST_DEPEND=" - $(python_gen_cond_dep ' - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) - ') - html? ( www-apps/xpra-html5 ) - server? ( - x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) - xinerama? ( x11-libs/libfakeXinerama ) -" -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) - ') - x11-libs/gtk+:3[introspection] - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXres - x11-libs/libXtst - x11-libs/libxkbfile - brotli? ( app-arch/brotli ) - csc? ( >=media-video/ffmpeg-1.2.2:0= ) - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) - jpeg? ( media-libs/libjpeg-turbo ) - pulseaudio? ( - media-libs/libpulse - media-plugins/gst-plugins-pulse:1.0 - ) - sound? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - vpx? ( media-libs/libvpx media-video/ffmpeg ) - webp? ( media-libs/libwebp ) -" -RDEPEND=" - ${DEPEND} - ${TEST_DEPEND} - $(python_gen_cond_dep ' - crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) - cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) - 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}] ) - webcam? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - media-libs/opencv[${PYTHON_USEDEP},python] - ) - ') - acct-group/xpra - virtual/ssh - x11-apps/xauth - x11-apps/xmodmap - ibus? ( app-i18n/ibus ) - pinentry? ( app-crypt/pinentry ) - trayicon? ( dev-libs/libayatana-appindicator ) - udev? ( virtual/udev ) -" -DEPEND+=" - test? ( ${TEST_DEPEND} ) -" -BDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cython-0.16[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - doc? ( virtual/pandoc ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4-xdummy.patch -) - -python_prepare_all() { - distutils-r1_python_prepare_all - - # FIXME: There are hardcoded paths all over the place but the following - # double-prefixes some files under /etc. Looks tricky to fix. :( - #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \)) - - sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ - -i setup.py || die - - if use minimal; then - sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ - -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ - -i setup.py || die - fi -} - -python_configure_all() { - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ - -i setup.py || die - - DISTUTILS_ARGS=( - --without-PIC - --without-Xdummy - $(use_with client) - $(use_with clipboard) - $(use_with csc csc_swscale) - --without-csc_libyuv - --without-cuda_rebuild - --without-cuda_kernels - $(use_with cups printing) - --without-debug - $(use_with dbus) - $(use_with doc docs) - $(use_with ffmpeg dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) - $(use_with ffmpeg enc_x264) - --without-enc_x265 - --with-gtk3 - $(use_with jpeg jpeg_encoder) - $(use_with jpeg jpeg_decoder) - --without-mdns - --without-sd_listen - --without-service - $(use_with opengl) - $(use_with server shadow) - $(use_with server) - $(use_with sound) - --without-strict - $(use_with vpx) - --with-warn - $(use_with webcam) - $(use_with webp) - --with-x11 - ) - - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" -} - -python_test() { - export XAUTHORITY=${HOME}/.Xauthority - touch "${XAUTHORITY}" || die - - distutils_install_for_testing - xdg_environment_reset - - env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ - PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ - XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ - "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die -} - -python_install_all() { - distutils-r1_python_prepare_all - - # Move udev dir to the right place if necessary. - if use udev; then - local dir=$(get_udevdir) - if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die - fi - else - rm -vr "${ED}"/usr/lib/udev || die - rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die - fi -} - -pkg_postinst() { - tmpfiles_process xpra.conf - xdg_pkg_postinst - use udev && udev_reload -} - -pkg_postrm() { - xdg_pkg_postinst - use udev && udev_reload -} diff --git a/x11-wm/xpra/xpra-4.4.6-r2.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild index b4c34890cee3..d65933d2b255 100644 --- a/x11-wm/xpra/xpra-4.4.6-r2.ebuild +++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,21 +8,22 @@ if [[ ${PV} = 9999* ]]; then inherit git-r3 else inherit pypi - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=yes DISTUTILS_EXT=1 -inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev +inherit xdg distutils-r1 prefix tmpfiles udev DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="https://xpra.org/" LICENSE="GPL-2 BSD" SLOT="0" IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama" +IUSE+=" +python_single_target_python3_11" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( client server ) diff --git a/x11-wm/xpra/xpra-6.0.1-r1.ebuild b/x11-wm/xpra/xpra-6.0.1-r1.ebuild new file mode 100644 index 000000000000..fef6cb43651c --- /dev/null +++ b/x11-wm/xpra/xpra-6.0.1-r1.ebuild @@ -0,0 +1,381 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" + if [[ ${PV} = 6.9999* ]]; then + EGIT_BRANCH="v6.x" + fi + inherit git-r3 +else + inherit pypi + KEYWORDS="~amd64 ~x86" +fi + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_EXT=1 + +inherit cuda xdg distutils-r1 prefix tmpfiles udev + +DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" +HOMEPAGE="https://xpra.org/" +LICENSE="GPL-2 BSD" +SLOT="0" +IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama " +IUSE+=" video_cards_nvidia" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( client gtk3 server ) + cups? ( dbus ) + oauth? ( server ) + opengl? ( client ) + clipboard? ( gtk3 ) + gtk3? ( client ) + test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama ) +" + +TEST_DEPEND=" + $(python_gen_cond_dep ' + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) + ') + html? ( www-apps/xpra-html5 ) + server? ( + x11-base/xorg-server[-minimal,xvfb] + x11-drivers/xf86-input-void + x11-drivers/xf86-video-dummy + ) + webcam? ( media-video/v4l2loopback ) + xinerama? ( x11-libs/libfakeXinerama ) +" +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) + sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + gtk3? ( + dev-python/pygobject:3[cairo] + ) + ') + dev-libs/xxhash + avif? ( media-libs/libavif ) + brotli? ( app-arch/brotli ) + client? ( + x11-libs/gtk+:3[X?,introspection] + ) + jpeg? ( media-libs/libjpeg-turbo ) + mdns? ( dev-libs/mdns ) + openh264? ( media-libs/openh264:= ) + pulseaudio? ( + media-plugins/gst-plugins-pulse:1.0 + media-plugins/gst-plugins-opus + ) + qrcode? ( media-gfx/qrencode ) + sound? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + vpx? ( media-libs/libvpx ) + webp? ( media-libs/libwebp ) + X? ( + x11-apps/xrandr + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXres + x11-libs/libXtst + x11-libs/libxkbfile + ) + x264? ( media-libs/x264 ) +" +# nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) +RDEPEND=" + ${DEPEND} + ${TEST_DEPEND} + $(python_gen_cond_dep ' + crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) + cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) + 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}] ) + webcam? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + media-libs/opencv[${PYTHON_USEDEP},python] + ) + ') + acct-group/xpra + virtual/ssh + x11-apps/xauth + x11-apps/xmodmap + ibus? ( app-i18n/ibus ) + pinentry? ( app-crypt/pinentry ) + trayicon? ( dev-libs/libayatana-appindicator ) + udev? ( virtual/udev ) +" +DEPEND+=" + test? ( + ${TEST_DEPEND} + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + doc? ( virtual/pandoc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9999-pep517.patch" +) + +src_prepare() { + default + + sed \ + -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \ + -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \ + -e '/setup.py install/d' \ + -i "${S}/tests/unittests/run" || die +} + +python_prepare_all() { + distutils-r1_python_prepare_all + + hprefixify xpra/scripts/config.py + + sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ + -i setup.py || die + + if use minimal; then + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ + -i setup.py || die + fi +} + +python_configure_all() { + sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ + -i setup.py || die + + DISTUTILS_ARGS=( + --with-PIC + "$(use_with avif)" + "$(use_with brotli)" + "$(use_with sound audio)" + "$(use_with client)" + "$(use_with clipboard)" + "$(use_with csc csc_cython)" + --without-csc_libyuv + # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv + "$(use_with cuda cuda_rebuild)" + "$(use_with cuda cuda_kernels)" + "$(use_with dbus)" + "$(use_with debug)" + "$(use_with doc docs)" + --without-evdi + # "$(use_with evdi)" x11-drivers/evdi::guru + "$(use_with examples example)" + "$(use_with gstreamer)" + "$(use_with gstreamer gstreamer_audio)" + "$(use_with gstreamer gstreamer_video)" + "$(use_with gtk3)" + "$(use_with html http)" + "$(use_with mdns)" + "$(use_with video_cards_nvidia nvidia)" + --without-nvdec + --without-nvenc + --without-nvfbc + # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK + "$(use_with opengl)" + "$(use_with openh264)" + "$(use_with cups printing)" + --without-pandoc_lua + "$(use_with qrcode qrencode)" + --without-quic + # "$(use_with quic)" # https://github.com/aiortc/aioquic + "$(use_with systemd sd_listen)" + "$(use_with server)" + "$(use_with systemd service)" + "$(use_with server shadow)" + "$(use_with vpx)" + "$(use_with webcam)" + "$(use_with webp)" + "$(use_with X x11)" + "$(use_with X Xdummy)" + + "$(use_with test tests)" + --with-strict + # --with-verbose + # --with-warn + # --with-cythonize_more + + --pkg-config-path="${S}/fs/lib/pkgconfig" + ) + + if use server; then + DISTUTILS_ARGS+=( + "$(use_with jpeg jpeg_encoder)" + "$(use_with vpx vpx_encoder)" + "$(use_with openh264 openh264_encoder)" + "$(use_with cuda nvjpeg_encoder)" + "$(use_with avif avif_encoder)" + "$(use_with webp webp_encoder)" + --without-spng_encoder + # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_encoder + --without-vpx_encoder + --without-openh264_encoder + --without-nvjpeg_encoder + --without-avif_encoder + --without-webp_encoder + --without-spng_encoder + ) + fi + + if use client || use gtk3; then + DISTUTILS_ARGS+=( + "$(use_with vpx vpx_decoder)" + "$(use_with openh264 openh264_decoder)" + "$(use_with cuda nvjpeg_decoder)" + "$(use_with jpeg jpeg_decoder)" + "$(use_with avif avif_decoder)" + "$(use_with webp webp_decoder)" + --without-spng_decoder + # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_decoder + --without-vpx_decoder + --without-openh264_decoder + --without-nvjpeg_decoder + --without-avif_decoder + --without-webp_decoder + --without-spng_decoder + ) + fi + + DISTUTILS_ARGS+=( + # Arguments from user + "${MYDISTUTILS_ARGS[@]}" + ) + + export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra" +} + +python_compile() { + if use cuda; then + export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" + fi + + PYTHONPATH="${S}" distutils-r1_python_compile +} + +python_test() { + einfo "${BUILD_DIR}/install/$(python_get_sitedir)" + + use cuda && cuda_add_sandbox -w + addwrite /dev/dri/renderD128 + + addpredict /dev/dri/card0 + addpredict /dev/fuse + addpredict /dev/tty0 + addpredict /dev/vga_arbiter + addpredict /proc/mtrr + addpredict /var/run/utmp + + addpredict "$(python_get_sitedir)" + + if [[ -d "/sys/devices/virtual/video4linux" ]]; then + local devices + readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )" + for device in "${devices[@]}"; do + addwrite "/dev/$(basename "${device}" || die )" + done + fi + + xdg_environment_reset + + export XAUTHORITY=${T}/.Xauthority + touch "${XAUTHORITY}" || die + + local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests" + + tests/unittests/run \ + --skip-fail unit.client.mixins.audioclient_test \ + --skip-fail unit.client.x11_client_test \ + --skip-fail unit.net.net_util_test \ + --skip-fail unit.notifications.common_test \ + --skip-fail unit.server.mixins.shadow_option_test \ + --skip-fail unit.server.mixins.start_option_test \ + --skip-fail unit.server.mixins.startdesktop_option_test \ + --skip-fail unit.server.server_auth_test \ + --skip-fail unit.server.shadow_server_test \ + --skip-fail unit.x11.x11_server_test \ + --skip-slow unit.client.mixins.webcam_test \ + --skip-slow unit.server.server_sockets_test \ + --skip-slow unit.server.source.source_mixins_test \ + || die -n +} + +python_install() { + # remove test file + rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www" + + distutils-r1_python_install +} + +python_install_all() { + distutils-r1_python_install_all + + mv -v "${ED}"/usr/etc "${ED}"/ || die + + sed -e "s#/.*data/etc#/etc#g" \ + -i "${ED}/etc/xpra/conf.d/"* || die + + # Move udev dir to the right place if necessary. + if use udev; then + local dir + dir=$(get_udevdir) + if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + fi + else + rm -vr "${ED}"/usr/lib/udev || die + rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die + fi +} + +pkg_postinst() { + tmpfiles_process xpra.conf + xdg_pkg_postinst + use udev && udev_reload +} + +pkg_postrm() { + xdg_pkg_postinst + use udev && udev_reload +} diff --git a/x11-wm/xpra/xpra-6.9999.ebuild b/x11-wm/xpra/xpra-6.9999.ebuild new file mode 100644 index 000000000000..fef6cb43651c --- /dev/null +++ b/x11-wm/xpra/xpra-6.9999.ebuild @@ -0,0 +1,381 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" + if [[ ${PV} = 6.9999* ]]; then + EGIT_BRANCH="v6.x" + fi + inherit git-r3 +else + inherit pypi + KEYWORDS="~amd64 ~x86" +fi + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_EXT=1 + +inherit cuda xdg distutils-r1 prefix tmpfiles udev + +DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" +HOMEPAGE="https://xpra.org/" +LICENSE="GPL-2 BSD" +SLOT="0" +IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama " +IUSE+=" video_cards_nvidia" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( client gtk3 server ) + cups? ( dbus ) + oauth? ( server ) + opengl? ( client ) + clipboard? ( gtk3 ) + gtk3? ( client ) + test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama ) +" + +TEST_DEPEND=" + $(python_gen_cond_dep ' + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,webp?,${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) + ') + html? ( www-apps/xpra-html5 ) + server? ( + x11-base/xorg-server[-minimal,xvfb] + x11-drivers/xf86-input-void + x11-drivers/xf86-video-dummy + ) + webcam? ( media-video/v4l2loopback ) + xinerama? ( x11-libs/libfakeXinerama ) +" +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) + sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + gtk3? ( + dev-python/pygobject:3[cairo] + ) + ') + dev-libs/xxhash + avif? ( media-libs/libavif ) + brotli? ( app-arch/brotli ) + client? ( + x11-libs/gtk+:3[X?,introspection] + ) + jpeg? ( media-libs/libjpeg-turbo ) + mdns? ( dev-libs/mdns ) + openh264? ( media-libs/openh264:= ) + pulseaudio? ( + media-plugins/gst-plugins-pulse:1.0 + media-plugins/gst-plugins-opus + ) + qrcode? ( media-gfx/qrencode ) + sound? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + vpx? ( media-libs/libvpx ) + webp? ( media-libs/libwebp ) + X? ( + x11-apps/xrandr + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXres + x11-libs/libXtst + x11-libs/libxkbfile + ) + x264? ( media-libs/x264 ) +" +# nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) +RDEPEND=" + ${DEPEND} + ${TEST_DEPEND} + $(python_gen_cond_dep ' + crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) + cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) + 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}] ) + webcam? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + media-libs/opencv[${PYTHON_USEDEP},python] + ) + ') + acct-group/xpra + virtual/ssh + x11-apps/xauth + x11-apps/xmodmap + ibus? ( app-i18n/ibus ) + pinentry? ( app-crypt/pinentry ) + trayicon? ( dev-libs/libayatana-appindicator ) + udev? ( virtual/udev ) +" +DEPEND+=" + test? ( + ${TEST_DEPEND} + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + $(python_gen_cond_dep ' + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + doc? ( virtual/pandoc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-9999-pep517.patch" +) + +src_prepare() { + default + + sed \ + -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \ + -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \ + -e '/setup.py install/d' \ + -i "${S}/tests/unittests/run" || die +} + +python_prepare_all() { + distutils-r1_python_prepare_all + + hprefixify xpra/scripts/config.py + + sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ + -i setup.py || die + + if use minimal; then + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ + -i setup.py || die + fi +} + +python_configure_all() { + sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ + -i setup.py || die + + DISTUTILS_ARGS=( + --with-PIC + "$(use_with avif)" + "$(use_with brotli)" + "$(use_with sound audio)" + "$(use_with client)" + "$(use_with clipboard)" + "$(use_with csc csc_cython)" + --without-csc_libyuv + # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv + "$(use_with cuda cuda_rebuild)" + "$(use_with cuda cuda_kernels)" + "$(use_with dbus)" + "$(use_with debug)" + "$(use_with doc docs)" + --without-evdi + # "$(use_with evdi)" x11-drivers/evdi::guru + "$(use_with examples example)" + "$(use_with gstreamer)" + "$(use_with gstreamer gstreamer_audio)" + "$(use_with gstreamer gstreamer_video)" + "$(use_with gtk3)" + "$(use_with html http)" + "$(use_with mdns)" + "$(use_with video_cards_nvidia nvidia)" + --without-nvdec + --without-nvenc + --without-nvfbc + # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK + "$(use_with opengl)" + "$(use_with openh264)" + "$(use_with cups printing)" + --without-pandoc_lua + "$(use_with qrcode qrencode)" + --without-quic + # "$(use_with quic)" # https://github.com/aiortc/aioquic + "$(use_with systemd sd_listen)" + "$(use_with server)" + "$(use_with systemd service)" + "$(use_with server shadow)" + "$(use_with vpx)" + "$(use_with webcam)" + "$(use_with webp)" + "$(use_with X x11)" + "$(use_with X Xdummy)" + + "$(use_with test tests)" + --with-strict + # --with-verbose + # --with-warn + # --with-cythonize_more + + --pkg-config-path="${S}/fs/lib/pkgconfig" + ) + + if use server; then + DISTUTILS_ARGS+=( + "$(use_with jpeg jpeg_encoder)" + "$(use_with vpx vpx_encoder)" + "$(use_with openh264 openh264_encoder)" + "$(use_with cuda nvjpeg_encoder)" + "$(use_with avif avif_encoder)" + "$(use_with webp webp_encoder)" + --without-spng_encoder + # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_encoder + --without-vpx_encoder + --without-openh264_encoder + --without-nvjpeg_encoder + --without-avif_encoder + --without-webp_encoder + --without-spng_encoder + ) + fi + + if use client || use gtk3; then + DISTUTILS_ARGS+=( + "$(use_with vpx vpx_decoder)" + "$(use_with openh264 openh264_decoder)" + "$(use_with cuda nvjpeg_decoder)" + "$(use_with jpeg jpeg_decoder)" + "$(use_with avif avif_decoder)" + "$(use_with webp webp_decoder)" + --without-spng_decoder + # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_decoder + --without-vpx_decoder + --without-openh264_decoder + --without-nvjpeg_decoder + --without-avif_decoder + --without-webp_decoder + --without-spng_decoder + ) + fi + + DISTUTILS_ARGS+=( + # Arguments from user + "${MYDISTUTILS_ARGS[@]}" + ) + + export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra" +} + +python_compile() { + if use cuda; then + export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" + fi + + PYTHONPATH="${S}" distutils-r1_python_compile +} + +python_test() { + einfo "${BUILD_DIR}/install/$(python_get_sitedir)" + + use cuda && cuda_add_sandbox -w + addwrite /dev/dri/renderD128 + + addpredict /dev/dri/card0 + addpredict /dev/fuse + addpredict /dev/tty0 + addpredict /dev/vga_arbiter + addpredict /proc/mtrr + addpredict /var/run/utmp + + addpredict "$(python_get_sitedir)" + + if [[ -d "/sys/devices/virtual/video4linux" ]]; then + local devices + readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )" + for device in "${devices[@]}"; do + addwrite "/dev/$(basename "${device}" || die )" + done + fi + + xdg_environment_reset + + export XAUTHORITY=${T}/.Xauthority + touch "${XAUTHORITY}" || die + + local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests" + + tests/unittests/run \ + --skip-fail unit.client.mixins.audioclient_test \ + --skip-fail unit.client.x11_client_test \ + --skip-fail unit.net.net_util_test \ + --skip-fail unit.notifications.common_test \ + --skip-fail unit.server.mixins.shadow_option_test \ + --skip-fail unit.server.mixins.start_option_test \ + --skip-fail unit.server.mixins.startdesktop_option_test \ + --skip-fail unit.server.server_auth_test \ + --skip-fail unit.server.shadow_server_test \ + --skip-fail unit.x11.x11_server_test \ + --skip-slow unit.client.mixins.webcam_test \ + --skip-slow unit.server.server_sockets_test \ + --skip-slow unit.server.source.source_mixins_test \ + || die -n +} + +python_install() { + # remove test file + rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www" + + distutils-r1_python_install +} + +python_install_all() { + distutils-r1_python_install_all + + mv -v "${ED}"/usr/etc "${ED}"/ || die + + sed -e "s#/.*data/etc#/etc#g" \ + -i "${ED}/etc/xpra/conf.d/"* || die + + # Move udev dir to the right place if necessary. + if use udev; then + local dir + dir=$(get_udevdir) + if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + fi + else + rm -vr "${ED}"/usr/lib/udev || die + rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die + fi +} + +pkg_postinst() { + tmpfiles_process xpra.conf + xdg_pkg_postinst + use udev && udev_reload +} + +pkg_postrm() { + xdg_pkg_postinst + use udev && udev_reload +} diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index b2531fd6fa85..fef6cb43651c 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -1,35 +1,42 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -if [[ ${PV} = 9999* ]]; then +if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" + if [[ ${PV} = 6.9999* ]]; then + EGIT_BRANCH="v6.x" + fi inherit git-r3 else inherit pypi KEYWORDS="~amd64 ~x86" fi -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..12} ) DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=yes DISTUTILS_EXT=1 -inherit xdg xdg-utils distutils-r1 multibuild prefix tmpfiles udev +inherit cuda xdg distutils-r1 prefix tmpfiles udev DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="https://xpra.org/" LICENSE="GPL-2 BSD" SLOT="0" -IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama" +IUSE="+X avif brotli +client +clipboard crypt csc cuda cups dbus debug doc examples gstreamer +gtk3 html ibus jpeg +lz4 lzo mdns minimal oauth opengl openh264 pinentry pulseaudio qrcode +server sound systemd test +trayicon udev vpx webcam webp x264 xdg xinerama " +IUSE+=" video_cards_nvidia" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client server ) + || ( client gtk3 server ) cups? ( dbus ) oauth? ( server ) opengl? ( client ) - test? ( client clipboard crypt dbus html server sound xdg xinerama ) + clipboard? ( gtk3 ) + gtk3? ( client ) + test? ( client clipboard crypt dbus gstreamer html server sound xdg xinerama ) " TEST_DEPEND=" @@ -44,40 +51,54 @@ TEST_DEPEND=" server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void + x11-drivers/xf86-video-dummy ) + webcam? ( media-video/v4l2loopback ) xinerama? ( x11-libs/libfakeXinerama ) " DEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] + dev-python/pygobject:3[${PYTHON_USEDEP}] opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + gtk3? ( + dev-python/pygobject:3[cairo] + ) ') - x11-libs/gtk+:3[introspection] - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXres - x11-libs/libXtst - x11-libs/libxkbfile + dev-libs/xxhash + avif? ( media-libs/libavif ) brotli? ( app-arch/brotli ) - csc? ( >=media-video/ffmpeg-1.2.2:0= ) - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) + client? ( + x11-libs/gtk+:3[X?,introspection] + ) jpeg? ( media-libs/libjpeg-turbo ) + mdns? ( dev-libs/mdns ) + openh264? ( media-libs/openh264:= ) pulseaudio? ( - media-libs/libpulse media-plugins/gst-plugins-pulse:1.0 + media-plugins/gst-plugins-opus ) + qrcode? ( media-gfx/qrencode ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) - vpx? ( media-libs/libvpx media-video/ffmpeg ) + vpx? ( media-libs/libvpx ) webp? ( media-libs/libwebp ) + X? ( + x11-apps/xrandr + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXres + x11-libs/libXtst + x11-libs/libxkbfile + ) + x264? ( media-libs/x264 ) " +# nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) RDEPEND=" ${DEPEND} ${TEST_DEPEND} @@ -104,24 +125,36 @@ RDEPEND=" udev? ( virtual/udev ) " DEPEND+=" - test? ( ${TEST_DEPEND} ) + test? ( + ${TEST_DEPEND} + $(python_gen_cond_dep ' + dev-python/paramiko[${PYTHON_USEDEP}] + ') + ) " BDEPEND=" $(python_gen_cond_dep ' - >=dev-python/cython-0.16[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pip[${PYTHON_USEDEP}] ') virtual/pkgconfig doc? ( virtual/pandoc ) " -# Broken by PEP517 migration and some tests failed for a while before that for -# unknown reasons. -RESTRICT="test" - PATCHES=( - "${FILESDIR}"/${PN}-9999-xdummy.patch + "${FILESDIR}/${PN}-9999-pep517.patch" ) +src_prepare() { + default + + sed \ + -e 's#UNITTESTS_DIR=`dirname $(readlink -f $0)`#: "${UNITTESTS_DIR:=`dirname $(readlink -f $0)`}"#' \ + -e 's#INSTALL_ROOT="$SRC_DIR/dist/python${PYTHON_VERSION}"#: "${INSTALL_ROOT:=$SRC_DIR/dist/python${PYTHON_VERSION}}"#' \ + -e '/setup.py install/d' \ + -i "${S}/tests/unittests/run" || die +} + python_prepare_all() { distutils-r1_python_prepare_all @@ -142,70 +175,190 @@ python_configure_all() { -i setup.py || die DISTUTILS_ARGS=( - --without-PIC - --without-Xdummy - $(use_with sound audio) - $(use_with client) - $(use_with clipboard) - $(use_with csc csc_swscale) + --with-PIC + "$(use_with avif)" + "$(use_with brotli)" + "$(use_with sound audio)" + "$(use_with client)" + "$(use_with clipboard)" + "$(use_with csc csc_cython)" --without-csc_libyuv - --without-cuda_rebuild - --without-cuda_kernels - $(use_with cups printing) - --without-debug - $(use_with dbus) - $(use_with doc docs) - $(use_with ffmpeg dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) - $(use_with ffmpeg enc_x264) - --without-enc_x265 - --with-gtk3 - $(use_with jpeg jpeg_encoder) - $(use_with jpeg jpeg_decoder) - --without-mdns - --without-sd_listen - --without-service - $(use_with opengl) - $(use_with server shadow) - $(use_with server) - --without-strict - $(use_with vpx) - --with-warn - $(use_with webcam) - $(use_with webp) - --with-x11 + # "$(use_with csc csc_libyuv)" # https://chromium.googlesource.com/libyuv/libyuv + "$(use_with cuda cuda_rebuild)" + "$(use_with cuda cuda_kernels)" + "$(use_with dbus)" + "$(use_with debug)" + "$(use_with doc docs)" + --without-evdi + # "$(use_with evdi)" x11-drivers/evdi::guru + "$(use_with examples example)" + "$(use_with gstreamer)" + "$(use_with gstreamer gstreamer_audio)" + "$(use_with gstreamer gstreamer_video)" + "$(use_with gtk3)" + "$(use_with html http)" + "$(use_with mdns)" + "$(use_with video_cards_nvidia nvidia)" + --without-nvdec + --without-nvenc + --without-nvfbc + # "$(use_with nvenc nvdec)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvenc)" # NVIDIA Video Codec SDK + # "$(use_with nvenc nvfbc)" # NVIDIA Capture SDK + "$(use_with opengl)" + "$(use_with openh264)" + "$(use_with cups printing)" + --without-pandoc_lua + "$(use_with qrcode qrencode)" + --without-quic + # "$(use_with quic)" # https://github.com/aiortc/aioquic + "$(use_with systemd sd_listen)" + "$(use_with server)" + "$(use_with systemd service)" + "$(use_with server shadow)" + "$(use_with vpx)" + "$(use_with webcam)" + "$(use_with webp)" + "$(use_with X x11)" + "$(use_with X Xdummy)" + + "$(use_with test tests)" + --with-strict + # --with-verbose + # --with-warn + # --with-cythonize_more + + --pkg-config-path="${S}/fs/lib/pkgconfig" + ) + + if use server; then + DISTUTILS_ARGS+=( + "$(use_with jpeg jpeg_encoder)" + "$(use_with vpx vpx_encoder)" + "$(use_with openh264 openh264_encoder)" + "$(use_with cuda nvjpeg_encoder)" + "$(use_with avif avif_encoder)" + "$(use_with webp webp_encoder)" + --without-spng_encoder + # "$(use_with spng spng_encoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_encoder + --without-vpx_encoder + --without-openh264_encoder + --without-nvjpeg_encoder + --without-avif_encoder + --without-webp_encoder + --without-spng_encoder + ) + fi + + if use client || use gtk3; then + DISTUTILS_ARGS+=( + "$(use_with vpx vpx_decoder)" + "$(use_with openh264 openh264_decoder)" + "$(use_with cuda nvjpeg_decoder)" + "$(use_with jpeg jpeg_decoder)" + "$(use_with avif avif_decoder)" + "$(use_with webp webp_decoder)" + --without-spng_decoder + # "$(use_with spng spng_decoder)" # https://github.com/randy408/libspng + ) + else + DISTUTILS_ARGS+=( + --without-jpeg_decoder + --without-vpx_decoder + --without-openh264_decoder + --without-nvjpeg_decoder + --without-avif_decoder + --without-webp_decoder + --without-spng_decoder + ) + fi + + DISTUTILS_ARGS+=( + # Arguments from user + "${MYDISTUTILS_ARGS[@]}" ) - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" + export XPRA_SOCKET_DIRS="${EPREFIX}/var/run/xpra" +} + +python_compile() { + if use cuda; then + export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" + fi + + PYTHONPATH="${S}" distutils-r1_python_compile } python_test() { - export XAUTHORITY=${HOME}/.Xauthority - touch "${XAUTHORITY}" || die + einfo "${BUILD_DIR}/install/$(python_get_sitedir)" + + use cuda && cuda_add_sandbox -w + addwrite /dev/dri/renderD128 + + addpredict /dev/dri/card0 + addpredict /dev/fuse + addpredict /dev/tty0 + addpredict /dev/vga_arbiter + addpredict /proc/mtrr + addpredict /var/run/utmp + + addpredict "$(python_get_sitedir)" + + if [[ -d "/sys/devices/virtual/video4linux" ]]; then + local devices + readarray -t devices <<<"$(find /sys/devices/virtual/video4linux -mindepth 1 -maxdepth 1 -type d -name 'video*' )" + for device in "${devices[@]}"; do + addwrite "/dev/$(basename "${device}" || die )" + done + fi - distutils_install_for_testing xdg_environment_reset - env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ - PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ - XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ - "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die + export XAUTHORITY=${T}/.Xauthority + touch "${XAUTHORITY}" || die + + local -x XPRA_TEST_COVERAGE=0 INSTALL_ROOT="${BUILD_DIR}/install" UNITTESTS_DIR="${S}/tests/unittests" + + tests/unittests/run \ + --skip-fail unit.client.mixins.audioclient_test \ + --skip-fail unit.client.x11_client_test \ + --skip-fail unit.net.net_util_test \ + --skip-fail unit.notifications.common_test \ + --skip-fail unit.server.mixins.shadow_option_test \ + --skip-fail unit.server.mixins.start_option_test \ + --skip-fail unit.server.mixins.startdesktop_option_test \ + --skip-fail unit.server.server_auth_test \ + --skip-fail unit.server.shadow_server_test \ + --skip-fail unit.x11.x11_server_test \ + --skip-slow unit.client.mixins.webcam_test \ + --skip-slow unit.server.server_sockets_test \ + --skip-slow unit.server.source.source_mixins_test \ + || die -n } -python_install_all() { - distutils-r1_python_prepare_all +python_install() { + # remove test file + rm -vrf "${BUILD_DIR}/install/usr/share/xpra/www" - # Switching to PEP517 gives /usr/etc. Previously, setup.py hardcodes - # if root_prefix.endswith("/usr"): - # root_prefix = root_prefix[:-4] - # But now setuptools uses data/* to represent out-of-sitedir files. - # The upstream hack no longer works. We are on our own. + distutils-r1_python_install +} + +python_install_all() { + distutils-r1_python_install_all mv -v "${ED}"/usr/etc "${ED}"/ || die + sed -e "s#/.*data/etc#/etc#g" \ + -i "${ED}/etc/xpra/conf.d/"* || die + # Move udev dir to the right place if necessary. if use udev; then - local dir=$(get_udevdir) + local dir + dir=$(get_udevdir) if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then dodir "${dir%/*}" mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |