From d4f65848c7ecabb56e2f93889cbd20078cd347f7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Dec 2024 02:07:07 +0000 Subject: gentoo auto-resync : 02:12:2024 - 02:07:07 --- x11-wm/Manifest.gz | Bin 9129 -> 9130 bytes x11-wm/fvwm3/Manifest | 15 +- .../files/fvwm3-1.1.0-fix-go-detection-v2.patch | 50 ----- x11-wm/fvwm3/files/fvwm3-1.1.1-desk-init.patch | 32 +++ x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild | 202 ------------------ x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild | 203 ------------------ x11-wm/fvwm3/fvwm3-1.1.1.ebuild | 185 ++++++++++++++++ x11-wm/fvwm3/fvwm3-9999.ebuild | 47 +++-- x11-wm/fvwm3/metadata.xml | 3 - x11-wm/mutter/Manifest | 2 + x11-wm/mutter/mutter-46.7.ebuild | 233 +++++++++++++++++++++ 11 files changed, 485 insertions(+), 487 deletions(-) delete mode 100644 x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch create mode 100644 x11-wm/fvwm3/files/fvwm3-1.1.1-desk-init.patch delete mode 100644 x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild delete mode 100644 x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild create mode 100644 x11-wm/fvwm3/fvwm3-1.1.1.ebuild create mode 100644 x11-wm/mutter/mutter-46.7.ebuild (limited to 'x11-wm') diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz index a83e7f760ca7..3fdfea93603a 100644 Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ diff --git a/x11-wm/fvwm3/Manifest b/x11-wm/fvwm3/Manifest index 4f13ed53bb4a..e677abe3db17 100644 --- a/x11-wm/fvwm3/Manifest +++ b/x11-wm/fvwm3/Manifest @@ -1,9 +1,6 @@ -AUX fvwm3-1.1.0-fix-go-detection-v2.patch 1807 BLAKE2B e34c3110b0fe64a392a8c2a9369780e55bee4f043f6c403e8e0b9f216e657580125a7b1fe0481017fc41de89866e099ead38f4779bec5737f30fe52c63ae6dab SHA512 cb2716f0ec085c75cceb73c0f6d3ba838c162162c0c3e6ae83bcf93c099d7f15d6d29bad59bd5522e24f1f4305d36f70fe91150536d239d3e1a1abb8fc9b6a33 -DIST fvwm3-1.0.9-docs.tar.xz 234884 BLAKE2B f52da9eb2486f7a212ead77ccc190c57076e1d3c73a3997c3a94edcf60dbc72ec5d410a8df1d621ff18b346741b1c94b3f87170db68c3067caa3295782a9bb61 SHA512 e6c33b09b7bac32bd61f1bd2c0216e2c99fef3f0b51b52b229093c25a437828e4bece382284d0c1f0bbbaf5b7459f2c391dfc1d2fa4ba80be22f09094e976b03 -DIST fvwm3-1.0.9.tar.gz 4525552 BLAKE2B cb58181adb42f5b8d491c6413277eb1f4a5d89637d9c6bb323223925c719d808e84ed0f72a1d0ffc822ddb8295ebf2bb89c2351ebd591916b50ebc69728e59fa SHA512 de71d74b76da8e0cf1560d51ef916857e3f825b272d786d9b6b93aef9a82c399f580b9b941a47aff1f327b097d12e1ce05860924e792206e4150ff19a5c39ee3 -DIST fvwm3-1.1.0-docs.tar.xz 230964 BLAKE2B f431011a63a8d190e01e34301e74fd40750deb51c947b055474888379b7364910351c923ac637968948a094b89f49d8be5758429a85cd66107b8696b526b0004 SHA512 629794d0aef9ef2d9ce9a8e1ff3bc63fe2ef30f9f593938e2892e4e04bd960f51d2a90aaf5c95328495bccea6b1dbfd6fdeb76f18bb9a8bc6eb2649359023df8 -DIST fvwm3-1.1.0.tar.gz 4527424 BLAKE2B ee9a3f190ae7fa1f1dd703e17b0e12f04da63212cade30facdbc8339ded7f598de143d18f17dde39d3af8e24ff2b34855ad3e5b2b6c5ffe466072a7353895cd8 SHA512 47eea05cbdecf4da3313b9183fa938544b451b9f133d7a68062feb222c3c1af3873402f80b60485d603afe8cd23a03f3e86a503fc1f2070e1ad2e6e64d012341 -EBUILD fvwm3-1.0.9-r1.ebuild 4808 BLAKE2B 522e96330ee3730704e2544ab34a71816b5616e8565790cabacbb3a0ccfbebcf09d7b0e74acd289b1d092c9e828e58d995d6986257d32db55b58310b6aea866e SHA512 9a10669c760d02ac45339259c8d4c836dcb3cfcfaf368363838ba16bf415afc83bb20db326999d4a45c237771b0c617691d3639292517475b45961fe37174380 -EBUILD fvwm3-1.1.0-r1.ebuild 4759 BLAKE2B 562730695d29ac3f1d587ad37803719614107e8332ac96b8faab71e20186d961bd39155057875346aca7bf2c2588db6c104f2b4c84fda52752ef75c85f933176 SHA512 8740a4d2bc9a67d9f1b190f846ab07ce5fc0fb210348450bd9f120ae224d79fb6a1a9e7bb04dc6787dcb25779c760902f90416f9afa7355b01e77668eb01e0c7 -EBUILD fvwm3-9999.ebuild 4278 BLAKE2B 3f6bdccc4fb68c3794bccc66276c92d6b84240a95b8e25f8b32329c351af6ec67b75e443326cd1acfea842b4f692c97c7d7f61199094ea91ff75cd0f82febb5c SHA512 ee590160dfd9ca7979776ab6ad64ce2f948f1addec06d937c418633bb6fc2fe8885fd9b5aefebde88b03d2bff64fc2b43fde7b84d454d4b15416370267c78a37 -MISC metadata.xml 1012 BLAKE2B 5c5d08f16521594e1425ca8efbe5162c72ce6aff0557c0c79f1e2717dfc77ba855f90c493b45ff361d2e75f00b17e549b6853ee660c77c57cdeadce1df223f32 SHA512 a53bdde33366823f867bcff8b6c90e3cae6e0808945278fd02928502fd38df9d699fa4ace2fe66c1524e74d256242202a2b3139deb1331b67ac72f2fd0e9608f +AUX fvwm3-1.1.1-desk-init.patch 1237 BLAKE2B f25ed4ba7cf2b5a5bc9bb4973d123d7afdcfc824f7eee64747534d8407f456fec5b2a3ec3f78fb80a0c81718cb11f216ca575b47fee9018d7a5667219c1f7f02 SHA512 c528fd645390bb5caa941a09f0d3fc19a932a332f45d568a00674c8cf4958145689bf05612dcacb0ec3109954ca07882cbbadf7f01610c6b6ac59b3ed74ddbd2 +DIST fvwm3-1.1.1-docs.tar.xz 241608 BLAKE2B fbdc789dce9e36a94a4b6c2541b4474548bd961e333d14507788a70e1e4103f0ae5df8223259670cd2aeaec43d3088f1b600b371d03543c2bbb4bce47c37815c SHA512 92385ff188269f85dfda0f079135d651973b1556ac13112cff087a2294256edd7dc2b99aa2c220f9f361df6a3a4d820c56e061dd5d818e58755b1f94df9b4e03 +DIST fvwm3-1.1.1.tar.gz 4016926 BLAKE2B 5654554d8bd6593f30cb5bdd05e424abd7fd3f298d12073d419d18967f17d2df58de797392af0b15a0bcf05d09c8fe7b3c273734d17cb97b617dcb9a5e7f4091 SHA512 66b044a2c463d56573c68f4cdd222a39a667a4acf3425d448c7e1c105e67a9d00abafff1e94c066f0781b4546d1b2b84bc9c20798a0b9ef4b0f673e743a2d4d0 +EBUILD fvwm3-1.1.1.ebuild 4626 BLAKE2B f45a9c81599a3d4bdf5498e10c72f03b48cdcd93730f4e2fe877fdfdb112436670298a6a363c5f54614d1e0080b67f65704746c1016d5545b8eba20996c6dafd SHA512 991d19d781d2a8f55206e5f99f11997f7626188e562c147e2ed774b9f4380255850154561adae2238d2a128234cc66e3d74c68f4bcc9c7cd50b44749307f42de +EBUILD fvwm3-9999.ebuild 4577 BLAKE2B aa5e96cb2776be29ba25ddef3b29807fd5f437fdd7fa87970abb4866e56b7e8f1566c5c306a6676bb7cb69ec7da8cbfc4cd6c307dd30f6fd31b6690ce5a70a8e SHA512 b7743ebe4f01cff8047af792c9e55f7b7d71c8b48b5997a33802f9ed051c9bd80ae76865a345f5707d5d142cac3194950ec4df81e64157067c21d435e49126bc +MISC metadata.xml 829 BLAKE2B 23828052466446a55db8d718ce60120ab06213bd53cd0a0e6d2be3b76d1ae39d629cd49236aeaf5c28b9493ef10854d2845281c88cbe0e7cdec4cce5d9368259 SHA512 f05606a0aaac1b7d7cda86991fc8b49d778d4fbc73c52ab19741e5f51dd62b07cef6bb7d32df7baad025b7654d0fe85c7a337a31fa9f254326f59b6eda7adb64 diff --git a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch b/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch deleted file mode 100644 index 5c17193728cc..000000000000 --- a/x11-wm/fvwm3/files/fvwm3-1.1.0-fix-go-detection-v2.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9be90a96c537b4a743774b0be9ffc8ca5c6498da Mon Sep 17 00:00:00 2001 -From: Matt Jolly -Date: Tue, 2 Apr 2024 20:47:38 +1000 -Subject: [PATCH] Use AX_COMPARE_VERSION macro for golang version checks - -The previous approach fragile, required manual updates, -and results in unexpected outcomes when the user has updated -golang. - -Reported-by: Denny Rivetti ---- a/configure.ac -+++ b/configure.ac -@@ -80,23 +80,13 @@ AC_ARG_ENABLE(golang, - - if test ! x"$with_golang" = xno; then - AC_CHECK_PROGS(GO, go) -- if test -n "$GO" ; then -- GOVERSIONOPTION=version -- go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version go//' | \ -- sed -e 's/ .*$//') -- AC_MSG_CHECKING([whether go version is >= 1.14.x ($go_version)]) -- case "$go_version" in -- 1.14*|1.15*|1.16*|1.17*|1.18*|1.19*|1.20*|1.21*|1.22*|1.23*) -- AC_MSG_RESULT([yes - version is: $go_version]) -- with_golang="yes" -- GO= -- ;; -- *) -- AC_MSG_RESULT([no - version is: $go_version]) -- with_golang="no" -- problem_golang=": version of go ($go_version) <= 1.14.x" -- ;; -- esac -+ if test -n "$GO"; then -+ GOVERSIONOPTION=version -+ go_version=$($GO $GOVERSIONOPTION | sed -e 's/go version go//' | sed -e 's/ .*$//') -+ AX_COMPARE_VERSION([$go_version], [ge], ["1.14.0"], -+ [with_golang="yes"; GO=], -+ [with_golang="no"; -+ AC_MSG_ERROR([Go version ($go_version) is lower than the minimum required version ($REQUIRED_GO_VERSION)])]) - fi - fi - AM_CONDITIONAL([FVWM_BUILD_GOLANG], [test x"$with_golang" = xyes]) -@@ -1514,4 +1504,4 @@ Fvwm3 Configuration: - Build man pages? $with_mandoc$problem_mandoc - Build html man pages? $with_htmldoc$problem_htmldoc - --" -\ No newline at end of file -+" diff --git a/x11-wm/fvwm3/files/fvwm3-1.1.1-desk-init.patch b/x11-wm/fvwm3/files/fvwm3-1.1.1-desk-init.patch new file mode 100644 index 000000000000..34b824f79dd2 --- /dev/null +++ b/x11-wm/fvwm3/files/fvwm3-1.1.1-desk-init.patch @@ -0,0 +1,32 @@ +From efef84cf5fcd2c4747ef75dd522605450efd278a Mon Sep 17 00:00:00 2001 +From: Jaimos Skriletz +Date: Sat, 30 Nov 2024 16:40:21 -0700 +Subject: [PATCH] FvwmPager: Update current desk correctly during init. + +When FvwmPager is tracking the current desk and is run on any desk +except desk 0, the current desk isn't updated during initialization +because the monitor update is sent before the desk update, so the +pager didn't realize the desk has changed. + +This ensures that the pager updates the current desk if either +the desk changes or the new desk is not the same as the current +desk to also catch updates during pager initialization. + +Fixes #1122 +--- + modules/FvwmPager/messages.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/FvwmPager/messages.c b/modules/FvwmPager/messages.c +index c93ed3056..86cd32e70 100644 +--- a/modules/FvwmPager/messages.c ++++ b/modules/FvwmPager/messages.c +@@ -454,7 +454,7 @@ void process_new_desk(unsigned long *body) + monitor_assign_virtual(fp->m); + + /* If always tracking current desk. Update Desks[0]. */ +- if (fAlwaysCurrentDesk && oldDesk != newDesk) ++ if (fAlwaysCurrentDesk && (oldDesk != newDesk || desk1 != newDesk)) + { + PagerWindow *t; + diff --git a/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild deleted file mode 100644 index 104d32825e4e..000000000000 --- a/x11-wm/fvwm3/fvwm3-1.0.9-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs -# for release ebuilds. -# Scripting for this is in sam-gentoo-scripts. -: ${FVWM3_DOCS_PREBUILT:=1} - -PYTHON_COMPAT=( python3_{10..12} ) -GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs - -DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" -HOMEPAGE="https://www.fvwm.org/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" - EGIT_BRANCH="main" -else - SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" - if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then - SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" - fi - KEYWORDS="~amd64 ~riscv" -fi - -LICENSE="GPL-2+ FVWM - go? ( Apache-2.0 BSD MIT )" -SLOT="0" -IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" - -DOCS=( NEWS ) - -if [[ ${PV} == 9999 ]]; then - DOCS+=( - dev-docs/COMMANDS - dev-docs/DEVELOPERS.md - dev-docs/INSTALL.md - dev-docs/PARSING.md - dev-docs/TODO.md - dev-docs/NEW-COMMANDS.md - ) -fi - -BDEPEND=" - virtual/pkgconfig - app-arch/unzip - go? ( >=dev-lang/go-1.14 ) -" - -if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - BDEPEND+=" - dev-libs/libxslt - dev-ruby/asciidoctor - " -fi - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} - !x11-wm/fvwm - dev-lang/perl - dev-libs/glib:2 - dev-libs/libevent:= - media-libs/fontconfig - media-libs/libpng:= - 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/libXft - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - bidi? ( dev-libs/fribidi ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - readline? ( - sys-libs/ncurses:= - sys-libs/readline:= - ) - stroke? ( dev-libs/libstroke ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - )" - -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto" - -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - -src_configure() { - # Non-upstream email where bugs should be sent; used in fvwm-bug. - export FVWM_BUGADDR="desktop-wm@nogentoo.org" - - # Recommended by upstream for release. Doesn't really matter for live ebuilds. - append-flags -fno-strict-aliasing - - # Signed chars are required. - for arch in arm arm64 ppc ppc64; do - use $arch && append-flags -fsigned-chars - done - - local myconf=( - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - $(use_enable bidi) - $(use_enable go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png - ) - - if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - myconf+=( - --enable-mandoc - --enable-htmldoc - ) - else - # Probably not required, but let's be safe - myconf+=( - --disable-mandoc - --disable-htmldoc - ) - fi - - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" -} - -src_install() { - # Since we're manually handling docs installation, let's do that first - # and then install the rest of the files via emake - local HTML_DOCS - if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] - HTML_DOCS="${WORKDIR}"/${P}-docs/html/* - else - HTML_DOCS="${S}"/doc/*.html - doman "${S}"/doc/*.[0-8] - fi - - einstalldocs - - emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - python_scriptinto "/usr/bin" - python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" - - make_session_desktop fvwm3 /usr/bin/fvwm3 - -} - -pkg_postinst() { - if use go; then - ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." - ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." - ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";" - ewarn "however FvwmPrompt and FvwmCommand will not be installed." - else - ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild." - ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." - ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." - fi -} diff --git a/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild deleted file mode 100644 index 9fe8d41f042d..000000000000 --- a/x11-wm/fvwm3/fvwm3-1.1.0-r1.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs -# for release ebuilds. -# Scripting for this is in sam-gentoo-scripts. -: ${FVWM3_DOCS_PREBUILT:=1} - -PYTHON_COMPAT=( python3_{10..12} ) -GO_OPTIONAL=1 -inherit autotools desktop flag-o-matic go-module python-single-r1 toolchain-funcs - -DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" -HOMEPAGE="https://www.fvwm.org/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" - EGIT_BRANCH="main" -else - SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" - if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then - SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" - fi - KEYWORDS="~amd64 ~riscv" -fi - -LICENSE="GPL-2+ FVWM - go? ( Apache-2.0 BSD MIT )" -SLOT="0" -IUSE="bidi debug +go netpbm nls perl readline stroke svg tk lock" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE}" - -DOCS=( NEWS ) - -if [[ ${PV} == 9999 ]]; then - DOCS+=( - dev-docs/COMMANDS - dev-docs/DEVELOPERS.md - dev-docs/INSTALL.md - dev-docs/PARSING.md - dev-docs/TODO.md - dev-docs/NEW-COMMANDS.md - ) -fi - -BDEPEND=" - virtual/pkgconfig - app-arch/unzip - go? ( >=dev-lang/go-1.14 ) -" - -if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - BDEPEND+=" - dev-libs/libxslt - dev-ruby/asciidoctor - " -fi - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} - !x11-wm/fvwm - dev-lang/perl - dev-libs/glib:2 - dev-libs/libevent:= - media-libs/fontconfig - media-libs/libpng:= - 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/libXft - x11-libs/libXpm - x11-libs/libXrandr - x11-libs/libXrender - bidi? ( dev-libs/fribidi ) - lock? ( x11-misc/xlockmore ) - netpbm? ( media-libs/netpbm ) - perl? ( tk? ( - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 - ) - ) - readline? ( - sys-libs/ncurses:= - sys-libs/readline:= - ) - stroke? ( dev-libs/libstroke ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - )" - -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}"/fvwm3-1.1.0-fix-go-detection-v2.patch -) - -src_prepare() { - default - use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \ - -i bin/FvwmPrompt/Makefile.am || die ) - - eautoreconf -} - -src_configure() { - # Recommended by upstream for release. Doesn't really matter for live ebuilds. - append-flags -fno-strict-aliasing - - # Signed chars are required. - for arch in arm arm64 ppc ppc64; do - use $arch && append-flags -fsigned-chars - done - - local myconf=( - --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm - --enable-package-subdirs - $(use_enable bidi) - $(use_enable go golang) - $(use_enable nls) - $(use_enable nls iconv) - $(use_enable perl perllib) - $(use_with readline readline-library) - $(use_enable svg rsvg) - --enable-png - ) - - if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then - myconf+=( - --enable-mandoc - --enable-htmldoc - ) - else - # Probably not required, but let's be safe - myconf+=( - --disable-mandoc - --disable-htmldoc - ) - fi - - use readline && myconf+=( --without-termcap-library ) - - econf "${myconf[@]}" -} - -src_compile() { - PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)" -} - -src_install() { - # Since we're manually handling docs installation, let's do that first - # and then install the rest of the files via emake - local HTML_DOCS - if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] - HTML_DOCS="${WORKDIR}"/${P}-docs/html/* - else - HTML_DOCS="${S}"/doc/*.html - doman "${S}"/doc/*.[0-8] - fi - - einstalldocs - - emake DESTDIR="${ED}" prefix="/usr" exec_prefix="/usr" datarootdir="/usr/share" install - - exeinto /etc/X11/Sessions - newexe - ${PN} <<-EOF - #!/bin/sh - ${PN} - EOF - - python_scriptinto "/usr/bin" - python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" - - make_session_desktop fvwm3 /usr/bin/fvwm3 - -} - -pkg_postinst() { - if use go; then - ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." - ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." - ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";" - ewarn "however FvwmPrompt and FvwmCommand will not be installed." - else - ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild." - ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." - ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." - fi -} diff --git a/x11-wm/fvwm3/fvwm3-1.1.1.ebuild b/x11-wm/fvwm3/fvwm3-1.1.1.ebuild new file mode 100644 index 000000000000..227108110a88 --- /dev/null +++ b/x11-wm/fvwm3/fvwm3-1.1.1.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Doc generation requires pulls in asciidoc/ruby, we'll prebuild docs +# for release ebuilds. +# Scripting for this is in sam-gentoo-scripts. +: ${FVWM3_DOCS_PREBUILT:=1} + +PYTHON_COMPAT=( python3_{10..13} ) +GO_OPTIONAL=1 +inherit flag-o-matic go-module meson optfeature python-single-r1 + +DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" +HOMEPAGE="https://www.fvwm.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/fvwmorg/fvwm3.git" + EGIT_BRANCH="main" + FVWM3_DOCS_PREBUILT=0 +else + SRC_URI="https://github.com/fvwmorg/fvwm3/releases/download/${PV}/${P}.tar.gz" + if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]]; then + SRC_URI+=" https://deps.gentoo.zip/x11-wm/fvwm3/${P}-docs.tar.xz" + fi + KEYWORDS="~amd64 ~riscv" +fi + +LICENSE="GPL-2+ FVWM + go? ( Apache-2.0 BSD MIT )" +SLOT="0" +IUSE="bidi +go nls readline svg" +# Strictly speaking readline is not required for go, +# but as most systems already have it installed we don't users to stub their toe on REQUIRED_USE +REQUIRED_USE="${PYTHON_REQUIRED_USE} !go? ( readline )" + +DOCS=( NEWS ) + +if [[ ${PV} == 9999 ]]; then + DOCS+=( + dev-docs/COMMANDS + dev-docs/DEVELOPERS.md + dev-docs/INSTALL.md + dev-docs/PARSING.md + dev-docs/TODO.md + dev-docs/NEW-COMMANDS.md + ) +fi + +BDEPEND=" + virtual/pkgconfig + app-arch/unzip + go? ( >=dev-lang/go-1.20 ) +" + +if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then + BDEPEND+=" + dev-libs/libxslt + dev-ruby/asciidoctor + " +fi + +COMMON_DEPEND=" + dev-lang/perl + dev-libs/glib:2 + dev-libs/libevent:= + media-libs/fontconfig + media-libs/libpng:= + x11-base/xorg-proto + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libxkbcommon + x11-libs/libXpm + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/xtrans + x11-libs/libXfixes + bidi? ( dev-libs/fribidi ) + readline? ( + sys-libs/readline:= + ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + ${PYTHON_DEPS} + !x11-wm/fvwm +" + +DEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-desk-init.patch +) + +src_configure() { + # Recommended by upstream for release. Doesn't really matter for live ebuilds. + append-flags -fno-strict-aliasing + + # Signed chars are required. + for arch in arm arm64 ppc ppc64; do + use $arch && append-flags -fsigned-chars + done + + local emesonargs=( + "-Dpng=enabled" + "-Dsm=enabled" + "-Dxcursor=enabled" + "-Dxfixes=enabled" + "-Dxpm=enabled" + "-Dxrender=enabled" + $(meson_feature bidi) + $(meson_feature go golang) + $(meson_feature nls iconv) + $(meson_feature nls) + $(meson_feature readline) # not required for go but it won't hurt to enable it + $(meson_feature svg cairo) # Pick 1 of 'cairo', 'cairo-svg', or 'libsvg-cairo'; add the appropriate dependency + $(meson_feature svg) + "-Dcairo-svg=disabled" + "-Dlibsvg-cairo=disabled" + "-Ddocdir=${EPREFIX}/usr/share/doc/${PF}" + ) + + if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then + emesonargs+=( + "-Dhtmldoc=true" + "-Dmandoc=true" + ) + else + # Probably not required, but let's be safe + emesonargs+=( + "-Dhtmldoc=false" + "-Dmandoc=false" + ) + fi + + meson_src_configure +} + +src_install() { + # Since we're manually handling docs installation, let's do that first + # and then install the rest of the files "normally". + local HTML_DOCS + if [[ ${FVWM3_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${P}-docs/man/**/*.[0-8] + HTML_DOCS="${WORKDIR}"/${P}-docs/html/* + fi + einstalldocs + + meson_src_install + + if ! use go; then + python_scriptinto "/usr/bin" + python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop" + fi +} + +pkg_postinst() { + if use go; then + ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole." + ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper." + ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\";" + ewarn "however FvwmPrompt and FvwmCommand will not be installed." + else + ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild." + ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." + ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." + fi + + optfeature_header "Useful optional features:" + optfeature "Screen locking" x11-misc/xlockmore + optfeature "NetPBM support (used by FvwmScript-ScreenDump)" media-libs/netpbm +} diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index b1eb858ae80b..20ea4b1d2fd7 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -10,7 +10,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) GO_OPTIONAL=1 -inherit flag-o-matic go-module meson python-single-r1 +inherit flag-o-matic go-module meson optfeature python-single-r1 DESCRIPTION="A multiple large virtual desktop window manager derived from fvwm" HOMEPAGE="https://www.fvwm.org/" @@ -31,8 +31,10 @@ fi LICENSE="GPL-2+ FVWM go? ( Apache-2.0 BSD MIT )" SLOT="0" -IUSE="bidi +go netpbm nls perl readline svg" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="bidi +go nls readline svg" +# Strictly speaking readline is not required for go, +# but as most systems already have it installed we don't users to stub their toe on REQUIRED_USE +REQUIRED_USE="${PYTHON_REQUIRED_USE} !go? ( readline )" DOCS=( NEWS ) @@ -50,54 +52,54 @@ fi BDEPEND=" virtual/pkgconfig app-arch/unzip - go? ( >=dev-lang/go-1.14 ) + go? ( >=dev-lang/go-1.20 ) " -if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then +if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then BDEPEND+=" dev-libs/libxslt dev-ruby/asciidoctor " fi -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} - !x11-wm/fvwm +COMMON_DEPEND=" dev-lang/perl dev-libs/glib:2 dev-libs/libevent:= media-libs/fontconfig media-libs/libpng:= - sys-libs/zlib + x11-base/xorg-proto 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/libXft + x11-libs/libxkbcommon x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender - x11-misc/xlockmore - dev-lang/tk - dev-perl/Tk - >=dev-perl/X11-Protocol-0.56 + x11-libs/xtrans + x11-libs/libXfixes bidi? ( dev-libs/fribidi ) readline? ( - sys-libs/ncurses:= sys-libs/readline:= ) svg? ( gnome-base/librsvg:2 x11-libs/cairo - )" + ) +" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto" +RDEPEND=" + ${COMMON_DEPEND} + ${PYTHON_DEPS} + !x11-wm/fvwm +" + +DEPEND="${COMMON_DEPEND}" src_configure() { # Recommended by upstream for release. Doesn't really matter for live ebuilds. @@ -112,6 +114,7 @@ src_configure() { "-Dpng=enabled" "-Dsm=enabled" "-Dxcursor=enabled" + "-Dxfixes=enabled" "-Dxpm=enabled" "-Dxrender=enabled" $(meson_feature bidi) @@ -126,7 +129,7 @@ src_configure() { "-Ddocdir=${EPREFIX}/usr/share/doc/${PF}" ) - if [[ ${FVWM3_DOCS_PREBUILT} == 0 ]]; then + if [[ ${FVWM3_DOCS_PREBUILT} -ne 1 ]]; then emesonargs+=( "-Dhtmldoc=true" "-Dmandoc=true" @@ -171,4 +174,8 @@ pkg_postinst() { ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"." ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way." fi + + optfeature_header "Useful optional features:" + optfeature "Screen locking" x11-misc/xlockmore + optfeature "NetPBM support (used by FvwmScript-ScreenDump)" media-libs/netpbm } diff --git a/x11-wm/fvwm3/metadata.xml b/x11-wm/fvwm3/metadata.xml index 278a0067ac68..13311dfc28e1 100644 --- a/x11-wm/fvwm3/metadata.xml +++ b/x11-wm/fvwm3/metadata.xml @@ -11,9 +11,6 @@ Enable building dev-lang/go code (FvwmPrompt) - Enable screen locking - Enable NetPBM support (used by FvwmScript-ScreenDump) - Mouse Gesture support fvwmorg/fvwm3 diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index 3beff9ea358b..20c8156e124c 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -2,8 +2,10 @@ AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e DIST mutter-45.5.tar.xz 2886412 BLAKE2B b5534943d41500a165de5242f73b9da145dd52a4b5168e863843ca5b08a6d726be9b7a94b94763e6b4c10b48355ed845accd9ae63704aefaf3f8e2bb361855b8 SHA512 15fb5589e2b971ac94b3d8f549643f2998375943c419114907c317761c8250089751dea65c35be44435350e6bb02bb238fcf2eef17bf7d6a5b41053a64ffba05 DIST mutter-45.6.tar.xz 2886844 BLAKE2B f5658d0667cac04f290040e26cf8326d6d30130d0500b18b318269bae152b18a1e4867b9c749269e14b31fb8d7af7fb7a1d72f94df1dad1da0bd98462b9a29f0 SHA512 bfd918469450dd287b58c5e8c55969d9d3bb737898a5823175c15841e2d483faf2900f6c0d4b2bcdcbdb4e58fa16d4dee836084f1f4307fbbce3e7a8d6343738 DIST mutter-46.4.tar.xz 6752800 BLAKE2B 330c8fd1537c6eea93af4413ec7ccf8c0ea478c5d11d8666b80c93e86eb3135782d365f5f7b449379e211f12d4172fc74b0c39026ab45064dbf18b50fe30a894 SHA512 b8d952da069230b2e10d82aaf87c7acca2a1436b0cc2e19b64012dc535690fdded931d905496dd668948330e553f863505c1aafb36b4ff4724f5ac0e9012f7db +DIST mutter-46.7.tar.xz 6755308 BLAKE2B 69cb8457ec9ab905c8764ffa8fbd44050431b359e349697615b90d201402dffd2bd850e3fb0f393ab75800d148c2805ac791f69d356c6bfb26007a2394cbbd48 SHA512 0d9b159805b79f90d2cb06582c859b10e56bc22001d1e1b0090821914e18085749a54eb117b94788578b17894e4d28ec408144a09b29f94b7785f7538c4613a8 EBUILD mutter-45.5.ebuild 7074 BLAKE2B be4c19f9fcea03f64e8faba3364b751f380c2fd865e0096cf5af32c17370f143467ab69e51827528cb7659a7e980afbd82f6222e279dd39e292d80e959940640 SHA512 fdc80858095dcb1122e79775fa7e6756cc0816bd9f75250b5630359b96b260ddc4db38bd6bc81b0937db955369d94f7afbb69c55e03ffd09474961282f18f7f7 EBUILD mutter-45.6.ebuild 7329 BLAKE2B 0f1f364a4f9b549e606bddf92546d12361521c5e4c48e9ca2e55e45f2f7bf28ace17b1a1eb598d44157be76d10c22549d09bbbeaa2c84b42b880ab30d7015fc1 SHA512 428844a68e1b23bbb1639e7f615ddb24dc64634bbaf3c7cd053a9c5ed6cbe815f3588082bc6d69003c5b28cbd6e034586cfee3a76d9a713c314b32c9bf09c7f6 EBUILD mutter-46.4.ebuild 7001 BLAKE2B e59f591d7f9ea67368c68de0d67e7b5b286c1d3928eca87c1d7876272e3d2f17402c12446f5aed32a293d054c01b57047ca9e6cebc7a12c669591ad805021b7b SHA512 84333dbb2d47a65d0e559012d00b644ee3056b29a95098e455ac228b250b117bde7e2f20da37c9caccd29d55dd9193eb67f540d49644038b979b9ea15ee56722 +EBUILD mutter-46.7.ebuild 7001 BLAKE2B e6dd971d72eb7f2e92dbf272cb152aef3483331e2ebccfce8234243032e643af7590a09090f343789ce870f8ccf16be37f5782f1497340da95b2e50e5ce48f6b SHA512 8e77eccfcb5ae5cdeaf0208e00fd2025f730dfd17472871226930e1e7fcd1eeb666903d85a0b3c073d889e4215ed60f90cfc663d80f87e85824a33939c49216b 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.7.ebuild b/x11-wm/mutter/mutter-46.7.ebuild new file mode 100644 index 000000000000..6d4577d90403 --- /dev/null +++ b/x11-wm/mutter/mutter-46.7.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-.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-238 + ) + systemd? ( sys-apps/systemd ) + x11-libs/libSM + input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) + >=x11-libs/startup-notification-0.7 + screencast? ( >=media-video/pipewire-0.3.33:= ) + 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 +} -- cgit v1.2.3