[neon/3rdparty/indi/Neon/release] debian: fix macOS detection

Pino Toscano null at kde.org
Wed Nov 17 11:15:56 GMT 2021


Git commit 62fafcea63c30ed7ecc6f37fa0a03378c7fbdcdc by Pino Toscano.
Committed on 23/11/2020 at 09:54.
Pushed by jriddell into branch 'Neon/release'.

fix macOS detection

M  +1    -0    debian/changelog
A  +18   -0    debian/patches/macos_detection.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/3rdparty/indi/commit/62fafcea63c30ed7ecc6f37fa0a03378c7fbdcdc

diff --git a/debian/changelog b/debian/changelog
index 7acdeb5..6a231e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ indi (1.8.7+dfsg-0r1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.5.1, no changes required.
   * Update the patches:
     - hurd_include.diff: refresh
+  * Fix the macOS detection; patch macos_detection.diff.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Mon, 23 Nov 2020 10:49:29 +0100
 
diff --git a/debian/patches/macos_detection.diff b/debian/patches/macos_detection.diff
new file mode 100644
index 0000000..961d71d
--- /dev/null
+++ b/debian/patches/macos_detection.diff
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix macOS detection
+ Use __APPLE__ to detect whether the OS is macOS instead of __MACH__;
+ __MACH__ matches also the Mach microkernel of GNU/Hurd.
+Forwarded: no
+Last-Update: 2020-11-23
+
+--- a/libs/indicom.c
++++ b/libs/indicom.c
+@@ -326,7 +326,7 @@ void IDLog(const char *fmt, ...)
+ double time_ns()
+ {
+     struct timespec ts;
+-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
++#ifdef __APPLE__ // OS X does not have clock_gettime, use clock_get_time
+     clock_serv_t cclock;
+     mach_timespec_t mts;
+     host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
diff --git a/debian/patches/series b/debian/patches/series
index 436acac..c2d3f2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 path_max.diff
 hurd_include.diff
+macos_detection.diff



More information about the Neon-commits mailing list