[SCM] easytag/master: Drop 1001-c90_style.patch applied upstream
jcowgill-guest at users.alioth.debian.org
jcowgill-guest at users.alioth.debian.org
Tue Feb 25 15:39:59 UTC 2014
The following commit has been merged in the master branch:
commit d6d9a8f6b10691ff634a9b44b1611e6e5d687f55
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Sun Feb 23 13:34:28 2014 +0000
Drop 1001-c90_style.patch applied upstream
diff --git a/debian/patches/1001-c90_style.patch b/debian/patches/1001-c90_style.patch
deleted file mode 100644
index 593ae67..0000000
--- a/debian/patches/1001-c90_style.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
index 6920a73..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-1001-c90_style.patch
--
easytag packaging
More information about the pkg-multimedia-commits
mailing list