diff --git a/debian/changelog b/debian/changelog index 121ef914745be53267472512ee2ad6306525927c..78cc7609e4cfcc4c70528d359a948bd887047b1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +gtk4 (4.8.3+ds-2+deb12u1+apertis1) apertis; urgency=medium + + * Sync updates from debian/bookworm/updates + * Remaining Apertis specific changes: + - Disable cloudproviders and ffmpeg build dependencies + + -- Apertis CI <devel@lists.apertis.org> Tue, 24 Oct 2023 09:55:22 +0000 + +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 <smcv@debian.org> Sat, 09 Sep 2023 20:32:02 +0100 + gtk4 (4.8.3+ds-2+apertis4) apertis; urgency=medium * d/rules: Disable cloudproviders for downstreams as well diff --git a/debian/control b/debian/control index 45f5be287b4b1b4eb689bde99985ce1823250a48..232ad14273d53b0ab2a9517151993ff9f920340b 100644 --- a/debian/control +++ b/debian/control @@ -79,7 +79,7 @@ Build-Depends-Indep: gi-docgen <!nodoc>, 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 --git a/debian/control.in b/debian/control.in index 2daa8fa895f87d7864bfd9172973b71eee7f511b..4dedcc7175bf6a69c22e992d43ec20e40e1af454 100644 --- a/debian/control.in +++ b/debian/control.in @@ -79,7 +79,7 @@ Build-Depends-Indep: gi-docgen <!nodoc>, 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 --git a/debian/gbp.conf b/debian/gbp.conf index d932f9fd27634904e7c0922c2aceb82aaa828bce..99571d0cae04706f15eb20826beec9cc4affe62f 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -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 --git a/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch b/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch index 948652bf933eeb0f79d400a97bc93e77e6fddf39..60ea7576ddfc4319b526a675baa33d072a69f600 100644 --- a/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch +++ b/debian/patches/gdk-x11-Reset-all-scroll-valuators-on-enter.patch @@ -6,12 +6,15 @@ We no longer need to make much distinction between multiple logical 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 --git a/debian/patches/placessidebar-Make-all-rows-ellipsize.patch b/debian/patches/placessidebar-Make-all-rows-ellipsize.patch new file mode 100644 index 0000000000000000000000000000000000000000..6c2dae3770ad4a36827c4a23d345dee7f0b8eb29 --- /dev/null +++ b/debian/patches/placessidebar-Make-all-rows-ellipsize.patch @@ -0,0 +1,46 @@ +From: Matthias Clasen <mclasen@redhat.com> +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 --git a/debian/patches/series b/debian/patches/series index f029df3c7ebd4210a78cbe9dfc07c267e1d9aa85..0792588e2bb24e95a3cf50f60d7190523d690ad4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,10 +6,11 @@ gdk-surface-Handle-clicks-outside-client-surfaces.patch 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 --git a/debian/watch b/debian/watch index 60faf13323e70d726548629483bc68f0877d88b3..2b14bbbbaf3548dd43a0ee25cc203d6e75de58e0 100644 --- a/debian/watch +++ b/debian/watch @@ -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