r47761 - in /desktop/experimental/gnome-terminal/debian: changelog control control.in patches/Fix-chunked-resize-and-geometry-option.patch patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch patches/series

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Fri Apr 1 08:55:27 UTC 2016


Author: smcv
Date: Fri Apr  1 08:55:27 2016
New Revision: 47761

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47761
Log:
* Team upload.
* Add patches restoring the ability for the terminal to resize itself
  (Closes: #819712)
* Depend on vte from experimental to enforce having a vte version that
  was compiled against Gtk 3.20, avoiding miscounting the padding and
  sizing windows 1 column x 1 row too small

Added:
    desktop/experimental/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch
    desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch
Modified:
    desktop/experimental/gnome-terminal/debian/changelog
    desktop/experimental/gnome-terminal/debian/control
    desktop/experimental/gnome-terminal/debian/control.in
    desktop/experimental/gnome-terminal/debian/patches/series

Modified: desktop/experimental/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/changelog?rev=47761&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/changelog	[utf-8] Fri Apr  1 08:55:27 2016
@@ -1,3 +1,14 @@
+gnome-terminal (3.20.0-2) experimental; urgency=medium
+
+  * Team upload.
+  * Add patches restoring the ability for the terminal to resize itself
+    (Closes: #819712)
+  * Depend on vte from experimental to enforce having a vte version that
+    was compiled against Gtk 3.20, avoiding miscounting the padding and
+    sizing windows 1 column x 1 row too small
+
+ -- Simon McVittie <smcv at debian.org>  Fri, 01 Apr 2016 09:34:13 +0100
+
 gnome-terminal (3.20.0-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/experimental/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/control?rev=47761&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/control	[utf-8] Fri Apr  1 08:55:27 2016
@@ -6,7 +6,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
 Standards-Version: 3.9.7
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 9),
@@ -16,10 +16,10 @@
                intltool (>= 0.50.0),
                libx11-dev,
                libdconf-dev (>= 0.14.0),
-               libgtk-3-dev (>= 3.12.0),
+               libgtk-3-dev (>= 3.20),
                libglib2.0-dev (>= 2.42.0),
                libpcre2-dev (>= 10.00),
-               libvte-2.91-dev (>= 0.44.0),
+               libvte-2.91-dev (>= 0.44.0-2~),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,

Modified: desktop/experimental/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/control.in?rev=47761&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/control.in	[utf-8] Fri Apr  1 08:55:27 2016
@@ -12,10 +12,10 @@
                intltool (>= 0.50.0),
                libx11-dev,
                libdconf-dev (>= 0.14.0),
-               libgtk-3-dev (>= 3.12.0),
+               libgtk-3-dev (>= 3.20),
                libglib2.0-dev (>= 2.42.0),
                libpcre2-dev (>= 10.00),
-               libvte-2.91-dev (>= 0.44.0),
+               libvte-2.91-dev (>= 0.44.0-2~),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,

Added: desktop/experimental/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch?rev=47761&op=file
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch	(added)
+++ desktop/experimental/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch	[utf-8] Fri Apr  1 08:55:27 2016
@@ -0,0 +1,75 @@
+From: Sorokin Alexei <sor.alexei at meowr.ru>
+Date: Mon, 7 Mar 2016 21:45:46 +0000
+Subject: Fix chunked resize and --geometry option
+
+Was caused by https://git.gnome.org/browse/gtk+/commit/?id=08974a1
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=760944
+---
+ src/terminal-options.c |  4 ----
+ src/terminal-window.c  | 19 +++++++++++++------
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/terminal-options.c b/src/terminal-options.c
+index cc51cf6..723ecfe 100644
+--- a/src/terminal-options.c
++++ b/src/terminal-options.c
+@@ -583,10 +583,6 @@ option_geometry_callback (const gchar *option_name,
+ {
+   TerminalOptions *options = data;
+ 
+-  /* See https://bugzilla.gnome.org/show_bug.cgi?id=760944 */
+-  if (gtk_check_version (3, 19, 5) == NULL)
+-    return unsupported_option_callback (option_name, value, data, error);
+-
+   if (options->initial_windows)
+     {
+       InitialWindow *iw;
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index 8b78849..ccfceaa 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -3562,8 +3562,9 @@ terminal_window_update_geometry (TerminalWindow *window)
+   GtkWidget *widget;
+   GdkGeometry hints;
+   GtkBorder padding;
+-  int char_width;
+-  int char_height;
++  GtkRequisition toplevel_request, widget_request;
++  int base_width, base_height;
++  int char_width, char_height;
+   
+   if (priv->active_screen == NULL)
+     return;
+@@ -3587,8 +3588,14 @@ terminal_window_update_geometry (TerminalWindow *window)
+       padding.top + padding.bottom != priv->old_base_height ||
+       widget != (GtkWidget*) priv->old_geometry_widget)
+     {
+-      hints.base_width = padding.left + padding.right;
+-      hints.base_height = padding.top + padding.bottom;
++      gtk_widget_get_preferred_size (GTK_WIDGET (window), NULL, &toplevel_request);
++      gtk_widget_get_preferred_size (widget, NULL, &widget_request);
++
++      base_width = toplevel_request.width - widget_request.width;
++      base_height = toplevel_request.height - widget_request.height;
++
++      hints.base_width = base_width + padding.left + padding.right;
++      hints.base_height = base_height + padding.top + padding.bottom;
+ 
+ #define MIN_WIDTH_CHARS 4
+ #define MIN_HEIGHT_CHARS 1
+@@ -3596,12 +3603,12 @@ terminal_window_update_geometry (TerminalWindow *window)
+       hints.width_inc = char_width;
+       hints.height_inc = char_height;
+ 
+-      /* min size is min size of just the geometry widget, remember. */
++      /* min size is min size of the whole window, remember. */
+       hints.min_width = hints.base_width + hints.width_inc * MIN_WIDTH_CHARS;
+       hints.min_height = hints.base_height + hints.height_inc * MIN_HEIGHT_CHARS;
+       
+       gtk_window_set_geometry_hints (GTK_WINDOW (window),
+-                                     widget,
++                                     NULL,
+                                      &hints,
+                                      GDK_HINT_RESIZE_INC |
+                                      GDK_HINT_MIN_SIZE |

Added: desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch?rev=47761&op=file
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch	(added)
+++ desktop/experimental/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch	[utf-8] Fri Apr  1 08:55:27 2016
@@ -0,0 +1,39 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Fri, 1 Apr 2016 08:22:31 +0100
+Subject: Replace no-op gtk_window_resize_to_geometry by calculating
+ new size
+
+Together with the previous commit, this fixes a regression in
+GNOME 3.20: anything that would alter the Terminal size, for example
+a font size change or the 80x24, 80x43 etc. menu items, did nothing.
+
+Signed-off-by: Simon McVittie <smcv at debian.org>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=760944
+---
+ src/terminal-window.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/terminal-window.c b/src/terminal-window.c
+index ccfceaa..646e01a 100644
+--- a/src/terminal-window.c
++++ b/src/terminal-window.c
+@@ -3200,13 +3200,18 @@ terminal_window_update_size (TerminalWindow *window)
+ {
+   TerminalWindowPrivate *priv = window->priv;
+   int grid_width, grid_height;
++  int pixel_width, pixel_height;
+ 
+   /* be sure our geometry is up-to-date */
+   terminal_window_update_geometry (window);
+ 
+   terminal_screen_get_size (priv->active_screen, &grid_width, &grid_height);
+ 
+-  gtk_window_resize_to_geometry (GTK_WINDOW (window), grid_width, grid_height);
++  /* the "old" struct members were updated by update_geometry */
++  pixel_width = priv->old_base_width + grid_width * priv->old_char_width;
++  pixel_height = priv->old_base_height + grid_height * priv->old_char_height;
++
++  gtk_window_resize (GTK_WINDOW (window), pixel_width, pixel_height);
+ }
+ 
+ void

Modified: desktop/experimental/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/series?rev=47761&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/series	[utf-8] Fri Apr  1 08:55:27 2016
@@ -3,3 +3,5 @@
 10_kfreebsd-f_dupfd_cloexec.patch
 Don-t-allow-the-theme-to-set-black-on-black.patch
 Provide-fallback-for-reading-current-directory-if-OS.patch
+Fix-chunked-resize-and-geometry-option.patch
+Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch




More information about the pkg-gnome-commits mailing list