[SCM] easytag/master: Cherry-pick patch from upstream git to prevent FTBFS due to mixed declarations and code in WavPack support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 042d8a74fffe52f61e71e1ca9104c30556ea41dd
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 11 17:29:40 2013 +0100

    Cherry-pick patch from upstream git to prevent FTBFS due to mixed declarations and code in WavPack support.

diff --git a/debian/patches/1001-c90_style.patch b/debian/patches/1001-c90_style.patch
new file mode 100644
index 0000000..593ae67
--- /dev/null
+++ b/debian/patches/1001-c90_style.patch
@@ -0,0 +1,47 @@
+Description: Fix mixed declarations and code in WavPack support.
+From: https://git.gnome.org/browse/easytag/commit/?id=17a33964c32035f6b
+---
+ src/wavpack_tag.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- easytag.orig/src/wavpack_tag.c
++++ easytag/src/wavpack_tag.c
+@@ -82,15 +82,15 @@ gboolean Wavpack_Tag_Write_File (FILE *f
+  */
+ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
+ {
+-    if (!filename || !FileTag)
+-        return FALSE;
+-
+     WavpackContext *wpc;
+     gchar *field, *field2;
+     guint length;
+ 
+     int open_flags = OPEN_TAGS;
+ 
++    if (!filename || !FileTag)
++        return FALSE;
++
+     wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
+ 
+     if ( wpc == NULL ) {
+@@ -271,9 +271,6 @@ gboolean Wavpack_Tag_Read_File_Tag (gcha
+ 
+ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile)
+ {
+-    if (!ETFile || !ETFile->FileTag)
+-        return FALSE;
+-
+     WavpackContext *wpc;
+ 
+     gchar    *filename = ((File_Name *)((GList *)ETFile->FileNameCur)->data)->value;
+@@ -282,6 +279,9 @@ gboolean Wavpack_Tag_Write_File_Tag (ET_
+ 
+     int open_flags = OPEN_EDIT_TAGS;
+ 
++    if (!ETFile || !ETFile->FileTag)
++        return FALSE;
++
+     wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
+ 
+     if ( wpc == NULL ) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6920a73
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001-c90_style.patch

-- 
easytag packaging