[Pkg-mongodb-maintainers] [pkg-mongodb] 329/394: Replace no-unused-variable.patch with Ubuntu's version

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit 4a1d9bbea343699512b02e60cbfd5542b11e32af
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Thu Jan 14 13:41:11 2016 +0200

    Replace no-unused-variable.patch with Ubuntu's version
    
    ... which also specifies -Wno-maybe-uninitialized. Without this building
    with GCC 5 fails.
---
 debian/patches/disable-warnings.patch   | 17 +++++++++++++++++
 debian/patches/no-unused-variable.patch | 19 -------------------
 debian/patches/series                   |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/debian/patches/disable-warnings.patch b/debian/patches/disable-warnings.patch
new file mode 100644
index 0000000..69ebd8e
--- /dev/null
+++ b/debian/patches/disable-warnings.patch
@@ -0,0 +1,17 @@
+Description: Don't fail (-Werror) on "unused-variable" and "maybe-uninitialized" warnings.
+Author: Martin Pitt <martin.pitt at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/1483400
+
+Index: mongodb-2.6.10/SConstruct
+===================================================================
+--- mongodb-2.6.10.orig/SConstruct
++++ mongodb-2.6.10/SConstruct
+@@ -835,6 +835,8 @@ if nix:
+                          "-Wall",
+                          "-Wsign-compare",
+                          "-Wno-unused-function",
++                         "-Wno-unused-variable",
++                         "-Wno-maybe-uninitialized",
+                          "-Wno-unknown-pragmas",
+                          "-Winvalid-pch"] )
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
diff --git a/debian/patches/no-unused-variable.patch b/debian/patches/no-unused-variable.patch
deleted file mode 100644
index fc7ebc4..0000000
--- a/debian/patches/no-unused-variable.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix FTBFS with gcc 5.1
- Need to pass -Wno-unused-variable to the compiler.
-Author: Laszlo Boszormenyi (GCS) <gcs at debian.org>
-Bug-Debian: https://bugs.debian.org/778012
-Forwarded: not-needed
-Last-Update: 2015-07-04
-
----
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -826,6 +826,7 @@
-                          "-Wall",
-                          "-Wsign-compare",
-                          "-Wno-unused-function",
-+                         "-Wno-unused-variable",
-                          "-Wno-unknown-pragmas",
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
diff --git a/debian/patches/series b/debian/patches/series
index ca13c21..67fc5bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,5 @@
 0004-Support-ppc64el-builds.patch
 0012-support-gnu.patch
 no-unused-function.patch
-no-unused-variable.patch
+disable-warnings.patch
 0014-Fix-GCC-5-FTBFS.patch

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