cherry-pick patch to fix FTBFS

diff --git a/debian/changelog b/debian/changelog
index 2a5a1b57d0eaf1dec20ea973212c24e49cb2714c..e3222a5bd2fb3af400201a75324fa2ccee7f9188 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+altos (1.9.19-2) unstable; urgency=medium
+
+  * cherry-pick patch from master branch that fixes FTBFS due to needing
+    another include, closes: #1082677 
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 26 Sep 2024 11:08:46 -0600
+
 altos (1.9.19-1) unstable; urgency=medium
 
   [ Bdale Garbee ]

diff --git a/debian/patches/more-includes.patch b/debian/patches/more-includes.patch
new file mode 100644 (file)
index 0000000..3977652
--- /dev/null
+++ b/debian/patches/more-includes.patch
@@ -0,0 +1,34 @@
+From 9694440cd501a9b170fec7c85fe57f1e4fe749b3 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Thu, 26 Sep 2024 08:23:48 -0700
+Subject: [PATCH] src: Add more includes to ao.h
+
+This makes sure altos has all of the C library definitions it needs
+rather than on relying on the C library to expose more than POSIX
+says it should.
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+ src/kernel/ao.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/kernel/ao.h b/src/kernel/ao.h
+index b3f780f5c..0437cb07f 100644
+--- a/src/kernel/ao.h
++++ b/src/kernel/ao.h
+@@ -19,10 +19,11 @@
+ #ifndef _AO_H_
+ #define _AO_H_
+ 
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <stddef.h>
++#include <stdarg.h>
+ #include <stdbool.h>
+ #include <ao_pins.h>
+ #include <ao_arch.h>
+-- 
+2.45.2
+

diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..6f2a8a22d0f11686793c8893f3be7d3df9958a0e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+more-includes.patch