r15452 - in /desktop/unstable/gtk+2.0/debian: ./ patches/
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Tue Apr 1 09:41:52 UTC 2008
Author: lool
Date: Tue Apr 1 09:41:51 2008
New Revision: 15452
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15452
Log:
* Refresh patches 009_gtk-export-filechooser,
030_gtkentry_password-char-circle, 033_treeview_resizing,
042_treeview_single-focus, 060_ignore-random-icons
* Fix offsets in patch 095_gtk-im-module-setting; thanks Akira TAGOH;
closes: #473699.
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/unstable/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch
desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch
desktop/unstable/gtk+2.0/debian/patches/060_ignore-random-icons.patch
desktop/unstable/gtk+2.0/debian/patches/095_gtk-im-module-setting.patch
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Tue Apr 1 09:41:51 2008
@@ -1,3 +1,13 @@
+gtk+2.0 (2.12.9-3) UNRELEASED; urgency=low
+
+ * Refresh patches 009_gtk-export-filechooser,
+ 030_gtkentry_password-char-circle, 033_treeview_resizing,
+ 042_treeview_single-focus, 060_ignore-random-icons
+ * Fix offsets in patch 095_gtk-im-module-setting; thanks Akira TAGOH;
+ closes: #473699.
+
+ -- Loic Minier <lool at dooz.org> Tue, 01 Apr 2008 11:10:59 +0200
+
gtk+2.0 (2.12.9-2) unstable; urgency=low
* debian/patches/092_implicit-g-fopen.patch:
Modified: desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch Tue Apr 1 09:41:51 2008
@@ -34,9 +34,9 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
---- gtk+2.0-2.11.6.orig/gtk/Makefile.am 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/Makefile.am 2007-07-24 10:31:52.000000000 +0200
-@@ -33,6 +33,8 @@
+--- a/gtk/Makefile.am 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/Makefile.am 2008-04-01 11:10:48.000000000 +0200
+@@ -37,6 +37,8 @@
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
@@ -45,7 +45,7 @@
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
-@@ -335,12 +337,15 @@
+@@ -339,12 +341,15 @@
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
@@ -64,7 +64,7 @@
gtksearchenginebeagle.h \
gtksearchenginetracker.h\
gtksearchenginesimple.h \
-@@ -350,10 +355,7 @@
+@@ -354,10 +359,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -75,8 +75,8 @@
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
---- gtk+2.0-2.11.6.orig/gtk/gtk.symbols 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtk.symbols 2007-07-24 09:09:13.000000000 +0200
+--- a/gtk/gtk.symbols 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtk.symbols 2008-04-01 11:10:48.000000000 +0200
@@ -1416,6 +1416,12 @@
#endif
#endif
@@ -90,8 +90,8 @@
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
---- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserprivate.h 2007-07-20 22:12:28.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserprivate.h 2007-07-24 09:09:14.000000000 +0200
+--- a/gtk/gtkfilechooserprivate.h 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtkfilechooserprivate.h 2008-04-01 11:10:48.000000000 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -107,8 +107,8 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
---- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.c 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.c 2007-07-24 09:09:14.000000000 +0200
+--- a/gtk/gtkfilechooserutils.c 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtkfilechooserutils.c 2008-04-01 11:10:48.000000000 +0200
@@ -119,6 +119,22 @@
"do-overwrite-confirmation");
}
@@ -139,8 +139,8 @@
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
---- gtk+2.0-2.11.6.orig/gtk/gtkfilechooserutils.h 2007-07-20 22:12:29.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilechooserutils.h 2007-07-24 09:09:14.000000000 +0200
+--- a/gtk/gtkfilechooserutils.h 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtkfilechooserutils.h 2008-04-01 11:10:48.000000000 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@@ -166,8 +166,8 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
---- gtk+2.0-2.11.6.orig/gtk/gtkfilesystemmodel.h 2007-07-20 22:12:28.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkfilesystemmodel.h 2007-07-24 09:09:14.000000000 +0200
+--- a/gtk/gtkfilesystemmodel.h 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtkfilesystemmodel.h 2008-04-01 11:10:48.000000000 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -179,8 +179,8 @@
#include <glib-object.h>
#include "gtkfilesystem.h"
#include <gtk/gtktreemodel.h>
---- gtk+2.0-2.11.6.orig/tests/autotestfilechooser.c 2007-07-20 22:13:57.000000000 +0200
-+++ gtk+2.0-2.11.6/tests/autotestfilechooser.c 2007-07-24 09:09:14.000000000 +0200
+--- a/tests/autotestfilechooser.c 2008-04-01 11:10:41.000000000 +0200
++++ b/tests/autotestfilechooser.c 2008-04-01 11:10:48.000000000 +0200
@@ -30,6 +30,7 @@
*/
@@ -189,8 +189,8 @@
#undef GTK_DISABLE_DEPRECATED
#include <config.h>
---- gtk+2.0-2.11.6.orig/gtk/gtkquery.h 2007-07-24 10:31:23.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtkquery.h 2007-07-24 10:31:26.000000000 +0200
+--- a/gtk/gtkquery.h 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtkquery.h 2008-04-01 11:10:48.000000000 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
@@ -206,8 +206,8 @@
#include <glib-object.h>
G_BEGIN_DECLS
---- gtk+2.0-2.11.6.orig/gtk/gtksearchengine.h 2007-07-24 10:30:25.000000000 +0200
-+++ gtk+2.0-2.11.6/gtk/gtksearchengine.h 2007-07-24 10:30:55.000000000 +0200
+--- a/gtk/gtksearchengine.h 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtksearchengine.h 2008-04-01 11:10:48.000000000 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
Modified: desktop/unstable/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/030_gtkentry_password-char-circle.patch?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/030_gtkentry_password-char-circle.patch Tue Apr 1 09:41:51 2008
@@ -1,7 +1,5 @@
-Index: gtk+2.0-2.11.3/gtk/gtkentry.c
-===================================================================
---- gtk+2.0-2.11.3.orig/gtk/gtkentry.c 2007-06-15 20:07:37.000000000 +0200
-+++ gtk+2.0-2.11.3/gtk/gtkentry.c 2007-06-16 14:25:47.000000000 +0200
+--- a/gtk/gtkentry.c 2008-04-01 11:10:41.000000000 +0200
++++ b/gtk/gtkentry.c 2008-04-01 11:11:08.000000000 +0200
@@ -537,7 +537,7 @@
g_param_spec_unichar ("invisible-char",
P_("Invisible character"),
@@ -11,7 +9,7 @@
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
-@@ -1101,7 +1101,7 @@
+@@ -1103,7 +1103,7 @@
entry->editable = TRUE;
entry->visible = TRUE;
@@ -20,7 +18,7 @@
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
-@@ -4550,9 +4550,9 @@
+@@ -4552,9 +4552,9 @@
* gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default
Modified: desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/033_treeview_resizing.patch?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/033_treeview_resizing.patch Tue Apr 1 09:41:51 2008
@@ -1,6 +1,6 @@
---- a/gtk/gtktreeview.c 2008-01-29 04:35:46.000000000 +0100
-+++ b/gtk/gtktreeview.c 2008-01-29 09:57:35.000000000 +0100
-@@ -2158,19 +2158,21 @@
+--- a/gtk/gtktreeview.c 2008-04-01 11:10:40.000000000 +0200
++++ b/gtk/gtktreeview.c 2008-04-01 11:11:21.000000000 +0200
+@@ -2163,19 +2163,21 @@
}
/* GtkWidget::size_allocate helper */
@@ -25,7 +25,7 @@
tree_view = GTK_TREE_VIEW (widget);
-@@ -2179,7 +2181,7 @@
+@@ -2184,7 +2186,7 @@
last_column = last_column->prev)
;
if (last_column == NULL)
@@ -34,7 +34,7 @@
for (first_column = g_list_first (tree_view->priv->columns);
first_column && !(GTK_TREE_VIEW_COLUMN (first_column->data)->visible);
-@@ -2205,12 +2207,38 @@
+@@ -2210,12 +2212,38 @@
number_of_expand_columns++;
}
@@ -74,7 +74,7 @@
for (list = (rtl ? last_column : first_column);
list != (rtl ? first_column->prev : last_column->next);
list = (rtl ? list->prev : list->next))
-@@ -2266,6 +2294,12 @@
+@@ -2271,6 +2299,12 @@
column->width += extra;
}
@@ -87,7 +87,7 @@
g_object_notify (G_OBJECT (column), "width");
allocation.width = column->width;
-@@ -2283,8 +2317,17 @@
+@@ -2288,8 +2322,17 @@
TREE_VIEW_DRAG_WIDTH, allocation.height);
}
@@ -105,7 +105,7 @@
}
-@@ -2299,13 +2342,13 @@
+@@ -2304,13 +2347,13 @@
g_return_if_fail (GTK_IS_TREE_VIEW (widget));
@@ -122,7 +122,7 @@
tmp_list = tree_view->priv->children;
while (tmp_list)
-@@ -2323,6 +2366,7 @@
+@@ -2328,6 +2371,7 @@
gtk_widget_size_allocate (child->widget, &allocation);
}
@@ -130,7 +130,7 @@
tree_view->priv->hadjustment->page_size = allocation->width;
tree_view->priv->hadjustment->page_increment = allocation->width * 0.9;
-@@ -2331,28 +2375,30 @@
+@@ -2336,28 +2380,30 @@
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->page_size, tree_view->priv->width);
if (gtk_widget_get_direction(widget) == GTK_TEXT_DIR_RTL)
@@ -181,7 +181,7 @@
gtk_adjustment_changed (tree_view->priv->hadjustment);
-@@ -2392,8 +2438,6 @@
+@@ -2397,8 +2443,6 @@
allocation->height - TREE_VIEW_HEADER_HEIGHT (tree_view));
}
@@ -190,7 +190,7 @@
if (tree_view->priv->tree == NULL)
invalidate_empty_focus (tree_view);
-@@ -2837,7 +2881,7 @@
+@@ -2842,7 +2886,7 @@
gtk_grab_add (widget);
GTK_TREE_VIEW_SET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
@@ -199,7 +199,7 @@
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
-@@ -3549,6 +3593,8 @@
+@@ -3554,6 +3598,8 @@
{
column->use_resized_width = TRUE;
column->resized_width = new_width;
@@ -208,7 +208,7 @@
gtk_widget_queue_resize (widget);
}
-@@ -11484,7 +11530,7 @@
+@@ -11511,7 +11557,7 @@
if (GTK_WIDGET_REALIZED (tree_view))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -217,8 +217,8 @@
}
g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
---- a/gtk/gtktreeviewcolumn.c 2008-01-29 04:35:46.000000000 +0100
-+++ b/gtk/gtktreeviewcolumn.c 2008-01-29 09:57:35.000000000 +0100
+--- a/gtk/gtktreeviewcolumn.c 2008-04-01 11:10:40.000000000 +0200
++++ b/gtk/gtktreeviewcolumn.c 2008-04-01 11:11:21.000000000 +0200
@@ -2142,6 +2142,7 @@
tree_column->tree_view != NULL &&
GTK_WIDGET_REALIZED (tree_column->tree_view))
@@ -227,8 +227,8 @@
gtk_widget_queue_resize (tree_column->tree_view);
}
---- a/gtk/gtktreeprivate.h 2008-01-29 04:35:47.000000000 +0100
-+++ b/gtk/gtktreeprivate.h 2008-01-29 09:57:35.000000000 +0100
+--- a/gtk/gtktreeprivate.h 2008-04-01 11:10:40.000000000 +0200
++++ b/gtk/gtktreeprivate.h 2008-04-01 11:11:21.000000000 +0200
@@ -268,6 +268,10 @@
GdkGC *tree_line_gc;
Modified: desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/042_treeview_single-focus.patch?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/042_treeview_single-focus.patch Tue Apr 1 09:41:51 2008
@@ -1,6 +1,6 @@
---- a/gtk/gtktreeview.c 2008-01-29 09:57:35.000000000 +0100
-+++ b/gtk/gtktreeview.c 2008-01-29 09:58:06.000000000 +0100
-@@ -9664,7 +9664,8 @@
+--- a/gtk/gtktreeview.c 2008-04-01 11:11:21.000000000 +0200
++++ b/gtk/gtktreeview.c 2008-04-01 11:11:32.000000000 +0200
+@@ -9669,7 +9669,8 @@
if (cursor_path)
{
Modified: desktop/unstable/gtk+2.0/debian/patches/060_ignore-random-icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/060_ignore-random-icons.patch?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/060_ignore-random-icons.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/060_ignore-random-icons.patch Tue Apr 1 09:41:51 2008
@@ -1,6 +1,6 @@
---- gtk+2.0-2.12.1.orig/gtk/updateiconcache.c 2007-10-21 22:04:11.000000000 +0200
-+++ gtk+2.0-2.12.1/gtk/updateiconcache.c 2007-10-21 22:04:23.000000000 +0200
-@@ -654,7 +654,7 @@
+--- a/gtk/updateiconcache.c 2008-04-01 11:10:40.000000000 +0200
++++ b/gtk/updateiconcache.c 2008-04-01 11:11:54.000000000 +0200
+@@ -658,7 +658,7 @@
directories = g_list_append (directories, g_strdup (subdir));
}
else
Modified: desktop/unstable/gtk+2.0/debian/patches/095_gtk-im-module-setting.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/095_gtk-im-module-setting.patch?rev=15452&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/095_gtk-im-module-setting.patch (original)
+++ desktop/unstable/gtk+2.0/debian/patches/095_gtk-im-module-setting.patch Tue Apr 1 09:41:51 2008
@@ -1,7 +1,7 @@
GNOME 502446; Adds XSETTINGS support for immodule
---- a/gdk/x11/gdksettings.c 2008-01-29 04:36:31.000000000 +0100
-+++ b/gdk/x11/gdksettings.c 2008-01-29 21:14:07.000000000 +0100
+--- a/gdk/x11/gdksettings.c 2008-04-01 11:12:11.000000000 +0200
++++ b/gdk/x11/gdksettings.c 2008-04-01 11:41:10.000000000 +0200
@@ -65,7 +65,8 @@
"Xft/RGBA\0" "gtk-xft-rgba\0"
"Xft/DPI\0" "gtk-xft-dpi\0"
@@ -18,10 +18,10 @@
{ 1239, 1261 },
- { 1285, 1305 }
+ { 1285, 1305 },
-+ { 1460, 1473 }
++ { 1326, 1339 }
};
---- a/gtk/gtkimmulticontext.c 2008-01-29 04:35:46.000000000 +0100
-+++ b/gtk/gtkimmulticontext.c 2008-01-29 21:13:12.000000000 +0100
+--- a/gtk/gtkimmulticontext.c 2008-04-01 11:12:11.000000000 +0200
++++ b/gtk/gtkimmulticontext.c 2008-04-01 11:12:18.000000000 +0200
@@ -85,6 +85,7 @@
gint n_chars,
GtkIMMulticontext *multicontext);
@@ -178,8 +178,8 @@
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
---- a/gtk/gtkimmulticontext.h 2008-01-29 04:35:46.000000000 +0100
-+++ b/gtk/gtkimmulticontext.h 2008-01-29 21:13:12.000000000 +0100
+--- a/gtk/gtkimmulticontext.h 2008-04-01 11:12:11.000000000 +0200
++++ b/gtk/gtkimmulticontext.h 2008-04-01 11:12:18.000000000 +0200
@@ -45,7 +45,7 @@
GtkIMMulticontextPrivate *priv;
@@ -189,8 +189,8 @@
};
struct _GtkIMMulticontextClass
---- a/gtk/gtksettings.c 2008-01-29 21:11:57.000000000 +0100
-+++ b/gtk/gtksettings.c 2008-01-29 21:13:12.000000000 +0100
+--- a/gtk/gtksettings.c 2008-04-01 11:12:11.000000000 +0200
++++ b/gtk/gtksettings.c 2008-04-01 11:12:18.000000000 +0200
@@ -106,7 +106,8 @@
PROP_PRINT_PREVIEW_COMMAND,
PROP_ENABLE_MNEMONICS,
@@ -222,8 +222,8 @@
}
static void
---- a/gtk/gtkimmodule.c 2008-01-29 21:11:57.000000000 +0100
-+++ b/gtk/gtkimmodule.c 2008-01-29 21:13:12.000000000 +0100
+--- a/gtk/gtkimmodule.c 2008-04-01 11:12:11.000000000 +0200
++++ b/gtk/gtkimmodule.c 2008-04-01 11:12:18.000000000 +0200
@@ -37,6 +37,8 @@
#include <pango/pango-utils.h>
#include "gtkimmodule.h"
@@ -334,8 +334,8 @@
- return g_strdup (context_id ? context_id : SIMPLE_ID);
+ return context_id ? context_id : SIMPLE_ID;
}
---- a/gtk/gtkimmodule.h 2008-01-29 04:35:47.000000000 +0100
-+++ b/gtk/gtkimmodule.h 2008-01-29 21:13:12.000000000 +0100
+--- a/gtk/gtkimmodule.h 2008-04-01 11:12:11.000000000 +0200
++++ b/gtk/gtkimmodule.h 2008-04-01 11:12:18.000000000 +0200
@@ -38,10 +38,10 @@
/* Functions for use within GTK+
More information about the pkg-gnome-commits
mailing list