diff options
-rw-r--r-- | gnustep-libs/pantomime/ChangeLog | 9 | ||||
-rw-r--r-- | gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch | 12 | ||||
-rw-r--r-- | gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild | 7 |
3 files changed, 23 insertions, 5 deletions
diff --git a/gnustep-libs/pantomime/ChangeLog b/gnustep-libs/pantomime/ChangeLog index b032eb6fe3a4..baa88ae496c8 100644 --- a/gnustep-libs/pantomime/ChangeLog +++ b/gnustep-libs/pantomime/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnustep-libs/pantomime -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.23 2009/07/07 15:53:18 voyageur Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.24 2010/07/07 20:52:11 voyageur Exp $ + + 07 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org> + pantomime-1.2.0_pre3-r1.ebuild, + +files/pantomime-1.2.0_pre3-gscategories.patch: + Drop unused include (removed from recent gnustep base), fix bug #327357 *pantomime-1.2.0_pre3-r1 (07 Jul 2009) diff --git a/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch b/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch new file mode 100644 index 000000000000..eb00d02d6c2f --- /dev/null +++ b/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch @@ -0,0 +1,12 @@ +diff -Naur Pantomime.orig/Framework/Pantomime/NSString+Extensions.m Pantomime/Framework/Pantomime/NSString+Extensions.m +--- Pantomime.orig/Framework/Pantomime/NSString+Extensions.m 2010-07-07 22:46:19.000000000 +0200 ++++ Pantomime/Framework/Pantomime/NSString+Extensions.m 2010-07-07 22:47:16.000000000 +0200 +@@ -42,8 +42,6 @@ + #ifdef MACOSX + #include <CoreFoundation/CFString.h> + #include <CoreFoundation/CFStringEncodingExt.h> +-#else +-#include <GNUstepBase/GSCategories.h> + #endif + + #include <ctype.h> diff --git a/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild b/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild index 93bce84e3c6b..2a364549dae1 100644 --- a/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild +++ b/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild,v 1.1 2009/07/07 15:53:18 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild,v 1.2 2010/07/07 20:52:11 voyageur Exp $ EAPI=2 -inherit gnustep-2 +inherit eutils gnustep-2 MY_PN=${PN/p/P} @@ -22,6 +22,7 @@ DEPEND="dev-libs/openssl" RDEPEND="${DEPEND}" src_prepare() { + epatch "${FILESDIR}"/${P}-gscategories.patch sed -i -e "s|ADDITIONAL_LDFLAGS|LIBRARIES_DEPEND_UPON|" \ Framework/Pantomime/GNUmakefile || die "as-needed sed failed" } |