r32231 - in /desktop/unstable/gtk+3.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Dec 20 17:42:14 UTC 2011
Author: biebl
Date: Tue Dec 20 17:42:13 2011
New Revision: 32231
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32231
Log:
* Update patches:
- Drop 000git_gtk_tree_view_get_tooltip_context_annotation.patch, applied
upstream.
- Drop 080_filechooserdefault-Don-t-unref-value-twice.patch, applied
upstream.
- Refresh 017_no_offscreen_device_grabbing.patch,
042_treeview_single-focus.patch and 043_notebook_scroll.patch.
Removed:
desktop/unstable/gtk+3.0/debian/patches/000git_gtk_tree_view_get_tooltip_context_annotation.patch
desktop/unstable/gtk+3.0/debian/patches/080_filechooserdefault-Don-t-unref-value-twice.patch
Modified:
desktop/unstable/gtk+3.0/debian/changelog
desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
desktop/unstable/gtk+3.0/debian/patches/042_treeview_single-focus.patch
desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch
desktop/unstable/gtk+3.0/debian/patches/series
Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=32231&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Tue Dec 20 17:42:13 2011
@@ -4,9 +4,16 @@
- Fixes segfault on arrow keypress in empty GtkIconView. Closes: #638704
- Fixes a11y related crash in treeview. Closes: #652073
- Fixes mouse grabbing when clicking resize grip. Closes: #630972
+ * Update patches:
+ - Drop 000git_gtk_tree_view_get_tooltip_context_annotation.patch, applied
+ upstream.
+ - Drop 080_filechooserdefault-Don-t-unref-value-twice.patch, applied
+ upstream.
+ - Refresh 017_no_offscreen_device_grabbing.patch,
+ 042_treeview_single-focus.patch and 043_notebook_scroll.patch.
* Change section of gir1.2-gtk-3.0 to introspection.
- -- Michael Biebl <biebl at debian.org> Tue, 20 Dec 2011 18:12:19 +0100
+ -- Michael Biebl <biebl at debian.org> Tue, 20 Dec 2011 18:38:25 +0100
gtk+3.0 (3.2.2-3) unstable; urgency=low
Modified: desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/017_no_offscreen_device_grabbing.patch?rev=32231&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] Tue Dec 20 17:42:13 2011
@@ -3,11 +3,11 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
Bug-Ubuntu: https://launchpad.net/bugs/804009
-Index: gtk+3.0-3.1.12/gtk/gtkmain.c
+Index: gtk+-3.2.3/gtk/gtkmain.c
===================================================================
---- gtk+3.0-3.1.12.orig/gtk/gtkmain.c 2011-09-02 14:39:44.225887145 -0400
-+++ gtk+3.0-3.1.12/gtk/gtkmain.c 2011-09-02 14:39:36.415886932 -0400
-@@ -2303,9 +2303,14 @@
+--- gtk+-3.2.3.orig/gtk/gtkmain.c 2011-12-20 18:37:42.094995730 +0100
++++ gtk+-3.2.3/gtk/gtkmain.c 2011-12-20 18:37:43.046995696 +0100
+@@ -2298,9 +2298,14 @@
{
GtkWindowGroup *group;
GtkWidget *old_grab_widget;
Modified: desktop/unstable/gtk+3.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/042_treeview_single-focus.patch?rev=32231&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/042_treeview_single-focus.patch [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/042_treeview_single-focus.patch [utf-8] Tue Dec 20 17:42:13 2011
@@ -1,8 +1,8 @@
-Index: gtk+-3.2.2/gtk/gtktreeview.c
+Index: gtk+-3.2.3/gtk/gtktreeview.c
===================================================================
---- gtk+-3.2.2.orig/gtk/gtktreeview.c 2011-11-12 04:45:08.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtktreeview.c 2011-11-13 02:59:31.902905921 +0100
-@@ -10082,7 +10082,8 @@
+--- gtk+-3.2.3.orig/gtk/gtktreeview.c 2011-12-19 14:58:28.000000000 +0100
++++ gtk+-3.2.3/gtk/gtktreeview.c 2011-12-20 18:32:45.163006233 +0100
+@@ -10090,7 +10090,8 @@
if (cursor_path)
{
Modified: desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/043_notebook_scroll.patch?rev=32231&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] Tue Dec 20 17:42:13 2011
@@ -4,10 +4,10 @@
* works from the whole area
See GNOME #630226 and #145244
-Index: gtk+-3.2.2/gtk/gtkcalendar.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkcalendar.c 2011-11-07 19:47:34.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkcalendar.c 2011-11-13 02:59:34.922905814 +0100
+Index: gtk+-3.2.3/gtk/gtkcalendar.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkcalendar.c 2011-12-20 18:37:35.210995973 +0100
++++ gtk+-3.2.3/gtk/gtkcalendar.c 2011-12-20 18:38:00.090995093 +0100
@@ -3161,6 +3161,10 @@
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
@@ -19,10 +19,10 @@
if (event->direction == GDK_SCROLL_UP)
{
if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.2.2/gtk/gtkcombobox.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkcombobox.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkcombobox.c 2011-11-13 02:59:34.926905815 +0100
+Index: gtk+-3.2.3/gtk/gtkcombobox.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkcombobox.c 2011-12-20 18:37:35.230995973 +0100
++++ gtk+-3.2.3/gtk/gtkcombobox.c 2011-12-20 18:38:00.094995093 +0100
@@ -3002,6 +3002,10 @@
GtkTreeIter iter;
GtkTreeIter new_iter;
@@ -34,11 +34,11 @@
if (!gtk_combo_box_get_active_iter (combo_box, &iter))
return TRUE;
-Index: gtk+-3.2.2/gtk/gtkmenu.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkmenu.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkmenu.c 2011-11-13 02:59:34.930905815 +0100
-@@ -3954,6 +3954,10 @@
+Index: gtk+-3.2.3/gtk/gtkmenu.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkmenu.c 2011-12-20 18:37:35.254995972 +0100
++++ gtk+-3.2.3/gtk/gtkmenu.c 2011-12-20 18:38:00.274995087 +0100
+@@ -3956,6 +3956,10 @@
{
GtkMenu *menu = GTK_MENU (widget);
@@ -49,10 +49,10 @@
switch (event->direction)
{
case GDK_SCROLL_RIGHT:
-Index: gtk+-3.2.2/gtk/gtknotebook.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtknotebook.c 2011-11-12 03:52:24.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtknotebook.c 2011-11-13 02:59:34.934905815 +0100
+Index: gtk+-3.2.3/gtk/gtknotebook.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtknotebook.c 2011-12-20 18:37:35.070995978 +0100
++++ gtk+-3.2.3/gtk/gtknotebook.c 2011-12-20 18:38:00.614995075 +0100
@@ -345,6 +345,8 @@
GtkAllocation *allocation);
static gint gtk_notebook_draw (GtkWidget *widget,
@@ -70,7 +70,7 @@
widget_class->button_press_event = gtk_notebook_button_press;
widget_class->button_release_event = gtk_notebook_button_release;
widget_class->popup_menu = gtk_notebook_popup_menu;
-@@ -1887,7 +1890,8 @@
+@@ -1899,7 +1902,8 @@
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
@@ -80,7 +80,7 @@
attributes_mask = GDK_WA_X | GDK_WA_Y;
priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
-@@ -2810,6 +2814,38 @@
+@@ -2822,6 +2826,38 @@
return FALSE;
}
@@ -119,10 +119,10 @@
static GList*
get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
{
-Index: gtk+-3.2.2/gtk/gtkpathbar.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkpathbar.c 2011-11-07 19:47:35.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkpathbar.c 2011-11-13 02:59:34.938905813 +0100
+Index: gtk+-3.2.3/gtk/gtkpathbar.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkpathbar.c 2011-12-20 18:37:35.150995976 +0100
++++ gtk+-3.2.3/gtk/gtkpathbar.c 2011-12-20 18:38:00.618995075 +0100
@@ -757,6 +757,10 @@
gtk_path_bar_scroll (GtkWidget *widget,
GdkEventScroll *event)
@@ -134,10 +134,10 @@
switch (event->direction)
{
case GDK_SCROLL_RIGHT:
-Index: gtk+-3.2.2/gtk/gtkrange.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkrange.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkrange.c 2011-11-13 02:59:34.938905813 +0100
+Index: gtk+-3.2.3/gtk/gtkrange.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkrange.c 2011-12-20 18:37:35.190995974 +0100
++++ gtk+-3.2.3/gtk/gtkrange.c 2011-12-20 18:38:00.618995075 +0100
@@ -2748,6 +2748,10 @@
GtkRange *range = GTK_RANGE (widget);
GtkRangePrivate *priv = range->priv;
@@ -149,10 +149,10 @@
if (gtk_widget_get_realized (widget))
{
gdouble delta;
-Index: gtk+-3.2.2/gtk/gtkscalebutton.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkscalebutton.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkscalebutton.c 2011-11-13 02:59:34.942905810 +0100
+Index: gtk+-3.2.3/gtk/gtkscalebutton.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkscalebutton.c 2011-12-20 18:37:35.110995977 +0100
++++ gtk+-3.2.3/gtk/gtkscalebutton.c 2011-12-20 18:38:00.618995075 +0100
@@ -848,6 +848,10 @@
if (event->type != GDK_SCROLL)
return FALSE;
@@ -164,10 +164,10 @@
d = gtk_scale_button_get_value (button);
if (event->direction == GDK_SCROLL_UP)
{
-Index: gtk+-3.2.2/gtk/gtkscrolledwindow.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkscrolledwindow.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkscrolledwindow.c 2011-11-13 02:59:34.942905810 +0100
+Index: gtk+-3.2.3/gtk/gtkscrolledwindow.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkscrolledwindow.c 2011-12-20 18:37:35.130995976 +0100
++++ gtk+-3.2.3/gtk/gtkscrolledwindow.c 2011-12-20 18:38:00.622995075 +0100
@@ -1852,6 +1852,10 @@
scrolled_window = GTK_SCROLLED_WINDOW (widget);
priv = scrolled_window->priv;
@@ -179,10 +179,10 @@
if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
range = priv->vscrollbar;
else
-Index: gtk+-3.2.2/gtk/gtkspinbutton.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtkspinbutton.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtkspinbutton.c 2011-11-13 02:59:34.946905809 +0100
+Index: gtk+-3.2.3/gtk/gtkspinbutton.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtkspinbutton.c 2011-12-20 18:37:35.090995978 +0100
++++ gtk+-3.2.3/gtk/gtkspinbutton.c 2011-12-20 18:38:00.622995075 +0100
@@ -1181,6 +1181,10 @@
GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
GtkSpinButtonPrivate *priv = spin->priv;
@@ -194,11 +194,11 @@
if (event->direction == GDK_SCROLL_UP)
{
if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.2.2/gtk/gtktreeview.c
-===================================================================
---- gtk+-3.2.2.orig/gtk/gtktreeview.c 2011-11-13 02:59:31.902905921 +0100
-+++ gtk+-3.2.2/gtk/gtktreeview.c 2011-11-13 02:59:34.950905810 +0100
-@@ -15106,6 +15106,10 @@
+Index: gtk+-3.2.3/gtk/gtktreeview.c
+===================================================================
+--- gtk+-3.2.3.orig/gtk/gtktreeview.c 2011-12-20 18:37:58.826995138 +0100
++++ gtk+-3.2.3/gtk/gtktreeview.c 2011-12-20 18:38:00.626995075 +0100
+@@ -15114,6 +15114,10 @@
{
gboolean retval = FALSE;
Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=32231&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series [utf-8] Tue Dec 20 17:42:13 2011
@@ -1,4 +1,3 @@
-000git_gtk_tree_view_get_tooltip_context_annotation.patch
001_static-linking-dont-query-immodules.patch
003_gdk.pc_privates.patch
015_default-fallback-icon-theme.patch
@@ -13,4 +12,3 @@
060_ignore-random-icons.patch
061_multiarch_module_fallback.patch
70-Fix-document-generation-in-out-of-tree-builds.patch
-080_filechooserdefault-Don-t-unref-value-twice.patch
More information about the pkg-gnome-commits
mailing list