r25374 - in /desktop/unstable/gtk+2.0/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Oct 14 18:02:00 UTC 2010
Author: joss
Date: Thu Oct 14 18:01:47 2010
New Revision: 25374
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25374
Log:
* Pickup some patches recommended by upstream from their git
repository.
+ 030_gtkscake_redraw.patch: correctly redraw GtkScales.
+ 031_papersize_usletter.patch: update list of countries using US
Letter paper format.
+ 032_offscreenwindow_dnd.patch: fix crasher with offscreen windows.
+ 033_filechooser_sort.patch: fix a bug that leaves a file chooser
dialog unusable after a file has been touched in the open folder.
+ 034_grab_broken.patch: generate correct event for WM_KILLFOCUS.
+ 035_filechooser_crash.patch: fix a crasher when the file list is
updated.
Added:
desktop/unstable/gtk+2.0/debian/patches/030_gtkscake_redraw.patch
desktop/unstable/gtk+2.0/debian/patches/031_papersize_usletter.patch
desktop/unstable/gtk+2.0/debian/patches/032_offscreenwindow_dnd.patch
desktop/unstable/gtk+2.0/debian/patches/033_filechooser_sort.patch
desktop/unstable/gtk+2.0/debian/patches/034_grab_broken.patch
desktop/unstable/gtk+2.0/debian/patches/035_filechooser_crash.patch
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/control
desktop/unstable/gtk+2.0/debian/patches/series
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=25374&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,3 +1,19 @@
+gtk+2.0 (2.20.1-2) unstable; urgency=low
+
+ * Pickup some patches recommended by upstream from their git
+ repository.
+ + 030_gtkscake_redraw.patch: correctly redraw GtkScales.
+ + 031_papersize_usletter.patch: update list of countries using US
+ Letter paper format.
+ + 032_offscreenwindow_dnd.patch: fix crasher with offscreen windows.
+ + 033_filechooser_sort.patch: fix a bug that leaves a file chooser
+ dialog unusable after a file has been touched in the open folder.
+ + 034_grab_broken.patch: generate correct event for WM_KILLFOCUS.
+ + 035_filechooser_crash.patch: fix a crasher when the file list is
+ updated.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 14 Oct 2010 20:01:28 +0200
+
gtk+2.0 (2.20.1-1) unstable; urgency=low
* New upstream bugfix release:
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=25374&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Thu Oct 14 18:01:47 2010
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5.0.22),
gettext,
pkg-config,
Added: desktop/unstable/gtk+2.0/debian/patches/030_gtkscake_redraw.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/030_gtkscake_redraw.patch?rev=25374&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/030_gtkscake_redraw.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/030_gtkscake_redraw.patch [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,0 +1,34 @@
+From 84f88bbb1d2e12b1c582e87fa098b823e91bbf33 Mon Sep 17 00:00:00 2001
+From: Jan Arne Petersen <jap at gnome.org>
+Date: Tue, 18 May 2010 06:46:42 +0000
+Subject: GtkRange: Redraw if GtkRange is a GtkScale and value is drawn.
+
+* gtk/gtkrange.c: (gtk_range_adjustment_value_change):
+Queue the draw also if the range is a scale and the value is drawn,
+fixing bug #533946 (Markus Brinkmann), when two HScales use one
+adjustment.
+---
+diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
+index 552eac7..a4fcee4 100644
+--- a/gtk/gtkrange.c
++++ b/gtk/gtkrange.c
+@@ -35,6 +35,7 @@
+ #include "gtkmarshalers.h"
+ #include "gtkorientable.h"
+ #include "gtkrange.h"
++#include "gtkscale.h"
+ #include "gtkscrollbar.h"
+ #include "gtkprivate.h"
+ #include "gtkintl.h"
+@@ -2618,7 +2619,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
+ gtk_range_calc_layout (range, range->adjustment->value);
+
+ /* now check whether the layout changed */
+- if (layout_changed (range->layout, &layout))
++ if (layout_changed (range->layout, &layout) ||
++ (GTK_IS_SCALE (range) && GTK_SCALE (range)->draw_value))
+ {
+ gtk_widget_queue_draw (GTK_WIDGET (range));
+ /* setup a timer to ensure the range isn't lagging too much behind the scroll position */
+--
+cgit v0.8.3.1
Added: desktop/unstable/gtk+2.0/debian/patches/031_papersize_usletter.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/031_papersize_usletter.patch?rev=25374&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/031_papersize_usletter.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/031_papersize_usletter.patch [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,0 +1,29 @@
+From 6e4d98c0c714038617195683be60810dbd349ac6 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik at redhat.com>
+Date: Fri, 21 May 2010 10:14:04 +0000
+Subject: Update list of US Letter locales
+
+Sync paper size fallbacks with the latest 1.8.1 CLDR table (#618000).
+---
+diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
+index 7188cef..894dca0 100644
+--- a/gtk/gtkpapersize.c
++++ b/gtk/gtkpapersize.c
+@@ -669,10 +669,11 @@ gtk_paper_size_get_default (void)
+ if (!locale)
+ return GTK_PAPER_NAME_A4;
+
+- if (g_str_has_prefix (locale, "en_CA") ||
+- g_str_has_prefix (locale, "en_US") ||
+- g_str_has_prefix (locale, "es_PR") ||
+- g_str_has_prefix (locale, "es_US"))
++ /* CLDR 1.8.1
++ * http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/territory_language_information.html
++ */
++ if (g_regex_match_simple("[^_.@]{2,3}_(BZ|CA|CL|CO|CR|GT|MX|NI|PA|PH|PR|SV|US|VE)",
++ locale, G_REGEX_ANCHORED, G_REGEX_MATCH_ANCHORED))
+ paper_size = GTK_PAPER_NAME_LETTER;
+ else
+ paper_size = GTK_PAPER_NAME_A4;
+--
+cgit v0.8.3.1
Added: desktop/unstable/gtk+2.0/debian/patches/032_offscreenwindow_dnd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/032_offscreenwindow_dnd.patch?rev=25374&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/032_offscreenwindow_dnd.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/032_offscreenwindow_dnd.patch [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,0 +1,26 @@
+From 4cf1f2c55c8d27052e43da932a5d5444bf1ed1f6 Mon Sep 17 00:00:00 2001
+From: Cody Russell <bratsche at gnome.org>
+Date: Tue, 01 Jun 2010 15:32:18 +0000
+Subject: Bug 608218 - GtkOffscreenWindow causes bad window with GtkEntry
+
+We now exit early from gdk_window_register_dnd() to avoid crashing if the
+window type is GDK_WINDOW_OFFSCREEN and does not support dnd operations.
+This makes it possible to use any dnd-enabled widgets, such as GtkEntry,
+within a GtkOffscreenWindow.
+---
+diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
+index 4b7fd85..c0ad26d 100644
+--- a/gdk/x11/gdkdnd-x11.c
++++ b/gdk/x11/gdkdnd-x11.c
+@@ -3879,6 +3879,9 @@ gdk_window_register_dnd (GdkWindow *window)
+
+ g_return_if_fail (window != NULL);
+
++ if (gdk_window_get_window_type (window) == GDK_WINDOW_OFFSCREEN)
++ return;
++
+ base_precache_atoms (display);
+
+ if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") != NULL)
+--
+cgit v0.8.3.1
Added: desktop/unstable/gtk+2.0/debian/patches/033_filechooser_sort.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/033_filechooser_sort.patch?rev=25374&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/033_filechooser_sort.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/033_filechooser_sort.patch [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,0 +1,26 @@
+From ac3797dfc1a0290cedfb35a883af1d171ab22be0 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte at redhat.com>
+Date: Wed, 16 Jun 2010 10:41:40 +0000
+Subject: Can't select file on file browser after changing sort order
+
+The row values are 1-indexed not 0-indexed, this has to be taken into
+account when producing the new_order array.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=621414
+(cherry picked from commit a8e3ce6bb486a4c89799a77abe153d647fea1a69)
+---
+diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
+index 738b061..7c9e1dc 100644
+--- a/gtk/gtkfilesystemmodel.c
++++ b/gtk/gtkfilesystemmodel.c
+@@ -739,7 +739,7 @@ gtk_file_system_model_sort (GtkFileSystemModel *model)
+ continue;
+ }
+
+- new_order[r] = node->row;
++ new_order[r] = node->row - 1;
+ r++;
+ node->row = r;
+ }
+--
+cgit v0.8.3.1
Added: desktop/unstable/gtk+2.0/debian/patches/034_grab_broken.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/034_grab_broken.patch?rev=25374&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/034_grab_broken.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/034_grab_broken.patch [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,0 +1,25 @@
+From 765f8344cd33c29f808a32c4b994c9ca562fe745 Mon Sep 17 00:00:00 2001
+From: Tor Lillqvist <tml at iki.fi>
+Date: Tue, 22 Jun 2010 18:30:13 +0000
+Subject: Generate correct grab broken event for WM_KILLFOCUS
+
+WM_KILLFOCUS means that a keyboard grab (not a pointer grab), if any,
+has been broken. I don't think this bug has matterd much as gtk
+generates a grab-broken-event signal for both keybord and pointer
+grabs being broken anyway.
+---
+diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
+index 3773e4d..23dcd24 100644
+--- a/gdk/win32/gdkevents-win32.c
++++ b/gdk/win32/gdkevents-win32.c
+@@ -2539,7 +2539,7 @@ gdk_event_translate (MSG *msg,
+ if (_gdk_display->keyboard_grab.window != NULL &&
+ !GDK_WINDOW_DESTROYED (_gdk_display->keyboard_grab.window))
+ {
+- generate_grab_broken_event (_gdk_display->keyboard_grab.window, FALSE, NULL);
++ generate_grab_broken_event (_gdk_display->keyboard_grab.window, TRUE, NULL);
+ }
+
+ /* fallthrough */
+--
+cgit v0.8.3.1
Added: desktop/unstable/gtk+2.0/debian/patches/035_filechooser_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/035_filechooser_crash.patch?rev=25374&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/035_filechooser_crash.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/035_filechooser_crash.patch [utf-8] Thu Oct 14 18:01:47 2010
@@ -1,0 +1,28 @@
+From 7868c0b58855b61717454bb85f62caf720b8f623 Mon Sep 17 00:00:00 2001
+From: Sergey Orlov <wasp82 at bk.ru>
+Date: Tue, 24 Aug 2010 18:17:15 +0000
+Subject: bgo#614006 - GtkFileSystemModel - Make sure to generate node IDs are valid for new files
+
+When a file was inserted during the period that the editable row was
+active, the node IDs would not get updated correctly.
+
+Signed-off-by: Federico Mena Quintero <federico at novell.com>
+---
+diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
+index 7c9e1dc..933420c 100644
+--- a/gtk/gtkfilesystemmodel.c
++++ b/gtk/gtkfilesystemmodel.c
+@@ -1778,7 +1778,10 @@ _gtk_file_system_model_update_file (GtkFileSystemModel *model,
+
+ id = node_get_for_file (model, file);
+ if (id == 0)
+- add_file (model, file, info);
++ {
++ add_file (model, file, info);
++ id = node_get_for_file (model, file);
++ }
+
+ node = get_node (model, id);
+
+--
+cgit v0.8.3.1
Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=25374&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Thu Oct 14 18:01:47 2010
@@ -10,6 +10,12 @@
021_loader-files-d.patch
022_disable-viqr-im-for-vi-locale.patch
022_module-files-append-compat-module-files-d.patch
+030_gtkscake_redraw.patch
+031_papersize_usletter.patch
+032_offscreenwindow_dnd.patch
+033_filechooser_sort.patch
+034_grab_broken.patch
+035_filechooser_crash.patch
041_ia32-libs.patch
042_treeview_single-focus.patch
060_ignore-random-icons.patch
More information about the pkg-gnome-commits
mailing list