Bump to 2.14.7-r2. Hopefully fix test failures, bug #238995, and enhance mime-type resolution, bug #257980.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 266 insertions, 1 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 44609e918a58..0cf7a6af09d9 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.410 2009/02/15 12:40:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.411 2009/03/01 23:01:14 eva Exp $
+
+*gtk+-2.14.7-r2 (01 Mar 2009)
+
+  01 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gtk+-2.14.7-ignore-gtkcurve.patch,
+  +files/gtk+-2.14.7-uncertain-mime.patch, +gtk+-2.14.7-r2.ebuild:
+  Bump to 2.14.7-r2. Hopefully fix test failures, bug #238995, and enhance
+  mime-type resolution, bug #257980.
 
   15 Feb 2009; Raúl Porcel <armin76@gentoo.org> gtk+-2.12.11.ebuild:
   arm/sh stable
diff --git a/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch b/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch
new file mode 100644
index 000000000000..74372445bc34
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch
@@ -0,0 +1,70 @@
+# https://bugzilla.gnome.org/show_bug.cgi?id=525550
+# Fix test suite failure by ignoring gtkcurve altogether.
+diff --git a/gtk/tests/object.c b/gtk/tests/object.c
+index c243913..e2bc63b 100644
+--- a/gtk/tests/object.c
++++ b/gtk/tests/object.c
+@@ -55,6 +55,7 @@ list_ignore_properties (gboolean buglist)
+ {
+   /* currently untestable properties */
+   static const IgnoreProperty ignore_properties[] = {
++    { "GtkCurve",               "",                     NULL, },                        /* Just ignore it, not worth fixing */
+     { "GtkContainer",           "child",                NULL, },                        /* needs working child widget */
+     { "GtkRadioMenuItem",       "group",                NULL, },                        /* needs working sibling */
+     { "GtkWidget",              "parent",               NULL, },                        /* needs working parent widget */
+@@ -89,11 +90,6 @@ list_ignore_properties (gboolean buglist)
+   static const IgnoreProperty bug_properties[] = {
+     { "GtkComboBox",            "active",               (void*) MATCH_ANY_VALUE },      /* FIXME: triggers NULL model bug */
+     { "GtkCTree",               "spacing",              (void*) MATCH_ANY_VALUE },      /* FIXME: triggers signedness bug */
+-    { "GtkCurve",               "curve-type",           (void*) MATCH_ANY_VALUE },      /* FIXME: triggers OOM */
+-    { "GtkCurve",               "min-x",                (void*) 0x80000000 },           /* FIXME: triggers coordinate OOB */
+-    { "GtkCurve",               "min-y",                (void*) 0x80000000 },           /* FIXME: triggers coordinate OOB */
+-    { "GtkCurve",               "max-x",                (void*) 0x80000000 },           /* FIXME: triggers coordinate OOB */
+-    { "GtkCurve",               "max-y",                (void*) 0x80000000 },           /* FIXME: triggers coordinate OOB */
+     { "GtkFileChooserButton",   "local-only",           (void*) MATCH_ANY_VALUE },      /* FIXME: triggers NULL path assertion */
+     { "GtkFileChooserDialog",   "local-only",           (void*) MATCH_ANY_VALUE },      /* FIXME: triggers NULL path assertion */
+     { "GtkFileChooserWidget",   "local-only",           (void*) MATCH_ANY_VALUE },      /* FIXME: triggers NULL path assertion */
+@@ -227,7 +223,8 @@ object_test_property (GObject           *object,
+       /* ignore untestable properties */
+       ignore_properties = list_ignore_properties (FALSE);
+       for (i = 0; ignore_properties[i].name; i++)
+-        if (g_type_is_a (G_OBJECT_TYPE (object), g_type_from_name (ignore_properties[i].type_name)) &&
++        if (g_strcmp0 ("", ignore_properties[i].name) ||
++            g_type_is_a (G_OBJECT_TYPE (object), g_type_from_name (ignore_properties[i].type_name)) &&
+             strcmp (pspec->name, ignore_properties[i].name) == 0 &&
+             (MATCH_ANY_VALUE == ignore_properties[i].value ||
+              value_as_pointer (&value) == ignore_properties[i].value ||
+@@ -235,7 +232,7 @@ object_test_property (GObject           *object,
+               strcmp (g_value_get_string (&value), ignore_properties[i].value) == 0)))
+           break;
+       /* ignore known property bugs if not testing thoroughly */
+-      if (ignore_properties[i].name == NULL && !g_test_thorough())
++      if (ignore_properties[i].name == NULL && !g_test_thorough ())
+         {
+           ignore_properties = list_ignore_properties (TRUE);
+           for (i = 0; ignore_properties[i].name; i++)
+@@ -250,7 +247,7 @@ object_test_property (GObject           *object,
+       /* assign unignored properties */
+       if (ignore_properties[i].name == NULL)
+         {
+-          if (g_test_verbose())
++          if (g_test_verbose ())
+             g_print ("PropertyTest: %s::%s := (%s value (%s): %p)\n",
+                      g_type_name (G_OBJECT_TYPE (object)), pspec->name,
+                      SELECT_NAME (dvalue), g_type_name (G_VALUE_TYPE (&value)),
+@@ -330,7 +327,7 @@ main (int   argc,
+   /* initialize test program */
+   pixbuf_init ();
+   gtk_test_init (&argc, &argv);
+-  gtk_test_register_all_types();
++  gtk_test_register_all_types ();
+   /* install a property test for each widget type */
+   otypes = gtk_test_list_all_types (NULL);
+   for (i = 0; otypes[i]; i++)
+@@ -342,5 +339,5 @@ main (int   argc,
+         g_test_add_data_func (testpath, (void*) otypes[i], widget_property_tests);
+         g_free (testpath);
+       }
+-  return g_test_run();
++  return g_test_run ();
+ }
diff --git a/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch b/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch
new file mode 100644
index 000000000000..f12a3f0dd531
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch
@@ -0,0 +1,19 @@
+# http://bugzilla.gnome.org/show_bug.cgi?id=569671
+# If pure sniffing yields uncertain results, try again with the filename.
+# Patch by Tyler Lawson
+--- a/gdk-pixbuf/gdk-pixbuf-io.c	2009-02-09 11:33:45.000000000 -0600
++++ b/gdk-pixbuf/gdk-pixbuf-io.c	2009-02-09 11:36:32.000000000 -0600
+@@ -793,8 +793,12 @@
+ 	gchar **mimes;
+ 	gchar *type;
+ 	gint j;
++	gboolean mimetype_uncertain;
+ 
+-	mime_type = g_content_type_guess (NULL, buffer, size, NULL);
++	mime_type = g_content_type_guess (NULL, buffer, size, &mimetype_uncertain);
++	if (mimetype_uncertain)
++		mime_type = g_content_type_guess (filename, buffer, size, NULL);
++		
+ 
+ 	for (modules = get_file_formats (); modules; modules = g_slist_next (modules)) {
+ 		GdkPixbufModule *module = (GdkPixbufModule *)modules->data;
diff --git a/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild b/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild
new file mode 100644
index 000000000000..0a6ebfd0f32e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.14.7-r2.ebuild,v 1.1 2009/03/01 23:01:14 eva Exp $
+
+WANT_AUTOMAKE="1.7"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama"
+
+RDEPEND="x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXt
+	x11-libs/libXext
+	>=x11-libs/libXrandr-1.2
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.17.6
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	>=x11-libs/cairo-1.6
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/inputproto
+	x11-proto/damageproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.8
+	doc? (
+			>=dev-util/gtk-doc-1.8
+			~app-text/docbook-xml-dtd-4.1.2
+		 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Please re-emerge x11-libs/cairo with the X USE flag set"
+		die "cairo needs the X flag set"
+	fi
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# 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"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# Fix filechooser placement.  bug #239360
+	epatch "${FILESDIR}/${PN}-2.14.7-filechooser.patch"
+
+	# Ignore broken curve tests, bug #238995
+	epatch "${FILESDIR}/${PN}-2.14.7-ignore-gtkcurve.patch"
+
+	# Uncertain mime fix, bug #257980
+	epatch "${FILESDIR}/${PN}-2.14.7-uncertain-mime.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	elibtoolize
+}
+
+src_compile() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--with-libpng \
+		--with-gdktarget=x11 \
+		--with-xinput"
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf} || die "configure failed"
+	emake || die "compile failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${D}/${GTK2_CONFDIR}/gtkrc"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	dodir /etc/env.d
+	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	elog "Please install app-text/evince for print preview functionality."
+	elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+	elog "add it to your gtkrc."
+}