Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Dear Release Team, I prepared a p-u for glade, fixing #859324 (basically glade eats a lot of CPU as soon as a non-trivial UI is created). The debdiff is attached. It also includes Vcs changes related to the salsa move. Best, -- ⢀⣴⠾⠻⢶⣦⠀ Sébastien Villemot ⣾⠁⢠⠒⠀⣿⡁ Debian Developer ⢿⡄⠘⠷⠚⠋⠀ http://sebastien.villemot.name ⠈⠳⣄⠀⠀⠀⠀ http://www.debian.org
diff -Nru glade-3.20.0/debian/changelog glade-3.20.0/debian/changelog --- glade-3.20.0/debian/changelog 2016-10-21 00:51:16.000000000 +0200 +++ glade-3.20.0/debian/changelog 2018-02-09 18:02:27.000000000 +0100 @@ -1,3 +1,16 @@ +glade (3.20.0-2+deb9u1) stretch; urgency=medium + + * Team upload. + + [ Sébastien Villemot ] + * fix-use-of-gtk-style-context-in-GladeDesignLayout.patch: new patch. + Fixes high CPU usage. (Closes: #859324) + + [ Jeremy Bicha ] + * Update Vcs fields and add debian/gbp.conf + + -- Sébastien Villemot <sebast...@debian.org> Fri, 09 Feb 2018 18:02:27 +0100 + glade (3.20.0-2) unstable; urgency=medium [ Jeremy Bicha ] diff -Nru glade-3.20.0/debian/control glade-3.20.0/debian/control --- glade-3.20.0/debian/control 2016-10-21 00:51:16.000000000 +0200 +++ glade-3.20.0/debian/control 2018-02-09 18:02:27.000000000 +0100 @@ -7,8 +7,8 @@ Priority: optional Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org> Uploaders: Andreas Henriksson <andr...@fatal.se>, Emilio Pozuelo Monfort <po...@debian.org>, Michael Biebl <bi...@debian.org> -Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade -Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glade +Vcs-Git: https://salsa.debian.org/gnome-team/glade.git -B debian/stretch +Vcs-Browser: https://salsa.debian.org/gnome-team/glade/tree/debian/stretch Build-Depends: debhelper (>= 10), gnome-pkg-tools (>= 0.10), gnome-common, diff -Nru glade-3.20.0/debian/control.in glade-3.20.0/debian/control.in --- glade-3.20.0/debian/control.in 2016-10-21 00:44:23.000000000 +0200 +++ glade-3.20.0/debian/control.in 2018-02-09 17:51:16.000000000 +0100 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian GNOME Maintainers <pkg-gnome-maintain...@lists.alioth.debian.org> Uploaders: @GNOME_TEAM@ -Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glade -Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glade +Vcs-Git: https://salsa.debian.org/gnome-team/glade.git -B debian/stretch +Vcs-Browser: https://salsa.debian.org/gnome-team/glade/tree/debian/stretch Build-Depends: debhelper (>= 10), gnome-pkg-tools (>= 0.10), gnome-common, diff -Nru glade-3.20.0/debian/gbp.conf glade-3.20.0/debian/gbp.conf --- glade-3.20.0/debian/gbp.conf 1970-01-01 01:00:00.000000000 +0100 +++ glade-3.20.0/debian/gbp.conf 2018-02-09 18:00:38.000000000 +0100 @@ -0,0 +1,4 @@ +[DEFAULT] +pristine-tar = True +debian-branch = debian/stretch +upstream-branch = upstream/3.20.x diff -Nru glade-3.20.0/debian/patches/fix-use-of-gtk-style-context-in-GladeDesignLayout.patch glade-3.20.0/debian/patches/fix-use-of-gtk-style-context-in-GladeDesignLayout.patch --- glade-3.20.0/debian/patches/fix-use-of-gtk-style-context-in-GladeDesignLayout.patch 1970-01-01 01:00:00.000000000 +0100 +++ glade-3.20.0/debian/patches/fix-use-of-gtk-style-context-in-GladeDesignLayout.patch 2018-02-09 17:44:05.000000000 +0100 @@ -0,0 +1,52 @@ +Description: Fix use of GTK+ style context in GladeDesignLayout. + It seems like modifying the style context in the 'draw' handler is not + recommended, and we need to save/restore the context. + . + Otherwise, for some widgets (GtkButton, GtkComboBox), the + GladeDesignLayout gets trapped in draw-damage loop. + . + See 0c076cc8828cd80f1f156a08569199675bf35165 for reference. +Author: Arnaud Rebillout <arn...@preev.io> +Origin: https://git.gnome.org/browse/glade/commit/?id=ac55fa78566145ac44d48ba88ec1351db5b4a99d +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=763624 +Bug-Debian: https://bugs.debian.org/859324 +Reviewed-By: Sébastien Villemot <sebast...@debian.org> +Last-Updated: 2018-02-09 +--- a/gladeui/glade-design-layout.c ++++ b/gladeui/glade-design-layout.c +@@ -1033,13 +1033,13 @@ draw_frame (GtkWidget *widget, cairo_t *cr, gboolean selected, + if (priv->widget_name) + { + GdkRectangle *rect = &priv->south_east; +- ++ gtk_style_context_save (context); + gtk_style_context_add_class (context, "handle"); + gtk_render_background (context, cr, rect->x, rect->y, rect->width, rect->height); + gtk_render_frame (context, cr, rect->x, rect->y, rect->width, rect->height); + gtk_render_layout (context, cr, rect->x + OUTLINE_WIDTH, rect->y + OUTLINE_WIDTH, + priv->widget_name); +- gtk_style_context_remove_class (context, "handle"); ++ gtk_style_context_restore (context); + } + } + +@@ -1084,6 +1084,7 @@ draw_selection (cairo_t *cr, + if (alloc.x < 0 || alloc.y < 0) return; + + context = gtk_widget_get_style_context (parent); ++ gtk_style_context_save (context); + gtk_style_context_add_class (context, "selection"); + r = color->red; g = color->green; b = color->blue; + gtk_widget_translate_coordinates (widget, parent, 0, 0, &x, &y); +@@ -1122,7 +1123,7 @@ draw_selection (cairo_t *cr, + + /* Draw Selection box */ + gtk_render_frame (context, cr, x - left, y - top, w + left + right, h + top + bottom); +- gtk_style_context_remove_class (context, "selection"); ++ gtk_style_context_restore (context); + } + + #define DIMENSION_OFFSET 9 +-- +cgit v0.12 + diff -Nru glade-3.20.0/debian/patches/series glade-3.20.0/debian/patches/series --- glade-3.20.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ glade-3.20.0/debian/patches/series 2018-02-09 16:44:14.000000000 +0100 @@ -0,0 +1 @@ +fix-use-of-gtk-style-context-in-GladeDesignLayout.patch
signature.asc
Description: PGP signature
