[SCM] easytag/master: Add patch to use CXXFLAGS from environment

[amigadave-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e0bdbc48ae6425d460f2e6082e5ea863c598c3e1
Author: David King <amigadave at amigadave.com>
Date:   Sat Apr 12 13:29:44 2014 +0100

    Add patch to use CXXFLAGS from environment

diff --git a/debian/patches/series b/debian/patches/series
index e69de29..2b1c309 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-CXXFLAGS-from-environment.patch
diff --git a/debian/patches/use-CXXFLAGS-from-environment.patch b/debian/patches/use-CXXFLAGS-from-environment.patch
new file mode 100644
index 0000000..09af64b
--- /dev/null
+++ b/debian/patches/use-CXXFLAGS-from-environment.patch
@@ -0,0 +1,38 @@
+Description: Use CXXFLAGS from environment
+Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=5a73d051b844e8c8e01f0f8d51e8839e4de3bf1a
+Applied-Upstream: https://git.gnome.org/browse/easytag/commit/?id=5a73d051b844e8c8e01f0f8d51e8839e4de3bf1a
+From: David King <amigadave at amigadave.com>
+
+Fix a typo when checking for warning options to pass to the C++
+compiler, and ensure that CXXFLAGS set in the environment are passed to
+the compiler.
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/configure.ac b/configure.ac
+index ae11d83..eacea67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -344,9 +344,9 @@ CFLAGS="$realsave_CFLAGS"
+ AC_SUBST([WARN_CFLAGS], ["$tested_warning_flags"])
+ AC_LANG_PUSH([C++])
+ 
+-realsave_CFLAGS="$CXXFLAGS"
++realsave_CXXFLAGS="$CXXFLAGS"
+ for option in $warning_flags; do
+-    save_CFLAGS="$CXXFLAGS"
++    save_CXXFLAGS="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -Werror $option"
+ 	AC_MSG_CHECKING([whether the c++ compiler understands $option])
+ 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM], [has_option=yes], [has_option=no])
+@@ -355,7 +355,7 @@ for option in $warning_flags; do
+ 	AS_IF([test $has_option = yes],
+ 	      [tested_cxx_warning_flags="$tested_cxx_warning_flags $option"])
+ 	unset has_option
+-	unset save_CFLAGS
++	unset save_CXXFLAGS
+ done
+ unset option
+ CXXFLAGS="$realsave_CXXFLAGS"
+-- 
+cgit v0.10.1
+

-- 
easytag packaging