Your message dated Sat, 07 Oct 2023 09:59:42 +0000
with message-id <[email protected]>
and subject line Released with 12.2
has caused the Debian Bug report #1051578,
regarding bookworm-pu: package gtk4/4.8.3+ds-2+deb12u1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1051578: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1051578
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: bookworm
User: [email protected]
Usertags: pu
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:gtk4
[ Reason ]
User request in #1043261
[ Impact ]
Parts of the left sidebar in the file chooser dialog (File -> Open,
File -> Save As) are truncated if the window is narrow or the sidebar
contains items with a long name, especially if the accessibility option
for larger-than-default font size is turned on.
[ Tests ]
A prerelease (equivalent except for the changelog and version number) is
available in https://people.debian.org/~smcv/12.2/pool/main/g/gtk4/, and I
have been using it for a couple of weeks on two bookworm GNOME machines
(a gaming desktop and my partner's laptop) with no obvious regressions.
I was able to reproduce something resembling the bug report on bookworm,
and I confirm that this change avoided it.
The same change was in 4.9.3 in experimental and 4.10.x in testing/unstable.
[ Risks ]
I would say this is low risk: it's a targeted fix backported from
upstream, and all it does is to set the ellipsize property on more rows.
[ 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 (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
debian/patches/placessidebar-Make-all-rows-ellipsize.patch,
gtk/gtksidebarrow.c, gtk/ui/gtksidebarrow.ui:
Fix #1043261
debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch:
Metadata changes only, no functional change
d/control.in, d/control, d/gbp.conf, d/watch:
Branch-related trivialities because this is the first bookworm update
for gtk4
[ Other info ]
There are various other fixes queued up on upstream's gtk-4-8 branch,
but I don't think they are going to do a 4.8.4 release with those fixes
included, or any particular QA of their own. We cannot directly test
4.8.x changes in testing/unstable any more, because testing/unstable
have been updated to the 4.10.x and then 4.12.x branches already.
If I find the time to assess impact vs risk for the rest of the gtk-4-8
changes, I'll propose another bookworm update with some or all of them -
but that doesn't seem likely to happen any time soon, and I hope that
reviewing more than one update won't increase the stable release team's
workload too much when compared with a single large cumulative update?
Thanks,
smcv
diffstat for gtk4-4.8.3+ds gtk4-4.8.3+ds
debian/changelog | 11 ++
debian/control | 2
debian/control.in | 2
debian/gbp.conf | 2
debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch | 3
debian/patches/placessidebar-Make-all-rows-ellipsize.patch | 46 ++++++++++
debian/patches/series | 3
debian/watch | 2
gtk/gtksidebarrow.c | 5 -
gtk/ui/gtksidebarrow.ui | 1
10 files changed, 67 insertions(+), 10 deletions(-)
diff -Nru gtk4-4.8.3+ds/debian/changelog gtk4-4.8.3+ds/debian/changelog
--- gtk4-4.8.3+ds/debian/changelog 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/changelog 2023-09-09 20:32:02.000000000 +0100
@@ -1,3 +1,14 @@
+gtk4 (4.8.3+ds-2+deb12u1) bookworm; urgency=medium
+
+ * d/p/placessidebar-Make-all-rows-ellipsize.patch:
+ Add patch from upstream gtk-4-8 branch to fix truncation in places
+ sidebar with large text accessibility setting (Closes: #1043261)
+ * d/patches: Mark patch for #1029972 as also applied for 4.8.4
+ * d/watch: Only watch for versions 4.8.x for bookworm
+ * d/gbp.conf, d/control.in: Switch packaging branch to debian/bookworm
+
+ -- Simon McVittie <[email protected]> Sat, 09 Sep 2023 20:32:02 +0100
+
gtk4 (4.8.3+ds-2) unstable; urgency=medium
[ Jeremy Bicha ]
diff -Nru gtk4-4.8.3+ds/debian/control gtk4-4.8.3+ds/debian/control
--- gtk4-4.8.3+ds/debian/control 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/control 2023-09-09 20:32:02.000000000 +0100
@@ -79,7 +79,7 @@
Rules-Requires-Root: no
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4
-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b debian/bookworm
Homepage: https://www.gtk.org/
Package: libgtk-4-1
diff -Nru gtk4-4.8.3+ds/debian/control.in gtk4-4.8.3+ds/debian/control.in
--- gtk4-4.8.3+ds/debian/control.in 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/control.in 2023-09-09 20:32:02.000000000 +0100
@@ -79,7 +79,7 @@
Rules-Requires-Root: no
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/gnome-team/gtk4
-Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gtk4.git -b debian/bookworm
Homepage: https://www.gtk.org/
Package: @SHARED_PKG@
diff -Nru gtk4-4.8.3+ds/debian/gbp.conf gtk4-4.8.3+ds/debian/gbp.conf
--- gtk4-4.8.3+ds/debian/gbp.conf 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/gbp.conf 2023-09-09 20:32:02.000000000 +0100
@@ -1,6 +1,6 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
+debian-branch = debian/bookworm
upstream-branch = upstream/4.8.x
upstream-vcs-tag = %(version)s
diff -Nru gtk4-4.8.3+ds/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch gtk4-4.8.3+ds/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch
--- gtk4-4.8.3+ds/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch 2023-09-09 20:32:02.000000000 +0100
@@ -6,12 +6,15 @@
devices, plus it breaks esp. with the Xwayland input device distribution.
Just iterate across all devices and reset their scroll valuators.
+(cherry picked from commit 824e983372d939693f7eba5c394e647a9035a0f8)
+
Origin: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5479
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4160
Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/5202
Bug-Debian: https://bugs.debian.org/1029972
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gtk4/+bug/1993594
Applied-upstream: 4.9.3, commit:824e983372d939693f7eba5c394e647a9035a0f8
+Applied-upstream: 4.8.4, commit:37843ec941f611a6c9e05732442c86e99016d5f0
---
gdk/x11/gdkdevicemanager-xi2.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff -Nru gtk4-4.8.3+ds/debian/patches/placessidebar-Make-all-rows-ellipsize.patch gtk4-4.8.3+ds/debian/patches/placessidebar-Make-all-rows-ellipsize.patch
--- gtk4-4.8.3+ds/debian/patches/placessidebar-Make-all-rows-ellipsize.patch 1970-01-01 01:00:00.000000000 +0100
+++ gtk4-4.8.3+ds/debian/patches/placessidebar-Make-all-rows-ellipsize.patch 2023-09-09 20:32:02.000000000 +0100
@@ -0,0 +1,46 @@
+From: Matthias Clasen <[email protected]>
+Date: Fri, 3 Feb 2023 10:00:03 +0100
+Subject: placessidebar: Make all rows ellipsize
+
+Otherwise, we end up with a single long row
+pushing the content of all the other rows
+off to the left, which is much worse than
+ellipsizing.
+
+Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/4710
+Bug-Debian: https://bugs.debian.org/1043261
+Applied-upstream: 4.9.3, commit:463f12a3bb42c60e2b86093f443d9d14541c9852
+Applied-upstream: 4.8.4, commit:c4ddf47d8f0625e23c5677a412bcc6ba585fa5a8
+---
+ gtk/gtksidebarrow.c | 5 -----
+ gtk/ui/gtksidebarrow.ui | 1 +
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
+index f2adfde..11ccf43 100644
+--- a/gtk/gtksidebarrow.c
++++ b/gtk/gtksidebarrow.c
+@@ -278,11 +278,6 @@ gtk_sidebar_row_set_property (GObject *object,
+
+ case PROP_SECTION_TYPE:
+ self->section_type = g_value_get_enum (value);
+- if (self->section_type == GTK_PLACES_SECTION_COMPUTER ||
+- self->section_type == GTK_PLACES_SECTION_OTHER_LOCATIONS)
+- gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_NONE);
+- else
+- gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_END);
+ break;
+
+ case PROP_PLACE_TYPE:
+diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
+index 046a1af..3521704 100644
+--- a/gtk/ui/gtksidebarrow.ui
++++ b/gtk/ui/gtksidebarrow.ui
+@@ -25,6 +25,7 @@
+ <object class="GtkLabel" id="label_widget">
+ <property name="hexpand">1</property>
+ <property name="xalign">0</property>
++ <property name="ellipsize">end</property>
+ <style>
+ <class name="sidebar-label"/>
+ </style>
diff -Nru gtk4-4.8.3+ds/debian/patches/series gtk4-4.8.3+ds/debian/patches/series
--- gtk4-4.8.3+ds/debian/patches/series 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/patches/series 2023-09-09 20:32:02.000000000 +0100
@@ -6,10 +6,11 @@
fontchooser-Drop-a-few-errant-translations.patch
gtkcssanimatedstyle-Fix-return-of-new_advance.patch
Update-Turkish-translation-2.patch
+gdk-x11-Reset-all-scroll-valuators-on-enter.patch
+placessidebar-Make-all-rows-ellipsize.patch
testsuite-Use-separate-setups-for-unstable-tests-instead-.patch
testsuite-Don-t-create-.test-files-for-flaky-or-failing-t.patch
node-editor-Save-test-data-relative-to-current-working-di.patch
-gdk-x11-Reset-all-scroll-valuators-on-enter.patch
debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
debian/reftests-Allow-minor-differences-to-be-tolerated.patch
debian/Disable-inscription-markup.ui-reftest.patch
diff -Nru gtk4-4.8.3+ds/debian/watch gtk4-4.8.3+ds/debian/watch
--- gtk4-4.8.3+ds/debian/watch 2023-02-04 15:14:39.000000000 +0000
+++ gtk4-4.8.3+ds/debian/watch 2023-09-09 20:32:02.000000000 +0100
@@ -1,4 +1,4 @@
version=4
opts="repack,dversionmangle=s/[~+](?:dfsg|ds)[0-9]*//g,repacksuffix=+ds" \
-https://download.gnome.org/sources/gtk/(\d[\d\.]+[02468])/ \
+https://download.gnome.org/sources/gtk/4.8/ \
gtk-@ANY_VERSION@\.tar\.xz
diff -Nru gtk4-4.8.3+ds/gtk/gtksidebarrow.c gtk4-4.8.3+ds/gtk/gtksidebarrow.c
--- gtk4-4.8.3+ds/gtk/gtksidebarrow.c 2022-12-22 18:44:48.000000000 +0000
+++ gtk4-4.8.3+ds/gtk/gtksidebarrow.c 2023-09-09 23:43:19.000000000 +0100
@@ -278,11 +278,6 @@
case PROP_SECTION_TYPE:
self->section_type = g_value_get_enum (value);
- if (self->section_type == GTK_PLACES_SECTION_COMPUTER ||
- self->section_type == GTK_PLACES_SECTION_OTHER_LOCATIONS)
- gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_NONE);
- else
- gtk_label_set_ellipsize (GTK_LABEL (self->label_widget), PANGO_ELLIPSIZE_END);
break;
case PROP_PLACE_TYPE:
diff -Nru gtk4-4.8.3+ds/gtk/ui/gtksidebarrow.ui gtk4-4.8.3+ds/gtk/ui/gtksidebarrow.ui
--- gtk4-4.8.3+ds/gtk/ui/gtksidebarrow.ui 2022-12-22 18:44:48.000000000 +0000
+++ gtk4-4.8.3+ds/gtk/ui/gtksidebarrow.ui 2023-09-09 23:43:19.000000000 +0100
@@ -25,6 +25,7 @@
<object class="GtkLabel" id="label_widget">
<property name="hexpand">1</property>
<property name="xalign">0</property>
+ <property name="ellipsize">end</property>
<style>
<class name="sidebar-label"/>
</style>
--- End Message ---
--- Begin Message ---
Version: 12.2
The upload requested in this bug has been released as part of 12.2.
--- End Message ---
