r30579 - in /desktop/experimental/gtk+3.0/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Oct 16 07:48:57 UTC 2011
Author: sjoerd
Date: Sun Oct 16 07:48:56 2011
New Revision: 30579
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30579
Log:
* debian/control.in: Update build-depends
* debian/rules: Bump libgail SHVER depends
* d/p/002_static-linking-dont-build-perf.patch: Removed, fixed upstream
* d/p/030_xim-modules.patch: Removed, fixed upstream
* d/p/045_trayicon-visual.patch: Removed, fixed upstream
* d/p/003_gdk.pc_privates.patch: Refreshed
* d/p/043_notebook_scroll.patch: Refreshed
* d/p/044_tracker_fts.patch: Refreshed
Removed:
desktop/experimental/gtk+3.0/debian/patches/002_static-linking-dont-build-perf.patch
desktop/experimental/gtk+3.0/debian/patches/030_xim-modules.patch
desktop/experimental/gtk+3.0/debian/patches/045_trayicon-visual.patch
Modified:
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/control
desktop/experimental/gtk+3.0/debian/control.in
desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols
desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch
desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch
desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch
desktop/experimental/gtk+3.0/debian/patches/series
desktop/experimental/gtk+3.0/debian/rules
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sun Oct 16 07:48:56 2011
@@ -1,8 +1,16 @@
gtk+3.0 (3.2.1-1) UNRELEASED; urgency=low
* New upstream release
-
- -- Sjoerd Simons <sjoerd at debian.org> Sun, 16 Oct 2011 07:49:46 +0100
+ * debian/control.in: Update build-depends
+ * debian/rules: Bump libgail SHVER depends
+ * d/p/002_static-linking-dont-build-perf.patch: Removed, fixed upstream
+ * d/p/030_xim-modules.patch: Removed, fixed upstream
+ * d/p/045_trayicon-visual.patch: Removed, fixed upstream
+ * d/p/003_gdk.pc_privates.patch: Refreshed
+ * d/p/043_notebook_scroll.patch: Refreshed
+ * d/p/044_tracker_fts.patch: Refreshed
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 16 Oct 2011 08:29:49 +0100
gtk+3.0 (3.0.12-3) unstable; urgency=low
Modified: desktop/experimental/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Sun Oct 16 07:48:56 2011
@@ -10,10 +10,10 @@
gettext,
pkg-config,
autotools-dev,
- libglib2.0-dev (>= 2.28.0),
- libgdk-pixbuf2.0-dev (>= 2.22.1),
- libpango1.0-dev (>= 1.28.3-2),
- libatk1.0-dev (>= 1.32.0-2),
+ libglib2.0-dev (>= 2.30.0),
+ libgdk-pixbuf2.0-dev (>= 2.24.0),
+ libpango1.0-dev (>= 1.29.0),
+ libatk1.0-dev (>= 2.1.5),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
libxi-dev (>= 2:1.3-4),
Modified: desktop/experimental/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control.in?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Sun Oct 16 07:48:56 2011
@@ -10,10 +10,10 @@
gettext,
pkg-config,
autotools-dev,
- libglib2.0-dev (>= 2.28.0),
- libgdk-pixbuf2.0-dev (>= 2.22.1),
- libpango1.0-dev (>= 1.28.3-2),
- libatk1.0-dev (>= 1.32.0-2),
+ libglib2.0-dev (>= 2.30.0),
+ libgdk-pixbuf2.0-dev (>= 2.24.0),
+ libpango1.0-dev (>= 1.29.0),
+ libatk1.0-dev (>= 2.1.5),
libx11-dev (>= 2:1.3.3-2),
libxext-dev (>= 2:1.1.1-3),
libxi-dev (>= 2:1.3-4),
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0.symbols?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols [utf-8] Sun Oct 16 07:48:56 2011
@@ -548,7 +548,7 @@
gdk_x11_window_get_xid at Base 3.0.0
gdk_x11_window_lookup_for_display at Base 3.0.0
gdk_x11_window_move_to_current_desktop at Base 3.0.0
- gdk_x11_window_set_theme_variant_gtk_only at Base 3.0.6
+ gdk_x11_window_set_theme_variant at Base 3.1.4
gdk_x11_window_set_user_time at Base 3.0.0
gdk_x11_xatom_to_atom at Base 3.0.0
gdk_x11_xatom_to_atom_for_display at Base 3.0.0
@@ -795,6 +795,7 @@
gtk_assistant_prepend_page at Base 3.0.0
gtk_assistant_previous_page at Base 3.0.0
gtk_assistant_remove_action_widget at Base 3.0.0
+ gtk_assistant_remove_page at Base 3.1.8-0ubuntu2
gtk_assistant_set_current_page at Base 3.0.0
gtk_assistant_set_forward_page_func at Base 3.0.0
gtk_assistant_set_page_complete at Base 3.0.0
@@ -862,10 +863,12 @@
gtk_builder_set_translation_domain at Base 3.0.0
gtk_builder_value_from_string at Base 3.0.0
gtk_builder_value_from_string_type at Base 3.0.0
+ gtk_button_box_get_child_non_homogeneous at Base 3.1.4
gtk_button_box_get_child_secondary at Base 3.0.0
gtk_button_box_get_layout at Base 3.0.0
gtk_button_box_get_type at Base 3.0.0
gtk_button_box_new at Base 3.0.0
+ gtk_button_box_set_child_non_homogeneous at Base 3.1.4
gtk_button_box_set_child_secondary at Base 3.0.0
gtk_button_box_set_layout at Base 3.0.0
gtk_button_box_style_get_type at Base 3.0.0
@@ -1207,6 +1210,7 @@
gtk_container_child_get at Base 3.0.0
gtk_container_child_get_property at Base 3.0.0
gtk_container_child_get_valist at Base 3.0.0
+ gtk_container_child_notify at Base 3.1.4
gtk_container_child_set at Base 3.0.0
gtk_container_child_set_property at Base 3.0.0
gtk_container_child_set_valist at Base 3.0.0
@@ -1247,6 +1251,7 @@
gtk_css_provider_load_from_file at Base 3.0.0
gtk_css_provider_load_from_path at Base 3.0.0
gtk_css_provider_new at Base 3.0.0
+ gtk_css_provider_to_string at Base 3.1.6
gtk_custom_paper_unix_dialog_get_type at Base 3.0.0
gtk_debug_flag_get_type at Base 3.0.0
gtk_delete_type_get_type at Base 3.0.0
@@ -1292,6 +1297,7 @@
gtk_drag_highlight at Base 3.0.0
gtk_drag_result_get_type at Base 3.0.0
gtk_drag_set_icon_default at Base 3.0.0
+ gtk_drag_set_icon_gicon at Base 3.1.4
gtk_drag_set_icon_name at Base 3.0.0
gtk_drag_set_icon_pixbuf at Base 3.0.0
gtk_drag_set_icon_stock at Base 3.0.0
@@ -1302,6 +1308,7 @@
gtk_drag_source_add_uri_targets at Base 3.0.0
gtk_drag_source_get_target_list at Base 3.0.0
gtk_drag_source_set at Base 3.0.0
+ gtk_drag_source_set_icon_gicon at Base 3.1.4
gtk_drag_source_set_icon_name at Base 3.0.0
gtk_drag_source_set_icon_pixbuf at Base 3.0.0
gtk_drag_source_set_icon_stock at Base 3.0.0
@@ -1388,6 +1395,7 @@
gtk_entry_get_layout_offsets at Base 3.0.0
gtk_entry_get_max_length at Base 3.0.0
gtk_entry_get_overwrite_mode at Base 3.0.0
+ gtk_entry_get_placeholder_text at Base 3.1.4
gtk_entry_get_progress_fraction at Base 3.0.0
gtk_entry_get_progress_pulse_step at Base 3.0.0
gtk_entry_get_text at Base 3.0.0
@@ -1422,6 +1430,7 @@
gtk_entry_set_invisible_char at Base 3.0.0
gtk_entry_set_max_length at Base 3.0.0
gtk_entry_set_overwrite_mode at Base 3.0.0
+ gtk_entry_set_placeholder_text at Base 3.1.4
gtk_entry_set_progress_fraction at Base 3.0.0
gtk_entry_set_progress_pulse_step at Base 3.0.0
gtk_entry_set_text at Base 3.0.0
@@ -1441,6 +1450,7 @@
gtk_expander_get_label at Base 3.0.0
gtk_expander_get_label_fill at Base 3.0.0
gtk_expander_get_label_widget at Base 3.0.0
+ gtk_expander_get_resize_toplevel at Base 3.1.4
gtk_expander_get_spacing at Base 3.0.0
gtk_expander_get_type at Base 3.0.0
gtk_expander_get_use_markup at Base 3.0.0
@@ -1451,6 +1461,7 @@
gtk_expander_set_label at Base 3.0.0
gtk_expander_set_label_fill at Base 3.0.0
gtk_expander_set_label_widget at Base 3.0.0
+ gtk_expander_set_resize_toplevel at Base 3.1.4
gtk_expander_set_spacing at Base 3.0.0
gtk_expander_set_use_markup at Base 3.0.0
gtk_expander_set_use_underline at Base 3.0.0
@@ -1617,6 +1628,7 @@
gtk_gradient_new_radial at Base 3.0.0
gtk_gradient_ref at Base 3.0.0
gtk_gradient_resolve at Base 3.0.0
+ gtk_gradient_to_string at Base 3.1.6
gtk_gradient_unref at Base 3.0.0
gtk_grid_attach at Base 3.0.0
gtk_grid_attach_next_to at Base 3.0.0
@@ -1981,6 +1993,10 @@
gtk_list_store_set_value at Base 3.0.0
gtk_list_store_set_valuesv at Base 3.0.0
gtk_list_store_swap at Base 3.0.0
+ gtk_lock_button_get_permission at Base 3.1.4
+ gtk_lock_button_get_type at Base 3.1.4
+ gtk_lock_button_new at Base 3.1.4
+ gtk_lock_button_set_permission at Base 3.1.4
gtk_main at Base 3.0.0
gtk_main_do_event at Base 3.0.0
gtk_main_iteration at Base 3.0.0
@@ -2154,6 +2170,9 @@
gtk_orientable_get_type at Base 3.0.0
gtk_orientable_set_orientation at Base 3.0.0
gtk_orientation_get_type at Base 3.0.0
+ gtk_overlay_add_overlay at Base 3.1.6
+ gtk_overlay_get_type at Base 3.1.6
+ gtk_overlay_new at Base 3.1.6
gtk_pack_direction_get_type at Base 3.0.0
gtk_pack_type_get_type at Base 3.0.0
gtk_page_orientation_get_type at Base 3.0.0
@@ -2566,6 +2585,7 @@
gtk_radio_tool_button_new_with_stock_from_widget at Base 3.0.0
gtk_radio_tool_button_set_group at Base 3.0.0
gtk_range_get_adjustment at Base 3.0.0
+ gtk_range_get_event_window at Base 3.0.0-0ubuntu1
gtk_range_get_fill_level at Base 3.0.0
gtk_range_get_flippable at Base 3.0.0
gtk_range_get_inverted at Base 3.0.0
@@ -2741,6 +2761,7 @@
gtk_render_frame at Base 3.0.0
gtk_render_frame_gap at Base 3.0.0
gtk_render_handle at Base 3.0.0
+ gtk_render_icon at Base 3.1.6
gtk_render_icon_pixbuf at Base 3.0.0
gtk_render_layout at Base 3.0.0
gtk_render_line at Base 3.0.0
@@ -3059,6 +3080,7 @@
gtk_symbolic_color_new_shade at Base 3.0.0
gtk_symbolic_color_ref at Base 3.0.0
gtk_symbolic_color_resolve at Base 3.0.0
+ gtk_symbolic_color_to_string at Base 3.1.6
gtk_symbolic_color_unref at Base 3.0.0
gtk_table_attach at Base 3.0.0
gtk_table_attach_defaults at Base 3.0.0
@@ -3783,6 +3805,7 @@
gtk_tree_view_column_get_visible at Base 3.0.0
gtk_tree_view_column_get_widget at Base 3.0.0
gtk_tree_view_column_get_width at Base 3.0.0
+ gtk_tree_view_column_get_x_offset at Base 3.1.6
gtk_tree_view_column_new at Base 3.0.0
gtk_tree_view_column_new_with_area at Base 3.0.0
gtk_tree_view_column_new_with_attributes at Base 3.0.0
@@ -4080,7 +4103,9 @@
gtk_widget_override_font at Base 3.0.0
gtk_widget_override_symbolic_color at Base 3.0.0
gtk_widget_path at Base 3.0.0
+ gtk_widget_path_append_for_widget at Base 3.1.6
gtk_widget_path_append_type at Base 3.0.0
+ gtk_widget_path_append_with_siblings at Base 3.1.6
gtk_widget_path_copy at Base 3.0.0
gtk_widget_path_free at Base 3.0.0
gtk_widget_path_get_object_type at Base 3.0.0
@@ -4093,6 +4118,8 @@
gtk_widget_path_iter_clear_regions at Base 3.0.0
gtk_widget_path_iter_get_name at Base 3.0.0
gtk_widget_path_iter_get_object_type at Base 3.0.0
+ gtk_widget_path_iter_get_sibling_index at Base 3.1.6
+ gtk_widget_path_iter_get_siblings at Base 3.1.6
gtk_widget_path_iter_has_class at Base 3.0.0
gtk_widget_path_iter_has_name at Base 3.0.0
gtk_widget_path_iter_has_qclass at Base 3.0.0
@@ -4108,6 +4135,9 @@
gtk_widget_path_length at Base 3.0.0
gtk_widget_path_new at Base 3.0.0
gtk_widget_path_prepend_type at Base 3.0.0
+ gtk_widget_path_ref at Base 3.1.6
+ gtk_widget_path_to_string at Base 3.1.4
+ gtk_widget_path_unref at Base 3.1.6
gtk_widget_pop_composite_child at Base 3.0.0
gtk_widget_push_composite_child at Base 3.0.0
gtk_widget_queue_compute_expand at Base 3.0.0
Modified: desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/003_gdk.pc_privates.patch?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Sun Oct 16 07:48:56 2011
@@ -1,40 +1,27 @@
-Index: gtk+-3.0.10/configure.ac
-===================================================================
---- gtk+-3.0.10.orig/configure.ac 2011-06-03 22:50:22.621119186 +0200
-+++ gtk+-3.0.10/configure.ac 2011-06-03 22:50:26.257073475 +0200
-@@ -1210,20 +1210,23 @@
+diff --git a/configure.ac b/configure.ac
+index 8944f6e..4ab86e4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1260,10 +1260,11 @@ fi
CFLAGS="$saved_cflags"
LDFLAGS="$saved_ldflags"
--GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
+-GDK_PACKAGES="$PANGO_PACKAGES $GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES gdk-pixbuf-2.0 $cairo_backends cairo-gobject"
+GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
-+GDK_PRIVATE_PACKAGES="$GIO_PACKAGE $X_PACKAGES $cairo_backends cairo-gobject"
++GDK_PRIVATE_PACKAGES="$GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $cairo_backends cairo-gobject"
--GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB"
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
-+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $MATH_LIB"
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
#
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
# into the pkg-config files
- #
- if test $enable_explicit_deps != yes ; then
-- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 cairo-gobject"
- GDK_EXTRA_LIBS=
-+else
-+ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
- fi
-
- AC_SUBST(GDK_PACKAGES)
-+AC_SUBST(GDK_PRIVATE_PACKAGES)
- AC_SUBST(GDK_EXTRA_LIBS)
- AC_SUBST(GDK_EXTRA_CFLAGS)
- AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+-3.0.10/gdk-3.0.pc.in
-===================================================================
---- gtk+-3.0.10.orig/gdk-3.0.pc.in 2011-02-11 21:24:40.000000000 +0100
-+++ gtk+-3.0.10/gdk-3.0.pc.in 2011-06-03 22:50:26.257073475 +0200
-@@ -8,5 +8,6 @@
+diff --git a/gdk-3.0.pc.in b/gdk-3.0.pc.in
+index 20c54fe..97b0537 100644
+--- a/gdk-3.0.pc.in
++++ b/gdk-3.0.pc.in
+@@ -8,5 +8,6 @@ Name: GDK
Description: GTK+ Drawing Kit
Version: @VERSION@
Requires: @GDK_PACKAGES@
Modified: desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/043_notebook_scroll.patch?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] Sun Oct 16 07:48:56 2011
@@ -4,11 +4,56 @@
* works from the whole area
See GNOME #630226 and #145244
-Index: gtk+-3.0.12/gtk/gtknotebook.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtknotebook.c 2011-07-28 03:34:32.000000000 +0200
-+++ gtk+-3.0.12/gtk/gtknotebook.c 2011-09-08 12:38:18.401719595 +0200
-@@ -338,6 +338,8 @@ static void gtk_notebook_size_allocate
+diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
+index cff79bf..1174692 100644
+--- a/gtk/gtkcalendar.c
++++ b/gtk/gtkcalendar.c
+@@ -3161,6 +3161,10 @@ gtk_calendar_scroll (GtkWidget *widget,
+ {
+ GtkCalendar *calendar = GTK_CALENDAR (widget);
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (event->direction == GDK_SCROLL_UP)
+ {
+ if (!gtk_widget_has_focus (widget))
+diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
+index c0bf2c8..e4149a7 100644
+--- a/gtk/gtkcombobox.c
++++ b/gtk/gtkcombobox.c
+@@ -3058,6 +3058,10 @@ gtk_combo_box_scroll_event (GtkWidget *widget,
+ GtkTreeIter iter;
+ GtkTreeIter new_iter;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (!gtk_combo_box_get_active_iter (combo_box, &iter))
+ return TRUE;
+
+diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
+index bb327b5..7b26987 100644
+--- a/gtk/gtkmenu.c
++++ b/gtk/gtkmenu.c
+@@ -3958,6 +3958,10 @@ gtk_menu_scroll (GtkWidget *widget,
+ {
+ GtkMenu *menu = GTK_MENU (widget);
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ switch (event->direction)
+ {
+ case GDK_SCROLL_RIGHT:
+diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
+index a6bf731..9e028d0 100644
+--- a/gtk/gtknotebook.c
++++ b/gtk/gtknotebook.c
+@@ -342,6 +342,8 @@ static void gtk_notebook_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gint gtk_notebook_draw (GtkWidget *widget,
cairo_t *cr);
@@ -17,15 +62,15 @@
static gint gtk_notebook_button_press (GtkWidget *widget,
GdkEventButton *event);
static gint gtk_notebook_button_release (GtkWidget *widget,
-@@ -639,6 +641,7 @@ gtk_notebook_class_init (GtkNotebookClas
- widget_class->get_preferred_height = gtk_notebook_get_preferred_height;
+@@ -645,6 +647,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
+ widget_class->get_preferred_height_for_width = gtk_notebook_get_preferred_height_for_width;
widget_class->size_allocate = gtk_notebook_size_allocate;
widget_class->draw = gtk_notebook_draw;
+ widget_class->scroll_event = gtk_notebook_scroll;
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;
-@@ -1857,7 +1860,8 @@ gtk_notebook_realize (GtkWidget *widget)
+@@ -1881,7 +1884,8 @@ gtk_notebook_realize (GtkWidget *widget)
attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
@@ -35,7 +80,7 @@
attributes_mask = GDK_WA_X | GDK_WA_Y;
priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
-@@ -2712,6 +2716,38 @@ get_widget_coordinates (GtkWidget *widge
+@@ -2844,6 +2848,38 @@ get_widget_coordinates (GtkWidget *widget,
return FALSE;
}
@@ -74,11 +119,56 @@
static GList*
get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
{
-Index: gtk+-3.0.12/gtk/gtkscrolledwindow.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkscrolledwindow.c 2011-07-28 03:34:32.000000000 +0200
-+++ gtk+-3.0.12/gtk/gtkscrolledwindow.c 2011-09-08 12:38:18.401719595 +0200
-@@ -1850,6 +1850,10 @@ gtk_scrolled_window_scroll_event (GtkWid
+diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
+index 14e6ebe..3bc9e65 100644
+--- a/gtk/gtkpathbar.c
++++ b/gtk/gtkpathbar.c
+@@ -757,6 +757,10 @@ static gboolean
+ gtk_path_bar_scroll (GtkWidget *widget,
+ GdkEventScroll *event)
+ {
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ switch (event->direction)
+ {
+ case GDK_SCROLL_RIGHT:
+diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
+index 96e54c6..593fe84 100644
+--- a/gtk/gtkrange.c
++++ b/gtk/gtkrange.c
+@@ -2748,6 +2748,10 @@ gtk_range_scroll_event (GtkWidget *widget,
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (gtk_widget_get_realized (widget))
+ {
+ gdouble delta;
+diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
+index b6c10f4..1190c4b 100644
+--- a/gtk/gtkscalebutton.c
++++ b/gtk/gtkscalebutton.c
+@@ -848,6 +848,10 @@ gtk_scale_button_scroll (GtkWidget *widget,
+ if (event->type != GDK_SCROLL)
+ return FALSE;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ d = gtk_scale_button_get_value (button);
+ if (event->direction == GDK_SCROLL_UP)
+ {
+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
+index 3bd5f3b..9ffe354 100644
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
+@@ -1852,6 +1852,10 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
scrolled_window = GTK_SCROLLED_WINDOW (widget);
priv = scrolled_window->priv;
@@ -89,101 +179,11 @@
if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
range = priv->vscrollbar;
else
-Index: gtk+-3.0.12/gtk/gtkcalendar.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkcalendar.c 2011-09-08 12:39:50.070167726 +0200
-+++ gtk+-3.0.12/gtk/gtkcalendar.c 2011-09-08 12:49:25.132979061 +0200
-@@ -3159,6 +3159,10 @@ gtk_calendar_scroll (GtkWidget *wid
- {
- GtkCalendar *calendar = GTK_CALENDAR (widget);
-
-+ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
-+ if (event->state & GDK_MOD1_MASK)
-+ return FALSE;
-+
- if (event->direction == GDK_SCROLL_UP)
- {
- if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.0.12/gtk/gtkcombobox.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkcombobox.c 2011-09-08 12:49:55.565127840 +0200
-+++ gtk+-3.0.12/gtk/gtkcombobox.c 2011-09-08 12:50:41.137350626 +0200
-@@ -2919,6 +2919,10 @@ gtk_combo_box_scroll_event (GtkWidget
- GtkTreeIter iter;
- GtkTreeIter new_iter;
-
-+ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
-+ if (event->state & GDK_MOD1_MASK)
-+ return FALSE;
-+
- if (!gtk_combo_box_get_active_iter (combo_box, &iter))
- return TRUE;
-
-Index: gtk+-3.0.12/gtk/gtkmenu.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkmenu.c 2011-09-08 12:49:55.613128071 +0200
-+++ gtk+-3.0.12/gtk/gtkmenu.c 2011-09-08 12:51:49.877686681 +0200
-@@ -3967,6 +3967,10 @@ gtk_menu_scroll (GtkWidget *widget,
- {
- GtkMenu *menu = GTK_MENU (widget);
-
-+ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
-+ if (event->state & GDK_MOD1_MASK)
-+ return FALSE;
-+
- switch (event->direction)
- {
- case GDK_SCROLL_RIGHT:
-Index: gtk+-3.0.12/gtk/gtkpathbar.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkpathbar.c 2011-09-08 12:52:56.090010373 +0200
-+++ gtk+-3.0.12/gtk/gtkpathbar.c 2011-09-08 12:53:30.554178865 +0200
-@@ -735,6 +735,10 @@ static gboolean
- gtk_path_bar_scroll (GtkWidget *widget,
- GdkEventScroll *event)
- {
-+ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
-+ if (event->state & GDK_MOD1_MASK)
-+ return FALSE;
-+
- switch (event->direction)
- {
- case GDK_SCROLL_RIGHT:
-Index: gtk+-3.0.12/gtk/gtkrange.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkrange.c 2011-09-08 12:52:56.142010629 +0200
-+++ gtk+-3.0.12/gtk/gtkrange.c 2011-09-08 12:54:02.798336499 +0200
-@@ -2744,6 +2744,10 @@ gtk_range_scroll_event (GtkWidget *
- GtkRange *range = GTK_RANGE (widget);
- GtkRangePrivate *priv = range->priv;
-
-+ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
-+ if (event->state & GDK_MOD1_MASK)
-+ return FALSE;
-+
- if (gtk_widget_get_realized (widget))
- {
- gdouble delta;
-Index: gtk+-3.0.12/gtk/gtkscalebutton.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkscalebutton.c 2011-09-08 12:52:56.198010906 +0200
-+++ gtk+-3.0.12/gtk/gtkscalebutton.c 2011-09-08 12:54:44.350539638 +0200
-@@ -845,6 +845,10 @@ gtk_scale_button_scroll (GtkWidget
- if (event->type != GDK_SCROLL)
- return FALSE;
-
-+ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
-+ if (event->state & GDK_MOD1_MASK)
-+ return FALSE;
-+
- d = gtk_scale_button_get_value (button);
- if (event->direction == GDK_SCROLL_UP)
- {
-Index: gtk+-3.0.12/gtk/gtkspinbutton.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtkspinbutton.c 2011-09-08 12:52:56.246011152 +0200
-+++ gtk+-3.0.12/gtk/gtkspinbutton.c 2011-09-08 12:55:05.302642068 +0200
-@@ -1176,6 +1176,10 @@ gtk_spin_button_scroll (GtkWidget *
+diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
+index 9a6b3ea..ac40967 100644
+--- a/gtk/gtkspinbutton.c
++++ b/gtk/gtkspinbutton.c
+@@ -1181,6 +1181,10 @@ gtk_spin_button_scroll (GtkWidget *widget,
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.0.12/gtk/gtktreeview.c
-===================================================================
---- gtk+-3.0.12.orig/gtk/gtktreeview.c 2011-09-08 12:52:56.354011665 +0200
-+++ gtk+-3.0.12/gtk/gtktreeview.c 2011-09-08 12:57:15.331277744 +0200
-@@ -15153,6 +15153,10 @@ gtk_tree_view_search_scroll_event (GtkWi
+diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
+index f7c5444..d33f001 100644
+--- a/gtk/gtktreeview.c
++++ b/gtk/gtktreeview.c
+@@ -15127,6 +15127,10 @@ gtk_tree_view_search_scroll_event (GtkWidget *widget,
{
gboolean retval = FALSE;
Modified: desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/044_tracker_fts.patch?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch [utf-8] Sun Oct 16 07:48:56 2011
@@ -2,16 +2,17 @@
Tracker in Debian is compiled with FTS support, so we make use of that in
GTK3's file selector dialog.
This way files can be found by their content and not only their file name.
-Index: gtk+-3.0.11/gtk/gtksearchenginetracker.c
-===================================================================
---- gtk+-3.0.11.orig/gtk/gtksearchenginetracker.c 2011-07-01 07:24:25.774613240 +0200
-+++ gtk+-3.0.11/gtk/gtksearchenginetracker.c 2011-07-01 07:24:46.346354619 +0200
-@@ -34,7 +34,7 @@
+
+diff --git a/gtk/gtksearchenginetracker.c b/gtk/gtksearchenginetracker.c
+index a2b4b93..ad878f6 100644
+--- a/gtk/gtksearchenginetracker.c
++++ b/gtk/gtksearchenginetracker.c
+@@ -51,7 +51,7 @@
* use filename matching instead. This doesn't use the content of the
* file however.
*/
-#undef FTS_MATCHING
+#define FTS_MATCHING
- #define MODULE_FILENAME "libtracker-sparql-0.10.so.0"
-
+ /*
+ * GtkSearchEngineTracker object
Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Sun Oct 16 07:48:56 2011
@@ -1,12 +1,9 @@
001_static-linking-dont-query-immodules.patch
-002_static-linking-dont-build-perf.patch
003_gdk.pc_privates.patch
015_default-fallback-icon-theme.patch
022_disable-viqr-im-for-vi-locale.patch
-030_xim-modules.patch
041_ia32-libs.patch
042_treeview_single-focus.patch
043_notebook_scroll.patch
044_tracker_fts.patch
-045_trayicon-visual.patch
060_ignore-random-icons.patch
Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=30579&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Sun Oct 16 07:48:56 2011
@@ -23,7 +23,7 @@
APIVER := 3
SONAME := 0
-SHVER := 3.0.0
+SHVER := 3.1.6
ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
More information about the pkg-gnome-commits
mailing list