diff options
| author |   Unit 193 <unit193@unit193.net> | 2023-07-14 00:20:22 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2023-07-14 00:20:22 -0400 |
| commit | 7220ab33176da380c4bb6315dc5c39a36b5ddd68 (patch) | |
| tree | cfd8309ade5d421ff9801641fc16142ea52fe8f4 | |
| parent | 517363f51610ffeeed2df816a6d854ebf56d2dc1 (diff) | |
Grab an upstream PR to fix FTBFS with gcc-13.
Closes: #1037587
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/add-missing-includes-for-gcc13.patch | 34 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 42 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 77fc7ba..8e8ddcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +barrier (2.4.0+dfsg-4) unstable; urgency=medium + + * d/p/add-missing-includes-for-gcc13.patch: + - Grab an upstream PR to fix FTBFS with gcc-13. (Closes: #1037587) + + -- Unit 193 <unit193@debian.org> Fri, 14 Jul 2023 00:19:07 -0400 + barrier (2.4.0+dfsg-3) unstable; urgency=medium * d/p/allow_gtest_exclusion.patch: diff --git a/debian/patches/add-missing-includes-for-gcc13.patch b/debian/patches/add-missing-includes-for-gcc13.patch new file mode 100644 index 0000000..98b0d9e --- /dev/null +++ b/debian/patches/add-missing-includes-for-gcc13.patch @@ -0,0 +1,34 @@ +From d376d23d534e053a160c32ee1170d237a2f3d6bd Mon Sep 17 00:00:00 2001 +From: "Benjamin A. Beasley" <code@musicinmybrain.net> +Date: Thu, 26 Jan 2023 09:25:59 -0500 +Subject: [PATCH] Add missing #include directives needed for GCC 13 + +--- + src/lib/base/String.h | 1 + + src/lib/net/FingerprintData.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/lib/base/String.h b/src/lib/base/String.h +index 9c5a53bac4..fa37f8f0dc 100644 +--- a/src/lib/base/String.h ++++ b/src/lib/base/String.h +@@ -18,6 +18,7 @@ + + #pragma once + ++#include <cstdint> + #include "common/common.h" + #include "common/stdstring.h" + +diff --git a/src/lib/net/FingerprintData.h b/src/lib/net/FingerprintData.h +index 938a69538d..522a481353 100644 +--- a/src/lib/net/FingerprintData.h ++++ b/src/lib/net/FingerprintData.h +@@ -18,6 +18,7 @@ + #ifndef BARRIER_LIB_NET_FINGERPRINT_DATA_H + #define BARRIER_LIB_NET_FINGERPRINT_DATA_H + ++#include <cstdint> + #include <string> + #include <vector> + diff --git a/debian/patches/series b/debian/patches/series index e59f2af..809897c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ include-gulrak.patch fix-includes.patch allow_gtest_exclusion.patch +add-missing-includes-for-gcc13.patch |