XPost: linux.debian.devel.release

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:adwaita-icon-theme
User: [email protected]
Usertags: unblock

I would like this to be considered for Debian 13.0 if possible, but if
we're too late for that, it can be deferred to 13.1 by converting this
request into a trixie-pu request.

[ Reason ]

New upstream bugfix release fixing a visual regression with trixie's
mutter version.

[ Impact ]

As a result of ambiguities in the CSS cursor spec (which is used by GTK
and Wayland as its taxonomy of cursors), the cursor for drag-and-drop
"move" operations (for example dragging a file in Nautilus) was a
4-pointed N-E-S-W arrow intended to be used when moving a larger object
like an entire window. This does not match the cursor used for other drag-and-drop operations (which is the default arrow pointing
north-northwest, with an appropriate emblem added to the corner) and
could confuse users.

Until recently this was masked by a libmutter bug that meant the cursor
did not always change when it should, so drag-and-drop operations would
often have ended up using the default north-northwest arrow cursor. We
fixed the mutter bug about a month ago, exposing the cursor theme bug.

[ Tests ]

I reproduced the bug in trixie's package by dragging a file in Nautilus
(cursor becomes a 4-pointed N-E-S-W arrow) and confirmed it is fixed in
the proposed package (cursor stays a NNW arrow).

[ Risks ]

It's a cursor. :-)

But more seriously: some unrelated package could conceivably have
assumed that the 'move' cursor would be a 4-pointed N-E-S-W arrow, and
used it with some semantic meaning where the default NNW arrow would be inappropriate. This seems low-risk to me: the default NNW arrow is
a reasonable fallback in many situations.

[ Checklist ]

[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing

[ Other info ]

The addition of debian/.gitignore in the diff is because I uploaded with
dgit (which keeps everything from the source tree), whereas the previous
upload was presumably done with debuild -I -i (which filters out
VCS-related files even if they are really part of the source code).
It makes no functional difference either way.

unblock adwaita-icon-theme/48.1-1

diffstat for adwaita-icon-theme-48.0 adwaita-icon-theme-48.1

Adwaita/cursors/all-resize |binary
Adwaita/cursors/move |binary
Adwaita/cursors/move.cur |binary
NEWS | 2 +
debian/.gitignore | 11 ++++++
debian/changelog | 23 +++++++++++++
meson.build | 9 +----
src/cursors/adwaita.svg | 60 +++++++++++++++-------------------
src/cursors/cursorgen.py | 2 -
src/cursors/pngs/24x24/all-resize.png |binary
src/cursors/pngs/30x30/all-resize.png |binary
src/cursors/pngs/36x36/all-resize.png |binary
src/cursors/pngs/48x48/all-resize.png |binary
src/cursors/pngs/72x72/all-resize.png |binary
src/cursors/pngs/96x96/all-resize.png |binary
15 files changed, 67 insertions(+), 40 deletions(-)

Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/Adwaita/cursors/all-resize and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/Adwaita/cursors/all-resize differ
Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/Adwaita/cursors/move and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/Adwaita/cursors/move differ
Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/Adwaita/cursors/move.cur and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/Adwaita/cursors/move.cur differ
diff -Nru adwaita-icon-theme-48.0/debian/changelog adwaita-icon-theme-48.1/debian/changelog
--- adwaita-icon-theme-48.0/debian/changelog 2025-03-14 15:42:02.000000000 +0000
+++ adwaita-icon-theme-48.1/debian/changelog 2025-07-14 10:43:34.000000000 +0100
@@ -1,3 +1,26 @@
+adwaita-icon-theme (48.1-1) unstable; urgency=medium
+
+ * Team upload
+ * New upstream bugfix release
+ - Make the 'move' cursor (used during drag-and-drop) an alias for
+ 'default' (default arrow pointing NNE), matching the intended
+ behaviour of file managers like nautilus.
+ Previously it was a 4-way arrow pointing N/E/S/W, originally
+ intended to be used for whole-window move actions, which is
+ unexpected for a drag-and-drop action and does not match the
+ metaphor used for drag-and-drop copying. However, until recently,
+ file managers in GNOME would have displayed the default arrow cursor
+ anyway as a result of compensating errors: a recently-fixed bug in
+ libmutter meant that the cursor didn't always change when it should.
+ (adwaita-icon-theme#303