r32771 - in /desktop/experimental/gtk+3.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Mon Mar 5 00:33:52 UTC 2012
Author: biebl
Date: Mon Mar 5 00:33:51 2012
New Revision: 32771
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32771
Log:
- Drop 003_gdk.pc_privates.patch, fixed upstream in a similar way.
- Disable 042_treeview_single-focus.patch for now since it has no
description why this patch is needed and it needs to be updated.
- Refresh remaining patches.
Modified:
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch
desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch
desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
desktop/experimental/gtk+3.0/debian/patches/series
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Mon Mar 5 00:33:51 2012
@@ -12,12 +12,15 @@
longer includes a dh_gtkmodules debhelper addon.
* Remove leftovers from the gtk3-engines-pixbuf package.
* Update patches:
- - Drop 003_gdk.pc_privates.patch, fixed upstream.
+ - Drop 003_gdk.pc_privates.patch, fixed upstream in a similar way.
- Drop 70-Fix-document-generation-in-out-of-tree-builds.patch, applied
upstream.
- Drop 041_ia32-libs.patch, no longer required with multiarch.
-
- -- Michael Biebl <biebl at debian.org> Mon, 05 Mar 2012 01:21:38 +0100
+ - Disable 042_treeview_single-focus.patch for now since it has no
+ description why this patch is needed and it needs to be updated.
+ - Refresh remaining patches.
+
+ -- Michael Biebl <biebl at debian.org> Mon, 05 Mar 2012 01:29:22 +0100
gtk+3.0 (3.2.3-1) unstable; urgency=low
Modified: desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Mon Mar 5 00:33:51 2012
@@ -2,11 +2,11 @@
when --disable-shared was given
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
-Index: gtk+-3.2.2/configure.ac
+Index: gtk+-3.3.16/configure.ac
===================================================================
---- gtk+-3.2.2.orig/configure.ac 2011-11-12 04:40:22.000000000 +0100
-+++ gtk+-3.2.2/configure.ac 2011-11-13 02:59:17.002906448 +0100
-@@ -208,6 +208,8 @@
+--- gtk+-3.3.16.orig/configure.ac 2012-03-05 01:24:59.732166898 +0100
++++ gtk+-3.3.16/configure.ac 2012-03-05 01:25:02.092166876 +0100
+@@ -205,6 +205,8 @@
# Create libtool early, because it's used in configure
LT_OUTPUT
@@ -15,11 +15,11 @@
# Make sure we use 64-bit versions of various file stuff.
AC_SYS_LARGEFILE
-Index: gtk+-3.2.2/modules/input/Makefile.am
+Index: gtk+-3.3.16/modules/input/Makefile.am
===================================================================
---- gtk+-3.2.2.orig/modules/input/Makefile.am 2011-11-11 23:39:32.000000000 +0100
-+++ gtk+-3.2.2/modules/input/Makefile.am 2011-11-13 02:59:17.002906448 +0100
-@@ -174,8 +174,12 @@
+--- gtk+-3.3.16.orig/modules/input/Makefile.am 2012-03-05 01:24:59.732166898 +0100
++++ gtk+-3.3.16/modules/input/Makefile.am 2012-03-05 01:25:02.096166876 +0100
+@@ -172,8 +172,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
else
Modified: desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/015_default-fallback-icon-theme.patch?rev=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] Mon Mar 5 00:33:51 2012
@@ -1,8 +1,8 @@
-Index: gtk+-3.2.2/gtk/gtksettings.c
+Index: gtk+-3.3.16/gtk/gtksettings.c
===================================================================
---- gtk+-3.2.2.orig/gtk/gtksettings.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+-3.2.2/gtk/gtksettings.c 2011-11-13 02:59:24.326906185 +0100
-@@ -408,7 +408,7 @@
+--- gtk+-3.3.16.orig/gtk/gtksettings.c 2012-03-05 00:06:46.552212764 +0100
++++ gtk+-3.3.16/gtk/gtksettings.c 2012-03-05 01:25:06.032166838 +0100
+@@ -430,7 +430,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
P_("Name of a icon theme to fall back to"),
Modified: desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch?rev=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch [utf-8] Mon Mar 5 00:33:51 2012
@@ -3,11 +3,11 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
-Index: gtk+3.0-3.1.92/gtk/gtkmain.c
+Index: gtk+-3.3.16/gtk/gtkmain.c
===================================================================
---- gtk+3.0-3.1.92.orig/gtk/gtkmain.c 2011-08-16 04:04:34.000000000 +0200
-+++ gtk+3.0-3.1.92/gtk/gtkmain.c 2011-09-21 15:35:06.361475136 +0200
-@@ -2205,9 +2205,14 @@
+--- gtk+-3.3.16.orig/gtk/gtkmain.c 2012-03-05 00:06:46.500212763 +0100
++++ gtk+-3.3.16/gtk/gtkmain.c 2012-03-05 01:25:09.020166807 +0100
+@@ -2003,9 +2003,14 @@
{
GtkWindowGroup *group;
GtkWidget *old_grab_widget;
Modified: desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/018_gdkenumtypes.c_location.patch?rev=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] Mon Mar 5 00:33:51 2012
@@ -18,11 +18,11 @@
gdk/Makefile.am | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
-diff --git a/gdk/Makefile.am b/gdk/Makefile.am
-index c7f24af..d918db0 100644
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -185,8 +185,8 @@ if HAVE_INTROSPECTION
+Index: gtk+-3.3.16/gdk/Makefile.am
+===================================================================
+--- gtk+-3.3.16.orig/gdk/Makefile.am 2012-03-05 00:06:46.324212766 +0100
++++ gtk+-3.3.16/gdk/Makefile.am 2012-03-05 01:25:14.252166756 +0100
+@@ -187,8 +187,8 @@
introspection_files = \
$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources)) \
$(gdk_c_sources) \
@@ -33,7 +33,7 @@
Gdk-3.0.gir: libgdk-3.la Makefile
Gdk_3_0_gir_SCANNERFLAGS = \
-@@ -303,7 +303,7 @@ endif
+@@ -305,7 +305,7 @@
lib_LTLIBRARIES = libgdk-3.la
@@ -42,7 +42,7 @@
EXTRA_DIST += $(gdk_built_sources)
install-exec-hook:
-@@ -315,18 +315,15 @@ BUILT_SOURCES = \
+@@ -317,18 +317,15 @@
$(gdk_built_sources) \
gdkconfig.h
@@ -65,6 +65,3 @@
&& rm -f xgen-getc
#
---
-1.7.5.4
-
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=32771&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] Mon Mar 5 00:33:51 2012
@@ -4,11 +4,11 @@
* works from the whole area
See GNOME #630226 and #145244
-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 @@
+Index: gtk+-3.3.16/gtk/gtkcalendar.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkcalendar.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkcalendar.c 2012-03-05 01:26:58.984165734 +0100
+@@ -3159,6 +3159,10 @@
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
@@ -19,11 +19,11 @@
if (event->direction == GDK_SCROLL_UP)
{
if (!gtk_widget_has_focus (widget))
-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 @@
+Index: gtk+-3.3.16/gtk/gtkcombobox.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkcombobox.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkcombobox.c 2012-03-05 01:26:58.992165734 +0100
+@@ -3059,6 +3059,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.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 @@
+Index: gtk+-3.3.16/gtk/gtkmenu.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkmenu.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkmenu.c 2012-03-05 01:26:59.032165732 +0100
+@@ -3922,6 +3922,10 @@
{
GtkMenu *menu = GTK_MENU (widget);
@@ -49,11 +49,11 @@
switch (event->direction)
{
case GDK_SCROLL_RIGHT:
-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 @@
+Index: gtk+-3.3.16/gtk/gtknotebook.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtknotebook.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtknotebook.c 2012-03-05 01:26:59.040165732 +0100
+@@ -342,6 +342,8 @@
GtkAllocation *allocation);
static gint gtk_notebook_draw (GtkWidget *widget,
cairo_t *cr);
@@ -62,7 +62,7 @@
static gint gtk_notebook_button_press (GtkWidget *widget,
GdkEventButton *event);
static gint gtk_notebook_button_release (GtkWidget *widget,
-@@ -648,6 +650,7 @@
+@@ -646,6 +648,7 @@
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;
@@ -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;
-@@ -1899,7 +1902,8 @@
+@@ -1894,7 +1897,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),
-@@ -2822,6 +2826,38 @@
+@@ -2859,6 +2863,38 @@
return FALSE;
}
@@ -119,11 +119,11 @@
static GList*
get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
{
-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 @@
+Index: gtk+-3.3.16/gtk/gtkpathbar.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkpathbar.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkpathbar.c 2012-03-05 01:26:59.064165732 +0100
+@@ -762,6 +762,10 @@
gtk_path_bar_scroll (GtkWidget *widget,
GdkEventScroll *event)
{
@@ -134,11 +134,11 @@
switch (event->direction)
{
case GDK_SCROLL_RIGHT:
-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 @@
+Index: gtk+-3.3.16/gtk/gtkrange.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkrange.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkrange.c 2012-03-05 01:26:59.096165732 +0100
+@@ -2827,6 +2827,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.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
+Index: gtk+-3.3.16/gtk/gtkscalebutton.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkscalebutton.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkscalebutton.c 2012-03-05 01:26:59.124165731 +0100
@@ -848,6 +848,10 @@
if (event->type != GDK_SCROLL)
return FALSE;
@@ -164,11 +164,11 @@
d = gtk_scale_button_get_value (button);
if (event->direction == GDK_SCROLL_UP)
{
-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 @@
+Index: gtk+-3.3.16/gtk/gtkscrolledwindow.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkscrolledwindow.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkscrolledwindow.c 2012-03-05 01:26:59.148165732 +0100
+@@ -1858,6 +1858,10 @@
scrolled_window = GTK_SCROLLED_WINDOW (widget);
priv = scrolled_window->priv;
@@ -179,11 +179,11 @@
if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
range = priv->vscrollbar;
else
-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 @@
+Index: gtk+-3.3.16/gtk/gtkspinbutton.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtkspinbutton.c 2012-03-05 00:06:46.168212766 +0100
++++ gtk+-3.3.16/gtk/gtkspinbutton.c 2012-03-05 01:26:59.152165733 +0100
+@@ -1262,6 +1262,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.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 @@
+Index: gtk+-3.3.16/gtk/gtktreeview.c
+===================================================================
+--- gtk+-3.3.16.orig/gtk/gtktreeview.c 2012-03-05 00:06:46.000000000 +0100
++++ gtk+-3.3.16/gtk/gtktreeview.c 2012-03-05 01:26:59.156165733 +0100
+@@ -15216,6 +15216,10 @@
{
gboolean retval = FALSE;
Modified: desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/061_multiarch_module_fallback.patch?rev=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] Mon Mar 5 00:33:51 2012
@@ -5,10 +5,10 @@
Author: Steve Langasek <steve.langasek at linaro.org>
Forwarded: not-needed
-Index: gtk+3.0/gtk/gtkmodules.c
+Index: gtk+-3.3.16/gtk/gtkmodules.c
===================================================================
---- gtk+3.0.orig/gtk/gtkmodules.c 2011-11-11 23:39:31.000000000 +0100
-+++ gtk+3.0/gtk/gtkmodules.c 2011-11-22 10:36:57.091163711 +0100
+--- gtk+-3.3.16.orig/gtk/gtkmodules.c 2012-03-05 00:06:46.000000000 +0100
++++ gtk+-3.3.16/gtk/gtkmodules.c 2012-03-05 01:28:44.432164702 +0100
@@ -59,6 +59,7 @@
gchar *home_gtk_dir = NULL;
gchar *module_path;
@@ -23,7 +23,7 @@
default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL);
- else
+ else {
- default_dir = g_build_filename (GTK_LIBDIR, "gtk-3.0", NULL);
+ default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL);
+ pre_multiarch_dir = "/usr/lib/gtk-3.0";
+ }
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=32771&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Mon Mar 5 00:33:51 2012
@@ -4,7 +4,7 @@
017_no_offscreen_device_grabbing.patch
018_gdkenumtypes.c_location.patch
022_disable-viqr-im-for-vi-locale.patch
-042_treeview_single-focus.patch
+#042_treeview_single-focus.patch
043_notebook_scroll.patch
044_tracker_fts.patch
060_ignore-random-icons.patch
More information about the pkg-gnome-commits
mailing list