Browse Source

gix macOS SDK 14+ builds

Bill Gianopoulos 1 year ago
parent
commit
82306af09c

+ 46 - 0
mozilla-central/patches/9999999-smlib-build-bustage.patch

@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
+# Date 1696258608 0
+Bug 9999999 - Fix smlib build bustage.
+
+diff --git a/hal/cocoa/smslib.mm b/hal/cocoa/smslib.mm
+--- a/hal/cocoa/smslib.mm
++++ b/hal/cocoa/smslib.mm
+@@ -568,17 +568,17 @@ void smsGetBufferData(char* buffer) {
+   kern_return_t result;
+ 
+   if (debugging || running == NO) {
+     return;
+   }
+ 
+   memset(iRecord, 1, iSize);
+   memset(buffer, 0, oSize);
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
++#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+   const size_t InStructSize = recordSize;
+   size_t OutStructSize = recordSize;
+   result = IOConnectCallStructMethod(connection,
+                                      function,  // magic kernel function number
+                                      (const void*)iRecord, InStructSize,
+                                      (void*)buffer, &OutStructSize);
+ #else   // __MAC_OS_X_VERSION_MIN_REQUIRED 1050
+   result = IOConnectMethodStructureIStructureO(
+@@ -779,17 +779,17 @@ int getData(sms_acceleration* accel, int
+   }
+ 
+   memset(iRecord, 1, iSize);
+   memset(oRecord, 0, oSize);
+ 
+   LOG_2ARG(@"    Querying device (%u, %d): ", sensors[sensorNum].function,
+            sensors[sensorNum].recordSize);
+ 
+-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
++#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+   const size_t InStructSize = recordSize;
+   size_t OutStructSize = recordSize;
+   result = IOConnectCallStructMethod(connection,
+                                      function,  // magic kernel function number
+                                      (const void*)iRecord, InStructSize,
+                                      (void*)oRecord, &OutStructSize);
+ #else   // __MAC_OS_X_VERSION_MIN_REQUIRED 1050
+   result = IOConnectMethodStructureIStructureO(

+ 1 - 0
mozilla-central/patches/series

@@ -1,2 +1,3 @@
+9999999-smlib-build-bustage.patch
 9999999-NSSgetentropy.patch
 9999999-NSSgetentropy.patch
 1807834-respect-dmg-hfs-env.patch
 1807834-respect-dmg-hfs-env.patch