[scummvm] 01/01: Avoid disabling -Wformat, which causes a build failure 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.

commit 2709edc0071fbf6cbb2b8ef44e2518b52219ca83
Author: Stephen Kitt <skitt at debian.org>
Date:   Thu Aug 10 13:14:37 2017 +0200

    Avoid disabling -Wformat, which causes a build failure with GCC 7
---
 debian/changelog                |  8 ++++++++
 debian/patches/series           |  1 +
 debian/patches/wno-format.patch | 22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 408f389..8d27a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scummvm (1.9.0+dfsg-2) unstable; urgency=medium
+
+  * Team upload.
+  * Avoid disabling -Wformat, which causes a build failure with GCC 7.
+    Closes: #871161.
+
+ -- Stephen Kitt <skitt at debian.org>  Thu, 10 Aug 2017 12:05:39 +0200
+
 scummvm (1.9.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release [October 2016].
diff --git a/debian/patches/series b/debian/patches/series
index 221a637..b1da962 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable-arm-asm.patch
+wno-format.patch
diff --git a/debian/patches/wno-format.patch b/debian/patches/wno-format.patch
new file mode 100644
index 0000000..27b4cbf
--- /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/test/module.mk
++++ b/test/module.mk
+@@ -14,13 +14,6 @@
+ TEST_LDFLAGS := $(LIBS)
+ TEST_CXXFLAGS := $(filter-out -Wglobal-constructors,$(CXXFLAGS))
+ 
+-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.git