Add a few fixes from upstream unreleased code

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

8 files changed, 173 insertions, 4 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 7b295b4cd7cb..1fcc07cbb9f6 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.399 2008/09/28 10:36:40 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.400 2008/09/29 07:40:36 leio Exp $
+
+*gtk+-2.14.3-r1 (29 Sep 2008)
+
+  29 Sep 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch,
+  +files/gtk+-2.14.3-fix-filesystem-double-free.patch,
+  +files/gtk+-2.14.3-fix-lpr_write-double-free.patch,
+  +files/gtk+-2.14.3-fix-password-dialog-on-mount.patch,
+  +files/gtk+-2.14.3-notebook-tab-draw-correctness.patch,
+  -gtk+-2.14.3.ebuild, +gtk+-2.14.3-r1.ebuild:
+  Add a few fixes from upstream unreleased code
 
   28 Sep 2008; Mart Raudsepp <leio@gentoo.org>
   +files/gtk+-2.14.3-limit-gtksignal-includes.patch, gtk+-2.14.3.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ba64a9d2fd0a..f53378b0329b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -18,7 +18,12 @@ AUX gtk+-2.12.9-gtk-filesystem-backend-tilde-fix.patch 1116 RMD160 f63ef76bc8f35
 AUX gtk+-2.12.9-libtool-2.patch 920 RMD160 3ef1dfe66e89af4fe9b51d662e6cc3f7fdaa6e3d SHA1 2e788ff62ed2bffc7c3f5e7900466a3fa0f95b3b SHA256 0f9c8c0700d22c55dff1e943651a20165dc3de510e00169e6f03c7e57063abfb
 AUX gtk+-2.12.9-print-backend-64bit.patch 572 RMD160 986d089399597ee506e405e36b46e4adaf2bde74 SHA1 e240e7e04359defee0a4748805ac71d77415978c SHA256 32f977a50bd578089e3b67a3c49042cda7867f7da9f262d10bf0b9c20eb1d8bd
 AUX gtk+-2.12.9-treeview-search-window-type.patch 841 RMD160 610af248058e785f9456918415c2e16a92c63e51 SHA1 079db29dcc7bf1aec49822d4098597b7ee6f022f SHA256 f381550baf1348f2731e6d09f4a3399c61c538fae96a2a470136f32d32e88eb1
+AUX gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch 759 RMD160 f2f7b8ea86780a344f07a8bcb5b5f2344f62e98c SHA1 e0e091919a5a24f5766befb8a850f1dcb520aeb3 SHA256 061b6f735d8010088a28ed49590d2dae75522b46e797c8d57252dc9cdeaefce7
+AUX gtk+-2.14.3-fix-filesystem-double-free.patch 575 RMD160 f2899d0d4d5143fbbf2394030299b9b5000a83df SHA1 bc85677e13f125201cd602a7176bbae600dd546f SHA256 6557652eef420dd2e30fabc2b67c739d47f4c628bdc18167b4c3becc60434b4d
+AUX gtk+-2.14.3-fix-lpr_write-double-free.patch 618 RMD160 cc98d31bd1b97b5138f63cf48524769231062495 SHA1 7505718d9035c5a5057f6ab9bc002c33f387e1a9 SHA256 b6e236053fc5bfd8088ec709ff22589235290b1b592f5c12485f261fec316082
+AUX gtk+-2.14.3-fix-password-dialog-on-mount.patch 996 RMD160 98b98df8efef75c79d16d5b7f6e040c35a7cf6b9 SHA1 d75b0cc441501c2d7d8a6dcf1955f3a5e71c5f8b SHA256 0cc890749246e713c9f4e4451220fc1c80c157763596523db66b65dc92f9790a
 AUX gtk+-2.14.3-limit-gtksignal-includes.patch 513 RMD160 ad967a5fb6b9fe2d96119d478429f10032bad8a5 SHA1 5c0df3e543303dfe456479359fea2cbd0d4b723e SHA256 20e7536c29e2675d18fd3aff933621a4fcab9b5615ff96593e9f36ab4febb734
