Dear maintainer, I've prepared an NMU for fenix (versioned as 0.92a.dfsg1-12.1~exp1). The diff is attached to this message.
I'm uploading to experimental before unstable in order to validate that autopkgtest works. Regards. -- Baptiste Beauplat - lyknode
diff -Nru fenix-0.92a.dfsg1/debian/changelog fenix-0.92a.dfsg1/debian/changelog
--- fenix-0.92a.dfsg1/debian/changelog 2019-02-13 15:35:24.000000000 +0100
+++ fenix-0.92a.dfsg1/debian/changelog 2021-05-14 14:13:28.000000000 +0200
@@ -1,3 +1,14 @@
+fenix (0.92a.dfsg1-12.1~exp1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Add a patch to fix FTBFS with gcc 10, declaring debug as an external
+ variable (Closes: #987637)
+ * Modify autopkgtest to assert fenix debug output
+ * Only run autopkgtest on architectures where binary package fenix is built
+ (required by the test suite)
+
+ -- Baptiste Beauplat <lykn...@debian.org> Fri, 14 May 2021 14:13:28 +0200
+
fenix (0.92a.dfsg1-12) unstable; urgency=medium
[ Peter Pentchev ]
diff -Nru fenix-0.92a.dfsg1/debian/patches/fix_ftbfs_gcc10.patch fenix-0.92a.dfsg1/debian/patches/fix_ftbfs_gcc10.patch
--- fenix-0.92a.dfsg1/debian/patches/fix_ftbfs_gcc10.patch 1970-01-01 01:00:00.000000000 +0100
+++ fenix-0.92a.dfsg1/debian/patches/fix_ftbfs_gcc10.patch 2021-05-11 21:08:56.000000000 +0200
@@ -0,0 +1,19 @@
+From: Baptiste Beauplat <lykn...@debian.org>
+Date: Tue, 11 May 2021 21:06:15 +0200
+Subject: Fix FTBFS with gcc 10 (Closes: #987637)
+
+Declare debug as an external variable.
+Declaration and assignation is done in main.c.
+---
+
+--- a/fxc/src/c_main.c
++++ b/fxc/src/c_main.c
+@@ -182,7 +182,7 @@
+ #ifdef TARGET_MAC
+ static int debug ;
+ #else
+-int debug;
++extern int debug;
+ #endif
+
+ void compile_init ()
diff -Nru fenix-0.92a.dfsg1/debian/patches/series fenix-0.92a.dfsg1/debian/patches/series
--- fenix-0.92a.dfsg1/debian/patches/series 2019-02-12 10:40:57.000000000 +0100
+++ fenix-0.92a.dfsg1/debian/patches/series 2021-05-10 21:39:02.000000000 +0200
@@ -35,3 +35,4 @@
fxc-cmdline-crash.patch
fxi-cmdline-title.patch
map-gif-256-colors.patch
+fix_ftbfs_gcc10.patch
diff -Nru fenix-0.92a.dfsg1/debian/tests/control fenix-0.92a.dfsg1/debian/tests/control
--- fenix-0.92a.dfsg1/debian/tests/control 2019-02-12 15:47:50.000000000 +0100
+++ fenix-0.92a.dfsg1/debian/tests/control 2021-05-14 14:13:28.000000000 +0200
@@ -1,3 +1,19 @@
Test-Command: env TESTDIR="$(pwd)/debian/tests/t" TEST_FENIX_MAP=/usr/bin/fenix-map TEST_FENIX_FXC=/usr/bin/fenix-fxc TEST_FENIX_FXI=/usr/bin/fenix-fxi TERM=dumb prove -v -r debian/tests/t
Depends: @, libgd-perl, libpath-tiny-perl, libtest-command-perl, perl
Restrictions: allow-stderr
+Architecture: arm
+ armel
+ armhf
+ hppa
+ hurd-i386
+ i386
+ kfreebsd-i386
+ m68k
+ mips
+ mipsel
+ mipsn32
+ mipsn32el
+ powerpc
+ s390
+ sh4
+ sparc
diff -Nru fenix-0.92a.dfsg1/debian/tests/t/lib/Test/Fenix/Compile.pm fenix-0.92a.dfsg1/debian/tests/t/lib/Test/Fenix/Compile.pm
--- fenix-0.92a.dfsg1/debian/tests/t/lib/Test/Fenix/Compile.pm 2019-02-12 15:47:50.000000000 +0100
+++ fenix-0.92a.dfsg1/debian/tests/t/lib/Test/Fenix/Compile.pm 2021-05-11 22:17:32.000000000 +0200
@@ -41,12 +41,11 @@
Test::More::plan tests => 4;
my $cmd = Test::Command->new(cmd => [
- $fxc, $test->{test}{src}->basename,
+ $fxc, '-d', $test->{test}{src}->basename,
]);
$cmd->exit_is_num(0);
- # Yeah, this is backwards, I know...
- $cmd->stdout_is_eq('');
- $cmd->stderr_isnt_eq('');
+ $cmd->stdout_like(qr/END/);
+ $cmd->stderr_like(qr/----- Main procedure/);
Test::More::ok -f $test->{test}{exe},
'the compiled program exists';
signature.asc
Description: PGP signature
