summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2010-07-14 17:12:57 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2010-07-14 17:12:57 +0000
commite961acc41ba11293a84fddd4ee3489430d08074f (patch)
treeb4e90a179c96ede2f365a7a665eb3399a0a6d4af /gnustep-apps/cynthiune
parentStable for HPPA (bug #327777). (diff)
downloadgentoo-2-e961acc41ba11293a84fddd4ee3489430d08074f.tar.gz
gentoo-2-e961acc41ba11293a84fddd4ee3489430d08074f.tar.bz2
gentoo-2-e961acc41ba11293a84fddd4ee3489430d08074f.zip
Fix compilation with new gnustep-base, bug #328191
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'gnustep-apps/cynthiune')
-rw-r--r--gnustep-apps/cynthiune/ChangeLog6
-rw-r--r--gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild3
-rw-r--r--gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch12
3 files changed, 19 insertions, 2 deletions
diff --git a/gnustep-apps/cynthiune/ChangeLog b/gnustep-apps/cynthiune/ChangeLog
index 03d69ba492e0..67b841161cb4 100644
--- a/gnustep-apps/cynthiune/ChangeLog
+++ b/gnustep-apps/cynthiune/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-apps/cynthiune
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.29 2010/02/10 21:41:48 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/ChangeLog,v 1.30 2010/07/14 17:12:56 voyageur Exp $
+
+ 14 Jul 2010; Bernard Cafarelli <voyageur@gentoo.org>
+ cynthiune-0.9.5-r5.ebuild, +files/cynthiune-0.9.5-NSWindow.patch:
+ Fix compilation with new gnustep-base, bug #328191
10 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org>
-cynthiune-0.9.5-r4.ebuild, -files/cynthiune-0.9.5-libmpcdecsv7.patch:
diff --git a/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild b/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild
index f8b3172b72fc..6da63b5b4e90 100644
--- a/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild
+++ b/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild,v 1.3 2010/02/08 18:11:05 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/cynthiune/cynthiune-0.9.5-r5.ebuild,v 1.4 2010/07/14 17:12:56 voyageur Exp $
inherit gnustep-2
@@ -38,6 +38,7 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-set-macro.patch
epatch "${FILESDIR}"/${P}-NSCellExtensions.patch
epatch "${FILESDIR}"/${P}-NSMutableDictionary.patch
+ epatch "${FILESDIR}"/${P}-NSWindow.patch
epatch "${FILESDIR}"/${P}-gnustep-make-2.patch
epatch "${FILESDIR}"/${P}-as-needed.patch
epatch "${FILESDIR}"/${P}-libmpcdec.patch
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch
new file mode 100644
index 000000000000..0de5fdf6e035
--- /dev/null
+++ b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch
@@ -0,0 +1,12 @@
+--- CynthiuneController.m.orig 2010-07-14 19:09:33.000000000 +0200
++++ CynthiuneController.m 2010-07-14 19:09:14.000000000 +0200
+@@ -28,9 +28,6 @@
+ #import <AppKit/NSPasteboard.h>
+ #import <AppKit/NSToolbar.h>
+ #import <AppKit/NSWindow.h>
+-#ifdef GNUSTEP
+-#import <AppKit/NSWindow+Toolbar.h>
+-#endif
+ #import <Foundation/NSArray.h>
+ #import <Foundation/NSBundle.h>
+ #import <Foundation/NSFileManager.h>