summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-07 17:37:01 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-07 17:37:01 +0100
commit2fe5661a32d6ec0ba1d6b37cc8ae67e3f81459ec (patch)
treef41d653fa88967e28246f7b63dba9f2fd7be2ab7 /x11-wm
parent6e88bac8dd26372eea042112ad3769b1fac9ae18 (diff)
gentoo auto-resync : 07:05:2023 - 17:37:01
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/Manifest.gzbin9283 -> 9288 bytes
-rw-r--r--x11-wm/i3/Manifest2
-rw-r--r--x11-wm/i3/i3-4.21.1.ebuild107
-rw-r--r--x11-wm/mutter/Manifest3
-rw-r--r--x11-wm/mutter/files/mutter-44.1-frame-updates.patch158
-rw-r--r--x11-wm/mutter/files/mutter-44.1-xdnd-frame-window.patch50
-rw-r--r--x11-wm/mutter/mutter-44.1-r1.ebuild240
7 files changed, 451 insertions, 109 deletions
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 7444ad83e5d0..664aa3f35c0d 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
Binary files differ
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 066458c1468e..7be474ba03f8 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,7 +1,5 @@
AUX i3-4.16-musl-GLOB_TILDE.patch 2783 BLAKE2B 9dea47af64b78a77006d3aa641273aa7a77846d4425e1da17424528445450112ab275cdf7098ba8c2a76f1b08561b1d1a852cb9fd4ee4c61e53832ca702ad55d SHA512 fdff65255e7c9b30eefdbf032e04ba568d5b75a5b7dfc5fce1aecaac0f0d376b6bb4f87338e1eaf5f20b1c5882ebfc7349f8ab43c804349b5f5c626f9fc1d340
-DIST i3-4.21.1.tar.xz 1297400 BLAKE2B 44661bd9edf0bee384b8be88cbf2361bb2ad26fdbaee9a2e010ebdee662b31129057a1a183f46bef0839a545f63c70d00903b0ec4693c1bc9390c84d7a78ac44 SHA512 9656b302d6654f38c48bfa1d97a89eaf3ed395027039b6903005d81a9e95d2c4aeba561cf8d1aa36962ba9975996f133ce4298132cddde0f70ba36f57af3197d
DIST i3-4.22.tar.xz 1349276 BLAKE2B fa179f445ba4286bfeec98dc7a2e1dfad14bda6874e84878a48ee5890ed4cf3a90fc542e8e14aedaaba3abebc8d280284a3b00e838da70a783064a4bd271ca41 SHA512 4e4536fb4108e92a1c918b5869232c0f7eb0feca2d3a49ba87250b970df0614cfe256d1e41fbd825a81c43b82898651e5d3fc11ca8101978916754dfa885266a
-EBUILD i3-4.21.1.ebuild 1979 BLAKE2B cb8c94ca4b59e0e39befcd14cebbfcdbbe97117bd20badbaaead8e765dcef011de56deefe1cf8fa233af96bb6bd2bbb0f19328eb80b9375710c014ae854dd056 SHA512 a927997aea4a47961ed35616f532e6eae25d548c28ab0a373e75b06fbd735be94e991ea1cf7967582c9774ed6b15efca83976dcd3840c920d22e7c0c4698aeac
EBUILD i3-4.22.ebuild 1916 BLAKE2B 97f461a7efa127ae9626c98ac973653d49ba78ae671e8467f6c6688b0770ba2376eb5639e2b76f1c197ecb236aa1270d0841dc991b6731208b5e4e24eab5616e SHA512 77dce2ae4c13add87198f854654c9700a901d594df6079c04e86ae1ff86bcfa18589a6d34c8927e78babc5005b9010f1992e1f20bafbd4ea1aa21290b26f8c0a
EBUILD i3-9999.ebuild 1910 BLAKE2B 7b066fe5cc374d9419f88703690de0b50b6a0acf485efe897aad943d2fb0c99d2f2672a4379390bd9ff5bb41445b5b03efa8ff4eac1600af632647468ef7c2a9 SHA512 75d8425ce90a13c192c14e92e7ad04ded387318d0b3d7b5d3a63bb5b4466def25e3c8a042e0405267c27ea85be1c399a1ee6f5082b001a8c15700ac0f3b8b6a6
MISC metadata.xml 537 BLAKE2B 81033b6b7a90a15350b23f77fe6c99d277025ae1f36ef6b5d78bf28f0b5c9fab608c165809433577551f0b478e5a154bc7b95b64b19f7ef9be18f6c7772473f8 SHA512 157b7fc03f7d9c9a455b787061a3e806701e98e3335a0f9edb50fbd5f7712ee3ed6e9573046d8fe72093e162c3253bad3e564b73633f4c67c60a326a103583be
diff --git a/x11-wm/i3/i3-4.21.1.ebuild b/x11-wm/i3/i3-4.21.1.ebuild
deleted file mode 100644
index 7e6669983282..000000000000
--- a/x11-wm/i3/i3-4.21.1.ebuild
+++ /dev/null
@@ -1,107 +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[xkb]
- 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"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.16-musl-GLOB_TILDE.patch
-)
-
-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/mutter/Manifest b/x11-wm/mutter/Manifest
index 5623afe4a978..1d5a7d408be0 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1,7 @@
AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b
AUX mutter-44.0-no-screencast-build.patch 2391 BLAKE2B c50121f4331cc1eaef577b0ec615cec024acc85f6bcdd8dc6c0d801e19485095bfd37dbf07e13fc0ccf06ec7b814ce02764276aae577d0253f528317950569b2 SHA512 41fd4fe6aea36d8c1b90bf7e1d93729b178332eff9bf1371f8f0fed00df828f4e20017505512c8295f9998ff95550a6b0a9135d728323d0ee418eed4aa218ea6
+AUX mutter-44.1-frame-updates.patch 6835 BLAKE2B 2cac8771bc352f3532d2605c5f1c4210c2bb5449dbe40345d31bc72863ea81561749cc192a02c968cd57027ec93ff9319789776b55aaed645a8b363670db16a9 SHA512 26729acba9c143b7a101891ae33a76453f4c055668636e3657369d193f9b5d5abbc88a4161ce4de6ec1799d875c2174ee9e82e736b8127f82a574fe19aefd59d
+AUX mutter-44.1-xdnd-frame-window.patch 1782 BLAKE2B d2ac08ce4e3d54d2307280e7fcfd34b16e1cf885e53af6aea97bb466cd0c8d34ff97559d82cce2c7754cefc30848553f658dbb74b56ce3e4072d7f441fcb068e SHA512 a5d498104a7c395007270294c276a09b6fdfcbf9e7f515312b1874ae3f71a405fe0378ea5e18be90990dfd351df28b7bee878c097b565eb688a2546c3ea40c50
DIST mutter-43.3.tar.xz 2782016 BLAKE2B 9a931dba410a71e67383a453c4480622fce3333ea5d7466bf05cf20b474e3cb06288ea8015bc391a77fc3a358c60282a965428c4984006a0ea8db9a7cfee2e2f SHA512 5e9d4b213ac674889af9c15dd52f79a28a1c38af57f08a19bd6b2bf78a799aaa2f6dcb76adb9fa8d6a94e21d988befc37a696bc06801c96e1f692c80a5aff2ae
DIST mutter-43.4.tar.xz 2782136 BLAKE2B 8b1ebf42fcd0dc7b502c09f54f21454a71c1cc0a366da5306b3d088ff9bc849f561358454844e8ee40b79e878d2240714a6aeae1be424f52e7a3f7fd0d190f43 SHA512 ca80ceb9233dca0b8331e7fc8ebced67871a2ecf606a648ec9f6922f1a53db107e20446b828813fcab8234467b9325623708eff066cf8d803a6b2e5695766ccb
DIST mutter-44.0.tar.xz 2838932 BLAKE2B 0a5ea5a45a8074face45727af5d332ef61d69180d941634bf1ab673f53cd710893ccbedd16cb7bc1a09b51120b2047105a04a8eae4fbcb3803179eba89c7d73e SHA512 c7d35e797d080f90cc43b2904bb04d2328fecd13cd7d1ab12b1db735d331b2df9501668c2e0f7a10ea3ad9821048b09cbeb7149fcda3d43f37e5a1834bb04e2b
@@ -7,6 +9,7 @@ DIST mutter-44.1.tar.xz 2843780 BLAKE2B f148b96ebeeb5db9cb620ca0870862cde579fc6d
EBUILD mutter-43.3.ebuild 5790 BLAKE2B 07e491948f860c2d14f483bfb411e0e66ca17c1d418493745fc6fa670a5f64551f61178e8f9ceda91d0a5df7a475cd765fbae7bd821410da9cd182c339ba2d50 SHA512 82452dc041323ecd47ed843d330ef0d69a62e362ebea6b7947b192634dbb1fc5bbb97f4e0f26ebd60e1eadb4d59210dd0e90d170f57b96148a893b34649dfefb
EBUILD mutter-43.4.ebuild 5790 BLAKE2B 07e491948f860c2d14f483bfb411e0e66ca17c1d418493745fc6fa670a5f64551f61178e8f9ceda91d0a5df7a475cd765fbae7bd821410da9cd182c339ba2d50 SHA512 82452dc041323ecd47ed843d330ef0d69a62e362ebea6b7947b192634dbb1fc5bbb97f4e0f26ebd60e1eadb4d59210dd0e90d170f57b96148a893b34649dfefb
EBUILD mutter-44.0-r1.ebuild 6376 BLAKE2B 820f2afaf60485b0e0a42133ce08515ba4f3d2bd054f7460bd8d09f70508dcb6bae541ac4bff0cb4a9d1a5c6014a8f9a7e7bcf72408fab6209fa350998f7e64d SHA512 e091bbf0323377a6357b4a3206961ae5bc770ff2b3e88531b03d8d2be3b9f59ef4c44767372b78a7e3e48a83764bf3deb0844ca6a879c3706d74c226c86e9cc4
+EBUILD mutter-44.1-r1.ebuild 6636 BLAKE2B d8852d013e712ad6d3b4846e9eed87595868d4f638dee95de3ee2ed6cf25aca0320853bffb1ca8c4c58c9edb739d14aa88b884f134cdc8d7419c3a52a2bb86bf SHA512 b4a613705312ece5e20ed4983bda5c07a21c6b371497f2602fc657d116e782204cd25777bb271facefb838fd434204ab63c688077bac4a18b6fe510b0db498ae
EBUILD mutter-44.1.ebuild 6460 BLAKE2B 664b2a09eeddc89762be49dc1d41fa5d36981094aa771d48c7aa8184598fe248618689321966ce03727464d6b770af503791b43eaf350f575287fa750b71dba3 SHA512 0c09c0f4a873610ecf0491d8ed4caae98aee0a347f9a9279133a84d43096930ca71871f7d1e81431c494045a8760831eb59bd04bfa1c58bb396f6fc7a084b5f4
EBUILD mutter-9999.ebuild 6463 BLAKE2B 525a3e193ca4f8b4782979b40ae09f9d62cf3efd7a578b7aada665e0e04fe7e27a3bc5269d9add898af2cb88923cda2c325e70b5cf2823bef52b3e0e22e86450 SHA512 8c8f98e7d1aa2fabae2744b75d443aed4a2d6ce412ebd5d7e04a2170fa5821b05cc9419bdee2bb171f23105b7c038e2820b694db03a568559088089ab4bd8d74
MISC metadata.xml 584 BLAKE2B 8c15ff1bc0bbadd7fe37f4a903d90c49f10aee6fd8cd83bcd81d486113397607f30b0a9c3aa43ee0b0f8e0cea8e8caaebac8560da70090fd0dbfbba8f8c0250d SHA512 924fc21a5378dc447e36c21f09ce45ebb61ea4de1dc1f541cb45ce139352616983141e8e1466fcc34dceaf1a5ea0f8e87023b25291e6796ef3f2163777e00a87
diff --git a/x11-wm/mutter/files/mutter-44.1-frame-updates.patch b/x11-wm/mutter/files/mutter-44.1-frame-updates.patch
new file mode 100644
index 000000000000..bc6f5411204b
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-44.1-frame-updates.patch
@@ -0,0 +1,158 @@
+From 82bd40dcbcc3601da755678778f033bd9a30286d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
+Date: Thu, 4 May 2023 12:31:41 +0200
+Subject: [PATCH] screen-cast/src: Never dequeue pw_buffer's we refuse to
+ record to
+
+The DMA buffer paths vs MemFd paths differ slightly in when content is
+recorded. This was in some places done by trying to record but bail if
+the dequeued buffer had the wrong type. This is problematic for two
+reasons: we'd update the timestamp even if we refused to record, making
+the follow-up attempt fail, and we'd dequeue and queue buffers that
+didn't get any content, meaning the receiving end would see empty
+buffers potentially with only cursor updates.
+
+Fix this by keeping track if a stream is DMA buffer able or not, and
+don't attempt to record at all in the places we would previously require
+DMA buffers. This avoids both issues: we don't dequeue/queue pw_buffers
+that we refuse to record to, and we won't update the recorded timestamp
+when we didn't intend to record to begin with.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2783
+Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2987>
+---
+ .../meta-screen-cast-monitor-stream-src.c | 25 ++++++++++++-------
+ src/backends/meta-screen-cast-stream-src.c | 22 ++++++++++------
+ src/backends/meta-screen-cast-stream-src.h | 3 ++-
+ 3 files changed, 32 insertions(+), 18 deletions(-)
+
+diff --git a/src/backends/meta-screen-cast-monitor-stream-src.c b/src/backends/meta-screen-cast-monitor-stream-src.c
+index efb458067e..073a4d101f 100644
+--- a/src/backends/meta-screen-cast-monitor-stream-src.c
++++ b/src/backends/meta-screen-cast-monitor-stream-src.c
+@@ -158,8 +158,8 @@ stage_painted (MetaStage *stage,
+ MetaScreenCastMonitorStreamSrc *monitor_src =
+ META_SCREEN_CAST_MONITOR_STREAM_SRC (user_data);
+ MetaScreenCastStreamSrc *src = META_SCREEN_CAST_STREAM_SRC (monitor_src);
+- MetaScreenCastRecordResult record_result;
+- MetaScreenCastRecordFlag flags;
++ MetaScreenCastRecordResult record_result =
++ META_SCREEN_CAST_RECORD_RESULT_RECORDED_NOTHING;
+ int64_t presentation_time_us;
+
+ if (monitor_src->maybe_record_idle_id)
+@@ -168,12 +168,16 @@ stage_painted (MetaStage *stage,
+ if (!clutter_frame_get_target_presentation_time (frame, &presentation_time_us))
+ presentation_time_us = g_get_monotonic_time ();
+
+- flags = META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY;
+- record_result =
+- meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
+- flags,
+- NULL,
+- presentation_time_us);
++ if (meta_screen_cast_stream_src_uses_dma_bufs (src))
++ {
++ MetaScreenCastRecordFlag flags = META_SCREEN_CAST_RECORD_FLAG_NONE;
++
++ record_result =
++ meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
++ flags,
++ NULL,
++ presentation_time_us);
++ }
+
+ if (!(record_result & META_SCREEN_CAST_RECORD_RESULT_RECORDED_FRAME))
+ {
+@@ -200,13 +204,16 @@ before_stage_painted (MetaStage *stage,
+ if (monitor_src->maybe_record_idle_id)
+ return;
+
++ if (!meta_screen_cast_stream_src_uses_dma_bufs (src))
++ return;
++
+ if (!clutter_stage_view_peek_scanout (view))
+ return;
+
+ if (!clutter_frame_get_target_presentation_time (frame, &presentation_time_us))
+ presentation_time_us = g_get_monotonic_time ();
+
+- flags = META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY;
++ flags = META_SCREEN_CAST_RECORD_FLAG_NONE;
+ meta_screen_cast_stream_src_maybe_record_frame_with_timestamp (src,
+ flags,
+ NULL,
+diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c
+index 91a8afab47..94fc222e43 100644
+--- a/src/backends/meta-screen-cast-stream-src.c
++++ b/src/backends/meta-screen-cast-stream-src.c
+@@ -107,6 +107,7 @@ typedef struct _MetaScreenCastStreamSrcPrivate
+ int64_t last_frame_timestamp_us;
+ guint follow_up_frame_source_id;
+
++ gboolean uses_dma_bufs;
+ GHashTable *dmabuf_handles;
+
+ cairo_region_t *redraw_clip;
+@@ -513,15 +514,9 @@ do_record_frame (MetaScreenCastStreamSrc *src,
+ {
+ MetaScreenCastStreamSrcPrivate *priv =
+ meta_screen_cast_stream_src_get_instance_private (src);
+- gboolean dmabuf_only;
+
+- dmabuf_only = flags & META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY;
+- if (dmabuf_only && spa_buffer->datas[0].type != SPA_DATA_DmaBuf)
+- return FALSE;
+-
+- if (!dmabuf_only &&
+- (spa_buffer->datas[0].data ||
+- spa_buffer->datas[0].type == SPA_DATA_MemFd))
++ if (spa_buffer->datas[0].data ||
++ spa_buffer->datas[0].type == SPA_DATA_MemFd)
+ {
+ int width = priv->video_format.size.width;
+ int height = priv->video_format.size.height;
+@@ -1058,6 +1053,8 @@ on_stream_add_buffer (void *data,
+ dmabuf_handle = NULL;
+ }
+
++ priv->uses_dma_bufs = !!dmabuf_handle;
++
+ if (dmabuf_handle)
+ {
+ meta_topic (META_DEBUG_SCREEN_CAST,
+@@ -1595,3 +1592,12 @@ meta_screen_cast_stream_src_class_init (MetaScreenCastStreamSrcClass *klass)
+ NULL, NULL, NULL,
+ G_TYPE_NONE, 0);
+ }
++
++gboolean
++meta_screen_cast_stream_src_uses_dma_bufs (MetaScreenCastStreamSrc *src)
++{
++ MetaScreenCastStreamSrcPrivate *priv =
++ meta_screen_cast_stream_src_get_instance_private (src);
++
++ return priv->uses_dma_bufs;
++}
+diff --git a/src/backends/meta-screen-cast-stream-src.h b/src/backends/meta-screen-cast-stream-src.h
+index 63058f2c35..a15ca54f15 100644
+--- a/src/backends/meta-screen-cast-stream-src.h
++++ b/src/backends/meta-screen-cast-stream-src.h
+@@ -41,7 +41,6 @@ typedef enum _MetaScreenCastRecordFlag
+ {
+ META_SCREEN_CAST_RECORD_FLAG_NONE = 0,
+ META_SCREEN_CAST_RECORD_FLAG_CURSOR_ONLY = 1 << 0,
+- META_SCREEN_CAST_RECORD_FLAG_DMABUF_ONLY = 1 << 1,
+ } MetaScreenCastRecordFlag;
+
+ typedef enum _MetaScreenCastRecordResult
+@@ -132,4 +131,6 @@ void meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStrea
+ float scale,
+ MetaMonitorTransform transform);
+
++gboolean meta_screen_cast_stream_src_uses_dma_bufs (MetaScreenCastStreamSrc *src);
++
+ #endif /* META_SCREEN_CAST_STREAM_SRC_H */
+--
+GitLab
+
diff --git a/x11-wm/mutter/files/mutter-44.1-xdnd-frame-window.patch b/x11-wm/mutter/files/mutter-44.1-xdnd-frame-window.patch
new file mode 100644
index 000000000000..4067e31ef277
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-44.1-xdnd-frame-window.patch
@@ -0,0 +1,50 @@
+From f21cc690527010918d10638cfc7747df3eede496 Mon Sep 17 00:00:00 2001
+From: Sebastian Keller <skeller@gnome.org>
+Date: Fri, 28 Apr 2023 12:20:11 +0200
+Subject: [PATCH] frames: Disable XDND support on the frame window
+
+All X11 surfaces created by gtk4 claim to support XDND via the XdndAware
+property. This was leading some clients, e.g. Qt, to consider the frame
+window as drop target instead of the client window.
+
+Avoid this issue by removing the XdndAware property again after gtk has
+created the surface.
+
+Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2715
+Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2978>
+
+
+(cherry picked from commit d643eb5c6fe50e7f1afffda0e8747a87f668a799)
+---
+ src/frames/meta-frame.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/frames/meta-frame.c b/src/frames/meta-frame.c
+index be685c51fc..345751ad14 100644
+--- a/src/frames/meta-frame.c
++++ b/src/frames/meta-frame.c
+@@ -504,6 +504,7 @@ frame_sync_wm_state (MetaFrame *frame,
+ GtkWidget *
+ meta_frame_new (Window window)
+ {
++ GdkDisplay *display;
+ GtkWidget *frame, *header, *content;
+ GdkSurface *surface;
+ int frame_height = 0;
+@@ -549,6 +550,13 @@ meta_frame_new (Window window)
+ frame_sync_motif_wm_hints (GTK_WINDOW (frame), window);
+ frame_sync_wm_normal_hints (GTK_WINDOW (frame), window);
+
++ /* Disable XDND support on the frame window, because it can cause some clients
++ * to try use it instead of the client window as drop target */
++ display = gtk_widget_get_display (GTK_WIDGET (frame));
++ XDeleteProperty (gdk_x11_display_get_xdisplay (display),
++ gdk_x11_surface_get_xid (surface),
++ gdk_x11_get_xatom_by_name_for_display (display, "XdndAware"));
++
+ return frame;
+ }
+
+--
+GitLab
+
diff --git a/x11-wm/mutter/mutter-44.1-r1.ebuild b/x11-wm/mutter/mutter-44.1-r1.ebuild
new file mode 100644
index 000000000000..8f0ee64bf0e6
--- /dev/null
+++ b/x11-wm/mutter/mutter-44.1-r1.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{9..11} )
+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/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/mutter.git"
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2+"
+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
+
+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
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+ >=media-libs/graphene-1.10.2[introspection?]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/pango-1.46[introspection?]
+ >=x11-libs/cairo-1.14[X]
+ >=dev-libs/fribidi-1.0.0
+ >=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+ >=dev-libs/glib-2.75.1:2
+ gnome-base/gnome-settings-daemon
+ >=dev-libs/json-glib-0.12.0[introspection?]
+ >=x11-libs/libxkbcommon-0.4.3
+ x11-libs/libICE
+ >=app-accessibility/at-spi2-core-2.46:2[introspection?]
+ sys-apps/dbus
+ >=x11-misc/colord-1.4.5:=
+ >=media-libs/lcms-2.6:2
+ >=media-libs/harfbuzz-2.6.0:=
+
+ gnome? ( gnome-base/gnome-desktop:4= )
+
+ >=media-libs/libcanberra-0.26
+
+ media-libs/libglvnd[X]
+
+ wayland? (
+ >=dev-libs/wayland-protocols-1.31
+ >=dev-libs/wayland-1.21.0
+
+ x11-libs/libdrm
+ media-libs/mesa[gbm(+)]
+ >=dev-libs/libinput-1.18.0:=
+
+ elogind? ( sys-auth/elogind )
+ x11-base/xwayland
+ 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.21:= )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+ test? ( >=x11-libs/gtk+-3.19.8:3[X,introspection?] )
+ 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-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
+"
+# )"
+
+RDEPEND="${DEPEND}
+ gnome-extra/zenity
+
+ !<gui-libs/gtk-4.6.4:4
+"
+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
+
+ # Fixes from 'master'
+ # Fix drag&drop in QT apps
+ "${FILESDIR}"/${P}-xdnd-frame-window.patch
+ # Fix frames dropping on screencast
+ "${FILESDIR}"/${P}-frame-updates.patch
+)
+
+python_check_deps() {
+ if use test; then
+ python_has_version ">=dev-python/python-dbusmock-0.28[${PYTHON_USEDEP}]"
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed -i -e "s:#!/usr/bin/bash:#!$(command -v bash):" src/tests/x11-test.sh || die
+}
+
+src_configure() {
+ local emesonargs=(
+ # Mutter X11 renderer only supports gles2 and GLX, thus do NOT pass
+ #
+ # -Dopengl_libname=libOpenGL.so.0
+ #
+ # while we build the x11 renderer, as we currently enable gles2 only
+ # with USE=wayland and x11 renderer wouldn't find the needed GLX symbols
+ # in a configuration where wayland is disabled, as libOpenGL doesn't
+ # include them.
+ #
+ # See
+ # - https://bugs.gentoo.org/835786
+ # - https://forums.gentoo.org/viewtopic-p-8695669.html
+
+ --buildtype $(usex debug debug plain)
+ -Dopengl=true
+ $(meson_use wayland gles2)
+ #gles2_libname
+ -Degl=true
+ -Dglx=true
+ $(meson_use wayland)
+ $(meson_use wayland xwayland)
+ $(meson_use systemd)
+ $(meson_use wayland native_backend)
+ $(meson_use screencast remote_desktop)
+ $(meson_use gnome libgnome_desktop)
+ $(meson_use udev)
+ -Dudev_dir=$(get_udevdir)
+ $(meson_use input_devices_wacom libwacom)
+ -Dsound_player=true
+ -Dpango_ft2=true
+ -Dstartup_notification=true
+ -Dsm=true
+ $(meson_use introspection)
+ $(meson_use gtk-doc docs)
+ $(meson_use test cogl_tests)
+ $(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+ -Dnative_tests=false
+ $(meson_use test clutter_tests)
+ $(meson_use test tests)
+ -Dkvm_tests=false
+ -Dtty_tests=false
+ $(meson_use sysprof profiler)
+ -Dinstalled_tests=false
+
+ #verbose # Let upstream choose default for verbose mode
+ #xwayland_path
+ # TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+ #xwayland_grab_default_access_rules
+ )
+
+ if use wayland && use video_cards_nvidia; then
+ emesonargs+=(
+ -Degl_device=true
+ -Dwayland_eglstream=true
+ )
+ else
+ emesonargs+=(
+ -Degl_device=false
+ -Dwayland_eglstream=false
+ )
+ fi
+
+ meson_src_configure
+}
+
+src_test() {
+ 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 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
+}