[scummvm-tools] 01/01: Fix building with GCC 7

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository scummvm-tools.

commit b9cb506b899579ad7c8e6e2e149a9e296db8cba6
Author: Stephen Kitt <skitt at debian.org>
Date:   Wed Aug 9 22:33:04 2017 +0200

    Fix building with GCC 7
---
 debian/changelog                |  7 +++++++
 debian/patches/series           |  1 +
 debian/patches/wno-format.patch | 22 ++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 39667ab..4e3b5da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scummvm-tools (1.9.0-2) UNRELEASED; urgency=medium
+
+  * Avoid disabling -Wformat, which causes a build failure with GCC 7.
+    Closes: #871066.
+
+ -- Stephen Kitt <skitt at debian.org>  Wed, 09 Aug 2017 09:16:46 +0200
+
 scummvm-tools (1.9.0-1) unstable; urgency=medium
 
   * New upstream release, including compilation-fixes.patch.
diff --git a/debian/patches/series b/debian/patches/series
index 570676f..fc51e30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ tests-missing-data.patch
 tests-broken.patch
 missing-posix-systems.patch
 spelling-fixes.patch
+wno-format.patch
diff --git a/debian/patches/wno-format.patch b/debian/patches/wno-format.patch
new file mode 100644
index 0000000..0f8176f
--- /dev/null
+++ b/debian/patches/wno-format.patch
@@ -0,0 +1,22 @@
+Description: Avoid -Wno-format
+Author: Stephen Kitt <skitt at debian.org>
+
+We don’t build with -Werror, and our combination of flags causes
+errors with -Wno-format, so avoid disabling -Wformat altogether.
+
+--- a/decompiler/test/module.mk
++++ b/decompiler/test/module.mk
+@@ -29,13 +29,6 @@
+ TEST_CFLAGS  := -I$(srcdir)/decompiler/test/cxxtest
+ TEST_LDFLAGS := $(decompile_LIBS) $(LDFLAGS)
+ 
+-ifdef HAVE_GCC3
+-# In test/common/str.h, we test a zero length format string. This causes GCC
+-# to generate a warning which in turn poses a problem when building with -Werror.
+-# To work around this, we disable -Wformat here.
+-TEST_CFLAGS  +=  -Wno-format
+-endif
+-
+ # Enable this to get an X11 GUI for the error reporter.
+ #TEST_FLAGS   += --gui=X11Gui
+ #TEST_LDFLAGS += -L/usr/X11R6/lib -lX11

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm-tools.git