diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:36:11 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 23:48:37 -0500 |
| commit | 0d41fe4855588fb659b8adafe215d5573517a79b (patch) | |
| tree | 38b274bd03375f4fa5b7d3a9fb3f64a19786bef2 /gnu/packages/patches/widelands-add-missing-map-include.patch | |
| parent | 7c57821c68d199ad56a8ed750b36eccc7ef238dd (diff) | |
| parent | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (diff) | |
Merge branch 'staging' into core-updates.
With "conflicts" resolved in (mostly in favor of master/staging):
gnu/packages/admin.scm
gnu/packages/gnuzilla.scm
gnu/packages/gtk.scm
gnu/packages/kerberos.scm
gnu/packages/linux.scm
guix/lint.scm
Diffstat (limited to 'gnu/packages/patches/widelands-add-missing-map-include.patch')
| -rw-r--r-- | gnu/packages/patches/widelands-add-missing-map-include.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/widelands-add-missing-map-include.patch b/gnu/packages/patches/widelands-add-missing-map-include.patch new file mode 100644 index 0000000000..633731bea2 --- /dev/null +++ b/gnu/packages/patches/widelands-add-missing-map-include.patch @@ -0,0 +1,28 @@ +From 316eaea209754368a57f445ea4dd016ecf8eded6 Mon Sep 17 00:00:00 2001 +From: matthiakl <t-m.42@mailpost.spdns.org> +Date: Sat, 14 Aug 2021 19:24:08 +0200 +Subject: [PATCH] Added missing direct incude (#5025) + +--- +This patch is from +https://github.com/widelands/widelands/pull/5025 +which has been merged after the release of Widelands 1.0. + + src/network/bufferedconnection.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/network/bufferedconnection.h b/src/network/bufferedconnection.h +index fe974b9e..7e1ecf87 100644 +--- a/src/network/bufferedconnection.h ++++ b/src/network/bufferedconnection.h +@@ -20,6 +20,7 @@ + #ifndef WL_NETWORK_BUFFEREDCONNECTION_H + #define WL_NETWORK_BUFFEREDCONNECTION_H + ++#include <map> + #include <memory> + #include <mutex> + #include <thread> +-- +2.30.2 + |