Last rites for gnustep-apps/cynthiune, gnustep-apps/gridlock, gnustep-apps/talksoup, bug #380433

8 files changed, 0 insertions, 980 deletions

diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch
deleted file mode 100644
index 9ca91887f270..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSCellExtensions.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur Cynthiune-0.9.5.orig/Frameworks/Cynthiune/NSCellExtensions.m Cynthiune-0.9.5/Frameworks/Cynthiune/NSCellExtensions.m
---- Cynthiune-0.9.5.orig/Frameworks/Cynthiune/NSCellExtensions.m	2007-06-30 10:06:22.000000000 +0200
-+++ Cynthiune-0.9.5/Frameworks/Cynthiune/NSCellExtensions.m	2007-06-30 10:06:47.000000000 +0200
-@@ -20,6 +20,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#import <AppKit/NSAttributedString.h>
- #import <AppKit/NSStringDrawing.h>
- 
- #import "NSCellExtensions.h"
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSMutableDictionary.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSMutableDictionary.patch
deleted file mode 100644
index 866c3644455c..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSMutableDictionary.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Cynthiune-0.9.5.orig/Bundles/OSS/OSSPreference.h	2008-01-04 13:52:41.000000000 +0100
-+++ Cynthiune-0.9.5/Bundles/OSS/OSSPreference.h	2008-01-04 13:51:46.000000000 +0100
-@@ -26,6 +26,7 @@
- #import <Cynthiune/Preference.h>
- 
- @class NSBox;
-+@class NSMutableDictionary;
- @class NSWindow;
- @class NSTextField;
- 
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch
deleted file mode 100644
index 0de5fdf6e035..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-NSWindow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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>
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch
deleted file mode 100644
index e707a44a2a4b..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- frameworks.make.orig	2008-12-09 18:05:15.000000000 +0100
-+++ frameworks.make	2008-12-09 18:05:22.000000000 +0100
-@@ -2,13 +2,16 @@
- 
- ADDITIONAL_INCLUDE_DIRS += $(foreach fdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(foreach framework,$(FRAMEWORKS),$(wildcard $(fdir)/$(framework).framework))),-I$(fdir)/Headers)
- ifeq (yes, $(local-build))
--  _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -Wl,-rpath,$(if $(wildcard $(shell pwd)/$(efdir)),$(shell pwd)/$(efdir),$(efdir))/Versions/Current -L$(efdir)/Versions/Current) -l$(framework))
-+  _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -Wl,-rpath,$(if $(wildcard $(shell pwd)/$(efdir)),$(shell pwd)/$(efdir),$(efdir))/Versions/Current -L$(efdir)/Versions/Current))
-+  _libs = $(foreach framework,$(FRAMEWORKS), -l$(framework))
- else
--  _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -L$(efdir)/Versions/Current) -l$(framework))
-+  _ldflags = $(foreach framework,$(FRAMEWORKS),$(foreach efdir,$(foreach fdir,$(FRAMEWORKS_DIRS),$(wildcard $(fdir)/$(framework).framework)), -L$(efdir)/Versions/Current))
-+  _libs = $(foreach framework,$(FRAMEWORKS), -l$(framework))
- endif
- 
- ifeq (mingw32, $(GNUSTEP_TARGET_OS))
--ADDITIONAL_GUI_LIBS += -L$(FRAMEWORKS_DIRS)/../../Cynthiune.app $(_ldflags)
-+ADDITIONAL_GUI_LIBS += -L$(FRAMEWORKS_DIRS)/../../Cynthiune.app $(_ldflags) $(_libs)
- else
- ADDITIONAL_LDFLAGS += $(_ldflags)
-+ADDITIONAL_GUI_LIBS += $(_libs)
- endif
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch
deleted file mode 100644
index a6554bda50c3..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-flac-1.1.3.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-* Josh Coalson <j_coalson@yahoo.com>: cynthiune patch for upcoming FLAC 1.1.3
-
---- Cynthiune-0.9.5/Bundles/FLAC/FLAC.h
-+++ Cynthiune-0.9.5/Bundles/FLAC/FLAC.h
-@@ -31,7 +31,11 @@
- 
- @interface FLAC : NSObject <CynthiuneBundle, Format>
- {
-+#ifdef LEGACY_FLAC
-   FLAC__FileDecoder *fileDecoder;
-+#else
-+  FLAC__StreamDecoder *fileDecoder;
-+#endif
- 
-   unsigned int bitsPerSample;
-   unsigned int duration;
---- Cynthiune-0.9.5/Bundles/FLAC/FLAC.m
-+++ Cynthiune-0.9.5/Bundles/FLAC/FLAC.m
-@@ -34,13 +34,25 @@
- #import <Cynthiune/Format.h>
- #import <Cynthiune/utils.h>
- 
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- #import "FLAC.h"
- 
- #define LOCALIZED(X) _b ([FLAC class], X)
- 
- static FLAC__StreamDecoderWriteStatus
-+#ifdef LEGACY_FLAC
- writeCallback (const FLAC__FileDecoder *fileDecoder, const FLAC__Frame *frame,
-                const FLAC__int32 * const buffer[], void *clientData)
-+#else
-+writeCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__Frame *frame,
-+               const FLAC__int32 * const buffer[], void *clientData)
-+#endif
- {
-   CFLAC *cStream;
-   unsigned int sample, channel;
-@@ -70,9 +82,15 @@
- }
- 
- static void
-+#ifdef LEGACY_FLAC
- metadataCallback (const FLAC__FileDecoder *fileDecoder,
-                   const FLAC__StreamMetadata *metadata,
-                   void *clientData)
-+#else
-+metadataCallback (const FLAC__StreamDecoder *fileDecoder,
-+                  const FLAC__StreamMetadata *metadata,
-+                  void *clientData)
-+#endif
- {
-   CFLAC *cStream;
- 
-@@ -88,9 +106,15 @@
- }
- 
- static void
-+#ifdef LEGACY_FLAC
- errorCallback (const FLAC__FileDecoder *fileDecoder,
-                FLAC__StreamDecoderErrorStatus status,
-                void *clientData)
-+#else
-+errorCallback (const FLAC__StreamDecoder *fileDecoder,
-+               FLAC__StreamDecoderErrorStatus status,
-+               void *clientData)
-+#endif
- {
-   NSLog (@"FLAC: received error with status %d", status);
- }
-@@ -161,6 +185,7 @@
- 
- - (BOOL) _initializeFileDecoderWithFilename: (NSString *) fileName
- {
-+#ifdef LEGACY_FLAC
-   FLAC__file_decoder_set_metadata_ignore_all (fileDecoder);
-   FLAC__file_decoder_set_metadata_respond (fileDecoder,
-                                            FLAC__METADATA_TYPE_STREAMINFO);
-@@ -173,13 +198,25 @@
-   return (FLAC__file_decoder_set_filename (fileDecoder, [fileName cString])
-           && (FLAC__file_decoder_init (fileDecoder) == FLAC__FILE_DECODER_OK)
-           && FLAC__file_decoder_process_until_end_of_metadata (fileDecoder));
-+#else
-+  FLAC__stream_decoder_set_metadata_ignore_all (fileDecoder);
-+  FLAC__stream_decoder_set_metadata_respond (fileDecoder,
-+                                           FLAC__METADATA_TYPE_STREAMINFO);
-+  return ((FLAC__stream_decoder_init_file (fileDecoder, [fileName cString],
-+          writeCallback, metadataCallback, errorCallback, self) == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+          && FLAC__stream_decoder_process_until_end_of_metadata (fileDecoder));
-+#endif
- }
- 
- - (BOOL) streamOpen: (NSString *) fileName
- {
-   BOOL result;
- 
-+#ifdef LEGACY_FLAC
-   fileDecoder = FLAC__file_decoder_new();
-+#else
-+  fileDecoder = FLAC__stream_decoder_new();
-+#endif
- 
-   if (fileDecoder)
-     {
-@@ -187,7 +224,11 @@
-         result = YES;
-       else
-         {
-+#ifdef LEGACY_FLAC
-           FLAC__file_decoder_delete (fileDecoder);
-+#else
-+          FLAC__stream_decoder_delete (fileDecoder);
-+#endif
-           fileDecoder = NULL;
-           result = NO;
-         }
-@@ -200,7 +241,11 @@
- 
- - (void) streamClose
- {
-+#ifdef LEGACY_FLAC
-   FLAC__file_decoder_delete (fileDecoder);
-+#else
-+  FLAC__stream_decoder_delete (fileDecoder);
-+#endif
-   fileDecoder = NULL;
- }
- 
-@@ -215,7 +260,11 @@
-   if (position >= readBufferSize)
-     {
-       position = 0;
-+#ifdef LEGACY_FLAC
-       success = FLAC__file_decoder_process_single (fileDecoder);
-+#else
-+      success = FLAC__stream_decoder_process_single (fileDecoder);
-+#endif
-     }
- 
-   if (success)
-@@ -251,13 +300,27 @@
-              withSize: (unsigned int) bufferSize
- {
-   int readBytes;
-+#ifdef LEGACY_FLAC
-   FLAC__FileDecoderState state;
- 
-   state = FLAC__file_decoder_get_state (fileDecoder);
-+#else
-+  FLAC__StreamDecoderState state;
-+
-+  state = FLAC__stream_decoder_get_state (fileDecoder);
-+#endif
- 
-+#ifdef LEGACY_FLAC
-   if (state == FLAC__FILE_DECODER_OK)
-+#else
-+  if (state < FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
-     readBytes = [self _processNextChunk: buffer withSize: bufferSize];
-+#ifdef LEGACY_FLAC
-   else if (state == FLAC__FILE_DECODER_END_OF_FILE)
-+#else
-+  else if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
-+#endif
-     readBytes = 0;
-   else
-     readBytes = -1;
-@@ -272,7 +335,11 @@
- 
- - (void) seek: (unsigned int) aPos
- {
-+#ifdef LEGACY_FLAC
-   FLAC__file_decoder_seek_absolute (fileDecoder, aPos * rate);
-+#else
-+  FLAC__stream_decoder_seek_absolute (fileDecoder, aPos * rate);
-+#endif
- }
- 
- - (unsigned int) readChannels
-@@ -295,7 +362,11 @@
-   if (readBuffer)
-     free (readBuffer);
-   if (fileDecoder)
-+#ifdef LEGACY_FLAC
-     FLAC__file_decoder_delete (fileDecoder);
-+#else
-+    FLAC__stream_decoder_delete (fileDecoder);
-+#endif
-   [super dealloc];
- }
- 
---- Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
-+++ Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
-@@ -33,6 +33,13 @@
- 
- #import "FLACTags.h"
- 
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- #define LOCALIZED(X) _b ([FLACTags class], X)
- 
- static inline int
-@@ -78,16 +85,27 @@
- }
- 
- static FLAC__StreamDecoderWriteStatus
-+#ifdef LEGACY_FLAC
- writeCallback (const FLAC__FileDecoder *fileDecoder, const FLAC__Frame *frame,
-                const FLAC__int32 * const buffer[], void *clientData)
-+#else
-+writeCallback (const FLAC__StreamDecoder *fileDecoder, const FLAC__Frame *frame,
-+               const FLAC__int32 * const buffer[], void *clientData)
-+#endif
- {
-   return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
- }
- 
- static void
-+#ifdef LEGACY_FLAC
- metadataCallback (const FLAC__FileDecoder *fileDecoder,
-                   const FLAC__StreamMetadata *metadata,
-                   void *clientData)
-+#else
-+metadataCallback (const FLAC__StreamDecoder *fileDecoder,
-+                  const FLAC__StreamMetadata *metadata,
-+                  void *clientData)
-+#endif
- {
-   unsigned int count;
- 
-@@ -104,9 +122,15 @@
- }
- 
- static void
-+#ifdef LEGACY_FLAC
- errorCallback (const FLAC__FileDecoder *fileDecoder,
-                FLAC__StreamDecoderErrorStatus status,
-                void *clientData)
-+#else
-+errorCallback (const FLAC__StreamDecoder *fileDecoder,
-+               FLAC__StreamDecoderErrorStatus status,
-+               void *clientData)
-+#endif
- {
-   NSLog (@"FLACTags: received error with status %d", status);
- }
-@@ -132,14 +156,23 @@
-               year: (NSString **) year
-         ofFilename: (NSString *) filename
- {
-+#ifdef LEGACY_FLAC
-   FLAC__FileDecoder *fileDecoder;
-+#else
-+  FLAC__StreamDecoder *fileDecoder;
-+#endif
-   BOOL result;
-   NSString **arrayOfValues[] = { title, artist, album, trackNumber,
-                                  genre, year };
- 
-+#ifdef LEGACY_FLAC
-   fileDecoder = FLAC__file_decoder_new();
-+#else
-+  fileDecoder = FLAC__stream_decoder_new();
-+#endif
-   if (fileDecoder)
-     {
-+#ifdef LEGACY_FLAC
-       FLAC__file_decoder_set_metadata_ignore_all (fileDecoder);
-       FLAC__file_decoder_set_metadata_respond (fileDecoder,
-                                                FLAC__METADATA_TYPE_VORBIS_COMMENT);
-@@ -156,6 +189,17 @@
-                 && FLAC__file_decoder_process_until_end_of_metadata
-                 (fileDecoder));
-       FLAC__file_decoder_delete (fileDecoder);
-+#else
-+      FLAC__stream_decoder_set_metadata_ignore_all (fileDecoder);
-+      FLAC__stream_decoder_set_metadata_respond (fileDecoder,
-+                                               FLAC__METADATA_TYPE_VORBIS_COMMENT);
-+      result = ((FLAC__stream_decoder_init_file (fileDecoder, [filename cString],
-+                    writeCallback, metadataCallback, errorCallback, arrayOfValues)
-+                    == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+                && FLAC__stream_decoder_process_until_end_of_metadata
-+                (fileDecoder));
-+      FLAC__stream_decoder_delete (fileDecoder);
-+#endif
-     }
-   else
-     result = NO;
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch
deleted file mode 100644
index 3972c72f133d..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-gnustep-make-2.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff -Naur Cynthiune-0.9.5.orig/Bundles/aRts/GNUmakefile Cynthiune-0.9.5/Bundles/aRts/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/aRts/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/aRts/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=aRts
- BUNDLE_NAME=aRts
- BUNDLE_EXTENSION=.output
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- aRts_PRINCIPAL_CLASS=aRts
- aRts_LANGUAGES=
- aRts_LOCALIZED_RESOURCE_FILES=
-diff -Naur Cynthiune-0.9.5.orig/Bundles/ASFTags/GNUmakefile Cynthiune-0.9.5/Bundles/ASFTags/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/ASFTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/ASFTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=ASFTags
- BUNDLE_NAME=ASFTags
- BUNDLE_EXTENSION=.tags
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- ASFTags_PRINCIPAL_CLASS=ASFTags
- 
- #
-diff -Naur Cynthiune-0.9.5.orig/Bundles/AudioFile/GNUmakefile Cynthiune-0.9.5/Bundles/AudioFile/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/AudioFile/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/AudioFile/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -24,7 +24,7 @@
- PACKAGE_NAME=AudioFile
- BUNDLE_NAME=AudioFile
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- AudioFile_PRINCIPAL_CLASS=AudioFile
- 
- AudioFile_LIBRARIES_DEPEND_UPON += 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/Esound/GNUmakefile Cynthiune-0.9.5/Bundles/Esound/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/Esound/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/Esound/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=Esound
- BUNDLE_NAME=Esound
- BUNDLE_EXTENSION=.output
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- Esound_PRINCIPAL_CLASS=Esound
- Esound_LANGUAGES=English French
- Esound_LOCALIZED_RESOURCE_FILES=Localizable.strings
-diff -Naur Cynthiune-0.9.5.orig/Bundles/FLAC/GNUmakefile Cynthiune-0.9.5/Bundles/FLAC/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/FLAC/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/FLAC/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=FLAC
- BUNDLE_NAME=FLAC
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- FLAC_PRINCIPAL_CLASS=FLAC
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/FLACTags/GNUmakefile Cynthiune-0.9.5/Bundles/FLACTags/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/FLACTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/FLACTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=FLACTags
- BUNDLE_NAME=FLACTags
- BUNDLE_EXTENSION=.tags
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- FLACTags_PRINCIPAL_CLASS=FLACTags
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/FormatSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/FormatSkeleton/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/FormatSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/FormatSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=$FORMAT$
- BUNDLE_NAME=$FORMAT$
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- $FORMAT$_PRINCIPAL_CLASS=$FORMAT$
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/GraphWriter/GNUmakefile Cynthiune-0.9.5/Bundles/GraphWriter/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/GraphWriter/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/GraphWriter/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=GraphWriter
- BUNDLE_NAME=GraphWriter
- BUNDLE_EXTENSION=.output
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- GraphWriter_PRINCIPAL_CLASS=GraphWriter
- GraphWriter_LANGUAGES=
- GraphWriter_LOCALIZED_RESOURCE_FILES=
-diff -Naur Cynthiune-0.9.5.orig/Bundles/ID3Tag/GNUmakefile Cynthiune-0.9.5/Bundles/ID3Tag/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/ID3Tag/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/ID3Tag/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=ID3Tag
- BUNDLE_NAME=ID3Tag
- BUNDLE_EXTENSION=.tags
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- ID3Tag_PRINCIPAL_CLASS=ID3Tag
- 
- #
-diff -Naur Cynthiune-0.9.5.orig/Bundles/Mod/GNUmakefile Cynthiune-0.9.5/Bundles/Mod/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/Mod/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/Mod/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=Mod
- BUNDLE_NAME=Mod
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- Mod_PRINCIPAL_CLASS=Mod
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/MP3/GNUmakefile Cynthiune-0.9.5/Bundles/MP3/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/MP3/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/MP3/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=MP3
- BUNDLE_NAME=MP3
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- MP3_PRINCIPAL_CLASS=MP3
- 
- #
-diff -Naur Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/Musepack/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/Musepack/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -28,7 +28,7 @@
- PACKAGE_NAME=Musepack
- BUNDLE_NAME=Musepack
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- Musepack_PRINCIPAL_CLASS=Musepack
- 
- #
-diff -Naur Cynthiune-0.9.5.orig/Bundles/Ogg/GNUmakefile Cynthiune-0.9.5/Bundles/Ogg/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/Ogg/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/Ogg/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=Ogg
- BUNDLE_NAME=Ogg
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- Ogg_PRINCIPAL_CLASS=Ogg
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/OSS/GNUmakefile Cynthiune-0.9.5/Bundles/OSS/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/OSS/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/OSS/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=OSS
- BUNDLE_NAME=OSS
- BUNDLE_EXTENSION=.output
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- OSS_PRINCIPAL_CLASS=OSS
- OSS_LANGUAGES=English French
- OSS_LOCALIZED_RESOURCE_FILES=Localizable.strings
-diff -Naur Cynthiune-0.9.5.orig/Bundles/OutputSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/OutputSkeleton/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/OutputSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/OutputSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=$OUTPUT$
- BUNDLE_NAME=$OUTPUT$
- BUNDLE_EXTENSION=.output
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- $OUTPUT$_PRINCIPAL_CLASS=$OUTPUT$
- $OUTPUT$_LANGUAGES=
- $OUTPUT$_LOCALIZED_RESOURCE_FILES=
-diff -Naur Cynthiune-0.9.5.orig/Bundles/Taglib/GNUmakefile Cynthiune-0.9.5/Bundles/Taglib/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/Taglib/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/Taglib/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=Taglib
- BUNDLE_NAME=Taglib
- BUNDLE_EXTENSION=.tags
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- Taglib_PRINCIPAL_CLASS=Taglib
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/TagsSkeleton/GNUmakefile Cynthiune-0.9.5/Bundles/TagsSkeleton/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/TagsSkeleton/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/TagsSkeleton/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=$TAGS$
- BUNDLE_NAME=$TAGS$
- BUNDLE_EXTENSION=.tags
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- $TAGS$_PRINCIPAL_CLASS=$TAGS$
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/Timidity/GNUmakefile Cynthiune-0.9.5/Bundles/Timidity/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/Timidity/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/Timidity/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=Timidity
- BUNDLE_NAME=Timidity
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- Timidity_PRINCIPAL_CLASS=Timidity
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/VorbisTags/GNUmakefile Cynthiune-0.9.5/Bundles/VorbisTags/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/VorbisTags/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/VorbisTags/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=VorbisTags
- BUNDLE_NAME=VorbisTags
- BUNDLE_EXTENSION=.tags
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- VorbisTags_PRINCIPAL_CLASS=VorbisTags
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/WaveOut/GNUmakefile Cynthiune-0.9.5/Bundles/WaveOut/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/WaveOut/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/WaveOut/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=WaveOut
- BUNDLE_NAME=WaveOut
- BUNDLE_EXTENSION=.output
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- WaveOut_PRINCIPAL_CLASS=WaveOut
- WaveOut_LANGUAGES=
- WaveOut_LOCALIZED_RESOURCE_FILES=
-diff -Naur Cynthiune-0.9.5.orig/Bundles/WindowsMedia/GNUmakefile Cynthiune-0.9.5/Bundles/WindowsMedia/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/WindowsMedia/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/WindowsMedia/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=WindowsMedia
- BUNDLE_NAME=WindowsMedia
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- WindowsMedia_PRINCIPAL_CLASS=WindowsMedia
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/Bundles/XMMSInput/GNUmakefile Cynthiune-0.9.5/Bundles/XMMSInput/GNUmakefile
---- Cynthiune-0.9.5.orig/Bundles/XMMSInput/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/Bundles/XMMSInput/GNUmakefile	2007-07-01 23:35:40.000000000 +0200
-@@ -35,7 +35,7 @@
- PACKAGE_NAME=XMMSInput
- BUNDLE_NAME=XMMSInput
- BUNDLE_EXTENSION=.format
--BUNDLE_INSTALL_DIR=$(GNUSTEP_INSTALLATION_DIR)/Library/Cynthiune
-+BUNDLE_INSTALL_DIR=$(DESTDIR)/$(GNUSTEP_SYSTEM_LIBRARY)/Cynthiune
- XMMSInput_PRINCIPAL_CLASS=XMMSInput
- 
- 
-diff -Naur Cynthiune-0.9.5.orig/GNUmakefile Cynthiune-0.9.5/GNUmakefile
---- Cynthiune-0.9.5.orig/GNUmakefile	2007-07-01 23:33:59.000000000 +0200
-+++ Cynthiune-0.9.5/GNUmakefile	2007-07-01 23:34:07.000000000 +0200
-@@ -22,8 +22,6 @@
- 
- include $(GNUSTEP_MAKEFILES)/common.make
- 
--GNUSTEP_INSTALLATION_DIR=$(GNUSTEP_LOCAL_ROOT)/
--
- FRAMEWORKS_DIRS = Frameworks/Cynthiune
- FRAMEWORKS = Cynthiune
- 
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdec.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdec.patch
deleted file mode 100644
index 1c89f4b4f86b..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-libmpcdec.patch
+++ /dev/null
@@ -1,310 +0,0 @@
-2009-05-19  Yavor Doganov  <yavor@gnu.org>
-
-	* Bundsles/Musepack/CNSFileHandle.h: Import <mpc/reader.h>.
-	(CNSFileHandleRetain, CNSFileHandleRelease): Remove prototypes.
-	(CNSFileHandleRead, CNSFileHandleTell, CNSFileHandleCanSeek)
-	(CNSFileHandleSeek, CNSFileHandleGetSize): Accept mpc_reader
-	type as first argument.
-	* Bundles/Musepack/CNSFileHandle.m (CNSFileHandleRetain)
-	(CNSFileHandleRelease): Delete; unused.
-	(CNSFileHandleRead, CNSFileHandleTell, CNSFileHandleCanSeek)
-	(CNSFileHandleSeek, CNSFileHandleGetSize): Adjust for the new
-	mpc_reader type.
-	* Bundles/Musepack/Musepack.h <mpcDecoder>: Declare of
-	mpc_demux type.
-	* Bundles/Musepack/Musepack.m: Import <mpc/mpcdec.h>.
-	(MPCReaderDelete): Use `mpc_reader_exit_stdio' instead of
-	`free'.
-	(MPCStreamInfoNew): Don't call `mpc_streaminfo_init'.
-	(MPCDecoderNew): Remove function.
-	([Musepack -streamOpen]): Initialize the decoder with the new
-	API function `mpc_demux_init'.
-	([Musepack +streamTestOpen]): Likewise.
-	([Musepack -readNextChunk:withSize:]): Adjust to use
-	`mpc_demux_decode'.
-	<frame, err>: New local variables.
-	<vbrAcc, vbrBits>: Remove.
-	([Musepack -readDuration]): Use `mpc_streaminfo_get_length' to
-	obtain the duration and return its result casted to unsigned int.
-	([Musepack -streamClose]): Use `mpc_demux_exit' as appropriate.
-	([Musepack +acceptedFileExtensions]): Recognize `.mpp'.
-	([Musepack -seek]): Use `mpc_demux_seek_second'.
-
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/CNSFileHandle.h
-+++ cynthiune.app-0.9.5/Bundles/Musepack/CNSFileHandle.h
-@@ -23,20 +23,17 @@
- #ifndef CNSFILEHANDLE_H
- #define CNSFILEHANDLE_H
- 
--#include <mpcdec/config_types.h>
-+#import <mpc/reader.h>
- 
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
- 
--void CNSFileHandleRetain (void *fileHandle);
--void CNSFileHandleRelease (void *fileHandle);
--
--int CNSFileHandleRead (void *fileHandle, void *ptr, int size);
--int CNSFileHandleTell (void *fileHandle);
--mpc_bool_t CNSFileHandleCanSeek (void *fileHandle);
--mpc_bool_t CNSFileHandleSeek (void *fileHandle, int offset);
--int CNSFileHandleGetSize (void *fileHandle);
-+int CNSFileHandleRead (mpc_reader *fileHandle, void *ptr, int size);
-+int CNSFileHandleTell (mpc_reader *fileHandle);
-+mpc_bool_t CNSFileHandleCanSeek (mpc_reader *fileHandle);
-+mpc_bool_t CNSFileHandleSeek (mpc_reader *fileHandle, int offset);
-+int CNSFileHandleGetSize (mpc_reader *fileHandle);
- 
- #ifdef __cplusplus
- }
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/CNSFileHandle.m
-+++ cynthiune.app-0.9.5/Bundles/Musepack/CNSFileHandle.m
-@@ -26,57 +26,45 @@
- 
- #import "CNSFileHandle.h"
- 
--void
--CNSFileHandleRetain (void *fileHandle)
--{
--  [(NSFileHandle *) fileHandle retain];
--}
--
--void
--CNSFileHandleRelease (void *fileHandle)
--{
--  [(NSFileHandle *) fileHandle release];
--}
--
- int
--CNSFileHandleRead (void *fileHandle, void *ptr, int size)
-+CNSFileHandleRead (mpc_reader *fileHandle, void *ptr, int size)
- {
-   NSData *data;
- 
--  data = [(NSFileHandle *) fileHandle readDataOfLength: size];
-+  data = [(NSFileHandle *) fileHandle->data readDataOfLength: size];
-   [data getBytes: ptr];
- 
-   return [data length];
- }
- 
- int
--CNSFileHandleTell (void *fileHandle)
-+CNSFileHandleTell (mpc_reader *fileHandle)
- {
--  return [(NSFileHandle *) fileHandle offsetInFile];
-+  return [(NSFileHandle *) fileHandle->data offsetInFile];
- }
- 
- mpc_bool_t
--CNSFileHandleCanSeek (void *fileHandle)
-+CNSFileHandleCanSeek (mpc_reader *fileHandle)
- {
-   return YES;
- }
- 
- mpc_bool_t
--CNSFileHandleSeek (void *fileHandle, int offset)
-+CNSFileHandleSeek (mpc_reader *fileHandle, int offset)
- {
--  [(NSFileHandle *) fileHandle seekToFileOffset: (long long) offset];
-+  [(NSFileHandle *) fileHandle->data seekToFileOffset: (long long) offset];
- 
-   return YES;
- }
- 
- int
--CNSFileHandleGetSize (void *fileHandle)
-+CNSFileHandleGetSize (mpc_reader *fileHandle)
- {
-   int size, where;
- 
--  where = [(NSFileHandle *) fileHandle offsetInFile];
--  size = [(NSFileHandle *) fileHandle seekToEndOfFile];
--  [(NSFileHandle *) fileHandle seekToFileOffset: (long long) where];
-+  where = [(NSFileHandle *) fileHandle->data offsetInFile];
-+  size = [(NSFileHandle *) fileHandle->data seekToEndOfFile];
-+  [(NSFileHandle *) fileHandle->data seekToFileOffset: (long long) where];
- 
-   return size;
- }
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/Musepack.h
-+++ cynthiune.app-0.9.5/Bundles/Musepack/Musepack.h
-@@ -31,7 +31,7 @@
- 
-   mpc_reader *mpcReader;
-   mpc_streaminfo *mpcStreamInfo;
--  mpc_decoder *mpcDecoder;
-+  mpc_demux *mpcDecoder;
- 
-   MPC_SAMPLE_FORMAT sampleBuffer[maxSamples];
-   unsigned char frameBuffer[maxSamples * 4];
---- cynthiune.app-0.9.5.orig/Bundles/Musepack/Musepack.m
-+++ cynthiune.app-0.9.5/Bundles/Musepack/Musepack.m
-@@ -30,7 +30,7 @@
- #import <Cynthiune/Format.h>
- #import <Cynthiune/utils.h>
- 
--#import <mpcdec/mpcdec.h>
-+#import <mpc/mpcdec.h>
- 
- #import "Musepack.h"
- #import "CNSFileHandle.h"
-@@ -75,7 +75,7 @@
- MPCReaderDelete (mpc_reader *reader)
- {
-   [(NSFileHandle *) reader->data release];
--  free (reader);
-+  mpc_reader_exit_stdio (reader);
- }
- 
- static mpc_streaminfo *
-@@ -84,23 +84,10 @@
-   mpc_streaminfo *streamInfo;
- 
-   streamInfo = malloc (sizeof (mpc_streaminfo));
--  mpc_streaminfo_init (streamInfo);
- 
-   return streamInfo;
- }
- 
--static mpc_decoder *
--MPCDecoderNew (mpc_reader *reader, mpc_streaminfo *streamInfo)
--{
--  mpc_decoder *decoder;
--
--  decoder = malloc (sizeof (mpc_decoder));
--  mpc_decoder_setup (decoder, reader);
--  mpc_decoder_initialize (decoder, streamInfo);
--
--  return decoder;
--}
--
- static inline void
- CopyBuffer (const MPC_SAMPLE_FORMAT *buffer, unsigned char *destBuffer,
-             unsigned int length)
-@@ -173,10 +160,13 @@
-     {
-       [fileHandle retain];
-       mpcReader = MPCReaderNew (fileHandle);
-+      if (!mpcReader)
-+      	return MPC_FALSE;
-       mpcStreamInfo = MPCStreamInfoNew ();
--      mpc_streaminfo_read (mpcStreamInfo, mpcReader);
--
--      mpcDecoder = MPCDecoderNew (mpcReader, mpcStreamInfo);
-+      mpcDecoder = mpc_demux_init (mpcReader);
-+      if (!mpcDecoder)
-+ 	return MPC_FALSE;
-+      mpc_demux_get_info (mpcDecoder, mpcStreamInfo);
- 
-       result = YES;
-     }
-@@ -196,6 +186,7 @@
-   NSFileHandle *testFileHandle;
-   mpc_reader *testReader;
-   mpc_streaminfo *testStreamInfo;
-+  mpc_demux *testDecoder;
-   BOOL result;
- 
-   testFileHandle = [NSFileHandle fileHandleForReadingAtPath: fileName];
-@@ -203,9 +194,14 @@
-     {
-       testReader = MPCReaderNew (testFileHandle);
-       testStreamInfo = MPCStreamInfoNew ();
--      result = !mpc_streaminfo_read (testStreamInfo, testReader);
--      free (testStreamInfo);
--      MPCReaderDelete (testReader);
-+      testDecoder = mpc_demux_init (testReader);
-+      if (testDecoder)
-+	{
-+	  result = YES;
-+	  mpc_demux_exit (testDecoder);
-+	}
-+      if (testReader)
-+	MPCReaderDelete (testReader);
-     }
-   else
-     result = NO;
-@@ -222,21 +218,29 @@
- 	     withSize: (unsigned int) bufferSize
- {
-   int bytes, status;
--  unsigned int vbrAcc, vbrBits;
-+  mpc_frame_info frame;
-+  mpc_status err;
-   unsigned long frames, samples;
- 
-   status = 1;
-+  frame.buffer = sampleBuffer;
- 
--  if (!remaining)
-+  while (!remaining)
-     {
--      samples = mpc_decoder_decode (mpcDecoder, sampleBuffer,
--                                    &vbrAcc, &vbrBits);
--      if (!samples)
--        status = 0;
--      else if (samples == (unsigned long) -1)
--        status = -1;
-+      err = mpc_demux_decode (mpcDecoder, &frame);
-+      if (err != MPC_STATUS_OK)
-+	{
-+	  status = -1;
-+	  break;
-+	}
-+      else if (frame.bits == -1)
-+	{
-+	  status = 0;
-+	  break;
-+	}
-       else
-         {
-+	   samples = frame.samples;
-           frames = samples * mpcStreamInfo->channels;
-           CopyBuffer (sampleBuffer, frameBuffer, frames);
-           remaining = frames * 2;
-@@ -277,7 +281,7 @@
- 
- - (unsigned int) readDuration
- {
--  return mpcStreamInfo->pcm_samples / mpcStreamInfo->sample_freq;
-+  return (unsigned int) mpc_streaminfo_get_length (mpcStreamInfo);
- }
- 
- - (void) streamClose
-@@ -287,12 +291,10 @@
-       [fileHandle closeFile];
-       [fileHandle release];
-     }
-+  if (mpcDecoder)
-+    mpc_demux_exit (mpcDecoder);
-   if (mpcReader)
-     MPCReaderDelete (mpcReader);
--  if (mpcStreamInfo)
--    free (mpcStreamInfo);
--  if (mpcDecoder)
--    free (mpcDecoder);
- 
-   [self _resetIVars];
- }
-@@ -300,7 +302,7 @@
- // Player Protocol
- + (NSArray *) acceptedFileExtensions
- {
--  return [NSArray arrayWithObjects: @"mpc", @"mp+", nil];
-+  return [NSArray arrayWithObjects: @"mpc", @"mp+", @"mpp", nil];
- }
- 
- - (BOOL) isSeekable
-@@ -310,7 +312,7 @@
- 
- - (void) seek: (unsigned int) aPos
- {
--  mpc_decoder_seek_seconds (mpcDecoder, (double) aPos);
-+  mpc_demux_seek_second (mpcDecoder, (double) aPos);
- }
- 
- @end
diff --git a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch b/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch
deleted file mode 100644
index 342d65a6ab42..000000000000
--- a/gnustep-apps/cynthiune/files/cynthiune-0.9.5-set-macro.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
-+++ Cynthiune-0.9.5/Bundles/FLACTags/FLACTags.m
-@@ -72,7 +72,9 @@
-       value = equalsign + 1;
-       position = keyPositionInArray (key);
-       if (position > -1)
--        SET (*arrayOfValues[position], [NSString stringWithUTF8String: value]);
-+        {
-+          SET (*arrayOfValues[position], [NSString stringWithUTF8String: value]);
-+        }
-     }
-   free (key);
- }
---- Cynthiune-0.9.5/Bundles/VorbisTags/VorbisTags.m
-+++ Cynthiune-0.9.5/Bundles/VorbisTags/VorbisTags.m
-@@ -150,7 +150,9 @@
-         }
-       
-       if (cComment)
--        SET (*string, [NSString stringWithUTF8String: cComment]);
-+        {
-+          SET (*string, [NSString stringWithUTF8String: cComment]);
-+        }
-     }
- }
- 
---- Cynthiune-0.9.5/Bundles/XMMSInput/XMMSInput.m
-+++ Cynthiune-0.9.5/Bundles/XMMSInput/XMMSInput.m
-@@ -329,7 +329,9 @@
- //   inputPlugin->output->open_audio (FMT_S16_LE,44100, 2);
-   result = (inputPlugin->is_our_file (name) == 1);
-   if (result)
--    SET (filename, fileName);
-+    {
-+      SET (filename, fileName);
-+    }
- 
-   return result;
- }