Control: tags 966188 + patch Control: tags 966188 + pending Dear maintainer,
I've prepared an NMU for d2x-rebirth (versioned as 0.58.1-1.3) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards, Stephen
diff -Nru d2x-rebirth-0.58.1/debian/changelog d2x-rebirth-0.58.1/debian/changelog --- d2x-rebirth-0.58.1/debian/changelog 2020-02-02 18:18:43.000000000 +0100 +++ d2x-rebirth-0.58.1/debian/changelog 2020-08-02 11:43:10.000000000 +0200 @@ -1,3 +1,11 @@ +d2x-rebirth (0.58.1-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Avoid defining objects twice; this allows building with GCC 10. + Closes: #966188. + + -- Stephen Kitt <sk...@debian.org> Sun, 02 Aug 2020 11:43:10 +0200 + d2x-rebirth (0.58.1-1.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru d2x-rebirth-0.58.1/debian/patches/common-objects.patch d2x-rebirth-0.58.1/debian/patches/common-objects.patch --- d2x-rebirth-0.58.1/debian/patches/common-objects.patch 1970-01-01 01:00:00.000000000 +0100 +++ d2x-rebirth-0.58.1/debian/patches/common-objects.patch 2020-08-02 11:42:09.000000000 +0200 @@ -0,0 +1,16 @@ +Description: Avoid defining objects twice +Author: Stephen Kitt <sk...@debian.org> + +This allows building with -fno-common (the GCC 10 default). + +--- 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 d2x-rebirth-0.58.1/debian/patches/series d2x-rebirth-0.58.1/debian/patches/series --- d2x-rebirth-0.58.1/debian/patches/series 2020-02-02 18:17:06.000000000 +0100 +++ d2x-rebirth-0.58.1/debian/patches/series 2020-08-02 11:43:10.000000000 +0200 @@ -3,3 +3,4 @@ spelling.patch libphysfs-3.0.1.patch python3.patch +common-objects.patch
signature.asc
Description: PGP signature
