Control: tags 1037618 + patch
Dear maintainer,
I've prepared an NMU for ddnet (versioned as 16.4-1.2). The diff
is attached to this message.
Cheers
--
Sebastian Ramacher
diff -Nru ddnet-16.4/debian/changelog ddnet-16.4/debian/changelog
--- ddnet-16.4/debian/changelog 2023-02-12 16:42:25.000000000 +0100
+++ ddnet-16.4/debian/changelog 2023-08-05 15:40:19.000000000 +0200
@@ -1,3 +1,10 @@
+ddnet (16.4-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Fix build with GCC-13. (Closes: #1037618)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sat, 05 Aug 2023 15:40:19 +0200
+
ddnet (16.4-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru ddnet-16.4/debian/patches/series ddnet-16.4/debian/patches/series
--- ddnet-16.4/debian/patches/series 2022-10-10 23:55:07.000000000 +0200
+++ ddnet-16.4/debian/patches/series 2023-08-05 15:39:54.000000000 +0200
@@ -1,3 +1,4 @@
# even that ddnet won't render this system font
# match-fonts-materialdesignicons-webfont-codepoints.patch
use-system-libjsonparser.patch
+use-str-copy-instead-of-snprintf-to-copy-strings.patch
diff -Nru ddnet-16.4/debian/patches/use-str-copy-instead-of-snprintf-to-copy-strings.patch ddnet-16.4/debian/patches/use-str-copy-instead-of-snprintf-to-copy-strings.patch
--- ddnet-16.4/debian/patches/use-str-copy-instead-of-snprintf-to-copy-strings.patch 1970-01-01 01:00:00.000000000 +0100
+++ ddnet-16.4/debian/patches/use-str-copy-instead-of-snprintf-to-copy-strings.patch 2023-08-05 15:40:19.000000000 +0200
@@ -0,0 +1,52 @@
+From 73fe4e6ed43e6044d12cf5a97272f651d48df71d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert=20M=C3=BCller?= <robytemuel...@gmail.com>
+Date: Wed, 19 Oct 2022 23:31:07 +0200
+Subject: [PATCH] Use `str_copy` instead of `snprintf` to copy strings
+
+---
+ src/tools/map_create_pixelart.cpp | 6 +++---
+ src/tools/map_find_env.cpp | 2 +-
+ src/tools/map_replace_area.cpp | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/src/tools/map_create_pixelart.cpp
++++ b/src/tools/map_create_pixelart.cpp
+@@ -46,9 +46,9 @@
+ }
+
+ char aFilenames[3][64];
+- snprintf(aFilenames[0], 64, "%s", argv[3]); //input_map
+- snprintf(aFilenames[1], 64, "%s", argv[9]); //output_map
+- snprintf(aFilenames[2], 64, "%s", argv[1]); //image_file
++ str_copy(aFilenames[0], argv[3]); //input_map
++ str_copy(aFilenames[1], argv[9]); //output_map
++ str_copy(aFilenames[2], argv[1]); //image_file
+
+ int aLayerID[2] = {atoi(argv[4]), atoi(argv[5])}; //layergroup_id, layer_id
+ int aStartingPos[2] = {atoi(argv[6]) * 32, atoi(argv[7]) * 32}; //pos_x, pos_y
+--- a/src/tools/map_find_env.cpp
++++ b/src/tools/map_find_env.cpp
+@@ -130,7 +130,7 @@
+ }
+
+ char aFilename[64];
+- snprintf(aFilename, 64, "%s", argv[1]);
++ str_copy(aFilename, argv[1]);
+ int EnvID = atoi(argv[2]) - 1;
+ dbg_msg("map_find_env", "input_map='%s'; env_number='#%d';", aFilename, EnvID + 1);
+
+--- a/src/tools/map_replace_area.cpp
++++ b/src/tools/map_replace_area.cpp
+@@ -72,9 +72,9 @@
+ }
+
+ char aaMapNames[3][64];
+- snprintf(aaMapNames[0], 64, "%s", argv[1]); //from_map
+- snprintf(aaMapNames[1], 64, "%s", argv[4]); //to_map
+- snprintf(aaMapNames[2], 64, "%s", argv[9]); //output_map
++ str_copy(aaMapNames[0], argv[1]); //from_map
++ str_copy(aaMapNames[1], argv[4]); //to_map
++ str_copy(aaMapNames[2], argv[9]); //output_map
+
+ float aaaGameAreas[2][2][2];
+
