New version from the stable branch: 2.6.10. Adding a couple of patches from upstream CVS to 2.8.0 (bug #102854)

(Portage version: 2.0.51.22-r2)

10 files changed, 130 insertions, 54 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 059612a7d6eb..265520642a30 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,19 @@
 # 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.173 2005/08/17 17:53:03 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.174 2005/08/19 07:43:37 leonardop Exp $
+
+*gtk+-2.8.0-r2 (19 Aug 2005)
+
+  19 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +files/gtk+-2.8.0-dep_checks.patch, +files/gtk+-2.8.0-gdk_fix.patch,
+  +gtk+-2.8.0-r2.ebuild:
+  Patches from upstream CVS to fix gdk warnings and related side-effects, as
+  wall as sanitizing some dependencies (bug #102854).
+
+*gtk+-2.6.10 (18 Aug 2005)
+
+  18 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> +gtk+-2.6.10.ebuild:
+  New version from the stable branch.
 
 *gtk+-2.8.0-r1 (17 Aug 2005)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index ae222f42f73b..b55346fd2082 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,33 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 c6c3805d8435d72c357e32e4277cb948 gtk+-2.8.0.ebuild 2935
-MD5 4719d1845d3618d0e464d397289e8577 gtk+-2.6.4-r1.ebuild 2960
+MD5 53f72707a81e0e05a620acb7e566282f ChangeLog 24916
 MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
 MD5 c23a87ba8c10d2a6b0733b3bcb088d73 gtk+-2.6.8.ebuild 2848
 MD5 18edfdeaf21ee671c0abb5b7aad40549 gtk+-2.8.0-r1.ebuild 2810
-MD5 4be3562f71af8184c46d141fba5e6a8b gtk+-2.6.7.ebuild 2838
-MD5 4d047fc2efdc83c714f736eb6c9f07e7 ChangeLog 24773
+MD5 48c9d303207326944fafe6f4395228ae gtk+-2.6.10.ebuild 2820
+MD5 d3dc2988479b26f1097a6f85e695bb22 gtk+-2.8.0-r2.ebuild 3003
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
-MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
-MD5 611d813de53655fa348ad470ee9c7179 files/digest-gtk+-2.6.8 208
-MD5 03586690fef8f3011aa496c446eecb92 files/digest-gtk+-2.8.0 137
-MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 4719d1845d3618d0e464d397289e8577 gtk+-2.6.4-r1.ebuild 2960
+MD5 4be3562f71af8184c46d141fba5e6a8b gtk+-2.6.7.ebuild 2838
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-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 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208
+MD5 611d813de53655fa348ad470ee9c7179 files/digest-gtk+-2.6.8 208
 MD5 03586690fef8f3011aa496c446eecb92 files/digest-gtk+-2.8.0-r1 137
-MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256
+MD5 f56b08a8f40b528e72b6406ea337c51c files/digest-gtk+-2.6.10 212
+MD5 5f35263753f0ad976c13f501247b8d51 files/gtk+-2.8.0-multilib.patch 2456
+MD5 435a16e306ba84bc7d8536a3369cf631 files/gtk+-2.8.0-dep_checks.patch 1690
+MD5 287a783fae710028b7fda8fdef220425 files/gtk+-2.8.0-gdk_fix.patch 638
+MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
+MD5 fff5a03e20c5f0e1321a2a29fa38fca9 files/digest-gtk+-2.8.0-r2 140
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDA3mv2G5bA0cA/ScRAoGSAJ4pSr75ypIzYPiYAGq+mG884PVp3QCcDa8v
-h6zbPA1Fu06kDLxjoyA3hn8=
-=/pSp
------END PGP SIGNATURE-----
+MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
+MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208
+MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256
+MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
+MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.10 b/x11-libs/gtk+/files/digest-gtk+-2.6.10
new file mode 100644
index 000000000000..f3f4f1bb20b3
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.10
@@ -0,0 +1,3 @@
+MD5 520090ef291e35ba93397060e20f5025 gtk+-2.6.10.tar.bz2 11521380
+MD5 598d2c1e53c44e87b70199621f2cf65c gtk+-2.6-smoothscroll-r5.patch.bz2 3758
+MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.0 b/x11-libs/gtk+/files/digest-gtk+-2.8.0
deleted file mode 100644
index 85772c1bb2be..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e169d35239bf9d23bdd84c473e3c4917 gtk+-2.8.0.tar.bz2 11810118
-MD5 ad9550c814fc5e24d2f03aa2dc3d5b8f gtk+-2-smoothscroll-r6.patch 18162
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.8.0-r1
deleted file mode 100644
index 85772c1bb2be..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.8.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e169d35239bf9d23bdd84c473e3c4917 gtk+-2.8.0.tar.bz2 11810118
-MD5 ad9550c814fc5e24d2f03aa2dc3d5b8f gtk+-2-smoothscroll-r6.patch 18162
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.8.0-r2 b/x11-libs/gtk+/files/digest-gtk+-2.8.0-r2
new file mode 100644
index 000000000000..f9c33208c33e
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.8.0-r2
@@ -0,0 +1,2 @@
+MD5 e169d35239bf9d23bdd84c473e3c4917 gtk+-2.8.0.tar.bz2 11810118
+MD5 0c7c66269cbac694971341dd2b2adf3d gtk+-2-smoothscroll-r6.patch.bz2 3718
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-dep_checks.patch b/x11-libs/gtk+/files/gtk+-2.8.0-dep_checks.patch
new file mode 100644
index 000000000000..34ec3d0f7fea
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.8.0-dep_checks.patch
@@ -0,0 +1,57 @@
+diff -NurdB gtk+-2.8.0/configure.in gtk+-2.8.0-patched/configure.in
+--- gtk+-2.8.0/configure.in	2005-08-13 07:51:54.000000000 -0500
++++ gtk+-2.8.0-patched/configure.in	2005-08-18 16:28:14.000000000 -0500
+@@ -1023,8 +1023,8 @@
+ GDK_PIXBUF_XLIB_PACKAGES=
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
+ GDK_PIXBUF_XLIB_EXTRA_LIBS=
+-
+-X_PACKAGES=
++	
++X_PACKAGES=fontconfig
+ GDK_EXTRA_LIBS="$GDK_WLIBS"
+ GDK_EXTRA_CFLAGS=
+ 	
+@@ -1034,11 +1034,20 @@
+ 
+ if test "x$gdktarget" = "xx11"; then
+   #
++  # We use fontconfig very peripherally when decoding the default
++  # settings.
++  #
++  if $PKG_CONFIG --exists fontconfig; then : ; else
++    AC_MSG_ERROR([
++*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
++  fi
++
++  #
+   # Check for basic X packages; we use pkg-config if available
+   #
+   if $PKG_CONFIG --exists x11 xext; then
+     have_base_x_pc=true
+-    X_PACKAGES="x11 xext"
++    X_PACKAGES="$X_PACKAGES x11 xext"
+     x_libs="`pkg-config --libs x11 xext`"
+     
+     # Strip out any .la files that pkg-config might give us (this happens
+@@ -1285,7 +1294,7 @@
+     X_PACKAGES="$X_PACKAGES xfixes"
+   fi
+ 
+-  if $have_base_pc ; then
++  if $have_base_x_pc ; then
+     GDK_EXTRA_LIBS="$x_extra_libs"
+   else
+     GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lX11 $GDK_EXTRA_LIBS"
+diff -NurdB gtk+-2.8.0/gdk/x11/gdkdrawable-x11.c gtk+-2.8.0-patched/gdk/x11/gdkdrawable-x11.c
+--- gtk+-2.8.0/gdk/x11/gdkdrawable-x11.c	2005-07-20 22:57:00.000000000 -0500
++++ gtk+-2.8.0-patched/gdk/x11/gdkdrawable-x11.c	2005-08-18 16:29:26.000000000 -0500
+@@ -29,8 +29,6 @@
+ #include "gdkx.h"
+ #include "gdkregion-generic.h"
+ 
+-#include <pango/pangoxft.h>
+-
+ #include <cairo-xlib.h>
+ 
+ #include <stdlib.h>
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-gdk_fix.patch b/x11-libs/gtk+/files/gtk+-2.8.0-gdk_fix.patch
new file mode 100644
index 000000000000..3cbe23c2d88a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.8.0-gdk_fix.patch
@@ -0,0 +1,12 @@
+diff -NurdB gtk+-2.8.0/gdk/x11/gdkwindow-x11.c gtk+-2.8.0-patched/gdk/x11/gdkwindow-x11.c
+--- gtk+-2.8.0/gdk/x11/gdkwindow-x11.c	2005-08-12 08:13:54.000000000 -0500
++++ gtk+-2.8.0-patched/gdk/x11/gdkwindow-x11.c	2005-08-18 16:47:48.000000000 -0500
+@@ -2913,7 +2913,7 @@
+   g_return_if_fail (pixmap == NULL || !parent_relative);
+   g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
+ 
+-  if (!gdk_drawable_get_colormap (pixmap))
++  if (pixmap && !gdk_drawable_get_colormap (pixmap))
+     {
+       g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
+       return;
diff --git a/x11-libs/gtk+/gtk+-2.8.0.ebuild b/x11-libs/gtk+/gtk+-2.6.10.ebuild
index 327e3fd234b3..27e5604f4ffe 100644
--- a/x11-libs/gtk+/gtk+-2.8.0.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.10.ebuild
@@ -1,15 +1,14 @@
 # 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.0.ebuild,v 1.1 2005/08/16 01:37:05 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.10.ebuild,v 1.1 2005/08/19 07:43:37 leonardop Exp $
 
-inherit gnome.org flag-o-matic eutils debug
+inherit flag-o-matic eutils
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gtk+-2-smoothscroll-r6.patch"
-#	amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )"
-# Patch doesn't apply anymore, see bug #101289
+SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
+	mirror://gentoo/gtk+-2.6-smoothscroll-r5.patch.bz2
+	amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )"
 
 LICENSE="LGPL-2"
 SLOT="2"
@@ -17,10 +16,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc tiff jpeg static"
 
 RDEPEND="virtual/x11
-	>=dev-libs/glib-2.7.1
+	>=dev-libs/glib-2.6
 	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.9
-	>=x11-libs/cairo-0.9.2
+	>=x11-libs/pango-1.8
 	x11-misc/shared-mime-info
 	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
@@ -30,17 +28,12 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	sys-devel/autoconf
 	>=sys-devel/automake-1.7.9
-	doc? (
-		>=dev-util/gtk-doc-1.4
-		~app-text/docbook-xml-dtd-4.1.2 )"
+	doc? ( >=dev-util/gtk-doc-1 )"
 
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
+# An arch specific config directory is used on multilib systems
+has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
 
 src_unpack() {
 
@@ -51,16 +44,15 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2-smoothscroll-r6.patch
+	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r5.patch
 
 	cd ${S}
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
-	# has_multilib_profile && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
-
+	has_multilib_profile && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
-	# use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
+	use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
 
 	# patch for ppc64 (#64359)
 	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
diff --git a/x11-libs/gtk+/gtk+-2.8.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.8.0-r2.ebuild
index 74fe87731432..0118987288f1 100644
--- a/x11-libs/gtk+/gtk+-2.8.0-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.8.0-r2.ebuild
@@ -1,13 +1,13 @@
 # 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.0-r1.ebuild,v 1.1 2005/08/17 17:53:03 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.8.0-r2.ebuild,v 1.1 2005/08/19 07:43:37 leonardop Exp $
 
 inherit gnome.org flag-o-matic eutils debug
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="${SRC_URI}
-	mirror://gentoo/gtk+-2-smoothscroll-r6.patch"
+	mirror://gentoo/gtk+-2-smoothscroll-r6.patch.bz2"
 
 LICENSE="LGPL-2"
 SLOT="2"
@@ -21,6 +21,7 @@ RDEPEND="virtual/x11
 	>=x11-libs/cairo-0.9.2
 	x11-misc/shared-mime-info
 	>=media-libs/libpng-1.2.1
+	media-libs/fontconfig
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )"
 
@@ -52,6 +53,12 @@ src_unpack() {
 	epatch ${DISTDIR}/${PN}-2-smoothscroll-r6.patch
 
 	cd ${S}
+
+	# Some sanity checks from upstream.
+	epatch ${FILESDIR}/${P}-dep_checks.patch
+	# Avoid Gdk warnings and other side-effects.
+	epatch ${FILESDIR}/${P}-gdk_fix.patch
+
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
 	has_multilib_profile && epatch ${FILESDIR}/gtk+-2.8.0-multilib.patch