Avoid passing --disable-debug. Added patch with bug fixes from upstream CVS.

(Portage version: 2.0.51.22-r2)

5 files changed, 121 insertions, 23 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f7bd08d3f597..ce1f4f12a78b 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.185 2005/09/03 22:00:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.186 2005/09/05 00:25:46 leonardop Exp $
+
+*gtk+-2.8.3-r1 (04 Sep 2005)
+
+  04 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gtk+-2.8.3-misc_fixes.patch, -gtk+-2.8.3.ebuild,
+  +gtk+-2.8.3-r1.ebuild:
+  Avoid passing --disable-debug. Added patch with various bug fixes from
+  upstream CVS repository.
 
   03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> gtk+-2.6.8.ebuild:
   Stable on ppc.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index be59a5e3ee83..ca717933689c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,20 +1,23 @@
-MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
-MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 MD5 2951abcea787bd537ac06ba5e2ac1243 ChangeLog 26485
-MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
-MD5 1995a6e7110df51f768949fa3de2cedf gtk+-2.8.3.ebuild 3339
+MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
 MD5 d9750f9180ebd11501fbbe1768786b73 gtk+-2.6.10.ebuild 2826
+MD5 63f2497b7c323a98016561afb448384d gtk+-2.6.7.ebuild 2839
 MD5 bf4a792547687221999ca1e822c6c595 gtk+-2.6.8.ebuild 2839
-MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
+MD5 4759440d175d01ad09a1e161590e7172 gtk+-2.8.3-r1.ebuild 3584
+MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
+MD5 1995a6e7110df51f768949fa3de2cedf gtk+-2.8.3.ebuild 3339
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
+MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
+MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
 MD5 71f1edf217fe1b660ed78cd89f9832b2 files/digest-gtk+-2.6.8 208
+MD5 d08a7fb70155059b3c3460cf44a99e9a files/digest-gtk+-2.8.3-r1 140
 MD5 d08a7fb70155059b3c3460cf44a99e9a files/digest-gtk+-2.8.3 140
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
-MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
-MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
+MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
+MD5 b328f4f7c0afc275b18aad14dbe0f181 files/gtk+-2.8.3-misc_fixes.patch 2856
 MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
-MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.3 b/x11-libs/gtk+/files/digest-gtk+-2.8.3-r1
index 303fa12976b1..303fa12976b1 100644
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.3
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.3-r1
diff --git a/x11-libs/gtk+/files/gtk+-2.8.3-misc_fixes.patch b/x11-libs/gtk+/files/gtk+-2.8.3-misc_fixes.patch
new file mode 100644
index 000000000000..61ce74d0b9f2
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.8.3-misc_fixes.patch
@@ -0,0 +1,83 @@
+diff -NurdB gtk+-2.8.3/gtk/gtkentry.c gtk+-2.8.3-patched/gtk/gtkentry.c
+--- gtk+-2.8.3/gtk/gtkentry.c	2005-08-20 20:57:01.000000000 -0500
++++ gtk+-2.8.3-patched/gtk/gtkentry.c	2005-09-04 13:50:37.000000000 -0500
+@@ -1049,6 +1049,18 @@
+   gtk_entry_reset_im_context (entry);
+   gtk_entry_reset_layout (entry);
+ 
++  if (entry->blink_timeout)
++    {
++      g_source_remove (entry->blink_timeout);
++      entry->blink_timeout = 0;
++    }
++
++  if (entry->recompute_idle)
++    {
++      g_source_remove (entry->recompute_idle);
++      entry->recompute_idle = 0;
++    }
++
+   if (!entry->visible)
+     {
+       /* We want to trash the text here because the entry might be leaked.  */
+diff -NurdB gtk+-2.8.3/gtk/gtkfilechooserdefault.c gtk+-2.8.3-patched/gtk/gtkfilechooserdefault.c
+--- gtk+-2.8.3/gtk/gtkfilechooserdefault.c	2005-08-23 07:48:05.000000000 -0500
++++ gtk+-2.8.3-patched/gtk/gtkfilechooserdefault.c	2005-09-04 13:47:51.000000000 -0500
+@@ -1617,13 +1617,16 @@
+       if (impl->local_only)
+ 	{
+ 	  GtkFilePath *base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-	  gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
+-	  gtk_file_path_free (base_path);
+-
+-	  if (!is_local)
++	  if (base_path != NULL)
+ 	    {
+-	      gtk_file_system_volume_free (impl->file_system, volume);
+-	      continue;
++	      gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
++	      gtk_file_path_free (base_path);
++	      
++	      if (!is_local)
++		{
++		  gtk_file_system_volume_free (impl->file_system, volume);
++		  continue;
++		}
+ 	    }
+ 	}
+ 
+@@ -6645,8 +6648,11 @@
+     }
+ 
+   path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
+-  change_folder_and_display_error (impl, path);
+-  gtk_file_path_free (path);
++  if (path != NULL)
++    {
++      change_folder_and_display_error (impl, path);
++      gtk_file_path_free (path);
++    }
+ 
+  out:
+ 
+diff -NurdB gtk+-2.8.3/gtk/gtkmain.c gtk+-2.8.3-patched/gtk/gtkmain.c
+--- gtk+-2.8.3/gtk/gtkmain.c	2005-08-19 11:46:57.000000000 -0500
++++ gtk+-2.8.3-patched/gtk/gtkmain.c	2005-09-04 13:49:34.000000000 -0500
+@@ -1256,7 +1256,7 @@
+    *  in the user_data field of GdkWindow's.
+    *  Ignore the event if we don't have a widget for it, except
+    *  for GDK_PROPERTY_NOTIFY events which are handled specialy.
+-   *  Though this happens rarely, bogus events can occour
++   *  Though this happens rarely, bogus events can occur
+    *  for e.g. destroyed GdkWindows. 
+    */
+   event_widget = gtk_get_event_widget (event);
+@@ -2044,7 +2044,7 @@
+ 
+   widget = NULL;
+   if (event && event->any.window && 
+-      !GDK_WINDOW_DESTROYED (event->any.window))
++      (event->type == GDK_DESTROY || !GDK_WINDOW_DESTROYED (event->any.window)))
+     gdk_window_get_user_data (event->any.window, (void**) &widget);
+   
+   return widget;
diff --git a/x11-libs/gtk+/gtk+-2.8.3.ebuild b/x11-libs/gtk+/gtk+-2.8.3-r1.ebuild
index 72387cfc1373..156edbb05115 100644
--- a/x11-libs/gtk+/gtk+-2.8.3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.3.ebuild,v 1.1 2005/09/01 10:29:28 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.3-r1.ebuild,v 1.1 2005/09/05 00:25:46 leonardop Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
@@ -62,6 +62,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	# Patches from upstream CVS repository for GNOME bugs #310270,
+	# #314980 and #315135.
+	epatch ${FILESDIR}/${P}-misc_fixes.patch
+
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
@@ -87,25 +91,25 @@ src_unpack() {
 }
 
 src_compile() {
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_enable static) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
 
 	# bug #8375
 	# replace-flags "-O3" "-O2"
 
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		`use_enable static` \
-		`use_enable debug` \
-		--with-libpng \
-		--with-gdktarget=x11 \
-		--with-xinput \
-		|| die "./configure failed to run"
+	econf $myconf || die "./configure failed to run"
 
 	# gtk+ isn't multithread friendly due to some obscure code generation bug
 	# was an issue with 2.0.6, but no longer an issue
 	emake || die "gtk+ failed to compile"
-
 }
 
 src_install() {