Package: release.debian.org Severity: normal X-Debbugs-Cc: adwaita-icon-th...@packages.debian.org Control: affects -1 + src:adwaita-icon-theme User: release.debian....@packages.debian.org 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 upstream) + - Rename the old 'move' cursor to 'all-resize', used when something can + be resized bidirectionally in 2 dimensions + - Make the legacy X11 'fleur' cursor an alias for the new 'all-resize' + instead of 'move', so that its shape still approximates its + traditional X11 shape + + -- Simon McVittie <s...@debian.org> Mon, 14 Jul 2025 10:43:34 +0100 + adwaita-icon-theme (48.0-1) unstable; urgency=medium * New upstream release diff -Nru adwaita-icon-theme-48.0/debian/.gitignore adwaita-icon-theme-48.1/debian/.gitignore --- adwaita-icon-theme-48.0/debian/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ adwaita-icon-theme-48.1/debian/.gitignore 2025-07-14 10:43:34.000000000 +0100 @@ -0,0 +1,11 @@ +*.debhelper +*.debhelper.log +*.substvars +.debhelper/ +adwaita-icon-theme-41/ +adwaita-icon-theme/ +autoreconf.after +autoreconf.before +debhelper-build-stamp +tmp-41/ +tmp/ diff -Nru adwaita-icon-theme-48.0/meson.build adwaita-icon-theme-48.1/meson.build --- adwaita-icon-theme-48.0/meson.build 2025-03-14 15:17:10.000000000 +0000 +++ adwaita-icon-theme-48.1/meson.build 2025-06-05 10:02:02.000000000 +0100 @@ -1,4 +1,4 @@ -project('adwaita-icon-theme', version : '48.0', meson_version : '>= 0.64.0') +project('adwaita-icon-theme', version : '48.1', meson_version : '>= 0.64.0') pkg = import('pkgconfig') pkg.generate( @@ -48,11 +48,12 @@ # Each one is of the form: # 'css-name': ['x11-name', 'x11-name', ...], + 'all-resize': ['fleur'], 'crosshair': ['cross', 'cross_reverse', 'diamond_cross', 'tcross'], # move and dnd-move are separate contexts # https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/issues/286 - 'default': ['arrow', 'dnd-move', 'left_ptr', 'top_left_arrow'], + 'default': ['arrow', 'dnd-move', 'left_ptr', 'top_left_arrow', 'move'], 'e-resize': ['right_side'], 'ew-resize': ['sb_h_double_arrow'], @@ -72,10 +73,6 @@ 'w-resize': ['left_side'], 'wait': ['watch'], - # Currently the move cursor is a 4-pointed arrow, but if its visual - # metaphor ever changes, this should probably become - # 'all-scroll': ['fleur'] as the next-closest equivalent. - 'move': ['fleur'], } foreach src, dests : cursor_symlinks # This acts as an assertion that the src is a cursor that exists diff -Nru adwaita-icon-theme-48.0/NEWS adwaita-icon-theme-48.1/NEWS --- adwaita-icon-theme-48.0/NEWS 2025-03-14 15:17:10.000000000 +0000 +++ adwaita-icon-theme-48.1/NEWS 2025-06-05 10:02:02.000000000 +0100 @@ -1,3 +1,5 @@ +48.1 +- cursors: semantic cleanup of DND cursors (issue #303) 48.0 - symbolic: pan-* old design was in place for -rtl - cursors: added dnd-ask on gtk request diff -Nru adwaita-icon-theme-48.0/src/cursors/adwaita.svg adwaita-icon-theme-48.1/src/cursors/adwaita.svg --- adwaita-icon-theme-48.0/src/cursors/adwaita.svg 2025-03-14 15:17:10.000000000 +0000 +++ adwaita-icon-theme-48.1/src/cursors/adwaita.svg 2025-06-05 10:02:02.000000000 +0100 @@ -6,7 +6,7 @@ height="400" id="svg2" sodipodi:version="0.32" - inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)" + inkscape:version="1.4 (e7c3feb100, 2024-10-09)" version="1.0" sodipodi:docname="adwaita.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" @@ -6425,20 +6425,20 @@ objecttolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="0.70710678" - inkscape:cx="805.39462" - inkscape:cy="198.69701" + inkscape:zoom="2.8284271" + inkscape:cx="151.14407" + inkscape:cy="154.85639" inkscape:document-units="px" - inkscape:current-layer="g1433" + inkscape:current-layer="layer2" width="400px" height="400px" inkscape:showpageshadow="false" borderlayer="true" showgrid="false" - inkscape:window-width="2560" - inkscape:window-height="1371" - inkscape:window-x="20" - inkscape:window-y="20" + inkscape:window-width="1845" + inkscape:window-height="1192" + inkscape:window-x="26" + inkscape:window-y="23" inkscape:window-maximized="0" inkscape:snap-nodes="true" inkscape:snap-bbox="true" @@ -6477,8 +6477,7 @@ inkscape:groupmode="layer" id="layer5" inkscape:label="shadows" - style="display:inline" - sodipodi:insensitive="true"><path + style="display:inline"><path id="path358" style="color:#000000;display:inline;opacity:0.2;fill:#000000;-inkscape-stroke:none;filter:url(#filter662)" d="m 242,23 v 2.5 c 0,0.782663 0.32877,1.448746 0.74609,2 C 242.32877,28.051254 242,28.717337 242,29.5 V 32 h 3 v -2.5 c 0,-0.282064 0.21794,-0.5 0.5,-0.5 h 13 c 0.28206,0 0.5,0.217936 0.5,0.5 V 32 h 3 v -2.5 c 0,-0.782669 -0.32875,-1.448746 -0.74609,-2 C 261.67125,26.948746 262,26.282669 262,25.5 V 23 h -3 v 2.5 c 0,0.282064 -0.21794,0.5 -0.5,0.5 h -13 C 245.21794,26 245,25.782064 245,25.5 V 23 Z" @@ -7555,8 +7554,7 @@ inkscape:groupmode="layer" id="layer1" style="display:inline" - inkscape:highlight-color="#ed333b" - sodipodi:insensitive="true"><g + inkscape:highlight-color="#ed333b"><g style="fill:none" id="g563" transform="rotate(90,120.01563,142.01563)"><path @@ -8773,14 +8771,14 @@ r="2.5" /><path id="rect277" style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" - d="m 94.5,83 v 7.5 H 87 A 0.5,0.5 135 0 0 86.5,91 l 0,2 a 0.5,0.5 45 0 0 0.5,0.5 h 7.5 v 7.5 a 0.5,0.5 45 0 0 0.5,0.5 h 2 A 0.5,0.5 135 0 0 97.5,101 V 93.5 H 105 A 0.5,0.5 135 0 0 105.5,93 V 91 A 0.5,0.5 45 0 0 105,90.5 H 97.5 V 83 A 0.5,0.5 45 0 0 97,82.5 H 95 A 0.5,0.5 135 0 0 94.5,83 Z" + d="m 94.5,83 v 7.5 H 87 A 0.5,0.5 135 0 0 86.5,91 v 2 a 0.5,0.5 45 0 0 0.5,0.5 h 7.5 v 7.5 a 0.5,0.5 45 0 0 0.5,0.5 h 2 A 0.5,0.5 135 0 0 97.5,101 V 93.5 H 105 A 0.5,0.5 135 0 0 105.5,93 V 91 A 0.5,0.5 45 0 0 105,90.5 H 97.5 V 83 A 0.5,0.5 45 0 0 97,82.5 H 95 A 0.5,0.5 135 0 0 94.5,83 Z" inkscape:path-effect="#path-effect278" inkscape:original-d="m 94.5,82.5 c 0,1.952474 0,5.333333 0,8 h -8 v 3 h 8 v 8 h 3 v -8 h 8 v -3 h -8 v -8 z" sodipodi:nodetypes="ccccccccccccc" transform="translate(-5,-1)" /><path id="path278" style="opacity:1;fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" - d="m 94.5,83 v 7.5 H 87 A 0.5,0.5 135 0 0 86.5,91 l 0,2 a 0.5,0.5 45 0 0 0.5,0.5 h 7.5 v 7.5 a 0.5,0.5 45 0 0 0.5,0.5 h 2 A 0.5,0.5 135 0 0 97.5,101 V 93.5 H 105 A 0.5,0.5 135 0 0 105.5,93 V 91 A 0.5,0.5 45 0 0 105,90.5 H 97.5 V 83 A 0.5,0.5 45 0 0 97,82.5 H 95 A 0.5,0.5 135 0 0 94.5,83 Z" + d="m 94.5,83 v 7.5 H 87 A 0.5,0.5 135 0 0 86.5,91 v 2 a 0.5,0.5 45 0 0 0.5,0.5 h 7.5 v 7.5 a 0.5,0.5 45 0 0 0.5,0.5 h 2 A 0.5,0.5 135 0 0 97.5,101 V 93.5 H 105 A 0.5,0.5 135 0 0 105.5,93 V 91 A 0.5,0.5 45 0 0 105,90.5 H 97.5 V 83 A 0.5,0.5 45 0 0 97,82.5 H 95 A 0.5,0.5 135 0 0 94.5,83 Z" inkscape:path-effect="#path-effect280" inkscape:original-d="m 94.5,82.5 c 0,1.952474 0,5.333333 0,8 h -8 v 3 h 8 v 8 h 3 v -8 h 8 v -3 h -8 v -8 z" sodipodi:nodetypes="ccccccccccccc" @@ -9504,8 +9502,7 @@ inkscape:groupmode="layer" id="g1433" inkscape:label="-silhouettes" - style="display:none" - sodipodi:insensitive="true"><path + style="display:none"><path id="path1281" style="color:#000000;opacity:0.5;fill:#3584e4;-inkscape-stroke:none" d="m 242,22 v 2.5 c 0,0.782663 0.32877,1.448746 0.74609,2 C 242.32877,27.051254 242,27.717337 242,28.5 V 31 h 3 v -2.5 c 0,-0.282064 0.21794,-0.5 0.5,-0.5 h 13 c 0.28206,0 0.5,0.217936 0.5,0.5 V 31 h 3 v -2.5 c 0,-0.782669 -0.32875,-1.448746 -0.74609,-2 C 261.67125,25.948746 262,25.282669 262,24.5 V 22 h -3 v 2.5 c 0,0.282064 -0.21794,0.5 -0.5,0.5 h -13 C 245.21794,25 245,24.782064 245,24.5 V 22 Z" @@ -10046,8 +10043,7 @@ id="layer6" inkscape:label="-logo" inkscape:highlight-color="#77767b" - style="display:inline" - sodipodi:insensitive="true"><text + style="display:inline"><text id="text17930" y="346" x="136.76958" @@ -10068,8 +10064,7 @@ inkscape:groupmode="layer" id="layer7" inkscape:label="-no-export" - style="display:inline" - sodipodi:insensitive="true"><circle + style="display:inline"><circle style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="circle6622" cx="176.66092" @@ -10609,30 +10604,29 @@ id="text2652"><tspan x="-394.50394" y="44.285324" - id="tspan10"><tspan + id="tspan2"><tspan style="-inkscape-font-specification:sans-serif" - id="tspan9">The shadows layer is two duplicates of the </tspan></tspan><tspan + id="tspan1">The shadows layer is two duplicates of the </tspan></tspan><tspan x="-394.50394" y="64.285324" - id="tspan12"><tspan + id="tspan4"><tspan style="-inkscape-font-specification:sans-serif" - id="tspan11">silhouttes layer with offsets and an </tspan></tspan><tspan + id="tspan3">silhouttes layer with offsets and an </tspan></tspan><tspan x="-394.50394" y="84.285324" - id="tspan14"><tspan + id="tspan6"><tspan style="-inkscape-font-specification:sans-serif" - id="tspan13">Inkscape basic Blur filter applied to all </tspan></tspan><tspan + id="tspan5">Inkscape basic Blur filter applied to all </tspan></tspan><tspan x="-394.50394" y="104.28532" - id="tspan16"><tspan + id="tspan8"><tspan style="-inkscape-font-specification:sans-serif" - id="tspan15">objects at once.</tspan></tspan></text></g><g + id="tspan7">objects at once.</tspan></tspan></text></g><g inkscape:groupmode="layer" id="layer2" inkscape:label="slices" - style="display:none" - inkscape:highlight-color="#3584e4" - sodipodi:insensitive="true"><rect + style="display:inline" + inkscape:highlight-color="#3584e4"><rect style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:#f6d32d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="default" width="24" @@ -11653,7 +11647,7 @@ x="16" height="24" width="24" - id="move" + id="all-resize" style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:#f6d32d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" /><rect style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.5;fill:#f6d32d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" id="all-scroll" diff -Nru adwaita-icon-theme-48.0/src/cursors/cursorgen.py adwaita-icon-theme-48.1/src/cursors/cursorgen.py --- adwaita-icon-theme-48.0/src/cursors/cursorgen.py 2025-03-14 15:17:10.000000000 +0000 +++ adwaita-icon-theme-48.1/src/cursors/cursorgen.py 2025-06-05 10:02:02.000000000 +0100 @@ -12,6 +12,7 @@ nominal_size = 24 cursors = { "alias": (18, 5), + "all-resize": (12, 11), "all-scroll": (11, 11), "cell": (11, 11), "col-resize": (12, 12), @@ -24,7 +25,6 @@ "grab": (11, 2), "grabbing": (9, 5), "help": (12, 21), - "move": (12, 11), "ne-resize": (15, 10), "nesw-resize": (11, 11), "no-drop": (3, 1), Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/src/cursors/pngs/24x24/all-resize.png and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/src/cursors/pngs/24x24/all-resize.png differ Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/src/cursors/pngs/30x30/all-resize.png and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/src/cursors/pngs/30x30/all-resize.png differ Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/src/cursors/pngs/36x36/all-resize.png and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/src/cursors/pngs/36x36/all-resize.png differ Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/src/cursors/pngs/48x48/all-resize.png and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/src/cursors/pngs/48x48/all-resize.png differ Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/src/cursors/pngs/72x72/all-resize.png and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/src/cursors/pngs/72x72/all-resize.png differ Binary files /tmp/t6MLo34k30/adwaita-icon-theme-48.0/src/cursors/pngs/96x96/all-resize.png and /tmp/8XncCIghoG/adwaita-icon-theme-48.1/src/cursors/pngs/96x96/all-resize.png differ