Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package zsnes [ Reason ] - Non-key package without autopkgtest - Fix a RC bug (#987640) [ Impact ] Low, the bug is a FTBFS. User experience in running the program is not affected. [ Tests ] The fix has been tested manually both by building the program (on the targeted i386 architecture) and running it. The test run was to launch the program and load a rom. The game started correctly. [ Risks ] Low: - Fix is trivial - No functionality changes - Leaf package [ 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 zsnes/1.510+bz2-10.1 -- Baptiste Beauplat - lyknode
diff -Nru zsnes-1.510+bz2/debian/changelog zsnes-1.510+bz2/debian/changelog
--- zsnes-1.510+bz2/debian/changelog 2019-12-14 16:03:00.000000000 +0100
+++ zsnes-1.510+bz2/debian/changelog 2021-05-14 14:46:32.000000000 +0200
@@ -1,3 +1,11 @@
+zsnes (1.510+bz2-10.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch to fix FTBFS with GCC 10, declaring HacksDisable as an extern
+ variable and fixing its type (Closes: #987640)
+
+ -- Baptiste Beauplat <lyknode@debian.org> Fri, 14 May 2021 14:46:32 +0200
+
zsnes (1.510+bz2-10) unstable; urgency=high
* Team upload.
diff -Nru zsnes-1.510+bz2/debian/patches/0018-Fix-ftbfs-with-gcc-10.patch zsnes-1.510+bz2/debian/patches/0018-Fix-ftbfs-with-gcc-10.patch
--- zsnes-1.510+bz2/debian/patches/0018-Fix-ftbfs-with-gcc-10.patch 1970-01-01 01:00:00.000000000 +0100
+++ zsnes-1.510+bz2/debian/patches/0018-Fix-ftbfs-with-gcc-10.patch 2021-05-05 23:28:51.000000000 +0200
@@ -0,0 +1,25 @@
+From: Baptiste Beauplat <lyknode@debian.org>
+Date: Wed, 5 May 2021 23:18:27 +0200
+Subject: Fix FTBFS with gcc 10 (Closes: #987640)
+
+Declare HacksDisable as external unsigned char in initc.c.
+Declaration and assignation is done in cfg.c. This file is generated at
+build time by parsegen from cfg.psr. The generated variable is an
+unsigned char.
+---
+ src/initc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/initc.c b/src/initc.c
+index 3096240..56b02bc 100644
+--- a/src/initc.c
++++ b/src/initc.c
+@@ -1496,7 +1496,7 @@ Would be nice to trash this section in the future
+ extern unsigned char ENVDisable, cycpb268, cycpb358, cycpbl2, cycpblt2, cycpbl;
+ extern unsigned char cycpblt, opexec268, opexec358, opexec268b, opexec358b;
+ extern unsigned char opexec268cph, opexec358cph, opexec268cphb, opexec358cphb;
+-bool HacksDisable;
++extern unsigned char HacksDisable;
+
+ void headerhack()
+ {
diff -Nru zsnes-1.510+bz2/debian/patches/series zsnes-1.510+bz2/debian/patches/series
--- zsnes-1.510+bz2/debian/patches/series 2019-12-14 16:02:16.000000000 +0100
+++ zsnes-1.510+bz2/debian/patches/series 2021-05-05 23:28:51.000000000 +0200
@@ -15,3 +15,4 @@
fortify-source-load.patch
hurd.patch
privacy-breach.patch
+0018-Fix-ftbfs-with-gcc-10.patch
Attachment:
signature.asc
Description: PGP signature