diff options
Diffstat (limited to 'x11-wm')
41 files changed, 1323 insertions, 732 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz Binary files differindex fcc909770205..3971506fb688 100644 --- a/x11-wm/Manifest.gz +++ b/x11-wm/Manifest.gz 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 a8e919e0bce8..05fba77c2488 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -3,13 +3,12 @@ AUX fvwm-2.5.27-translucent-menus.diff 15765 BLAKE2B 85623d5d671d97842ffe819ddfa 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 +AUX fvwm-2.7.0-translucent-menus.diff 15303 BLAKE2B 9689b136bf17aff87bf9b2b872a8d746268849333d06595a5147be7dbc2b6e2a9f75643c67d28564663cf0571378612ebc96e1eff22e315305501cca438c9947 SHA512 34714e25ca5a30479174c1a75ef6441e9dd7e9506e52edced1c8658979059d03b07f5373b82178c2871034155e74a0bf16b55db30784575bc7e6f06555a321fd DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e DIST fvwm-2.7.0.tar.gz 3933529 BLAKE2B b4be7083c2946cb2a0c48673271d490a49aba5aec8407169bedc5a35f55fe8cd2724a9f6570c5e7ea110652c04956570c874256f96fa5d920a2a1ede152c0c25 SHA512 fc9076c3f07f36b0b2c7c4d2bdf7bb1a711000e39316e327173548bc99dc2b8a29b591e3644e1492f87603b576cd4a3f58ecbdd84a4384d294417b3c56c81808 -EBUILD fvwm-2.6.9.ebuild 4034 BLAKE2B 603b739468c0c94f41348b62014245fd465da01622079f0bbaa68f4f3c736bce79b716ad8a3d7d6787bcbf3245340827e6308f7a5e0948afaffc0c2566676a5b SHA512 2e30f69354c6070e8b47992435a8368bc636d50498cb90f4413328703b79c9f69d5e633df9c6056c2ef7e019db1d9e020e14bf0d2e6f254c1a96c94912a440f5 -EBUILD fvwm-2.7.0-r1.ebuild 4207 BLAKE2B 9e5688558de8d59148f64192efb7af939b57196573fae988288aea1c7d083e9192e8abd659d580cf919166531218be5d1ad228501cefa347d808b0b0820341bd SHA512 45917c0c96c62574f88e8f8a95084a81df67360432e16a1f6edae99b297895108bf3b6ff42bdd350bf934a01d55e919ec3ecfc8254b94e769d0ccd8052fbcc79 -EBUILD fvwm-2.7.0-r4.ebuild 4209 BLAKE2B 505a4648aa42937a45b03ff0287ab8e3f36ced9ee1f7b2c621c21eb32a7c165aef1c801f2c88bc59e2380028c0e17248b4df1e205a9e111e950cb70d64079eae SHA512 df088592623113e21365679469dd2f208d06b709036504c1e5549798fa09609e1a90e711ddb7a6e6f7c3ddb6ce004db0f0608633b02e321f62c1ccd5922c3578 -EBUILD fvwm-2.7.0.ebuild 4256 BLAKE2B b88389581da14df1c3328b439068d619ce071d1a847d7259babe787e65a9e2851b310795aa1c93b6ecec766f515ad0792b33747358fb04979b82a2a2a60c87d1 SHA512 3f5956ae078e98839a50f09aa70a43e6f732a7fb7a3749032a43166fd57405f7f9363e12315d3c03ce81d3098495906f8f8ba1b72b2089a9e3201b4a02c8645a +EBUILD fvwm-2.6.9.ebuild 4028 BLAKE2B c9804f9cc36495584742523186dffc2e4f28eae553082b6fb8ee7167c5784cc7c7aabaac1a7fba42f0a8fb78c7f57518582621b54ef5fdd2179d4ad37f8657bd SHA512 11dc4792bc1039c953e3f1a0a290c311426ff67e7bda60278581481938a70a2abd6bc23810771c657d9d58050d7558bb2dfafe17de1a19a3baf83ceaa7fdaa99 +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.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.7.0-translucent-menus.diff b/x11-wm/fvwm/files/fvwm-2.7.0-translucent-menus.diff new file mode 100644 index 000000000000..67f0a3bf0cd5 --- /dev/null +++ b/x11-wm/fvwm/files/fvwm-2.7.0-translucent-menus.diff @@ -0,0 +1,507 @@ +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", + ++ "Translucent", ++ "NoTranslucent", + NULL + }; + +@@ -625,6 +627,7 @@ void parse_colorset(int n, char *line) + char *fg_tint = NULL; + char *bg_tint = NULL; + char *icon_tint = NULL; ++ char *translucent_tint = NULL; + Bool have_pixels_changed = False; + Bool has_icon_pixels_changed = False; + Bool has_fg_changed = False; +@@ -637,6 +640,7 @@ 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; ++ Bool has_translucent_tint_changed = False; + Bool has_pixmap_changed = False; + Bool has_shape_changed = False; + Bool has_image_alpha_changed = False; +@@ -764,6 +768,10 @@ void parse_colorset(int n, char *line) + case 21: /* Plain */ + has_pixmap_changed = True; + free_colorset_background(cs, True); ++ cs->is_translucent = False; ++ cs->translucent_tint_percent = 0; ++ cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED; ++ has_translucent_tint_changed = True; + break; + case 22: /* NoShape */ + has_shape_changed = True; +@@ -930,6 +938,24 @@ void parse_colorset(int n, char *line) + cs->icon_alpha_percent = tmp; + } + break; ++ case 42: /* Translucent */ ++ cs->is_translucent = True; ++ parse_simple_tint( ++ cs, args, &translucent_tint, ++ TRANSLUCENT_TINT_SUPPLIED, ++ &has_translucent_tint_changed, &percent, ++ "Translucent"); ++ if (has_translucent_tint_changed) ++ { ++ cs->translucent_tint_percent = percent; ++ } ++ break; ++ case 43: /* NoTranslucent */ ++ cs->is_translucent = False; ++ cs->translucent_tint_percent = 0; ++ cs->color_flags &= ~TRANSLUCENT_TINT_SUPPLIED; ++ has_translucent_tint_changed = True; ++ break; + default: + /* test for ?Gradient */ + if (option[0] && StrEquals(&option[1], "Gradient")) +@@ -1632,6 +1658,27 @@ void parse_colorset(int n, char *line) + } + } + ++ /* ++ * ---------- change the translucent tint colour ---------- ++ */ ++ if (has_translucent_tint_changed) ++ { ++ /* user specified colour */ ++ if (translucent_tint != NULL) ++ { ++ PictureFreeColors( ++ dpy, Pcmap, &cs->translucent_tint, 1, 0, True); ++ cs->translucent_tint = GetColor(translucent_tint); ++ } ++ else ++ { ++ /* default */ ++ PictureFreeColors( ++ dpy, Pcmap, &cs->translucent_tint, 1, 0, True); ++ cs->translucent_tint = GetColor(black); ++ } ++ } ++ + /* + * ---------- send new colorset to fvwm and clean up ---------- + */ +@@ -1728,6 +1775,7 @@ void alloc_colorset(int n) + ncs->fgsh = GetColor(white); + ncs->tint = GetColor(black); + ncs->icon_tint = GetColor(black); ++ ncs->translucent_tint = GetColor(black); + ncs->pixmap = XCreatePixmapFromBitmapData( + dpy, Scr.NoFocusWin, + &g_bits[4 * (nColorsets % 3)], 4, 4, +@@ -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); ++ ncs->translucent_tint = GetColor(black); + } + ncs->fg_tint = ncs->bg_tint = GetColor(black); + /* set flags for fg contrast, bg average */ +@@ -1756,6 +1805,7 @@ void alloc_colorset(int n) + ncs->icon_alpha_percent = 100; + ncs->tint_percent = 0; + ncs->icon_tint_percent = 0; ++ ncs->translucent_tint_percent = 0; + ncs->fg_tint_percent = ncs->bg_tint_percent = 0; + ncs->dither = (PictureDitherByDefault())? True:False; + nColorsets++; +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 */ ++ /* x,y XMapRaise */ ++ int x; ++ int y; + } MenuRootDynamic; + + /* access macros to dynamic menu members */ +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)) ++#define MENU_IS_TRANSPARENT(mr,cs) \ ++ (MENU_IS_TRANSLUCENT(mr,cs) || CSET_IS_TRANSPARENT(cs)) ++#define MR_IS_TRANSLUCENT_MENU(mr) \ ++ (!MR_IS_TEAR_OFF_MENU(mr) && MR_STYLE(mr) && \ ++ ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSLUCENT( \ ++ ST_CSET_MENU(MR_STYLE(mr)))) ++#define MR_IS_TRANSPARENT_MENU(mr) \ ++ (MR_IS_TRANSLUCENT_MENU(mr) || (MR_STYLE(mr) && \ ++ ST_HAS_MENU_CSET(MR_STYLE(mr)) && CSET_IS_TRANSPARENT( \ ++ ST_CSET_MENU(MR_STYLE(mr))))) ++ + /* ---------------------------- imports ------------------------------------ */ + + /* This external is safe. It's written only during startup. */ +@@ -220,6 +233,8 @@ typedef struct mloop_static_info_t + } mloop_static_info_t; + + /* ---------------------------- forward declarations ----------------------- */ ++static MenuRoot *seek_submenu_instance( ++ MenuRoot *parent_menu, MenuItem *parent_item); + + /* ---------------------------- local variables ---------------------------- */ + +@@ -381,12 +396,22 @@ static void animated_move_back( + Bool transparent_bg = False; + + /* move it back */ +- if (ST_HAS_MENU_CSET(MR_STYLE(mr)) && +- CSET_IS_TRANSPARENT(ST_CSET_MENU(MR_STYLE(mr)))) ++ if (MR_IS_TRANSPARENT_MENU(mr)) + { + transparent_bg = True; + get_menu_repaint_transparent_parameters( + &mrtp, mr, fw); ++ if (MR_IS_TRANSLUCENT_MENU(mr) && MR_SUBMENU_ITEM(mr)) ++ { ++ MenuRoot *smr; ++ smr = seek_submenu_instance( ++ mr, MR_SUBMENU_ITEM(mr)); ++ if (smr) ++ { ++ /* just unmap it here, popdown later */ ++ XUnmapWindow(dpy, MR_WINDOW(smr)); ++ } ++ } + } + AnimatedMoveOfWindow( + MR_WINDOW(mr), act_x, act_y, act_x - MR_XANIMATION(mr), +@@ -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; + } ++ MR_IS_TEAR_OFF_MENU(mr) = 1; + } + else + { +@@ -2716,7 +2742,37 @@ static void paint_menu( + } + MR_IS_PAINTED(mr) = 1; + /* paint the menu background */ +- if (ms && ST_HAS_MENU_CSET(ms)) ++ if (MR_IS_TRANSLUCENT_MENU(mr)) ++ { ++ Pixmap trans = None; ++ FvwmRenderAttributes fra; ++ colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)]; ++ ++ fra.mask = 0; ++ if (colorset->translucent_tint_percent > 0) ++ { ++ fra.mask = FRAM_HAVE_TINT; ++ fra.tint = colorset->translucent_tint; ++ fra.tint_percent = colorset->translucent_tint_percent; ++ } ++ if (MR_IS_BACKGROUND_SET(mr) == False) ++ { ++ trans = PGraphicsCreateTranslucent( ++ dpy, MR_WINDOW(mr), &fra, ++ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), ++ MR_X(mr), MR_Y(mr), MR_WIDTH(mr), MR_HEIGHT(mr)); ++ XMapRaised(dpy, MR_WINDOW(mr)); ++ if (trans != None) ++ { ++ XSetWindowBackgroundPixmap( ++ dpy, MR_WINDOW(mr), trans); ++ MR_IS_BACKGROUND_SET(mr) = True; ++ clear_expose_menu_area(MR_WINDOW(mr), pevent); ++ XFreePixmap(dpy, trans); ++ } ++ } ++ } ++ else if (ms && ST_HAS_MENU_CSET(ms)) + { + if (MR_IS_BACKGROUND_SET(mr) == False) + { +@@ -3525,10 +3581,7 @@ static int pop_menu_up( + MR_HAS_POPPED_UP_RIGHT(mr) = 0; + } + MR_XANIMATION(parent_menu) += end_x - prev_x; +- if (ST_HAS_MENU_CSET(MR_STYLE(parent_menu)) && +- CSET_IS_TRANSPARENT( +- ST_CSET_MENU( +- MR_STYLE(parent_menu)))) ++ if (MR_IS_TRANSPARENT_MENU(parent_menu)) + { + transparent_bg = True; + get_menu_repaint_transparent_parameters( +@@ -3707,10 +3760,21 @@ static int pop_menu_up( + */ + + XMoveWindow(dpy, MR_WINDOW(mr), x, y); ++ MR_X(mr) = x; ++ MR_Y(mr) = y; + XSelectInput(dpy, MR_WINDOW(mr), event_mask); +- XMapRaised(dpy, MR_WINDOW(mr)); +- if (popdown_window) +- XUnmapWindow(dpy, popdown_window); ++ if (MR_IS_TRANSLUCENT_MENU(mr)) ++ { ++ if (popdown_window) ++ XUnmapWindow(dpy, popdown_window); ++ paint_menu(mr, NULL, fw); ++ } ++ else ++ { ++ XMapRaised(dpy, MR_WINDOW(mr)); ++ if (popdown_window) ++ XUnmapWindow(dpy, popdown_window); ++ } + XFlush(dpy); + MR_MAPPED_COPIES(mr)++; + MST_USAGE_COUNT(mr)++; +@@ -6274,16 +6338,122 @@ void update_transparent_menu_bg( + { + last = True; + } +- if (!last && CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms))) ++ if (!last && ++ (CSET_IS_TRANSPARENT_PR_TINT(ST_CSET_MENU(ms)) || ++ MR_IS_TRANSLUCENT_MENU(mr))) + { + /* too slow ... */ + return; + } +- SetWindowBackgroundWithOffset( +- dpy, MR_WINDOW(mr), step_x - current_x, step_y - current_y, +- MR_WIDTH(mr), MR_HEIGHT(mr), +- &Colorset[ST_CSET_MENU(ms)], Pdepth, +- FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False); ++ if (MR_IS_TRANSLUCENT_MENU(mr)) ++ { ++ Pixmap trans, tmp; ++ FvwmRenderAttributes fra; ++ colorset_t *colorset = &Colorset[ST_CSET_MENU(ms)]; ++ ++ fra.mask = 0; ++ if (colorset->translucent_tint_percent > 0) ++ { ++ fra.mask = FRAM_HAVE_TINT; ++ fra.tint = colorset->translucent_tint; ++ fra.tint_percent = colorset->translucent_tint_percent; ++ } ++ if (current_x == step_x) ++ { ++ /* Reuse the old pixmap for the part of the menu ++ * that has not moved. (This can be extended to get ++ * two new rectangles, one in each direction) ++ * ++ * It saves the unmapping of the window and makes ++ * Things less flickering. ++ */ ++ GC my_gc; ++ unsigned long valuemask = GCSubwindowMode; ++ XGCValues values; ++ int out_y=0; ++ values.subwindow_mode = IncludeInferiors; ++ if (step_y < 0) ++ { ++ out_y = -step_y; ++ } ++ trans = XCreatePixmap(dpy, MR_WINDOW(mr), MR_WIDTH(mr), ++ MR_HEIGHT(mr), Pdepth); ++ my_gc = fvwmlib_XCreateGC(dpy, MR_WINDOW(mr), 0, NULL); ++ XChangeGC(dpy, my_gc, valuemask, &values); ++ ++ XClearWindow(dpy, MR_WINDOW(mr)); ++ ++ if (current_y < step_y) ++ { ++ XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0, ++ step_y-current_y, MR_WIDTH(mr), ++ MR_HEIGHT(mr)-(step_y-current_y), ++ 0,0); ++ tmp = PGraphicsCreateTranslucent( ++ dpy, MR_WINDOW(mr), &fra, ++ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), ++ current_x, current_y+MR_HEIGHT(mr), ++ MR_WIDTH(mr), step_y-current_y); ++ ++ XCopyArea(dpy, tmp, trans, my_gc, 0, 0, ++ MR_WIDTH(mr), step_y-current_y,0, ++ MR_HEIGHT(mr)-(step_y-current_y)); ++ } ++ else ++ { ++ XCopyArea(dpy, MR_WINDOW(mr), trans, my_gc, 0, ++ 0, MR_WIDTH(mr), ++ MR_HEIGHT(mr)-(current_y-step_y), 0, ++ current_y-step_y); ++ tmp = PGraphicsCreateTranslucent( ++ dpy, MR_WINDOW(mr), &fra, ++ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), ++ current_x,step_y, MR_WIDTH(mr), ++ current_y-step_y); ++ XCopyArea(dpy, tmp, trans, my_gc, 0, 0, ++ MR_WIDTH(mr), current_y-step_y,0, ++ out_y); ++ } ++ MR_X(mr) = step_x; ++ MR_Y(mr) = step_y; ++ XFreePixmap(dpy, tmp); ++ XFreeGC(dpy,my_gc); ++ } ++ else ++ { ++ XUnmapWindow(dpy, MR_WINDOW(mr)); ++ MR_X(mr) = step_x; ++ MR_Y(mr) = step_y; ++ trans = PGraphicsCreateTranslucent( ++ dpy, MR_WINDOW(mr), &fra, ++ BACK_GC(ST_MENU_INACTIVE_GCS(ms)), ++ step_x, step_y, MR_WIDTH(mr), ++ MR_HEIGHT(mr)); ++ XMapRaised(dpy, MR_WINDOW(mr)); ++ } ++ XSetWindowBackgroundPixmap( ++ dpy, MR_WINDOW(mr), trans); ++ XFreePixmap(dpy, trans); ++ if (current_x == step_x) ++ { ++ /* Redraw the border */ ++ RelieveRectangle( ++ dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr) - 1, ++ MR_HEIGHT(mr) - 1, (Pdepth < 2) ? ++ SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)) : ++ HILIGHT_GC(MST_MENU_INACTIVE_GCS(mr)), ++ SHADOW_GC(MST_MENU_INACTIVE_GCS(mr)), ++ MST_BORDER_WIDTH(mr)); ++ } ++ } ++ else ++ { ++ SetWindowBackgroundWithOffset( ++ dpy, MR_WINDOW(mr), step_x - current_x, ++ step_y - current_y, MR_WIDTH(mr), MR_HEIGHT(mr), ++ &Colorset[ST_CSET_MENU(ms)], Pdepth, ++ FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False); ++ } + } + + +@@ -6324,10 +6494,7 @@ void repaint_transparent_menu( + } + if (!is_bg_set) + { +- SetWindowBackground( +- dpy, MR_WINDOW(mr), MR_WIDTH(mr), MR_HEIGHT(mr), +- &Colorset[ST_CSET_MENU(ms)], Pdepth, +- FORE_GC(MST_MENU_INACTIVE_GCS(mr)), False); ++ update_transparent_menu_bg(prtm, x, y, x, y, end_x, end_y); + } + /* redraw the background of non active item */ + for (mi = MR_FIRST_ITEM(mr); mi != NULL; mi = MI_NEXT_ITEM(mi)) +@@ -6951,10 +7118,12 @@ void UpdateMenuColorset(int cset) + SetWindowBackground( + dpy, MR_WINDOW(mr), MR_WIDTH(mr), + MR_HEIGHT(mr), +- &Colorset[ST_CSET_MENU(ms)], +- Pdepth, ++ &Colorset[ST_CSET_MENU(ms)], Pdepth, + FORE_GC(MST_MENU_INACTIVE_GCS(mr)), +- True); ++ False); ++ XClearArea( ++ dpy, MR_WINDOW(mr), 0, 0, MR_WIDTH(mr), ++ MR_HEIGHT(mr), True); + } + else if ((ST_HAS_ACTIVE_CSET(ms) && + ST_CSET_ACTIVE(ms) == cset) || +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) + ++#define MR_X(m) ((m)->d->x) ++#define MR_Y(m) ((m)->d->y) ++ + struct MenuRoot; + struct MenuStyle; + struct MenuReturn; +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; ++ /* only use by fvwm menu (non tear-off) */ ++ Bool is_translucent; ++ Pixel translucent_tint; ++ unsigned int translucent_tint_percent : 7; + #endif + } colorset_t; + +@@ -78,6 +82,7 @@ typedef struct + #define FG_TINT_SUPPLIED 0x100 + #define BG_TINT_SUPPLIED 0x200 + #define ICON_TINT_SUPPLIED 0x400 ++#define TRANSLUCENT_TINT_SUPPLIED 0x800 + #endif + + /* colorsets are stored as an array of structs to permit fast dereferencing */ +@@ -153,6 +158,11 @@ extern colorset_t *Colorset; + (cset != NULL && cset->pixmap == ParentRelative && \ + cset->tint_percent > 0) + ++#define CSET_IS_TRANSLUCENT(cset) \ ++ (cset >= 0 && Colorset[cset].is_translucent) ++#define CSETS_IS_TRANSLUCENT(cset) \ ++ (cset && cset->is_translucent) ++ + #ifndef FVWM_COLORSET_PRIVATE + /* Create n new colorsets, fvwm/colorset.c does its own thing (different size) + */ +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( + } + } + +-#if 0 /* humm... maybe useful one day with menus */ ++#if 1 /* humm... maybe useful one day with menus */ + Pixmap PGraphicsCreateTranslucent( + Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc, + int x, int y, int width, int height) +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); +- ++Pixmap PGraphicsCreateTranslucent( ++ Display *dpy, Window win, FvwmRenderAttributes *fra, GC gc, ++ int x, int y, int width, int height); + /* never used ! */ + Pixmap PGraphicsCreateDitherPixmap( + Display *dpy, Window win, Drawable src, Pixmap mask, int depth, GC gc, diff --git a/x11-wm/fvwm/fvwm-2.6.9.ebuild b/x11-wm/fvwm/fvwm-2.6.9.ebuild index 6f87f6d062cb..d26d44193004 100644 --- a/x11-wm/fvwm/fvwm-2.6.9.ebuild +++ b/x11-wm/fvwm/fvwm-2.6.9.ebuild @@ -10,7 +10,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" COMMON_DEPEND=" 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 ba08db44f026..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 86cc24e714c9..f9d500959304 100644 --- a/x11-wm/marco/Manifest +++ b/x11-wm/marco/Manifest @@ -1,5 +1,5 @@ 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-r1.ebuild 1536 BLAKE2B b5d7f5672157f1c8579df04c51a139c71a63d5aaf6629ddc9c6a793dce505d7a893258b1385d28f2b28438a4b44d607ca1ee1c5eb6c1175f374fb1be46ee026a SHA512 12eec2175c4bdb402e911ee8778364dbc7f599c1f03419b333ac7607857c31e0b1b9d1a6c943eb966e715f0d057247cd742edd1b65ec0a856e3c377193c3f95e +EBUILD marco-1.26.2-r1.ebuild 1616 BLAKE2B a1dc6b482f0035e81b33e9bec99344e70ea9f7bc54308c90b2c52293ee6eeb1699741c5f3c8d26cf338f22b75c1eb5ff1f36cfa6a5c8dbbdd04ed3a8366f8361 SHA512 82d9628cebe96efc396a360029abbda8708c83d4359ff1ec9c9e3526aaddca25bb33cf3c1aa04c285e4ddf21d4146db66908c5e2e58ddef38239c5c06f808219 +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 index d0d40b051f8e..bd1e415ad436 100644 --- a/x11-wm/marco/marco-1.26.2-r1.ebuild +++ b/x11-wm/marco/marco-1.26.2-r1.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MATE2_LA_PUNT="yes" +# For script meson_post_install.py +# Bug 906826, tracker bug 762406 +PYTHON_COMPAT=( python3_{10..13} ) -inherit mate meson +inherit mate meson python-any-r1 KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" @@ -42,6 +45,8 @@ COMMON_DEPEND=" xinerama? ( x11-libs/libXinerama ) " +DEPEND="${PYTHON_DEPS}" + RDEPEND="${COMMON_DEPEND} gnome-extra/zenity >=mate-base/mate-desktop-1.20.0 diff --git a/x11-wm/marco/marco-1.28.1-r1.ebuild b/x11-wm/marco/marco-1.28.1-r1.ebuild index bb7c264be6aa..6240ace59fd1 100644 --- a/x11-wm/marco/marco-1.28.1-r1.ebuild +++ b/x11-wm/marco/marco-1.28.1-r1.ebuild @@ -4,8 +4,11 @@ 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 @@ -46,6 +49,8 @@ COMMON_DEPEND=" xinerama? ( x11-libs/libXinerama ) " +DEPEND="${PYTHON_DEPS}" + RDEPEND="${COMMON_DEPEND} gnome-extra/zenity virtual/libintl diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest index b3eebe309bc9..9a2393643519 100644 --- a/x11-wm/metacity/Manifest +++ b/x11-wm/metacity/Manifest @@ -3,5 +3,5 @@ DIST metacity-3.50.0.tar.xz 1959172 BLAKE2B a697bb0d820211abdd212a250d0ea6a69896 DIST metacity-3.52.0.tar.xz 1960156 BLAKE2B e8d078f08c4d3a40a98b5d95aa0286adc4da518ca6a495768d9e31626862b03a3ad5da26928ccc3f337b9811fd5ffa927a37e5f9ab6a7b7c256052842207b5cf SHA512 e49c8a45a26b9b43700e50787fef9e02a6c5abc5d8a809542acaf32f6e15ea756bf8398883e3c69707908e8556ae726d9764fc09f07b0beaa40f79a1490c361e EBUILD metacity-3.46.1.ebuild 1294 BLAKE2B a7bf0e45f6ff90cbf944ae34bb7d6cdd8bd047ce58d7ebfdd4e2a59dc495fc042453518d4243494430bd05b74226f133fec9f842e3be6999b8b3fc163cf8b51f SHA512 778aaeae01a372aaa9c907323f3959c3f90cce06e622c20ae0f6493843078015978f8c0d9dacdb0245f91ef53ddb226f7b63862a0e210e5279e337f972644709 EBUILD metacity-3.50.0.ebuild 1294 BLAKE2B b54f901a1fa0a3eb6d4b536764039e966b8f1225f335a8c21141ca3147d4aa27fd14d27e17be12771ebcad61fa778f616f5b808904081d56f3666e21b30b4aad SHA512 c9f68f9b0edccde5c84db81615f067f572fdfa1e50a8484a78f18463981c94140811ba7fc41df902c3d3341466f0d21a438fb7352a2c3490306b39135446cad3 -EBUILD metacity-3.52.0.ebuild 1295 BLAKE2B 05e7fbb91c4bcf61234b9afe5e959f9f45a81d086c9bbbc3e18888303c11b2cd7b02f92548914c5e159be9861d8173e9ae75b2d844d6b5112b18de6392cd8940 SHA512 bdf9b520a6180fb737bba7422479a835f0ce77c66c7be56fd46f9ec3b32ec37eb90eb6ebb37328802790448d5f811ba9b4965912e5e9b2edbd01adef000f74f6 +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.52.0.ebuild b/x11-wm/metacity/metacity-3.52.0.ebuild index 3158e3f409bf..60f7ad76a4f2 100644 --- a/x11-wm/metacity/metacity-3.52.0.ebuild +++ b/x11-wm/metacity/metacity-3.52.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/" LICENSE="GPL-2+" SLOT="0" IUSE="+libcanberra vulkan xinerama" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="amd64 ~riscv" # TODO: libgtop could be optional, but no knob RDEPEND=" diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 97cb874a1bd8..d3351caf31f8 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,7 +1,6 @@ AUX 38919a88b2b8381f5b24b69742d1b9db32029c61.patch 724 BLAKE2B aa7739b0e333d887b39e89f7774b016b6aa9339b37682861f852d354554ccdbe52cc9c9bc50bb612731e4f9a371b749729758d9ab8072ab0d5f282f46c4c697f SHA512 5f96534e613356453a9e060c0145d55db3737812e5094568819c031ced6e2c8c41583ac208b38a664d42302cb94031d20154764628cae05348d20362b91d0ffe -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-r1.ebuild 4101 BLAKE2B d7629f62e5888b83c2df2ea0f87cc929e46836adee876ac773b8ccc3c1645b2d3ceec97069b9d6a0b1d3527277fb29b1427db50cc011201301bb47b281302a6d SHA512 d7532f2f7f15cf1bd780f3a1070400f8cdcfb661cd832f412538124e243ee63c2ec82c850a65b1bab550916d472a1d4f5cb92a98b9f62869490be630e0319477 -EBUILD muffin-6.0.1-r2.ebuild 4297 BLAKE2B bd26540c2925164814508a9eaadd09eb45be0fe4da5c9edaddd0d067a83b10fa17438c51da7bf232de8f00acdb783f144c470ad1211eaa1025609791eac5f69b SHA512 c33d614101b74179e115678a7a067fd40378cfc135cae5d506701bb2b8cbb2073af63ae07700a20bf7d5761fa319567f4c050f0dcf11d2f9c3815c01208e8490 +DIST muffin-6.2.0.tar.gz 4522979 BLAKE2B d2cf508eeea77e22c79c65404e90beced72b9eca87542dc38abbf8a411464b4afce4d48e73cddf284a4cb86d9eca420edf95e3cb0ad7a0bc6b2c93a4bd1df257 SHA512 0711370323cd29627f312fbd2208daa5bca3be391f9454524f34447dc31f6e8dae63617af790843a2d84fd63340a6db476783b5eadb27b95fe2503f51323d193 +EBUILD muffin-6.0.1-r2.ebuild 4400 BLAKE2B 3a0acd85ae136f7bc78a6fbe4362a94b251b2ed860e8200024ac4b2af2c1e7c25384d0a8ecb82ae38045517725965c9b9fa1910f294fa3d53d1b965c5d0aab66 SHA512 6697ac6e9cd504538e2830d58fa1451e4fa5367b693278304b2a850a90867f743a88b8f4aa0d219ae7fa49eeeb545cf9b5c3a73c199a9290dcfa7e2e692eec5d +EBUILD muffin-6.2.0.ebuild 4207 BLAKE2B 0fd1e8390653e7cee50af5a5c7f45d33a0e4b2fcc3e7dd40f05bada17be9951e3080aedd90662ddce2b72e005ddd6b9ca491e43a3be4f805c1c243a43f00264c SHA512 0322e44c9667f3ae1820bb32923ba39715edaaaeae9cde5c6913d2a2063562a6029d874f79e143d6750caedd35f6d69b763afd26f828466db811819012e0a189 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-r2.ebuild b/x11-wm/muffin/muffin-6.0.1-r2.ebuild index a367d3802f64..881c52c194a2 100644 --- a/x11-wm/muffin/muffin-6.0.1-r2.ebuild +++ b/x11-wm/muffin/muffin-6.0.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -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" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0" SLOT="0" IUSE="input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ~loong ~ppc64 ~riscv x86" REQUIRED_USE="wayland? ( udev )" # Dependencies listed in meson order @@ -164,6 +164,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/muffin/muffin-6.0.1-r1.ebuild b/x11-wm/muffin/muffin-6.2.0.ebuild index 92298d7401d7..30fc4b7ff295 100644 --- a/x11-wm/muffin/muffin-6.0.1-r1.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 @@ -157,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 6e1309f7bb28..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 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7 EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6 -EBUILD mutter-9999.ebuild 7110 BLAKE2B 451332ba76a0ad31666b81fab02573348e6c80de1c4b79208f732dcf97746987bb2cefed69612e2e1dca847c9f04ad358e7195e5f50753e0e0c689b6853622eb SHA512 2af7a4175faaa345cf9d16d744c2ccad0edf6c45110dcc5dfd5af20bd7e17a8837d63b325964db42591732fd800eb65048213d9b1cbf19d48de5fb781ebfa3d7 +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-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 2ec64dde579a..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/qtile/Manifest b/x11-wm/qtile/Manifest index 2758274c706f..f9444d3bfc36 100644 --- a/x11-wm/qtile/Manifest +++ b/x11-wm/qtile/Manifest @@ -4,8 +4,12 @@ DIST qtile-0.23.0.tar.gz 524536 BLAKE2B 9cf5b0cdffd7bc95ab7649827c221b20718f9dcc DIST qtile-0.25.0.tar.gz 569312 BLAKE2B 3841ca41755f37191c659c039da45279393b5bbe94b3d532651548ba51d6dc62f3ac94cc5f3b02aa2b6c806e6bf97c9651756579b77938d133bdb1a697150626 SHA512 afd3267c70681d3656569f8ea88d02f35ab5d6baaa28b3d90f1b7552b5ed32c7d2f1f4f17272458ff2c39d0ca8f4fdb87748c9d7b4eb41031f3079126096c7d0 DIST qtile-0.26.0.tar.gz 593712 BLAKE2B c7f43813b42d1009f0f542ef0964e07cbb3286af6af058e168d62d1e32c7dfaf51fe537568b77d5b21a1701c1ce159b63f86b6ba4ae3bf5482125562c91c5d3a SHA512 0b28125e3111493a90c5ae993a516dccf984f794ba9c0424c9366a3b04073fdf06deba42e59e8b1e33b60e5686730e0ed010161943a4a77ab4b36e4c7c710a61 DIST qtile-0.27.0.tar.gz 598603 BLAKE2B 79f876d290398839e83b14304956f7bbe5a5bb70faccae6e090dd37477728c9067fc9d6797b498b5a8cd1a35f08fb4bc85ee3609a244f955d2b15b79f30d96c4 SHA512 62daa4ec51239506e2a860b9d021e2838edba887c7ff45bbede36428a399343470b9357f4aab373d13279c933ae19c3bd2b03bb520862386298a1258fe505127 +DIST qtile-0.28.0.tar.gz 601157 BLAKE2B c2ec5ac92484ad8124a2eeb0aa57050ff529f0223cb889a6da81291a2c52002e989d94667cc3b34449284ca52ca50186379619c05bf83adeb6dc5dfa8c4a6dc1 SHA512 aad0f260ab8f8e974e12f385324e7eadab6a314c9eb1b3114bbfc928819f7a764eb8243e7ed6545ca87f38b223e00d525cba5e8b2430c35aa93370c9fecd0947 +DIST qtile-0.28.1.tar.gz 601217 BLAKE2B 04f24c5b628e1c3d0eca395135ef0d0093af5a57d23aea751e76197da4f148ae679a9fb650e2589e5f2e253673cab86642e3f0695ac219641c65192eb9a37274 SHA512 95b4d95206aeac4bb59d47c94eb93b55ac413681050345a0d61cdb19b71dd785bb6c13c0161757b9bfa5e8d0ce345fcf64eea04fc44b2f596a65b70f5da5d32e EBUILD qtile-0.23.0-r1.ebuild 2528 BLAKE2B f9ce358fc66266d64df063c0ec40cb1041355a21174a79b3276c9a12fee46cf9f49220cbb0aad288fac824c2d3f6c89e374b85847534de093169e3c277fd02bd SHA512 8a37e0dafd9c02da3994dde2dd148ba27851af8c2494801cdd68d3f1a3f283f5b47407d9ca5a0f8feb60d13bf8fd7bcd5133d8261c85342d068cd6108f1ff41d EBUILD qtile-0.25.0.ebuild 2519 BLAKE2B 41b5a877fcdb39dc2990d5dd444e4e751c6316db038450f7f312d42f4c9f106fb2c80adf634856336e33630ad0974913caad095a4eebbfce3f8d0cd7ae9d6b40 SHA512 e4648a579f66c63c94f52ef7c50965e03e51dd7531c72ce1525556222174254e98c34bfa17aa84c53603cb399e0a522540f4fc6414464a62a3b63956919f71b1 EBUILD qtile-0.26.0.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 EBUILD qtile-0.27.0.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 +EBUILD qtile-0.28.0.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 +EBUILD qtile-0.28.1.ebuild 2626 BLAKE2B 4f6bdb6618e96f850eb2e01dcede5e13b03405997172f4b5c2f3d61930c37e74a32b7a67c23c26ad8670bcc3d016d934a25f5930ce8998711ee66aee2929446c SHA512 2f7ff63669ba75a300eaaa1b06f943f17fc3da0431cdf11af29bd4a1a0aa0cd0a1e3a030f269ab12fb5581c3bcb7935bd0a1d24d6e11bf8b52fdb404d692f1a0 MISC metadata.xml 422 BLAKE2B 10ddda5d4485b4a3c76ff658a41e2b4ea6004413ea3d2d9d4b088a7a25de36e167ae70505c195467c2401df0396a40e2301cc29a25e7e4097ed20cc6335e8956 SHA512 5f5aeecab841345abe98b87180644e60f8e52a12fc2c354cdd3678d8ad5c8c1ba13790a1bc6fa5662587714f3af9566f6adbdbc355b18d632d0ffa3eb4e83106 diff --git a/x11-wm/qtile/qtile-0.28.0.ebuild b/x11-wm/qtile/qtile-0.28.0.ebuild new file mode 100644 index 000000000000..e8473373841c --- /dev/null +++ b/x11-wm/qtile/qtile-0.28.0.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi virtualx + +DESCRIPTION="A full-featured, hackable tiling window manager written in Python" +HOMEPAGE=" + https://qtile.org/ + https://github.com/qtile/qtile/ + https://pypi.org/project/qtile/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="pulseaudio wayland" + +RDEPEND=" + >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] + >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] + dev-python/dbus-next[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] + x11-libs/cairo[X,xcb(+)] + x11-libs/libnotify[introspection] + x11-libs/pango + pulseaudio? ( + dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] + media-sound/pulseaudio + ) + wayland? ( + >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] + >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] + ) +" +BDEPEND=" + dev-python/cffi[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}] + test? ( + dev-python/libcst[${PYTHON_USEDEP}] + media-gfx/imagemagick[X] + x11-base/xorg-server[xephyr,xvfb] + ) + wayland? ( + >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] + >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ + -i setup.py || die + + # some tests expect bin/qtile + mkdir bin || die + cat >> bin/qtile <<-EOF || die + #!/bin/sh + exec qtile "\${@}" + EOF + chmod +x bin/qtile || die + + distutils-r1_python_prepare_all +} + +src_compile() { + local -x CFFI_TMPDIR=${T} + distutils-r1_src_compile +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + local EPYTEST_DESELECT=( + # mypy stuff + test/test_check.py + test/migrate/test_check_migrations.py + # TODO: this test clearly requires x11 — so why is wayland + # variant being run? + 'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]' + ) + + # force usage of built module + rm -rf libqtile || die + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x TZ=UTC + nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || + die -n "Tests failed with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGELOG README.rst ) + distutils-r1_python_install_all + + insinto /usr/share/xsessions + doins resources/qtile.desktop + + insinto /usr/share/wayland-sessions + doins resources/qtile-wayland.desktop + + exeinto /etc/X11/Sessions + newexe "${FILESDIR}"/${PN}-session-r1 ${PN} +} diff --git a/x11-wm/qtile/qtile-0.28.1.ebuild b/x11-wm/qtile/qtile-0.28.1.ebuild new file mode 100644 index 000000000000..e8473373841c --- /dev/null +++ b/x11-wm/qtile/qtile-0.28.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi virtualx + +DESCRIPTION="A full-featured, hackable tiling window manager written in Python" +HOMEPAGE=" + https://qtile.org/ + https://github.com/qtile/qtile/ + https://pypi.org/project/qtile/ +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~riscv" +IUSE="pulseaudio wayland" + +RDEPEND=" + >=dev-python/cairocffi-1.6.0[${PYTHON_USEDEP}] + >=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}] + dev-python/dbus-next[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + >=dev-python/xcffib-1.4.0[${PYTHON_USEDEP}] + x11-libs/cairo[X,xcb(+)] + x11-libs/libnotify[introspection] + x11-libs/pango + pulseaudio? ( + dev-python/pulsectl-asyncio[${PYTHON_USEDEP}] + media-sound/pulseaudio + ) + wayland? ( + >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] + >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] + ) +" +BDEPEND=" + dev-python/cffi[${PYTHON_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] + dev-python/setuptools-scm[${PYTHON_USEDEP}] + test? ( + dev-python/libcst[${PYTHON_USEDEP}] + media-gfx/imagemagick[X] + x11-base/xorg-server[xephyr,xvfb] + ) + wayland? ( + >=dev-python/pywayland-0.4.17[${PYTHON_USEDEP}] + >=dev-python/pywlroots-0.17[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + sed -e "s/can_import(\"wlroots.ffi_build\")/$(usex wayland True False)/" \ + -i setup.py || die + + # some tests expect bin/qtile + mkdir bin || die + cat >> bin/qtile <<-EOF || die + #!/bin/sh + exec qtile "\${@}" + EOF + chmod +x bin/qtile || die + + distutils-r1_python_prepare_all +} + +src_compile() { + local -x CFFI_TMPDIR=${T} + distutils-r1_src_compile +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + local EPYTEST_DESELECT=( + # mypy stuff + test/test_check.py + test/migrate/test_check_migrations.py + # TODO: this test clearly requires x11 — so why is wayland + # variant being run? + 'test/backend/x11/test_window.py::test_urgent_hook_fire[wayland-2]' + ) + + # force usage of built module + rm -rf libqtile || die + + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + local -x TZ=UTC + nonfatal epytest --backend=x11 $(usev wayland '--backend=wayland') || + die -n "Tests failed with ${EPYTHON}" +} + +python_install_all() { + local DOCS=( CHANGELOG README.rst ) + distutils-r1_python_install_all + + insinto /usr/share/xsessions + doins resources/qtile.desktop + + insinto /usr/share/wayland-sessions + doins resources/qtile-wayland.desktop + + exeinto /etc/X11/Sessions + newexe "${FILESDIR}"/${PN}-session-r1 ${PN} +} diff --git a/x11-wm/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 |