[neon/3rdparty/indi/Neon/release] debian: update the patches

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


Git commit 85421f90a1495327474fd5c9ce767b28bcdd3e88 by Pino Toscano.
Committed on 12/01/2021 at 09:08.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- path_max.diff: drop, no more needed now
- macos_detection.diff: drop, fixed upstream

M  +3    -0    debian/changelog
D  +0    -18   debian/patches/macos_detection.diff
D  +0    -72   debian/patches/path_max.diff
M  +0    -2    debian/patches/series

https://invent.kde.org/neon/3rdparty/indi/commit/85421f90a1495327474fd5c9ce767b28bcdd3e88

diff --git a/debian/changelog b/debian/changelog
index 6e264d9..93000b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ indi (1.8.8+dfsg-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - path_max.diff: drop, no more needed now
+    - macos_detection.diff: drop, fixed upstream
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Tue, 12 Jan 2021 10:05:49 +0100
 
diff --git a/debian/patches/macos_detection.diff b/debian/patches/macos_detection.diff
deleted file mode 100644
index 961d71d..0000000
--- a/debian/patches/macos_detection.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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/path_max.diff b/debian/patches/path_max.diff
deleted file mode 100644
index a1e107d..0000000
--- a/debian/patches/path_max.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Workaround PATH_MAX usages
- Workaround the unconditional usage of PATH_MAX, by providing a fallback value
- for it.
-Last-Update: 2019-02-28
-Forwarded: no
-
---- a/libs/indibase/indiccd.cpp
-+++ b/libs/indibase/indiccd.cpp
-@@ -51,6 +51,10 @@
- #include <zlib.h>
- #include <sys/stat.h>
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- const char * IMAGE_SETTINGS_TAB = "Image Settings";
- const char * IMAGE_INFO_TAB     = "Image Info";
- const char * GUIDE_HEAD_TAB     = "Guider Head";
---- a/libs/indibase/indilogger.cpp
-+++ b/libs/indibase/indilogger.cpp
-@@ -27,6 +27,10 @@
- #include <cstring>
- #include <sys/stat.h>
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- namespace INDI
- {
- char Logger::Tags[Logger::nlevels][MAXINDINAME] = { "ERROR",       "WARNING",     "INFO",        "DEBUG",
---- a/libs/indibase/indidetector.cpp
-+++ b/libs/indibase/indidetector.cpp
-@@ -1,6 +1,10 @@
- /*******************************************************************************
-  Copyright(c) 2010, 2017 Ilia Platone, Jasem Mutlaq. All rights reserved.
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- 
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
---- a/libs/indibase/dsp/dspinterface.cpp
-+++ b/libs/indibase/dsp/dspinterface.cpp
-@@ -45,6 +45,10 @@
- #include <unistd.h>
- #include <fcntl.h>
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- // Create dir recursively
- static int _det_mkdir(const char *dir, mode_t mode)
- {
---- a/libs/indibase/indisensorinterface.cpp
-+++ b/libs/indibase/indisensorinterface.cpp
-@@ -42,6 +42,10 @@
- #include <zlib.h>
- #include <sys/stat.h>
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- // Create dir recursively
- static int _det_mkdir(const char *dir, mode_t mode)
- {
diff --git a/debian/patches/series b/debian/patches/series
index c2d3f2d..ae2e929 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-path_max.diff
 hurd_include.diff
-macos_detection.diff



More information about the Neon-commits mailing list