Fixed compile problem with recent versions of gdk. Bug # 78948. Thanks Edward Middleton.

Package-Manager: portage-2.0.51.18

4 files changed, 41 insertions, 20 deletions

diff --git a/dev-ruby/ruby-gdkpixbuf2/ChangeLog b/dev-ruby/ruby-gdkpixbuf2/ChangeLog
index 3ae7e69ecd63..0c687b096376 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ChangeLog
+++ b/dev-ruby/ruby-gdkpixbuf2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/ruby-gdkpixbuf2
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdkpixbuf2/ChangeLog,v 1.16 2004/11/25 03:16:59 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdkpixbuf2/ChangeLog,v 1.17 2005/03/08 02:56:59 twp Exp $
+
+  08 Mar 2005; Tom Payne <twp@gentoo.org>
+  +files/ruby-gdkpixbuf2-0.11.0-fix-includes.patch,
+  ruby-gdkpixbuf2-0.11.0.ebuild:
+  Fixed compile problem with recent versions of gdk. Bug # 78948. Thanks
+  Edward Middleton.
 
 *ruby-gdkpixbuf2-0.11.0 (25 Nov 2004)
 
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index 4c49da117aa5..7e98290dd159 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1,22 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 86f051688733270579b4e227260b4a48 ChangeLog 2594
-MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
-MD5 6f450ffeab11f355a7bc754f366b29d1 ruby-gdkpixbuf2-0.11.0.ebuild 469
-MD5 212e5a4d53cbe32c41543fdab9c9f8bc ruby-gdkpixbuf2-0.8.0.ebuild 444
-MD5 02bf9f90deb342e89701c50d19517bb8 ruby-gdkpixbuf2-0.8.1.ebuild 443
 MD5 608eae067fbfe7315815f243784bdd96 ruby-gdkpixbuf2-0.9.1.ebuild 500
+MD5 d10072bd8c0ca2887e5385f1cefaff38 ruby-gdkpixbuf2-0.11.0.ebuild 513
+MD5 212e5a4d53cbe32c41543fdab9c9f8bc ruby-gdkpixbuf2-0.8.0.ebuild 444
 MD5 a597c4895db22b65b0324ef32d7344e8 ruby-gdkpixbuf2-0.10.1.ebuild 498
-MD5 becea4be55fd0a464b9eeaa7f3b09570 files/digest-ruby-gdkpixbuf2-0.11.0 75
+MD5 45c3653413b8a35df8c4557df815d8c9 ChangeLog 2813
+MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
+MD5 02bf9f90deb342e89701c50d19517bb8 ruby-gdkpixbuf2-0.8.1.ebuild 443
 MD5 f15d65d18e7816f32c3bcf8023b5835b files/digest-ruby-gdkpixbuf2-0.8.0 73
 MD5 7de5312a62217022283595b441356cde files/digest-ruby-gdkpixbuf2-0.8.1 73
 MD5 2b2c4fe1967f3e6d7abc0f74a6008c23 files/digest-ruby-gdkpixbuf2-0.9.1 73
+MD5 31e02e89d8f3aa68fed57164106640a5 files/ruby-gdkpixbuf2-0.11.0-fix-includes.patch 849
 MD5 43ae64cda07995d0490456a74ef8f043 files/digest-ruby-gdkpixbuf2-0.10.1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBpU0SVWNWqTUmv+0RAhzyAKCBedEK6qTLFf1NoWFZrEPL/m8WoACgmL+V
-AQ0p4ExU1osYBCYl0IVnHyw=
-=DvG8
------END PGP SIGNATURE-----
+MD5 becea4be55fd0a464b9eeaa7f3b09570 files/digest-ruby-gdkpixbuf2-0.11.0 75
diff --git a/dev-ruby/ruby-gdkpixbuf2/files/ruby-gdkpixbuf2-0.11.0-fix-includes.patch b/dev-ruby/ruby-gdkpixbuf2/files/ruby-gdkpixbuf2-0.11.0-fix-includes.patch
new file mode 100644
index 000000000000..a520d38ba211
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/files/ruby-gdkpixbuf2-0.11.0-fix-includes.patch
@@ -0,0 +1,23 @@
+diff -uNr gdkpixbuf/rbgdk-pixbuf-format.c gdkpixbuf.new/rbgdk-pixbuf-format.c
+--- gdkpixbuf/rbgdk-pixbuf-format.c	2004-11-15 04:39:34.000000000 +1300
++++ gdkpixbuf.new/rbgdk-pixbuf-format.c	2004-12-16 21:26:42.729147720 +1300
+@@ -13,7 +13,6 @@
+ #if RBGDK_PIXBUF_CHECK_VERSION(2,2,0)
+ 
+ #ifdef HAVE_GDK_PIXBUF_GDK_PIXBUF_IO_H
+-#define GDK_PIXBUF_ENABLE_BACKEND
+ #include <gdk-pixbuf/gdk-pixbuf-io.h>
+ #endif
+ 
+diff -uNr gdkpixbuf/rbgdk-pixbuf.h gdkpixbuf.new/rbgdk-pixbuf.h
+--- gdkpixbuf/rbgdk-pixbuf.h	2004-11-15 04:39:34.000000000 +1300
++++ gdkpixbuf.new/rbgdk-pixbuf.h	2004-12-16 21:26:42.729147720 +1300
+@@ -9,6 +9,8 @@
+   Copyright (C) 2002-2004 Masao Mutoh
+ ************************************************/
+ 
++
++#define GDK_PIXBUF_ENABLE_BACKEND
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk-pixbuf/gdk-pixdata.h>
+ #include "rbgobject.h"
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-0.11.0.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-0.11.0.ebuild
index fbf466e69ee6..d8a83f603c63 100644
--- a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-0.11.0.ebuild
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-0.11.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-0.11.0.ebuild,v 1.1 2004/11/25 03:16:59 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-0.11.0.ebuild,v 1.2 2005/03/08 02:56:59 twp Exp $
 
 inherit ruby ruby-gnome2
 
@@ -11,3 +11,4 @@ USE_RUBY="ruby16 ruby18 ruby19"
 DEPEND=">=x11-libs/gtk+-2.0.0"
 RDEPEND="${DEPEND}
 	>=dev-ruby/ruby-glib2-${PV}"
+PATCHES="${FILESDIR}/${P}-fix-includes.patch"