From d42467d5e2134972ebcf24d93a7bf2f1dbe77f1d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 5 Aug 2008 21:41:17 +0000 Subject: [PATCH] 2.13.6 --- .cvsignore | 2 +- filechooser-auth.patch | 12 --- gtk+-2.4.1-lib64.patch | 52 ------------ gtk-2.13.0-calendarcomma.patch | 12 --- gtk-2.13.3-choosergio.patch | 143 --------------------------------- gtk2.spec | 5 +- icon-view-a11y.patch | 29 ------- pixbuf-loader.patch | 39 --------- printer-hostname.patch | 43 ---------- sources | 2 +- system-log-crash.patch | 46 ----------- 11 files changed, 6 insertions(+), 379 deletions(-) delete mode 100644 filechooser-auth.patch delete mode 100644 gtk+-2.4.1-lib64.patch delete mode 100644 gtk-2.13.0-calendarcomma.patch delete mode 100644 gtk-2.13.3-choosergio.patch delete mode 100644 icon-view-a11y.patch delete mode 100644 pixbuf-loader.patch delete mode 100644 printer-hostname.patch delete mode 100644 system-log-crash.patch diff --git a/.cvsignore b/.cvsignore index 4a22f08..c13813a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gtk+-2.13.5.tar.bz2 +gtk+-2.13.6.tar.bz2 diff --git a/filechooser-auth.patch b/filechooser-auth.patch deleted file mode 100644 index dbadf8e..0000000 --- a/filechooser-auth.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gtk+-2.12.9/gtk/gtkfilechooserdefault.c.filechooser-auth gtk+-2.12.9/gtk/gtkfilechooserdefault.c ---- gtk+-2.12.9/gtk/gtkfilechooserdefault.c.filechooser-auth 2008-04-09 13:39:03.000000000 -0400 -+++ gtk+-2.12.9/gtk/gtkfilechooserdefault.c 2008-04-09 13:39:06.000000000 -0400 -@@ -10377,7 +10377,7 @@ shortcuts_activate_get_info_cb (GtkFileS - - data->impl->shortcuts_activate_iter_handle = NULL; - -- if (cancelled) -+ if (cancelled || g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_INTR)) - goto out; - - if (!error && gtk_file_info_get_is_folder (info)) diff --git a/gtk+-2.4.1-lib64.patch b/gtk+-2.4.1-lib64.patch deleted file mode 100644 index 95907bc..0000000 --- a/gtk+-2.4.1-lib64.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- gtk+-2.6.0/gdk-pixbuf/gdk-pixbuf-io.c.lib64 2004-12-21 14:33:41.296252000 -0500 -+++ gtk+-2.6.0/gdk-pixbuf/gdk-pixbuf-io.c 2004-12-21 14:35:57.858554000 -0500 -@@ -258,7 +258,17 @@ - gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE")); - - if (!result) -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL); -+ { -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", -+ HOST, "gdk-pixbuf.loaders", NULL); -+ if (!g_file_test (result, G_FILE_TEST_EXISTS)) -+ { -+ g_free (result); -+ -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", -+ "gdk-pixbuf.loaders", NULL); -+ } -+ } - - return result; - } ---- gtk+-2.6.0/gdk-pixbuf/Makefile.am.lib64 2004-12-21 14:33:49.952587000 -0500 -+++ gtk+-2.6.0/gdk-pixbuf/Makefile.am 2004-12-21 14:34:45.644839000 -0500 -@@ -274,6 +274,7 @@ - -I$(top_srcdir)/gdk-pixbuf \ - -I$(top_builddir)/gdk-pixbuf \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DHOST=\"$(host_triplet)\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DG_DISABLE_DEPRECATED \ ---- gtk+-2.6.0/gtk/gtkrc.c.lib64 2004-12-21 14:34:02.909617000 -0500 -+++ gtk+-2.6.0/gtk/gtkrc.c 2004-12-21 14:36:39.265106000 -0500 -@@ -377,7 +377,17 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ { -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, -+ "gtk.immodules", NULL); -+ if (!g_file_test (result, G_FILE_TEST_EXISTS)) -+ { -+ g_free (result); -+ -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", -+ "gtk.immodules", NULL); -+ } -+ } - } - - #ifdef G_OS_WIN32 diff --git a/gtk-2.13.0-calendarcomma.patch b/gtk-2.13.0-calendarcomma.patch deleted file mode 100644 index c6938ec..0000000 --- a/gtk-2.13.0-calendarcomma.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- trunk/gtk/gtkcalendar.h 2008/02/27 22:46:48 19670 -+++ trunk/gtk/gtkcalendar.h 2008/02/28 05:41:56 19671 -@@ -72,7 +72,7 @@ - GTK_CALENDAR_NO_MONTH_CHANGE = 1 << 2, - GTK_CALENDAR_SHOW_WEEK_NUMBERS = 1 << 3, - GTK_CALENDAR_WEEK_START_MONDAY = 1 << 4, -- GTK_CALENDAR_SHOW_DETAILS = 1 << 5, -+ GTK_CALENDAR_SHOW_DETAILS = 1 << 5 - } GtkCalendarDisplayOptions; - - /** - diff --git a/gtk-2.13.3-choosergio.patch b/gtk-2.13.3-choosergio.patch deleted file mode 100644 index f6fa3c2..0000000 --- a/gtk-2.13.3-choosergio.patch +++ /dev/null @@ -1,143 +0,0 @@ -The gtk_file_chooser_get_filename() returning relative path instead of -absolute broke inkscape (#452648) - -2008-06-15 Carlos Garnacho - - * gtk/gtkfilechooser.c (gtk_file_chooser_get_filename): Return full - path here as expected, not just the basename. - - * gtk/gtkfilechooserdefault.c - (gtk_file_chooser_default_update_current_folder): Ensure that we keep - a reference to file, since it can be destroyed when switching back to - browse mode. - - * gtk/gtkfilesystem.c (get_icon_for_special_directory): Removed, home - and desktop directories are dealt by the filechooser as normal files, - not volumes, so the icon for these is handled directly by GIO. - (_gtk_file_system_volume_render_icon): Update caller. - - -Index: trunk/gtk/gtkfilechooserdefault.c -=================================================================== ---- trunk/gtk/gtkfilechooserdefault.c (revision 20392) -+++ trunk/gtk/gtkfilechooserdefault.c (revision 20393) -@@ -6982,6 +6982,8 @@ - - profile_start ("start", NULL); - -+ g_object_ref (file); -+ - switch (impl->operation_mode) - { - case OPERATION_MODE_SEARCH: -@@ -7001,6 +7003,7 @@ - GTK_FILE_CHOOSER_ERROR_BAD_FILENAME, - _("Cannot change to folder because it is not local")); - -+ g_object_unref (file); - profile_end ("end - not local", NULL); - return FALSE; - } -@@ -7024,6 +7027,7 @@ - data); - - set_busy_cursor (impl, TRUE); -+ g_object_unref (file); - - profile_end ("end", NULL); - return TRUE; -Index: trunk/gtk/gtkfilesystem.c -=================================================================== ---- trunk/gtk/gtkfilesystem.c (revision 20392) -+++ trunk/gtk/gtkfilesystem.c (revision 20393) -@@ -1662,50 +1662,6 @@ - return pixbuf; - } - --static GIcon * --get_icon_for_special_directory (GFile *file) --{ -- const gchar *special_dir; -- GFile *special_file; -- -- special_dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP); -- special_file = g_file_new_for_path (special_dir); -- -- if (g_file_equal (file, special_file)) -- { -- const char *names[] = { -- "user-desktop", -- "gnome-fs-desktop", -- "folder", -- "gtk-directory", -- NULL -- }; -- g_object_unref (special_file); -- return g_themed_icon_new_from_names ((char **)names, -1); -- } -- -- g_object_unref (special_file); -- special_dir = g_get_home_dir (); -- special_file = g_file_new_for_path (special_dir); -- -- if (g_file_equal (file, special_file)) -- { -- const char *names[] = { -- "user-home", -- "gnome-fs-home", -- "folder", -- "gtk-directory", -- NULL -- }; -- g_object_unref (special_file); -- return g_themed_icon_new_from_names ((char **)names, -1); -- } -- -- g_object_unref (special_file); -- -- return NULL; --} -- - GdkPixbuf * - _gtk_file_system_volume_render_icon (GtkFileSystemVolume *volume, - GtkWidget *widget, -@@ -1724,24 +1680,14 @@ - DEBUG ("volume_get_icon_name"); - - if (IS_ROOT_VOLUME (volume)) -- icon = g_themed_icon_new_from_names ((char **)harddisk_icons, -1); -+ icon = g_themed_icon_new_from_names ((char **) harddisk_icons, -1); - else if (G_IS_DRIVE (volume)) - icon = g_drive_get_icon (G_DRIVE (volume)); - else if (G_IS_VOLUME (volume)) - icon = g_volume_get_icon (G_VOLUME (volume)); - else if (G_IS_MOUNT (volume)) -- { -- GMount *mount = G_MOUNT (volume); -- GFile *file; -+ icon = g_mount_get_icon (G_MOUNT (volume)); - -- file = g_mount_get_root (mount); -- icon = get_icon_for_special_directory (file); -- g_object_unref (file); -- -- if (!icon) -- icon = g_mount_get_icon (mount); -- } -- - if (!icon) - return NULL; - -Index: trunk/gtk/gtkfilechooser.c -=================================================================== ---- trunk/gtk/gtkfilechooser.c (revision 20392) -+++ trunk/gtk/gtkfilechooser.c (revision 20393) -@@ -454,7 +454,7 @@ - - if (file) - { -- result = g_file_get_basename (file); -+ result = g_file_get_path (file); - g_object_unref (file); - } - diff --git a/gtk2.spec b/gtk2.spec index d8d64b5..8e407e6 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.13.5 +%define base_version 2.13.6 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X @@ -298,6 +298,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-2.0 %changelog +* Tue Aug 5 2008 Matthias Clasen - 2.13.6-1 +- Update to 2.13.6 + * Mon Jul 21 2008 Matthias Clasen - 2.13.5-1 - Update to 2.13.5 diff --git a/icon-view-a11y.patch b/icon-view-a11y.patch deleted file mode 100644 index 57536f7..0000000 --- a/icon-view-a11y.patch +++ /dev/null @@ -1,29 +0,0 @@ -Index: gtk/gtkiconview.c -=================================================================== ---- gtk/gtkiconview.c (revision 20741) -+++ gtk/gtkiconview.c (working copy) -@@ -8970,8 +8970,8 @@ - { - if (tmp_list == NULL) - tmp_list = items; -- else -- info->index = item->item->index; -+ -+ info->index = item->item->index; - } - - items = items->next; -@@ -8981,11 +8981,8 @@ - { - info = deleted_item->data; - gtk_icon_view_item_accessible_add_state (GTK_ICON_VIEW_ITEM_ACCESSIBLE (info->item), ATK_STATE_DEFUNCT, TRUE); -- } -- g_signal_emit_by_name (atk_obj, "children_changed::remove", -- index, NULL, NULL); -- if (deleted_item) -- { -+ g_signal_emit_by_name (atk_obj, "children_changed::remove", -+ index, NULL, NULL); - priv->items = g_list_remove_link (priv->items, deleted_item); - g_free (info); - } diff --git a/pixbuf-loader.patch b/pixbuf-loader.patch deleted file mode 100644 index 70087c7..0000000 --- a/pixbuf-loader.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: gdk-pixbuf/io-icns.c -=================================================================== ---- gdk-pixbuf/io-icns.c (revision 20245) -+++ gdk-pixbuf/io-icns.c (working copy) -@@ -364,7 +364,7 @@ - return pixbuf; - } - --#ifndef INCLUDE_png -+#ifndef INCLUDE_icns - #define MODULE_ENTRY(function) G_MODULE_EXPORT void function - #else - #define MODULE_ENTRY(function) void _gdk_pixbuf__icns_ ## function -Index: gdk-pixbuf/io-ico.c -=================================================================== ---- gdk-pixbuf/io-ico.c (revision 20245) -+++ gdk-pixbuf/io-ico.c (working copy) -@@ -1184,7 +1184,7 @@ - return TRUE; - } - --#ifndef INCLUDE_png -+#ifndef INCLUDE_ico - #define MODULE_ENTRY(function) G_MODULE_EXPORT void function - #else - #define MODULE_ENTRY(function) void _gdk_pixbuf__ico_ ## function -Index: gdk-pixbuf/io-jasper.c -=================================================================== ---- gdk-pixbuf/io-jasper.c (revision 20245) -+++ gdk-pixbuf/io-jasper.c (working copy) -@@ -262,7 +262,7 @@ - return TRUE; - } - --#ifndef INCLUDE_png -+#ifndef INCLUDE_jasper - #define MODULE_ENTRY(function) G_MODULE_EXPORT void function - #else - #define MODULE_ENTRY(function) void _gdk_pixbuf__jasper_ ## function diff --git a/printer-hostname.patch b/printer-hostname.patch deleted file mode 100644 index ce645a2..0000000 --- a/printer-hostname.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- modules/printbackends/cups/gtkprintbackendcups.c 2008-06-03 23:23:22.000000000 +0200 -+++ modules/printbackends/cups/gtkprintbackendcups.c 2008-06-11 13:15:34.000000000 +0200 -@@ -433,6 +433,7 @@ gtk_print_backend_cups_print_stream (Gtk - GtkCupsRequest *request; - GtkPrintSettings *settings; - const gchar *title; -+ char printer_absolute_uri[HTTP_MAX_URI]; - - GTK_NOTE (PRINTING, - g_print ("CUPS Backend: %s\n", G_STRFUNC)); -@@ -444,12 +445,30 @@ gtk_print_backend_cups_print_stream (Gtk - GTK_CUPS_POST, - IPP_PRINT_JOB, - data_io, -- cups_printer->hostname, -+ NULL, - cups_printer->device_uri); - -+#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1 -+ httpAssembleURIf (HTTP_URI_CODING_ALL, -+ printer_absolute_uri, -+ sizeof (printer_absolute_uri), -+ "ipp", -+ NULL, -+ "localhost", -+ ippPort (), -+ "/printers/%s", -+ gtk_printer_get_name (gtk_print_job_get_printer (job))); -+#else -+ g_snprintf (printer_absolute_uri, -+ sizeof (printer_absolute_uri), -+ "ipp://localhost:%d/printers/%s", -+ ippPort (), -+ gtk_printer_get_name (gtk_print_job_get_printer (job))); -+#endif -+ - gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, - IPP_TAG_URI, "printer-uri", -- NULL, cups_printer->printer_uri); -+ NULL, printer_absolute_uri); - - title = gtk_print_job_get_title (job); - if (title) diff --git a/sources b/sources index 99c75cc..87f9f31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19a9127ec1d072444068acc90aca8085 gtk+-2.13.5.tar.bz2 +d9b3455d4639d44073abd1fb89d0c7b9 gtk+-2.13.6.tar.bz2 diff --git a/system-log-crash.patch b/system-log-crash.patch deleted file mode 100644 index 5c7b2e3..0000000 --- a/system-log-crash.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up gtk+-2.12.1/gtk/gtktreeview.c.system-log gtk+-2.12.1/gtk/gtktreeview.c ---- gtk+-2.12.1/gtk/gtktreeview.c.system-log 2007-10-18 21:51:23.000000000 -0400 -+++ gtk+-2.12.1/gtk/gtktreeview.c 2007-10-18 21:53:18.000000000 -0400 -@@ -13276,18 +13276,24 @@ gtk_tree_view_get_visible_range (GtkTree - { - GtkRBTree *tree; - GtkRBNode *node; -- -+ gboolean retval; -+ - g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE); - - if (!tree_view->priv->tree) - return FALSE; - -+ retval = TRUE; -+ - if (start_path) - { - _gtk_rbtree_find_offset (tree_view->priv->tree, - TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, 0), - &tree, &node); -- *start_path = _gtk_tree_view_find_path (tree_view, tree, node); -+ if (tree) -+ *start_path = _gtk_tree_view_find_path (tree_view, tree, node); -+ else -+ retval = FALSE; - } - - if (end_path) -@@ -13300,10 +13306,13 @@ gtk_tree_view_get_visible_range (GtkTree - y = TREE_WINDOW_Y_TO_RBTREE_Y (tree_view, tree_view->priv->vadjustment->page_size) - 1; - - _gtk_rbtree_find_offset (tree_view->priv->tree, y, &tree, &node); -- *end_path = _gtk_tree_view_find_path (tree_view, tree, node); -+ if (tree) -+ *end_path = _gtk_tree_view_find_path (tree_view, tree, node); -+ else -+ retval = FALSE; - } - -- return TRUE; -+ return retval; - } - - static void