callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk+2.0 (2.10.7-1) experimental; urgency=low

Browse Source 
* New upstream release.
  * Refresh patches.
  * 022_gtkcupsutils_multipage.patch: removed, integrated upstream.
  * Regenerate 070_mandatory-relibtoolize.patch.
  * 014_gtktreeview_missing-icons.patch: update patch with the upstream 
    fix that was committed.
This commit is contained in:
Josselin Mouette
2007-01-09 22:54:54 +00:00
parent 7d6e7ba548
commit 7be20e6e17
8 changed files with 35613 additions and 4588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
debian/changelog vendored
View File

@ -1,3 +1,14 @@
gtk+2.0 (2.10.7-1) experimental; urgency=low
* New upstream release.
* Refresh patches.
* 022_gtkcupsutils_multipage.patch: removed, integrated upstream.
* Regenerate 070_mandatory-relibtoolize.patch.
* 014_gtktreeview_missing-icons.patch: update patch with the upstream
fix that was committed.
-- Josselin Mouette <joss@debian.org> Tue, 9 Jan 2007 23:51:51 +0100
gtk+2.0 (2.10.6-5) experimental; urgency=low gtk+2.0 (2.10.6-5) experimental; urgency=low
[ Loic Minier ] [ Loic Minier ]

18
debian/patches/001_static-linking-dont-query-immodules.patch vendored
View File

@ -1,6 +1,7 @@
diff -urN gtk+-2.10.1.orig/configure.in gtk+-2.10.1/configure.in Index: gtk+-2.10.7/configure.in
--- gtk+-2.10.1.orig/configure.in 2006-08-15 00:12:10.000000000 +0200 ===================================================================
+++ gtk+-2.10.1/configure.in 2006-08-15 10:09:55.000000000 +0200 --- gtk+-2.10.7.orig/configure.in 2007-01-09 23:18:48.410353000 +0100
+++ gtk+-2.10.7/configure.in 2007-01-09 23:18:59.591051750 +0100
@@ -134,6 +134,7 @@ @@ -134,6 +134,7 @@
dnl Initialize libtool dnl Initialize libtool
AC_PROG_CC AC_PROG_CC
@ -9,10 +10,11 @@ diff -urN gtk+-2.10.1.orig/configure.in gtk+-2.10.1/configure.in
if test "$os_win32" = "yes"; then if test "$os_win32" = "yes"; then
if test x$enable_static = xyes -o x$enable_static = x; then if test x$enable_static = xyes -o x$enable_static = x; then
diff -urN gtk+-2.10.1.orig/modules/input/Makefile.am gtk+-2.10.1/modules/input/Makefile.am Index: gtk+-2.10.7/modules/input/Makefile.am
--- gtk+-2.10.1.orig/modules/input/Makefile.am 2006-01-29 05:00:45.000000000 +0100 ===================================================================
+++ gtk+-2.10.1/modules/input/Makefile.am 2006-08-15 10:09:55.000000000 +0200 --- gtk+-2.10.7.orig/modules/input/Makefile.am 2007-01-05 19:36:21.000000000 +0100
@@ -89,8 +89,12 @@ +++ gtk+-2.10.7/modules/input/Makefile.am 2007-01-09 23:18:59.591051750 +0100
@@ -94,8 +94,12 @@
if CROSS_COMPILING if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_IMMODULES_TEST=false
else else
@ -25,7 +27,7 @@ diff -urN gtk+-2.10.1.orig/modules/input/Makefile.am gtk+-2.10.1/modules/input/M
# Running this if cross compiling or if DESTDIR is set is going to # Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it. # not work at all, so skip it.
@@ -130,7 +134,18 @@ @@ -135,7 +139,18 @@
$(IM_IME_MODULE) $(IM_IME_MODULE)
gtk.immodules: Makefile.am $(module_LTLIBRARIES) gtk.immodules: Makefile.am $(module_LTLIBRARIES)

