add back libgnomeui-2.0.5-GTK_TYPE_INVISIBLE.patch

5 files changed, 18 insertions, 39 deletions

diff --git a/gnome-base/libgnomeui/ChangeLog b/gnome-base/libgnomeui/ChangeLog
index 9b20d7e845a8..be4c2fe845e2 100644
--- a/gnome-base/libgnomeui/ChangeLog
+++ b/gnome-base/libgnomeui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/libgnomeui
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.13 2002/11/28 01:42:43 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/ChangeLog,v 1.14 2002/11/29 07:49:43 azarah Exp $
+
+*libgnomeui-2.0.6-r1 (29 Nov 2002)
+
+  29 Nov 2002; Martin Schlemmer <azarah@gentoo.org> libgnomeui-2.0.6-r1.ebuild :
+  Fix a crash when using gtk+-2.1.  Added ${P}-GTK_TYPE_INVISIBLE.patch
+  for this.  This is a fix backported from 2.1.2.  (add patch back).
 
 *libgnomeui-2.0.6 (27 Nov 2002)
 
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.5 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.5
deleted file mode 100644
index 098a4e5b7bf2..000000000000
--- a/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ba25408907ce5c006d15ddc362dd983 libgnomeui-2.0.5.tar.bz2 965219
diff --git a/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.6 b/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.6-r1
index 72bf00543c5d..72bf00543c5d 100644
--- a/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.6
+++ b/gnome-base/libgnomeui/files/digest-libgnomeui-2.0.6-r1
diff --git a/gnome-base/libgnomeui/libgnomeui-2.0.5.ebuild b/gnome-base/libgnomeui/libgnomeui-2.0.5.ebuild
deleted file mode 100644
index 837fee692718..000000000000
--- a/gnome-base/libgnomeui/libgnomeui-2.0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.0.5.ebuild,v 1.5 2002/10/05 05:39:13 drobbins Exp $
-
-IUSE="doc"
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="User interface part of libgnome"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64 alpha"
-LICENSE="GPL-2 LGPL-2.1" 
-
-RDEPEND=">=x11-libs/gtk+-2.0.6
-	>=sys-devel/perl-5.0.0
-	>=sys-apps/gawk-3.1.0
-	>=dev-libs/popt-1.6.0
-	>=sys-devel/bison-1.28
-	>=sys-devel/gettext-0.10.40
-	>=media-sound/esound-0.2.29
-	>=media-libs/audiofile-0.2.3
-	>=gnome-base/libbonoboui-2.0.3
-	>=gnome-base/gconf-1.2.1
-	>=gnome-base/libgnome-2.0.4
-	>=gnome-base/libgnomecanvas-2.0.4"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
-DOCS="AUTHORS  COPYING.LIB INSTALL NEWS README"
-
-
-
diff --git a/gnome-base/libgnomeui/libgnomeui-2.0.6.ebuild b/gnome-base/libgnomeui/libgnomeui-2.0.6-r1.ebuild
index ef985aacde05..db018ddcb970 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.0.6.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.0.6.ebuild,v 1.1 2002/11/28 01:42:43 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.0.6-r1.ebuild,v 1.1 2002/11/29 07:49:43 azarah Exp $
 
 IUSE="doc"
 
@@ -31,3 +31,13 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.9-r2 )"
 
 DOCS="AUTHORS  COPYING.LIB INSTALL NEWS README"
+
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix a crash when using gtk+-2.1.
+	# <azarah@gentoo.org> (21 Nov 2002)
+	cd ${S}; epatch ${FILESDIR}/${PN}-2.0.5-GTK_TYPE_INVISIBLE.patch
+}
+