summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2008-11-27 02:36:46 +0000
committerMart Raudsepp <leio@gentoo.org>2008-11-27 02:36:46 +0000
commit892e08994bafa15be899cd9dbd2b21bd244b9ded (patch)
tree1430e495519b987726e310f4e993879c4d50c60d /x11-libs/gtk+/files
parentNew bug fix release - improves custom mimetype icons display, various memory ... (diff)
downloadhistorical-892e08994bafa15be899cd9dbd2b21bd244b9ded.tar.gz
historical-892e08994bafa15be899cd9dbd2b21bd244b9ded.tar.bz2
historical-892e08994bafa15be899cd9dbd2b21bd244b9ded.zip
Version bump for various bug fixes. Remove old
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r4 x86_64
Diffstat (limited to 'x11-libs/gtk+/files')
-rw-r--r--x11-libs/gtk+/files/gtk+-2.12.10-fix-get_frame_extents.patch42
-rw-r--r--x11-libs/gtk+/files/gtk+-2.12.10-fix-treeview_sort_indicators.patch25
-rw-r--r--x11-libs/gtk+/files/gtk+-2.12.9-filechooser-fix-icon-size.patch28
-rw-r--r--x11-libs/gtk+/files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch32
-rw-r--r--x11-libs/gtk+/files/gtk+-2.12.9-print-backend-64bit.patch19
-rw-r--r--x11-libs/gtk+/files/gtk+-2.12.9-treeview-search-window-type.patch18
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch19
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch26
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-fix-filesystem-double-free.patch19
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-fix-lpr_write-double-free.patch22
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-fix-password-dialog-on-mount.patch30
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-notebook-tab-draw-correctness.patch56
-rw-r--r--x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch20
13 files changed, 0 insertions, 356 deletions
diff --git a/x11-libs/gtk+/files/gtk+-2.12.10-fix-get_frame_extents.patch b/x11-libs/gtk+/files/gtk+-2.12.10-fix-get_frame_extents.patch
deleted file mode 100644
index 99aab1761ae1..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.12.10-fix-get_frame_extents.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-2008-06-06 Matthias Clasen <mclasen@redhat.com>
-
- Bug 536757 – regression: openoffice.org menus are placed at wrong
- position since 2.12.10
-
- * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents):
- Return the right coordinates.
-
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index cc1f6fd..68e9e69 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -3412,6 +3412,7 @@ gdk_window_get_frame_extents (GdkWindow *window,
- Window xwindow;
- Window xparent;
- Window root;
-+ Window child;
- Window *children;
- guchar *data;
- Window *vroots;
-@@ -3470,13 +3471,15 @@ gdk_window_get_frame_extents (GdkWindow *window,
- if ((type_return == XA_CARDINAL) && (format_return == 32) &&
- (nitems_return == 4) && (data))
- {
-- guint32 *ldata = (guint32 *) data;
-+ gulong *ldata = (gulong *) data;
- got_frame_extents = TRUE;
-
- /* try to get the real client window geometry */
- if (XGetGeometry (GDK_DISPLAY_XDISPLAY (display), xwindow,
-- &root, &wx, &wy, &ww, &wh, &wb, &wd))
-- {
-+ &root, &wx, &wy, &ww, &wh, &wb, &wd) &&
-+ XTranslateCoordinates (GDK_DISPLAY_XDISPLAY (display),
-+ xwindow, root, 0, 0, &wx, &wy, &child))
-+ {
- rect->x = wx;
- rect->y = wy;
- rect->width = ww;
---
-1.5.4.5
-
diff --git a/x11-libs/gtk+/files/gtk+-2.12.10-fix-treeview_sort_indicators.patch b/x11-libs/gtk+/files/gtk+-2.12.10-fix-treeview_sort_indicators.patch
deleted file mode 100644
index 31038087b7d2..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.12.10-fix-treeview_sort_indicators.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-2008-06-08 Kristian Rietveld <kris@imendio.com>
-
- Merge from trunk:
-
- * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):
- always determine what arrow to show if show_sort_indicator is true.
- (#352738, Chris Vine).
-
-diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
-index 9331b8f..52994cf 100644
---- a/gtk/gtktreeviewcolumn.c
-+++ b/gtk/gtktreeviewcolumn.c
-@@ -925,8 +925,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
- &sort_column_id,
- NULL);
-
-- if (tree_column->show_sort_indicator
-- && (sort_column_id >= 0 && sort_column_id == tree_column->sort_column_id))
-+ if (tree_column->show_sort_indicator)
- {
- gboolean alternative;
-
---
-1.5.4.5
-
diff --git a/x11-libs/gtk+/files/gtk+-2.12.9-filechooser-fix-icon-size.patch b/x11-libs/gtk+/files/gtk+-2.12.9-filechooser-fix-icon-size.patch
deleted file mode 100644
index 77b72e61fdc6..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.12.9-filechooser-fix-icon-size.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- 2008-04-08 Tomas Bzatek <tbzatek@redhat.com>
-
- * gtk/gtkfilesystem.c: (gtk_file_info_render_icon),
- (gtk_file_system_volume_render_icon):
- Fix fallback icon rendering size
-
-diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
-index 04de8a6..2f7dff5 100644
---- a/gtk/gtkfilesystem.c
-+++ b/gtk/gtkfilesystem.c
-@@ -306,7 +306,7 @@ gtk_file_info_render_icon (const GtkFileInfo *info,
- pixbuf = gtk_widget_render_icon (widget,
- gtk_file_info_get_is_folder (info)
- ? GTK_STOCK_DIRECTORY : GTK_STOCK_FILE,
-- GTK_ICON_SIZE_SMALL_TOOLBAR,
-+ GTK_ICON_SIZE_MENU,
- NULL);
- if (!pixbuf && error)
- g_set_error (error,
-@@ -670,7 +670,7 @@ gtk_file_system_volume_render_icon (GtkFileSystem *file_system,
- if (!pixbuf)
- pixbuf = gtk_widget_render_icon (widget,
- GTK_STOCK_HARDDISK,
-- GTK_ICON_SIZE_SMALL_TOOLBAR,
-+ GTK_ICON_SIZE_MENU,
- NULL);
-
- return pixbuf;
diff --git a/x11-libs/gtk+/files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch b/x11-libs/gtk+/files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch
deleted file mode 100644
index 57ea9f3ef76c..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-2008-04-02 Federico Mena Quintero <federico@novell.com>
-
- Merged from trunk:
-
- Fix http://bugzilla.gnome.org/show_bug.cgi?id=492134 - The file
- chooser incorrectly substitutes and expands a ~ when you type it
- in the filename entry.
-
- * gtk/gtkfilesystemunix.c (expand_tilde): Ensure that empty
- basenames result in a slash-terminated pathname.
- gtk_file_system_unix_parse() is correct, but it was splitting
- "/home/username" into path="/home" and file_part="username", which
- is not what the caller wants when the entry has just "~" or
- "~username".
-
-diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c
-index ad225af..31387cb 100644
---- a/gtk/gtkfilesystemunix.c
-+++ b/gtk/gtkfilesystemunix.c
-@@ -1470,10 +1470,11 @@ expand_tilde (const char *filename)
- home = passwd->pw_dir;
- }
-
-+ /* We put G_DIR_SEPARATOR_S so that empty basenames will make the resulting path end in a slash */
- if (slash)
- return g_build_filename (home, G_DIR_SEPARATOR_S, slash + 1, NULL);
- else
-- return g_strdup (home);
-+ return g_build_filename (home, G_DIR_SEPARATOR_S, NULL);
- }
-
- static gboolean
diff --git a/x11-libs/gtk+/files/gtk+-2.12.9-print-backend-64bit.patch b/x11-libs/gtk+/files/gtk+-2.12.9-print-backend-64bit.patch
deleted file mode 100644
index 9c9a2f92ce9e..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.12.9-print-backend-64bit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2008-03-12 Sebastian Dröge <slomo@circular-chaos.org>
-
- Merged from trunk:
-
- * modules/printbackends/cups/gtkprintbackendcups.c: Include
- <glib/gstdio.h> for g_fopen().
-
-diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
-index fd16916..72c5871 100644
---- a/modules/printbackends/cups/gtkprintbackendcups.c
-+++ b/modules/printbackends/cups/gtkprintbackendcups.c
-@@ -35,6 +35,7 @@
- #include <cairo-pdf.h>
- #include <cairo-ps.h>
-
-+#include <glib/gstdio.h>
- #include <glib/gi18n-lib.h>
- #include <gmodule.h>
-
diff --git a/x11-libs/gtk+/files/gtk+-2.12.9-treeview-search-window-type.patch b/x11-libs/gtk+/files/gtk+-2.12.9-treeview-search-window-type.patch
deleted file mode 100644
index 72b720b9cc35..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.12.9-treeview-search-window-type.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-2008-03-15 Matthias Clasen <mclasen@redhat.com>
-
- * gtk/gtktreeview.c (gtk_tree_view_ensure_interactive_directory):
- Set window type hint on the search popup. (#522279, Danny Baumann)
-
-diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
-index de13b14..04550ff 100644
---- a/gtk/gtktreeview.c
-+++ b/gtk/gtktreeview.c
-@@ -10358,6 +10358,8 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
- gtk_window_group_add_window (GTK_WINDOW (toplevel)->group,
- GTK_WINDOW (tree_view->priv->search_window));
-
-+ gtk_window_set_type_hint (GTK_WINDOW (tree_view->priv->search_window),
-+ GDK_WINDOW_TYPE_HINT_UTILITY);
- gtk_window_set_modal (GTK_WINDOW (tree_view->priv->search_window), TRUE);
- g_signal_connect (tree_view->priv->search_window, "delete_event",
- G_CALLBACK (gtk_tree_view_search_delete_event),
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch b/x11-libs/gtk+/files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch
deleted file mode 100644
index e3c5e923bdf8..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-2008-09-26 Matthias Clasen
-
- Bug 553211 – GtkFileChooserButton unsets filter after first use
-
- * gtk/gtkfilechooserdefault.c (show_and_select_files): Also
- get the content-type, since it is used later on.
- Pointed out by Davyd Madeley.
-
---- branches/gtk-2-14/gtk/gtkfilechooserdefault.c 2008/09/27 00:20:42 21527
-+++ branches/gtk-2-14/gtk/gtkfilechooserdefault.c 2008/09/27 00:21:43 21528
-@@ -6502,7 +6502,7 @@
-
- impl->show_and_select_files_cancellable =
- _gtk_file_system_get_folder (impl->file_system, parent_file,
-- "standard::is-hidden,standard::type,standard::name",
-+ "standard::is-hidden,standard::type,standard::name,standard::content-type",
- show_and_select_files_get_folder_cb, info);
-
- profile_end ("end", NULL);
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch b/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch
deleted file mode 100644
index 40db2ef1957d..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-fix-combining-broken-diacritics.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: gtk/gtkimcontextsimple.c
-===================================================================
---- gtk/gtkimcontextsimple.c (revision 21556)
-+++ gtk/gtkimcontextsimple.c (revision 21557)
-@@ -407,11 +407,19 @@
- return FALSE;
- }
-
--/* When updating the table of the compose sequences, also update here.
-+/* Checks if a keysym is a dead key. Dead key keysym values are defined in
-+ * ../gdk/gdkkeysyms.h and the first is GDK_dead_grave. As X.Org is updated,
-+ * more dead keys are added and we need to update the upper limit.
-+ * Also checks if the keysym belongs to the non-spacing mark Unicode category,
-+ * by invoking gdk_keyval_to_unicode(). For keysyms like 0x1000000 + 0x0301,
-+ * it converts them to 0x301, which makes g_unichar_type() report them as
-+ * non-spacing mark. Thus, we check that the value is less then 0x1000000.
-+ * check_algorithmically() does not handle keysyms > 0x1000000.
- */
- #define IS_DEAD_KEY(k) \
- (((k) >= GDK_dead_grave && (k) <= (GDK_dead_dasia+1)) || \
-- g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK)
-+ ((g_unichar_type (gdk_keyval_to_unicode (k)) == G_UNICODE_NON_SPACING_MARK) && \
-+ ((k) < 0x1000000)))
-
- static gboolean
- check_algorithmically (GtkIMContextSimple *context_simple,
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-fix-filesystem-double-free.patch b/x11-libs/gtk+/files/gtk+-2.14.3-fix-filesystem-double-free.patch
deleted file mode 100644
index 16d9d9b1f366..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-fix-filesystem-double-free.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From gtk-2-14 branch:
-
-2008-09-25 Michael Natterer
-
- gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_finalize):
- don't unref the file system backend, the newly added
- unset_file_system_backend() already does this (bug #553135).
-
---- branches/gtk-2-14/gtk/gtkfilechooserdefault.c 2008/09/25 11:22:34 21514
-+++ branches/gtk-2-14/gtk/gtkfilechooserdefault.c 2008/09/25 11:23:42 21515
-@@ -934,8 +934,6 @@
-
- shortcuts_free (impl);
-
-- g_object_unref (impl->file_system);
--
- g_free (impl->browse_files_last_selected_name);
-
- for (l = impl->filters; l; l = l->next)
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-fix-lpr_write-double-free.patch b/x11-libs/gtk+/files/gtk+-2.14.3-fix-lpr_write-double-free.patch
deleted file mode 100644
index df844b1f667c..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-fix-lpr_write-double-free.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From gtk-2-14 branch:
-
-2008-09-25 Marek Kasik
-
- Bug 553241 – double freed pointer in lpr_write cause firefox3 crash
-
- * modules/printbackends/lpr/gtkprintbackendlpr.c:
- The redundant freeing of memory was removed.
-
- Patch by Chris Wang
-
---- branches/gtk-2-14/modules/printbackends/lpr/gtkprintbackendlpr.c 2008/09/25 11:46:35 21516
-+++ branches/gtk-2-14/modules/printbackends/lpr/gtkprintbackendlpr.c 2008/09/25 11:57:56 21517
-@@ -289,8 +289,6 @@
- lpr_print_cb (GTK_PRINT_BACKEND_LPR (ps->backend),
- error, user_data);
-
-- if (error)
-- g_error_free (error);
-
- if (error != NULL)
- {
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-fix-password-dialog-on-mount.patch b/x11-libs/gtk+/files/gtk+-2.14.3-fix-password-dialog-on-mount.patch
deleted file mode 100644
index 08fa13524d91..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-fix-password-dialog-on-mount.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From gtk-2-14 branch:
-
-2008-09-26 Matthias Clasen
-
- Bug 553133 – GtkFileChooser won't ask to mount a volume
-
- * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Use
- a GtkMountOperation when mounting, so that we get a password
- dialog when required.
-
---- branches/gtk-2-14/gtk/gtkfilechooserdefault.c 2008/09/26 19:25:35 21523
-+++ branches/gtk-2-14/gtk/gtkfilechooserdefault.c 2008/09/26 19:45:13 21524
-@@ -10192,12 +10192,16 @@
-
- if (!_gtk_file_system_volume_is_mounted (volume))
- {
-+ GtkMountOperation *mount_op;
-+
- set_busy_cursor (impl, TRUE);
-
-+ mount_op = gtk_mount_operation_new (get_toplevel (GTK_WIDGET (impl)));
- impl->shortcuts_activate_iter_cancellable =
-- _gtk_file_system_mount_volume (impl->file_system, volume, NULL,
-+ _gtk_file_system_mount_volume (impl->file_system, volume, mount_op,
- shortcuts_activate_volume_mount_cb,
- g_object_ref (impl));
-+ g_object_unref (mount_op);
- }
- else
- {
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-notebook-tab-draw-correctness.patch b/x11-libs/gtk+/files/gtk+-2.14.3-notebook-tab-draw-correctness.patch
deleted file mode 100644
index 9afe39c488f8..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-notebook-tab-draw-correctness.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From gtk-2-14 branch:
-
-2008-09-26 Matthias Clasen
-
- Bug 553578 - tabs are not drawn correctly
-
- * gtk/gtknotebook.c: Track the visibility state of notebook tabs
- between allocations so that we know to redraw the tab labels if
- tabs are hidden and shown without changing position.
- Reported by Marek Kašík, patch by Owen Taylor.
-
---- branches/gtk-2-14/gtk/gtknotebook.c 2008/09/26 23:58:12 21525
-+++ branches/gtk-2-14/gtk/gtknotebook.c 2008/09/27 00:00:32 21526
-@@ -153,6 +153,11 @@
- guint reorderable : 1;
- guint detachable : 1;
-
-+ /* if true, the tab label was visible on last allocation; we track this so
-+ * that we know to redraw the tab area if a tab label was hidden then shown
-+ * without changing position */
-+ guint tab_allocated_visible : 1;
-+
- GtkRequisition requisition;
- GtkAllocation allocation;
-
-@@ -5556,9 +5561,15 @@
- gint tab_curvature;
- gint tab_pos = get_effective_tab_pos (notebook);
- gboolean tab_allocation_changed;
-+ gboolean was_visible = page->tab_allocated_visible;
-
-- if (!page->tab_label)
-- return FALSE;
-+ if (!page->tab_label ||
-+ !GTK_WIDGET_VISIBLE (page->tab_label) ||
-+ !gtk_widget_get_child_visible (page->tab_label))
-+ {
-+ page->tab_allocated_visible = FALSE;
-+ return was_visible;
-+ }
-
- xthickness = widget->style->xthickness;
- ythickness = widget->style->ythickness;
-@@ -5630,6 +5641,12 @@
-
- gtk_widget_size_allocate (page->tab_label, &child_allocation);
-
-+ if (!was_visible)
-+ {
-+ page->tab_allocated_visible = TRUE;
-+ tab_allocation_changed = TRUE;
-+ }
-+
- return tab_allocation_changed;
- }
-
diff --git a/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch b/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch
deleted file mode 100644
index dd098e9cc52b..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.14.3-reorder-compose-key-table-order.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: gtk/gtkimcontextsimple.c
-===================================================================
---- gtk/gtkimcontextsimple.c (revision 21564)
-+++ gtk/gtkimcontextsimple.c (working copy)
-@@ -933,12 +933,12 @@
- return TRUE;
- tmp_list = tmp_list->next;
- }
--
-- if (check_algorithmically (context_simple, n_compose))
-- return TRUE;
-
- if (check_compact_table (context_simple, &gtk_compose_table_compact, n_compose))
- return TRUE;
-+
-+ if (check_algorithmically (context_simple, n_compose))
-+ return TRUE;
- }
-
- /* The current compose_buffer doesn't match anything */