From 9f1f566505409badb4e6b487554c966806a32001 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Mon, 29 Sep 2014 07:47:15 +0700
Subject: audio/mp3val: Fix build.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 audio/mp3val/fix_compile_warnings.diff    |  37 ------------------------------
 audio/mp3val/fix_compile_warnings.diff.gz | Bin 0 -> 502 bytes
 audio/mp3val/mp3val.SlackBuild            |   2 +-
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 audio/mp3val/fix_compile_warnings.diff
 create mode 100644 audio/mp3val/fix_compile_warnings.diff.gz

(limited to 'audio/mp3val')

diff --git a/audio/mp3val/fix_compile_warnings.diff b/audio/mp3val/fix_compile_warnings.diff
deleted file mode 100644
index ebe09e8d45..0000000000
--- a/audio/mp3val/fix_compile_warnings.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur mp3val-0.1.8-src/report.cpp mp3val-0.1.8-src.patched/report.cpp
---- mp3val-0.1.8-src/report.cpp	2009-06-25 16:14:35.000000000 -0400
-+++ mp3val-0.1.8-src.patched/report.cpp	2014-09-21 15:24:24.000000000 -0400
-@@ -25,9 +25,9 @@
- 
- extern bool bSuppressInfo;
- 
--int PrintMessage(ostream *out,char *caption,char *filename,char *message,int iErrorFrame);
-+int PrintMessage(ostream *out,const char *caption,const char *filename,const char *message,int iErrorFrame);
- 
--int PrintReport(ostream *out,char *filename,MPEGINFO *mpginfo) {
-+int PrintReport(ostream *out,const char *filename,MPEGINFO *mpginfo) {
- 	int frame_types=0;
- 	int mpeg_total;
- 	int tags_total;
-@@ -228,7 +228,7 @@
- 
- }
- 
--int PrintMessage(ostream *out,char *caption,char *filename,char *message,int iErrorFrame) {
-+int PrintMessage(ostream *out,const char *caption,const char *filename,const char *message,int iErrorFrame) {
- 	(*out)<<caption<<": ";
- 	if(iErrorFrame>=0) {
- 		(*out)<<"\""<<filename<<"\" (offset 0x"<<hex<<iErrorFrame<<dec<<"): ";
-diff -Naur mp3val-0.1.8-src/report.h mp3val-0.1.8-src.patched/report.h
---- mp3val-0.1.8-src/report.h	2009-06-25 16:14:38.000000000 -0400
-+++ mp3val-0.1.8-src.patched/report.h	2014-09-21 15:24:15.000000000 -0400
-@@ -26,7 +26,7 @@
- 
- #include "mpegparse.h"
- 
--int PrintReport(ostream *out,char *filename,MPEGINFO *mpginfo);
--int PrintMessage(ostream *out,char *caption,char *filename,char *message,int iErrorFrame);
-+int PrintReport(ostream *out,const char *filename,MPEGINFO *mpginfo);
-+int PrintMessage(ostream *out,const char *caption,const char *filename,const char *message,int iErrorFrame);
- 
- #endif
diff --git a/audio/mp3val/fix_compile_warnings.diff.gz b/audio/mp3val/fix_compile_warnings.diff.gz
new file mode 100644
index 0000000000..8b822a381e
Binary files /dev/null and b/audio/mp3val/fix_compile_warnings.diff.gz differ
diff --git a/audio/mp3val/mp3val.SlackBuild b/audio/mp3val/mp3val.SlackBuild
index 8c52ef54bb..db0e75c7c7 100644
--- a/audio/mp3val/mp3val.SlackBuild
+++ b/audio/mp3val/mp3val.SlackBuild
@@ -64,7 +64,7 @@ chmod 644 *
 
 # this isn't strictly necessary for Slack 14.1, but at some point these
 # warnings might possibly become errors in some future version of gcc.
-patch -p1 < $CWD/fix_compile_warnings.diff
+zcat $CWD/fix_compile_warnings.diff.gz | patch -p1
 
 make -f Makefile.linux CXXFLAGS="$SLKCFLAGS"
 mkdir -p $PKG/usr/bin
-- 
cgit v1.2.3