diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-08-29 10:59:23 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-08-29 10:59:23 +0000 |
| commit | c9a6a047418774e62562db8c74decc2a828acc00 (patch) | |
| tree | fc8e6c06228afe7e6ba3703fe66d8c3c85d155a3 /gnustep-apps | |
| parent | respect flags, don't run autopoint twice, add verbosity for live ebuild (diff) | |
| download | gentoo-2-c9a6a047418774e62562db8c74decc2a828acc00.tar.gz gentoo-2-c9a6a047418774e62562db8c74decc2a828acc00.tar.bz2 gentoo-2-c9a6a047418774e62562db8c74decc2a828acc00.zip | |
Fix compilation with gcc-4.7, bug #427374
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-apps')
| -rw-r--r-- | gnustep-apps/textedit/ChangeLog | 7 | ||||
| -rw-r--r-- | gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch | 20 | ||||
| -rw-r--r-- | gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild | 8 |
3 files changed, 32 insertions, 3 deletions
diff --git a/gnustep-apps/textedit/ChangeLog b/gnustep-apps/textedit/ChangeLog index 90213defbbd2..720f6e1b847d 100644 --- a/gnustep-apps/textedit/ChangeLog +++ b/gnustep-apps/textedit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnustep-apps/textedit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/ChangeLog,v 1.17 2012/05/30 07:44:21 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/ChangeLog,v 1.18 2012/08/29 10:59:23 voyageur Exp $ + + 29 Aug 2012; Bernard Cafarelli <voyageur@gentoo.org> + textedit-0.95_pre20100427.ebuild, + +files/textedit-0.95_pre20100427-gcc47.patch: + Fix compilation with gcc-4.7, bug #427374 30 May 2012; Jeff Horelick <jdhore@gentoo.org> textedit-0.95_pre20100427.ebuild: diff --git a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch b/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch new file mode 100644 index 000000000000..b2a0bfedcd3c --- /dev/null +++ b/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch @@ -0,0 +1,20 @@ +--- textedit.app-4.0+20061029.orig/Document.m ++++ textedit.app-4.0+20061029/Document.m +@@ -1361,13 +1361,13 @@ validateToggleItem (NSMenuItem *aCell, B + { + SEL action = [aCell action]; + #ifdef GNUSTEP +- const char *sel_name = sel_get_name (action); ++ const char *sel_name = sel_getName (action); + +- if (!strcmp (sel_name, sel_get_name (@selector (toggleRich:)))) { ++ if (!strcmp (sel_name, sel_getName (@selector (toggleRich:)))) { + validateToggleItem (aCell, [self isRichText], _(@"&Make Plain Text"), _(@"&Make Rich Text")); +- } else if (!strcmp (sel_name, sel_get_name (@selector (togglePageBreaks:)))) { ++ } else if (!strcmp (sel_name, sel_getName (@selector (togglePageBreaks:)))) { + validateToggleItem (aCell, [self hasMultiplePages], _(@"&Wrap to Window"), _(@"&Wrap to Page")); +- } else if (!strcmp (sel_name, sel_get_name (@selector (toggleHyphenation:)))) { ++ } else if (!strcmp (sel_name, sel_getName (@selector (toggleHyphenation:)))) { + if (!hyphenationSupported()) // Disable it + return NO; + validateToggleItem (aCell, ([self hyphenationFactor] > 0.0), _(@"Disallow &Hyphenation"), _(@"Allow &Hyphenation")); diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild index 09b4aa417e82..1121bb991b78 100644 --- a/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild +++ b/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild,v 1.3 2012/05/30 07:44:21 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/textedit/textedit-0.95_pre20100427.ebuild,v 1.4 2012/08/29 10:59:23 voyageur Exp $ EAPI=3 -inherit gnustep-2 +inherit eutils gnustep-2 S=${WORKDIR}/TextEdit @@ -15,3 +15,7 @@ KEYWORDS="amd64 ~ppc x86" LICENSE="GPL-2" SLOT="0" IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc47.patch +} |