Merge ~liushuyu-011/ubuntu/+source/kbd:ubuntu/devel into ubuntu/+source/kbd:ubuntu/devel

[Zixing Liu]

This merge proposal fixes kbd build with GCC 14 due to missing C standard library headers.

[Vladimir Petko (vpa1977)]

- Please add the ftbfs bug and reference it in the patch/changelog
- Please forward the patch upstream and update the header.
- Please run quilt refresh on the patch.

review: Needs Fixing

[Zixing Liu (liushuyu-011)]

> - Please run quilt refresh on the patch.

$ quilt refresh
Patch debian/patches/Add-missing-headers.patch is unchanged

> - Please forward the patch upstream and update the header.

Now using upstream patch (the same change).

[Vladimir Petko (vpa1977)]

$ quilt --version
0.67
$quilt refresh
Refreshed patch Add-missing-headers.patch
$ git diff debian/patches/Add-missing-headers.patch
diff --git a/debian/patches/Add-missing-headers.patch b/debian/patches/Add-missing-headers.patch
index df8e073..8e2309c 100644
--- a/debian/patches/Add-missing-headers.patch
+++ b/debian/patches/Add-missing-headers.patch
@@ -3,10 +3,8 @@ Author: Andreas Henriksson <email address hidden>
 Origin: upstream, https://github.com/legionus/kbd/commit/d8ba05d190db2b4e410993ea241fcdc28e0128a2
 Last-Update: 2024-09-19
 ---
-Index: kbd/contrib/splitfont.c
-===================================================================
---- kbd.orig/contrib/splitfont.c
-+++ kbd/contrib/splitfont.c
+--- a/contrib/splitfont.c
++++ b/contrib/splitfont.c
 @@ -5,6 +5,8 @@
  #include <fcntl.h>
  #include <unistd.h>

[Vladimir Petko (vpa1977)]

Ran quilt refresh before upload.

Uploaded, Thank you.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 3807d24..c5ce0d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kbd (2.6.4-2ubuntu3) oracular; urgency=medium
+
+  * d/p/Add-missing-headers.patch: add a patch to fix FTBFS with GCC 14
+    (LP: #2081329).
+
+ -- Zixing Liu <[e-mail]>  Thu, 19 Sep 2024 11:27:01 -0600
+
 kbd (2.6.4-2ubuntu2) noble; urgency=medium
 
   * No-change rebuild for CVE-2024-3094
diff --git a/debian/patches/Add-missing-headers.patch b/debian/patches/Add-missing-headers.patch
new file mode 100644
index 0000000..df8e073
--- /dev/null
+++ b/debian/patches/Add-missing-headers.patch
@@ -0,0 +1,18 @@
+Description: Add missing headers to fix GCC 14 build
+Author: Andreas Henriksson <[e-mail]>
+Origin: upstream, https://github.com/legionus/kbd/commit/d8ba05d190db2b4e410993ea241fcdc28e0128a2
+Last-Update: 2024-09-19
+---
+Index: kbd/contrib/splitfont.c
+===================================================================
+--- kbd.orig/contrib/splitfont.c
++++ kbd/contrib/splitfont.c
+@@ -5,6 +5,8 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
++#include <string.h>
++#include <stdlib.h>
+ 
+ void dosplit(int from, int to, char *fontbuf, int size, char *fontfile)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index e03c21e..3d3e5d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Support-KT_DEAD2-diacritics.patch
 
 loadkeys_find_usable_console.diff
 loadkeys_ckbcomp.diff
+Add-missing-headers.patch