Merge pull request #2594 from andydotxyz/fix/2478

'Fix' the Sierra build error by adding -tags legacy
fyne-io · Oct 31, 2021 · 729a478 · 729a478
2 parents 5ace18d + b757268
commit 729a478
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/app/app_darwin.go b/app/app_darwin.go
@@ -4,7 +4,7 @@ package app
 
 /*
 #cgo CFLAGS: -x objective-c
-#cgo LDFLAGS: -framework Foundation -framework UserNotifications
+#cgo LDFLAGS: -framework Foundation
 
 #include <stdbool.h>
 #include <stdlib.h>

diff --git a/app/app_darwin.m b/app/app_darwin.m
@@ -1,11 +1,19 @@
 // +build !ci
 
+#import <Foundation/Foundation.h>
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 #import <UserNotifications/UserNotifications.h>
+#endif
 
 static int notifyNum = 0;
 
 extern void fallbackSend(char *cTitle, char *cBody);
 
+bool isBundled() {
+    return [[NSBundle mainBundle] bundleIdentifier] != nil;
+}
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
 void doSendNotification(UNUserNotificationCenter *center, NSString *title, NSString *body) {
     UNMutableNotificationContent *content = [UNMutableNotificationContent new];
     [content autorelease];
@@ -24,10 +32,6 @@ void doSendNotification(UNUserNotificationCenter *center, NSString *title, NSStr
     }];
 }
 
-bool isBundled() {
-    return [[NSBundle mainBundle] bundleIdentifier] != nil;
-}
-
 void sendNotification(char *cTitle, char *cBody) {
     UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
     NSString *title = [NSString stringWithUTF8String:cTitle];
@@ -49,3 +53,8 @@ void sendNotification(char *cTitle, char *cBody) {
             }
         }];
 }
+#else
+void sendNotification(char *cTitle, char *cBody) {
+	fallbackSend(cTitle, cBody);
+}
+#endif
diff --git a/app/app_notlegacy_darwin.go b/app/app_notlegacy_darwin.go
@@ -0,0 +1,9 @@
+// +build !ci
+// +build !legacy
+
+package app
+
+/*
+#cgo LDFLAGS: -framework Foundation -framework UserNotifications
+*/
+import "C"
diff --git a/internal/driver/glfw/menu_darwin.m b/internal/driver/glfw/menu_darwin.m
@@ -9,8 +9,8 @@
 NSControlStateValue STATE_ON = NSControlStateValueOn;
 NSControlStateValue STATE_OFF = NSControlStateValueOff;
 #else
-NSControlStateValue STATE_ON = NSOnState;
-NSControlStateValue STATE_OFF = NSOffState;
+NSCellStateValue STATE_ON = NSOnState;
+NSCellStateValue STATE_OFF = NSOffState;
 #endif