+AUX gtk+-2.14.3-notebook-tab-draw-correctness.patch 1622 RMD160 6bb09317f7856dc188c6da851877be615c926736 SHA1 efbe19a4ad12d0475d18bc751119f7f401e1c5c2 SHA256 6360ccc94ad2d63266bf1e872eaaba16f823762338b88e33286944220f0dc021
 AUX gtk+-2.8.0-multilib.patch 2456 RMD160 ba94fb0b16f9002dec8e92700ff3f7931f600548 SHA1 e65e843c6f1beecee7a0e1f7ec3292596c2a65a4 SHA256 595bddaa3e50a54f47dbcf30381e11bce0baa1ccd683ac1ba30ca0221b78a4fd
 AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d14512f7 SHA1 7817e3c2bbec1058192d524d68e78635fa48beca SHA256 7786691d5f89588abc7174e97cbd374d8cbe98b4e8dfd27005eade03b047aa2d
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
@@ -39,6 +44,6 @@ EBUILD gtk+-2.12.12.ebuild 4857 RMD160 3de9a98829ab1484e1490a71b968248bd79264f1
 EBUILD gtk+-2.12.8.ebuild 4571 RMD160 5ee8c3872801e50cf1dc99282e74253946422c47 SHA1 2fcdb81933fd6bab2fb7b10ede0ac7fed5d553a6 SHA256 80ea9abd64a29eafcc09e4b248214f2ad0f7aebee627ab053258a911ca2f82e6
 EBUILD gtk+-2.12.9-r1.ebuild 4615 RMD160 98b7930a6ade2ad915a7101f6750922926a43c08 SHA1 e790f140baa04576a518574d076e3527cc30bca7 SHA256 1c703580dcb5620fdffd811bad7366c3484865cc570a8e319220f05f4b7b2326
 EBUILD gtk+-2.12.9-r2.ebuild 5455 RMD160 a16d03626f9b8f03a656523bac0b1239242db034 SHA1 b6f55b8277da86d740f1d6c13656cac7635b049c SHA256 3fa5da02d232e4cb17bf904a8f8fc0de582626b819373346ad7c230991eb5e01
-EBUILD gtk+-2.14.3.ebuild 4408 RMD160 38744ec41682b481db7ea45c3d60ef917b9e8311 SHA1 8441f16e784fe1c52303b64b6a290660aab1c2e0 SHA256 f85d4de12970e67854d5b71f4059d20bb0d1c0440b35c9ba821d47e8bf1dcfcb
-MISC ChangeLog 57345 RMD160 d3ef155c5595b65e4ed81b64ff3faacac35f9f44 SHA1 19140c27ee527706a1dde419c45f021f520a001c SHA256 5d5197f0ed002fd930cd807bd558594f44a0d5b40ac73a176cb1f16c101afede
+EBUILD gtk+-2.14.3-r1.ebuild 4806 RMD160 ec24035b0844a5d792e72cbd977b88b7458a5471 SHA1 feed71617921fa615132eb64e411f2917fbb960a SHA256 ebacf0c6e65138848a38fd452f150437c57f57a97873dfb6659d365eac376ec3
+MISC ChangeLog 57817 RMD160 0d2df02eefd6a3284c9b2a86c49f27fb24afc811 SHA1 34fb53eeca563d1ebb1c520680057d0f91ea0815 SHA256 947f3899bdb5bc7336f54e72c5241db6bf3e2e7ed2f0c19d71eeeafd83905348
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
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
new file mode 100644
index 000000000000..e3c5e923bdf8
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-dont-unset-filechooser-filter-after-first-use.patch
@@ -0,0 +1,19 @@
+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-filesystem-double-free.patch b/x11-libs/gtk+/files/gtk+-2.14.3-fix-filesystem-double-free.patch
new file mode 100644
index 000000000000..16d9d9b1f366
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-fix-filesystem-double-free.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 000000000000..df844b1f667c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-fix-lpr_write-double-free.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..08fa13524d91
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-fix-password-dialog-on-mount.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..9afe39c488f8
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.3-notebook-tab-draw-correctness.patch
@@ -0,0 +1,56 @@
+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+/gtk+-2.14.3.ebuild b/x11-libs/gtk+/gtk+-2.14.3-r1.ebuild
index 2aaf6966017f..8709a84129de 100644
--- a/x11-libs/gtk+/gtk+-2.14.3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.3.ebuild,v 1.3 2008/09/28 10:40:35 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.3-r1.ebuild,v 1.1 2008/09/29 07:40:36 leio Exp $
 
 WANT_AUTOMAKE="1.7"
 
@@ -75,6 +75,13 @@ src_unpack() {
 	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
 	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
 
+	# Various fixes from upstream gtk-2-14 branch, will be part of 2.14.4
+	epatch "${FILESDIR}/${P}-fix-filesystem-double-free.patch"
+	epatch "${FILESDIR}/${P}-fix-lpr_write-double-free.patch"
+	epatch "${FILESDIR}/${P}-fix-password-dialog-on-mount.patch"
+	epatch "${FILESDIR}/${P}-notebook-tab-draw-correctness.patch"
+	epatch "${FILESDIR}/${P}-dont-unset-filechooser-filter-after-first-use.patch"
+
 	# Don't break inclusion of gtkclist.h, upstream bug 536767
 	epatch "${FILESDIR}/${P}-limit-gtksignal-includes.patch"