25
debian/patches/014_gtktreeview_missing-icons.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.6/gtk/gtktreeview.c Index: gtk+-2.10.7/gtk/gtktreeview.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.6.orig/gtk/gtktreeview.c 2006-09-16 06:37:08.000000000 +0200 --- gtk+-2.10.7.orig/gtk/gtktreeview.c 2007-01-09 23:38:26.791997250 +0100
+++ gtk+2.0-2.10.6/gtk/gtktreeview.c 2006-12-28 23:41:50.000000000 +0100 +++ gtk+-2.10.7/gtk/gtktreeview.c 2007-01-09 23:51:07.043510000 +0100
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
+/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */ +/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
/* gtktreeview.c /* gtktreeview.c
@ -19,3 +19,22 @@ Index: gtk+2.0-2.10.6/gtk/gtktreeview.c
if (tree_view->priv->cursor != NULL) if (tree_view->priv->cursor != NULL)
cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor); cursor_path = gtk_tree_row_reference_get_path (tree_view->priv->cursor);
else else
@@ -8110,7 +8106,8 @@
&& tree_view->priv->fixed_height >= 0)
{
_gtk_rbtree_node_set_height (tree, node, tree_view->priv->fixed_height);
- gtk_tree_view_node_queue_redraw (tree_view, tree, node);
+ if (GTK_WIDGET_REALIZED (tree_view))
+ gtk_tree_view_node_queue_redraw (tree_view, tree, node);
}
else
{
@@ -8131,7 +8128,7 @@
}
done:
- if (!tree_view->priv->fixed_height_mode)
+ if (GTK_WIDGET_REALIZED (tree_view) && !tree_view->priv->fixed_height_mode)
install_presize_handler (tree_view);
if (free_path)
gtk_tree_path_free (path);

91
debian/patches/022_gtkcupsutils_multipage.patch vendored
View File

@ -1,91 +0,0 @@
Index: gtk+2.0-2.10.6/modules/printbackends/cups/gtkcupsutils.c
===================================================================
--- gtk+2.0-2.10.6.orig/modules/printbackends/cups/gtkcupsutils.c 2006-12-28 23:43:27.000000000 +0100
+++ gtk+2.0-2.10.6/modules/printbackends/cups/gtkcupsutils.c 2006-12-28 23:43:43.000000000 +0100
@@ -474,12 +474,80 @@
}
default:
- ippAddString (request->ipp_request,
- IPP_TAG_OPERATION,
- option_tag,
- option,
- NULL,
- value);
+ {
+ char *values;
+ char *s;
+ int in_quotes;
+ char *next;
+ GPtrArray *strings;
+
+ values = g_strdup (value);
+ strings = NULL;
+ in_quotes = 0;
+
+ for (s = values, next = s; *s != '\0'; s++)
+ {
+ if (in_quotes != 2 && *s == '\'')
+ {
+ /* skip quoted value */
+ if (in_quotes == 0)
+ in_quotes = 1;
+ else
+ in_quotes = 0;
+ }
+ else if (in_quotes != 1 && *s == '\"')
+ {
+ /* skip quoted value */
+ if (in_quotes == 0)
+ in_quotes = 2;
+ else
+ in_quotes = 0;
+ }
+ else if (in_quotes == 0 && *s == ',')
+ {
+ /* found delimiter, add to value array */
+ *s = '\0';
+ if (strings == NULL)
+ strings = g_ptr_array_new ();
+ g_ptr_array_add (strings, next);
+ next = s + 1;
+ }
+ else if (in_quotes == 0 && *s == '\\' && s[1] != '\0')
+ {
+ /* skip escaped character */
+ s++;
+ }
+ }
+
+ if (strings == NULL)
+ {
+ /* single value */
+ ippAddString (request->ipp_request,
+ IPP_TAG_OPERATION,
+ option_tag,
+ option,
+ NULL,
+ value);
+ }
+ else
+ {
+ /* multiple values */
+
+ /* add last value */
+ g_ptr_array_add (strings, next);
+
+ ippAddStrings (request->ipp_request,
+ IPP_TAG_OPERATION,
+ option_tag,
+ option,
+ strings->len,
+ NULL,
+ (const char **) strings->pdata);
+ g_ptr_array_free (strings, TRUE);
+ }
+
+ g_free (values);
+ }
break;
}

12
debian/patches/023_gtkentry_password-char-circle.patch vendored
View File

