r48620 - in /desktop/unstable/gnome-terminal/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed May 11 14:58:13 UTC 2016
Author: biebl
Date: Wed May 11 14:58:13 2016
New Revision: 48620
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48620
Log:
Refresh patches.
Removed:
desktop/unstable/gnome-terminal/debian/patches/Add-a-systemd-user-service-for-the-terminal-server.patch
Modified:
desktop/unstable/gnome-terminal/debian/changelog
desktop/unstable/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch
desktop/unstable/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch
desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch
desktop/unstable/gnome-terminal/debian/patches/series
Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=48620&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog [utf-8] Wed May 11 14:58:13 2016
@@ -2,6 +2,7 @@
* New upstream release.
* Drop Build-Depends on gnome-doc-utils, no longer needed.
+ * Refresh patches.
-- Michael Biebl <biebl at debian.org> Wed, 20 Apr 2016 02:50:59 +0200
Modified: desktop/unstable/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch?rev=48620&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/Fix-chunked-resize-and-geometry-option.patch [utf-8] Wed May 11 14:58:13 2016
@@ -10,11 +10,11 @@
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
+Index: b/src/terminal-options.c
+===================================================================
--- a/src/terminal-options.c
+++ b/src/terminal-options.c
-@@ -583,10 +583,6 @@ option_geometry_callback (const gchar *option_name,
+@@ -583,10 +583,6 @@
{
TerminalOptions *options = data;
@@ -25,11 +25,11 @@
if (options->initial_windows)
{
InitialWindow *iw;
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 8b78849..ccfceaa 100644
+Index: b/src/terminal-window.c
+===================================================================
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
-@@ -3562,8 +3562,9 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3571,8 +3571,9 @@
GtkWidget *widget;
GdkGeometry hints;
GtkBorder padding;
@@ -41,7 +41,7 @@
if (priv->active_screen == NULL)
return;
-@@ -3587,8 +3588,14 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3596,8 +3597,14 @@
padding.top + padding.bottom != priv->old_base_height ||
widget != (GtkWidget*) priv->old_geometry_widget)
{
@@ -58,7 +58,7 @@
#define MIN_WIDTH_CHARS 4
#define MIN_HEIGHT_CHARS 1
-@@ -3596,12 +3603,12 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3605,12 +3612,12 @@
hints.width_inc = char_width;
hints.height_inc = char_height;
Modified: desktop/unstable/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch?rev=48620&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/Replace-no-op-gtk_window_resize_to_geometry-by-calcu.patch [utf-8] Wed May 11 14:58:13 2016
@@ -12,11 +12,11 @@
src/terminal-window.c | 148 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 114 insertions(+), 34 deletions(-)
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index ccfceaa..adef2b3 100644
+Index: b/src/terminal-window.c
+===================================================================
--- a/src/terminal-window.c
+++ b/src/terminal-window.c
-@@ -72,11 +72,26 @@ struct _TerminalWindowPrivate
+@@ -72,11 +72,26 @@
GtkWidget *menubar;
TerminalMdiContainer *mdi_container;
@@ -45,7 +45,7 @@
void *old_geometry_widget; /* only used for pointer value as it may be freed */
GtkWidget *confirm_close_dialog;
-@@ -87,6 +102,7 @@ struct _TerminalWindowPrivate
+@@ -87,6 +102,7 @@
guint disposed : 1;
guint present_on_insert : 1;
@@ -53,7 +53,7 @@
/* Workaround until gtk+ bug #535557 is fixed */
guint icon_title_set : 1;
-@@ -2285,6 +2301,12 @@ terminal_window_realize (GtkWidget *widget)
+@@ -2287,6 +2303,12 @@
/* Need to do this now since this requires the window to be realized */
if (priv->active_screen != NULL)
sync_screen_icon_title (priv->active_screen, NULL, window);
@@ -66,7 +66,7 @@
}
static gboolean
-@@ -2619,7 +2641,6 @@ terminal_window_init (TerminalWindow *window)
+@@ -2621,7 +2643,6 @@
GtkActionGroup *action_group;
GtkAction *action;
GtkUIManager *manager;
@@ -74,7 +74,7 @@
GError *error;
GtkWindowGroup *window_group;
GtkAccelGroup *accel_group;
-@@ -2649,7 +2670,7 @@ terminal_window_init (TerminalWindow *window)
+@@ -2651,7 +2672,7 @@
priv->active_screen = NULL;
@@ -83,7 +83,7 @@
priv->mdi_container = TERMINAL_MDI_CONTAINER (terminal_notebook_new ());
-@@ -2684,13 +2705,15 @@ terminal_window_init (TerminalWindow *window)
+@@ -2686,13 +2707,15 @@
g_signal_connect (priv->mdi_container, "create-window",
G_CALLBACK (handle_tab_droped_on_desktop), window);
@@ -102,7 +102,7 @@
priv->old_geometry_widget = NULL;
/* GAction setup */
-@@ -2751,7 +2774,7 @@ terminal_window_init (TerminalWindow *window)
+@@ -2753,7 +2776,7 @@
#endif
priv->menubar = gtk_ui_manager_get_widget (manager, "/menubar");
@@ -111,7 +111,7 @@
priv->menubar,
FALSE, FALSE, 0);
-@@ -3200,13 +3223,41 @@ terminal_window_update_size (TerminalWindow *window)
+@@ -3209,13 +3232,41 @@
{
TerminalWindowPrivate *priv = window->priv;
int grid_width, grid_height;
@@ -138,8 +138,7 @@
+ "[window %p] size is %dx%d cells of %dx%d px\n",
+ window, grid_width, grid_height,
+ priv->old_char_width, priv->old_char_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_chrome_width + grid_width * priv->old_char_width;
+ pixel_height = priv->old_chrome_height + grid_height * priv->old_char_height;
@@ -149,12 +148,13 @@
+ grid_height * priv->old_char_height,
+ priv->old_chrome_width, priv->old_chrome_height,
+ pixel_width, pixel_height);
-+
+
+- gtk_window_resize_to_geometry (GTK_WINDOW (window), grid_width, grid_height);
+ gtk_window_resize (GTK_WINDOW (window), pixel_width, pixel_height);
}
void
-@@ -3560,12 +3611,13 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3569,12 +3620,13 @@
{
TerminalWindowPrivate *priv = window->priv;
GtkWidget *widget;
@@ -172,7 +172,7 @@
if (priv->active_screen == NULL)
return;
-@@ -3577,25 +3629,48 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3586,25 +3638,48 @@
* window, but that doesn't make too much sense.
*/
terminal_screen_get_cell_size (priv->active_screen, &char_width, &char_height);
@@ -237,7 +237,7 @@
#define MIN_WIDTH_CHARS 4
#define MIN_HEIGHT_CHARS 1
-@@ -3623,11 +3698,9 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3632,11 +3707,9 @@
hints.min_height,
hints.width_inc,
hints.height_inc);
@@ -252,7 +252,7 @@
priv->old_geometry_widget = widget;
}
else
-@@ -3636,6 +3709,13 @@ terminal_window_update_geometry (TerminalWindow *window)
+@@ -3645,6 +3718,13 @@
"[window %p] hints: increment unchanged, not setting\n",
window);
}
Modified: desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch?rev=48620&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch [utf-8] Wed May 11 14:58:13 2016
@@ -13,9 +13,11 @@
collect2: error: ld returned 1 exit status
+Index: b/configure.ac
+===================================================================
--- a/configure.ac
+++ b/configure.ac
-@@ -256,7 +256,8 @@
+@@ -257,7 +257,8 @@
PKG_CHECK_MODULES([NAUTILUS],[
libnautilus-extension >= $NAUTILUS_REQUIRED
gio-2.0
Modified: desktop/unstable/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/series?rev=48620&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/series [utf-8] Wed May 11 14:58:13 2016
@@ -5,4 +5,3 @@
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
-Add-a-systemd-user-service-for-the-terminal-server.patch
More information about the pkg-gnome-commits
mailing list