Your message dated Mon, 17 May 2021 18:38:37 +0000
with message-id <[email protected]>
and subject line unblock fenix
has caused the Debian Bug report #988641,
regarding unblock: fenix/0.92a.dfsg1-12.1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
988641: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988641
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package fenix
[ Reason ]
- Non-key package
- Autopkgtest does not cover all architectures (but does cover all built
architectures)
- Fixes RC bug (#987637)
[ Impact ]
- Low, the fix is a trivial (one-liner) change for a FTBFS. No
user/behavior changes.
- A change has been made to the test suite to:
* Run only on built architectures
* Cover the fix
[ Tests ]
I've run the program and built a fenix source file (taken from the
source examples) in order to cover the fix. Additionally, the fix is
covered by autopkgtest.
I've also successfully rebuilt all (3) reverse B-D.
[ Risks ]
Low:
- Changes covered by autopkgtest
- Trivial change
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
- Non-maintainer upload
unblock fenix/0.92a.dfsg1-12.1
--
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) unstable; 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 <[email protected]> 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 <[email protected]>
+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
--- End Message ---
--- Begin Message ---
Unblocked.
--- End Message ---