@ -1,8 +1,8 @@
Index: gtk+2.0-2.10.6/gtk/gtkentry.c Index: gtk+-2.10.7/gtk/gtkentry.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.6.orig/gtk/gtkentry.c 2006-12-29 02:08:52.000000000 +0100 --- gtk+-2.10.7.orig/gtk/gtkentry.c 2007-01-05 19:32:46.000000000 +0100
+++ gtk+2.0-2.10.6/gtk/gtkentry.c 2006-12-29 02:10:32.000000000 +0100 +++ gtk+-2.10.7/gtk/gtkentry.c 2007-01-09 23:21:46.613490000 +0100
@@ -521,7 +521,7 @@ @@ -526,7 +526,7 @@
g_param_spec_unichar ("invisible-char", g_param_spec_unichar ("invisible-char",
P_("Invisible character"), P_("Invisible character"),
P_("The character to use when masking entry contents (in \"password mode\")"), P_("The character to use when masking entry contents (in \"password mode\")"),
@ -11,7 +11,7 @@ Index: gtk+2.0-2.10.6/gtk/gtkentry.c
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
@@ -1059,7 +1059,7 @@ @@ -1064,7 +1064,7 @@
entry->editable = TRUE; entry->editable = TRUE;
entry->visible = TRUE; entry->visible = TRUE;
@ -20,7 +20,7 @@ Index: gtk+2.0-2.10.6/gtk/gtkentry.c
entry->dnd_position = -1; entry->dnd_position = -1;
entry->width_chars = -1; entry->width_chars = -1;
entry->is_cell_renderer = FALSE; entry->is_cell_renderer = FALSE;
@@ -4236,9 +4236,9 @@ @@ -4325,9 +4325,9 @@
* gtk_entry_set_visibility() has been called to set text visibility * gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to * to %FALSE. i.e. this is the character used in "password mode" to
* show the user how many characters have been typed. The default * show the user how many characters have been typed. The default

8
debian/patches/024_filechooser_single-click.patch vendored
View File

@ -1,7 +1,7 @@
Index: gtk+2.0-2.10.6/gtk/gtkfilechooserdefault.c Index: gtk+-2.10.7/gtk/gtkfilechooserdefault.c
=================================================================== ===================================================================
--- gtk+2.0-2.10.6.orig/gtk/gtkfilechooserdefault.c 2007-01-03 00:07:41.000000000 +0100 --- gtk+-2.10.7.orig/gtk/gtkfilechooserdefault.c 2007-01-05 19:32:45.000000000 +0100
+++ gtk+2.0-2.10.6/gtk/gtkfilechooserdefault.c 2007-01-03 00:12:50.000000000 +0100 +++ gtk+-2.10.7/gtk/gtkfilechooserdefault.c 2007-01-09 23:21:52.205839500 +0100
@@ -330,10 +330,8 @@ @@ -330,10 +330,8 @@
static void filter_combo_changed (GtkComboBox *combo_box, static void filter_combo_changed (GtkComboBox *combo_box,
@ -26,7 +26,7 @@ Index: gtk+2.0-2.10.6/gtk/gtkfilechooserdefault.c
g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event", g_signal_connect (impl->browse_shortcuts_tree_view, "key_press_event",
G_CALLBACK (shortcuts_key_press_event_cb), impl); G_CALLBACK (shortcuts_key_press_event_cb), impl);
@@ -8167,16 +8165,13 @@ @@ -8173,16 +8171,13 @@
/* Callback used when a row in the shortcuts list is activated */ /* Callback used when a row in the shortcuts list is activated */
static void static void

40029
debian/patches/070_mandatory-relibtoolize.patch vendored
View File

File diff suppressed because it is too large Load Diff

1
debian/patches/series vendored
View File

@ -13,7 +13,6 @@
014_gtktreeview_missing-icons.patch 014_gtktreeview_missing-icons.patch
020_immodules-files-d.patch 020_immodules-files-d.patch
021_loader-files-d.patch 021_loader-files-d.patch
022_gtkcupsutils_multipage.patch
023_gtkentry_password-char-circle.patch 023_gtkentry_password-char-circle.patch
024_filechooser_single-click.patch 024_filechooser_single-click.patch
070_mandatory-relibtoolize.patch 070_mandatory-relibtoolize.patch