Control: tags 1097381 + patch Control: tags 1097381 + pending Dear maintainer,
I've prepared an NMU for meritous (versioned as 1.5-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for meritous-1.5 meritous-1.5 changelog | 7 +++++++ patches/gcc-15.patch | 34 ++++++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 42 insertions(+) diff -Nru meritous-1.5/debian/changelog meritous-1.5/debian/changelog --- meritous-1.5/debian/changelog 2021-01-03 17:40:37.000000000 +0200 +++ meritous-1.5/debian/changelog 2025-10-04 13:55:39.000000000 +0300 @@ -1,3 +1,10 @@ +meritous (1.5-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 15. (Closes: #1097381) + + -- Adrian Bunk <[email protected]> Sat, 04 Oct 2025 13:55:39 +0300 + meritous (1.5-1.1) unstable; urgency=medium * Non maintainer upload by the Reproducible Builds team. diff -Nru meritous-1.5/debian/patches/gcc-15.patch meritous-1.5/debian/patches/gcc-15.patch --- meritous-1.5/debian/patches/gcc-15.patch 1970-01-01 02:00:00.000000000 +0200 +++ meritous-1.5/debian/patches/gcc-15.patch 2025-10-04 13:55:39.000000000 +0300 @@ -0,0 +1,34 @@ +Description: Fix FTBFS with GCC 15 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1097381 + +--- meritous-1.5.orig/src/levelblit.c ++++ meritous-1.5/src/levelblit.c +@@ -2575,7 +2575,7 @@ void SpecialTile(int x, int y) + break; + case 42: + if (rooms[player_room].room_type == 5) { +- if (CanGetArtifact(rooms[player_room].room_param)) { ++ if (CanGetArtifact()) { + + } else { + sprintf(message, _("The artifact is tainted with shadow. You must slay more of the shadow first.") ); +--- meritous-1.5.orig/src/save.h ++++ meritous-1.5/src/save.h +@@ -24,7 +24,7 @@ + #ifndef SAVE_H + #define SAVE_H + +-void DoSaveGame(); ++void DoSaveGame(char *filename); + + void FWInt(int val); + void FWChar(unsigned char i); +@@ -39,6 +39,6 @@ void SaveGame(char *); + void LoadGame(char *); + void CloseFile(); + +-int IsSaveFile(); ++int IsSaveFile(char *filename); + + #endif diff -Nru meritous-1.5/debian/patches/series meritous-1.5/debian/patches/series --- meritous-1.5/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ meritous-1.5/debian/patches/series 2025-10-04 13:55:39.000000000 +0300 @@ -0,0 +1 @@ +gcc-15.patch
