Fix compilation with new gnustep-base, bug #328191

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 22 insertions, 4 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/Manifest b/gnustep-apps/cynthiune/Manifest
index ac6bd5c40794..53d869c7ebb2 100644
--- a/gnustep-apps/cynthiune/Manifest
+++ b/gnustep-apps/cynthiune/Manifest
@@ -1,11 +1,12 @@
 AUX cynthiune-0.9.5-NSCellExtensions.patch 489 RMD160 b1ce1939f4c63c3dc01979762f03ed1294f59411 SHA1 1ab1511acb797497bc911f0fba4f331ca9af1ebe SHA256 a306d2dfef899d223741b0e39f57c1ca6be9ed8517c8fb08f14186ce13c586f8
 AUX cynthiune-0.9.5-NSMutableDictionary.patch 312 RMD160 aebeb9f2b5cd54621103c61cc1b1af6e0eb69dfd SHA1 4888c09008acdd8c27e89f93b58fdefc0f479d3d SHA256 9555d22fe34ccf415f2433b9a4628666b4a2c4ed8f0eb3262419075ef0934322
+AUX cynthiune-0.9.5-NSWindow.patch 403 RMD160 ea444fecbc6406d0f18b176755d2195e6cbeaf0b SHA1 d05a0d2721532cbe7218c9b7f4bc7ca50a0dffa8 SHA256 4ce40d44770de335844375e33de867a651e9ff06661658adc892421455ae939a
 AUX cynthiune-0.9.5-as-needed.patch 1681 RMD160 07179474202c7f64689731d079b9b94cc3a201c4 SHA1 6d041502b3e348529f6298812595dbd04e58ed34 SHA256 4241e0709d8889661090b8b94574bcf6e9eb219aab7ff044ec17a2941445e83d
 AUX cynthiune-0.9.5-flac-1.1.3.patch 8504 RMD160 4320c4a28fcd5bc9d37fab4113168ba9e4c0b42b SHA1 d2552a9e68dd5bee85a2545a0d49074f99f69029 SHA256 bbf5da3ba5acce325ce0d21c164f435912fa68149c7955179399bfee6ce4805f
 AUX cynthiune-0.9.5-gnustep-make-2.patch 12567 RMD160 2ea2afc4facff487187c7a600c1a711911d1b9db SHA1 f77ed1765d746a118c9a72fdf59bb8fc409bfde1 SHA256 61adc8a6ee7257c778dca98189a87942b29c1f08364419ff601f6865ae125246
 AUX cynthiune-0.9.5-libmpcdec.patch 8735 RMD160 29c22b17128624e54e2ad629daf31bbbbaabdeef SHA1 fa8e24aeb3b662cfef0d279ab77a52ca1df5e9c9 SHA256 8c5337294146216d30fecf5bfb87688c42d8ec4dad6cf0e3e07213236cc45c8d
 AUX cynthiune-0.9.5-set-macro.patch 1108 RMD160 db86c99b51c925e7f0716f660904a1e4182ef902 SHA1 a15c667e9e5d60ee333d16eaf5db779ec95060b6 SHA256 47241760782bf54ff172ef0a010e5b27073c717e62c85e2c428425752b018f4d
 DIST Cynthiune-0.9.5.tar.gz 490426 RMD160 b9dff46275b6b79ebc62655e7de92b9c9aa41274 SHA1 6622288efde5e576defa64f0d4034adeb56291d4 SHA256 e3e036385388556759e3712ea5e595976ec7a4867698dea7c46b46d226122e70
-EBUILD cynthiune-0.9.5-r5.ebuild 2050 RMD160 661d68d81748100e6bcff837455fbc26c1df399a SHA1 af6d851eb2d8e0799bf58d6079f24fb7937a2e43 SHA256 7613aa93907b544c4261edd2ad448f4703449bdbe2e098bf511196df390955b3
-MISC ChangeLog 4600 RMD160 555ed7d76e9f0bf22bdfac776cc39790b641ae19 SHA1 a54e35e14123aa051823c34d32c63bdf724ccb22 SHA256 91980d4795a20f746399309f0e26f19f003506f293277684d2db21b7ba43421a
+EBUILD cynthiune-0.9.5-r5.ebuild 2094 RMD160 f2a749ff7041e7b0addf5416c2dba8a41e8932b3 SHA1 96847b64b8374ea6dc192b789aad904445fac833 SHA256 d159d16a1ab619e28d647bdeb48b3d2d396bf7fd7581aeaef1ebc06dcf0d91e7
+MISC ChangeLog 4777 RMD160 2f8cc3db0309f25bc1523e4dfce54188709a975f SHA1 ffdd79f2b9d02b1ab44ea2798e17c9724ae5acd5 SHA256 3bb231113481484927cfaf5076c4ce535287f261d853e146821838b05295eb21
 MISC metadata.xml 2216 RMD160 06c2aea6ad54e88d28371ef8a6302120e88e8505 SHA1 65b4217c9947df1b0052b2a121bfce3c849de949 SHA256 6559882bfeb74a0c812e092fc392728e16a7df57d1ec45d43f44babd79ee3424
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>