Skip to content
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
debian/changelog
View file @ 2d2dc3fd
gtk+2.0 (2.24.33-2ubuntu1) impish; urgency=medium
* Resynchronize on Debian
-- Sebastien Bacher <seb128@ubuntu.com> Fri, 18 Jun 2021 13:17:20 +0200
gtk+2.0 (2.24.33-2) unstable; urgency=medium
* Team upload
* d/rules: Build udeb with extra CPPFLAGS.
This allows adding special-case code for debian-installer where
necessary.
* udeb: Clamp text layout width to no more than was requested.
This works around a relayout loop that makes the Debian installer hang.
To minimize the effect on installed systems, this is
#ifdef DEBIAN_INSTALLER; we currently have no evidence of similar
relayout loops outside the d-i environment. (Closes: #988786)
* Increase dependency on librsvg2-common from Suggests to Recommends.
This is not a hard dependency, but should be installed in nearly all
cases. Increasingly many icons are provided in SVG format, so
applications will appear broken if the SVG pixbuf loader is not
installed. See #980396 for more information.
adwaita-icon-theme already Recommends librsvg2-common, but people who
routinely do not install recommended packages will get a better hint
about how much will be broken by its removal if GTK also recommends it.
-- Simon McVittie <smcv@debian.org> Wed, 19 May 2021 17:13:33 +0100
gtk+2.0 (2.24.33-1ubuntu1) hirsute; urgency=medium
* Merge from Debian unstable. Remaining changes:
......
debian/control
View file @ 2d2dc3fd
......@@ -3,7 +3,7 @@ Section: libs
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Jeremy Bicha <jbicha@debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Build-Depends: debhelper-compat (= 12),
dh-python,
gettext,
......@@ -66,9 +66,9 @@ Depends: libgtk2.0-common,
shared-mime-info
Provides: gtk2.0-binver-2.10.0
Recommends: libgail-common,
librsvg2-common,
libgtk2.0-bin
Suggests: librsvg2-common,
gvfs
Suggests: gvfs
Multi-Arch: same
Description: GTK graphical user interface library - old version
GTK is a multi-platform toolkit for creating graphical user
......
debian/control.in
View file @ 2d2dc3fd
......@@ -66,9 +66,9 @@ Depends: @COMMON_PKG@,
shared-mime-info
Provides: @GTK_BINVER_DEP@
Recommends: libgail-common,
librsvg2-common,
@BIN_PKG@
Suggests: librsvg2-common,
gvfs
Suggests: gvfs
Multi-Arch: same
Description: GTK graphical user interface library - old version
GTK is a multi-platform toolkit for creating graphical user
......
debian/patches/d-i/textlayout-Clamp-width-to-the-value-we-asked-for-as-a-hac.patch 0 → 100644
View file @ 2d2dc3fd
From: Simon McVittie <smcv@debian.org>
Date: Wed, 19 May 2021 11:36:58 +0100
Subject: textlayout: Clamp width to the value we asked for, as a hack for d-i
When we ask Pango to lay out text with a particular width in mind, if
the width is really narrow then reducing it can result in Pango asking
for *more* space. This can result in a relayout loop in the Debian
installer. Avoid this by restricting the width to be no more than what
we asked for, which might result in text being clipped or overlapping
with an adjacent widget but is better than an infinite loop.
Signed-off-by: Simon McVittie <smcv@debian.org>
Bug-Debian: https://bugs.debian.org/988786
---
gtk/gtktextlayout.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 31139d7..f8a44c0 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -2472,6 +2472,17 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
display->width = PIXEL_BOUND (extents.width) + display->left_margin + display->right_margin;
display->height += PANGO_PIXELS (extents.height);
+#ifdef DEBIAN_INSTALLER
+ if (display->total_width > 0 && display->width > display->total_width)
+ {
+ g_warning ("%s: we asked Pango to wrap text for width %dpx but it "
+ "now wants %dpx. Clamping result to %dpx!",
+ G_STRFUNC, display->total_width, display->width,
+ display->total_width);
+ display->width = display->total_width;
+ }
+#endif
+
/* If we aren't wrapping, we need to do the alignment of each
* paragraph ourselves.
*/
debian/patches/series
View file @ 2d2dc3fd
......@@ -23,3 +23,4 @@ backport_search_printer_location.patch
menubar_toolbar_dragging.patch
use-secrets-service-for-cups-auth_info.patch
Reinstate-marshallers-that-accidentally-became-part-of-th.patch
d-i/textlayout-Clamp-width-to-the-value-we-asked-for-as-a-hac.patch
debian/rules
View file @ 2d2dc3fd
......@@ -119,6 +119,7 @@ shared_configure_flags := $(configure_flags) \
--enable-introspection \
--enable-man
shared_udeb_configure_flags := $(configure_flags) \
CPPFLAGS="$(CPPFLAGS) -DDEBIAN_INSTALLER" \
--disable-introspection \
--disable-xcomposite \
--disable-xdamage \
......