treewide: remove old patches for macOS

These shouldn’t be needed now that we are on macOS 10.12.
2019-04-26 21:54:32 -04:00
parent 5fad67d361
commit 0fe315c9b6
33 changed files with 22 additions and 1198 deletions
@@ -1,64 +0,0 @@
--- a/garglk/fontmac.m
-+++ b/garglk/fontmac.m
-@@ -167,7 +167,7 @@ static void propfont(char *file, int style)
-     }
- }
- 
-static NSMutableArray<NSURL *> * gli_registered_fonts = nil;
-+static NSMutableArray * gli_registered_fonts = nil;
- static NSDistributedLock * gli_font_lock = nil;
- 
- void fontreplace(char *font, int type)
-@@ -181,7 +181,7 @@ void fontreplace(char *font, int type)
-     NSFontDescriptor * fontFamilyDescriptor =
-         [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily];
- 
-    NSArray<NSFontDescriptor *> * fontMatches =
-+    NSArray * fontMatches =
-         [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil];
- 
-     for (NSFontDescriptor * sysfont in fontMatches)
-@@ -259,7 +259,7 @@ void fontload(void)
- 
-     // obtain a list of all files in the Fonts directory
-     NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"];
-    NSArray<NSString *> * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
-+    NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
- 
-     // create a collection to hold the registered font URLs
-     gli_registered_fonts = [NSMutableArray new];
--- a/garglk/launchmac.m
-+++ b/garglk/launchmac.m
-@@ -556,7 +556,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
-                          <GargoyleApp, NSApplicationDelegate, NSWindowDelegate>
- {
-     BOOL openedFirstGame;
-    NSMutableDictionary<NSNumber *, GargoyleWindow *> * windows;
-+    NSMutableDictionary * windows;
-     NSConnection * link;
- }
- - (BOOL) launchFile: (NSString *) file;
--- a/garglk/ttsmac.m
-+++ b/garglk/ttsmac.m
-@@ -30,7 +30,7 @@
- #import "sysmac.h"
- 
- // a queue of phrases to feed to the speech synthesizer
-static NSMutableArray<NSString *> * phraseQueue = nil;
-+static NSMutableArray * phraseQueue = nil;
- static NSRange purgeRange;
- 
- @interface SpeechDelegate : NSObject <NSSpeechSynthesizerDelegate>
-@@ -96,10 +96,10 @@ void gli_initialize_tts(void)
-             NSString * lang = [NSString stringWithCString: gli_conf_speak_language
-                                                  encoding: NSUTF8StringEncoding];
- 
-            NSArray<NSString *> * voices = [NSSpeechSynthesizer availableVoices];
-+            NSArray * voices = [NSSpeechSynthesizer availableVoices];
-             for (NSString * voice in voices)
-             {
-                NSDictionary<NSString *, id> * attr = [NSSpeechSynthesizer attributesForVoice: voice];
-+                NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice];
-                 if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]])
-                 {
-                     [synth setVoice: voice];
@@ -34,8 +34,6 @@ stdenv.mkDerivation {
  buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
    ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ];

-  patches = [ ./darwin.patch ];
-
  buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";

  installPhase =