Control: tags 966187 + patch Control: tags 966187 + pending Dear maintainer,
I've prepared an NMU for d1x-rebirth (versioned as 0.58.1-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards, Stephen
diff -Nru d1x-rebirth-0.58.1/debian/changelog d1x-rebirth-0.58.1/debian/changelog --- d1x-rebirth-0.58.1/debian/changelog 2020-02-01 16:24:25.000000000 +0100 +++ d1x-rebirth-0.58.1/debian/changelog 2020-08-02 11:16:13.000000000 +0200 @@ -1,3 +1,11 @@ +d1x-rebirth (0.58.1-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Avoid defining objects twice; this allows building with GCC 10. + Closes: #966187. + + -- Stephen Kitt <sk...@debian.org> Sun, 02 Aug 2020 11:16:13 +0200 + d1x-rebirth (0.58.1-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru d1x-rebirth-0.58.1/debian/patches/common-objects.patch d1x-rebirth-0.58.1/debian/patches/common-objects.patch --- d1x-rebirth-0.58.1/debian/patches/common-objects.patch 1970-01-01 01:00:00.000000000 +0100 +++ d1x-rebirth-0.58.1/debian/patches/common-objects.patch 2020-08-02 11:16:04.000000000 +0200 @@ -0,0 +1,27 @@ +Description: Avoid defining objects twice +Author: Stephen Kitt <sk...@debian.org> + +This allows building with -fno-common (the GCC 10 default). + +--- a/main/multi.h ++++ b/main/multi.h +@@ -181,7 +181,7 @@ + #define MULTI_GAME_TYPE_COUNT 8 + #define MULTI_GAME_NAME_LENGTH 13 + #define MULTI_ALLOW_POWERUP_MAX 12 +-int multi_allow_powerup_mask[MAX_POWERUP_TYPES]; ++extern int multi_allow_powerup_mask[MAX_POWERUP_TYPES]; + extern char *multi_allow_powerup_text[MULTI_ALLOW_POWERUP_MAX]; + extern const char GMNames[MULTI_GAME_TYPE_COUNT][MULTI_GAME_NAME_LENGTH]; + extern const char GMNamesShrt[MULTI_GAME_TYPE_COUNT][8]; +--- a/texmap/ntmap.c ++++ b/texmap/ntmap.c +@@ -55,7 +55,7 @@ + int Lighting_on=1; // initialize to no lighting + int Tmap_flat_flag = 0; // 1 = render texture maps as flat shaded polygons. + int Current_seg_depth; // HACK INTERFACE: how far away the current segment (& thus texture) is +-int Max_perspective_depth; ++extern int Max_perspective_depth; + int Max_flat_depth; + + // These variables are the interface to assembler. They get set for each texture map, which is a real waste of time. diff -Nru d1x-rebirth-0.58.1/debian/patches/series d1x-rebirth-0.58.1/debian/patches/series --- d1x-rebirth-0.58.1/debian/patches/series 2020-02-01 15:03:06.000000000 +0100 +++ d1x-rebirth-0.58.1/debian/patches/series 2020-08-02 11:13:04.000000000 +0200 @@ -1,3 +1,4 @@ debian.patch spelling.patch python3.patch +common-objects.patch
signature.asc
Description: PGP signature
