Date: Mon, 7 Jun 2010 11:06:33 +0300 (EEST) From: Andriy Gapon <avg@icyb.net.ua> To: FreeBSD-gnats-submit@FreeBSD.org Cc: bsdkaffee@gmail.com Subject: ports/147639: [PATCH] audio/libtunepimp: make compilable with gcc44 Message-ID: <201006070806.o5786Xk6052603@trant.local.> Resent-Message-ID: <201006070810.o578A6T9041229@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147639 >Category: ports >Synopsis: [PATCH] audio/libtunepimp: make compilable with gcc44 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 07 08:10:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Andriy Gapon >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD 9.0-CURRENT amd64 gcc-4.4.5.2010051 >Description: I am trying to use lang/gcc44 to build as much of my ports as possible. Many ports including this one have problems outlined here: http://gcc.gnu.org/gcc-4.3/porting_to.html under section "Header dependency cleanup" Added file(s): - files/patch-include_tunepimp-0.5_metadata.h - files/patch-lib_c_wrapper.cpp - files/patch-lib_protocol.cpp - files/patch-lib_readmeta.cpp - files/patch-lib_tunepimp.cpp - files/patch-plugins_mp3_id3_2_3_meta.cpp - files/patch-plugins_mp3_id3_meta.cpp - files/patch-plugins_wma_wma.cpp - files/patch-plugins_wma_wmafile.cpp Port maintainer (bsdkaffee@gmail.com) is cc'd. Generated with FreeBSD Port Tools 0.99 Patchfiles created via update-patches target. >How-To-Repeat: >Fix: --- libtunepimp-0.5.3_6,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-include_tunepimp-0.5_metadata.h /usr/ports/audio/libtunepimp/files/patch-include_tunepimp-0.5_metadata.h --- /usr/ports/audio/libtunepimp.orig/files/patch-include_tunepimp-0.5_metadata.h 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-include_tunepimp-0.5_metadata.h 2010-06-07 10:56:02.730985447 +0300 @@ -0,0 +1,10 @@ +--- include/tunepimp-0.5/metadata.h.orig 2010-06-07 10:40:42.479449473 +0300 ++++ include/tunepimp-0.5/metadata.h 2010-06-07 10:41:25.477086516 +0300 +@@ -29,6 +29,7 @@ + + #include <string> + #include <cstdio> ++#include <cstring> + + #include "defs.h" + #include "tp_c.h" diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-lib-metadata.cpp /usr/ports/audio/libtunepimp/files/patch-lib-metadata.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-lib-metadata.cpp 2006-04-10 13:08:48.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-lib-metadata.cpp 2010-06-07 10:56:02.744990057 +0300 @@ -1,6 +1,14 @@ ---- lib/metadata.cpp.orig Wed Nov 10 17:37:26 2004 -+++ lib/metadata.cpp Wed Sep 14 17:25:59 2005 -@@ -34,6 +34,14 @@ +--- lib/metadata.cpp.orig 2006-11-18 12:52:33.000000000 +0200 ++++ lib/metadata.cpp 2010-06-07 10:43:10.556325912 +0300 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + #include <math.h> + #include <stdio.h> ++#include <stdlib.h> + #include "metadata.h" + #include "../config.h" + using namespace std; +@@ -35,6 +36,14 @@ extern "C" #include "astrcmp.h" } diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-lib-utf8-utf8util.cpp /usr/ports/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-lib-utf8-utf8util.cpp 2006-04-10 13:08:48.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-lib-utf8-utf8util.cpp 2010-06-07 10:56:02.808978027 +0300 @@ -1,6 +1,14 @@ ---- lib/utf8/utf8util.cpp.orig Mon Jul 11 05:01:23 2005 -+++ lib/utf8/utf8util.cpp Wed Sep 14 17:19:42 2005 -@@ -38,7 +38,7 @@ +--- lib/utf8/utf8util.cpp.orig 2006-11-18 12:52:26.000000000 +0200 ++++ lib/utf8/utf8util.cpp 2010-06-07 10:39:57.243921985 +0300 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <stdlib.h> + #include "utf8util.h" + #include "utf8.h" + #ifdef WIN32 +@@ -38,7 +39,7 @@ string utf8Encode(const string &from) char *dest; string to; @@ -9,7 +17,7 @@ ret = utf8_encode(from.c_str(), &dest); if (ret >= 0) { -@@ -54,7 +54,7 @@ +@@ -54,7 +55,7 @@ string utf8Decode(const string &from) char *dest; string to; diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-lib_c_wrapper.cpp /usr/ports/audio/libtunepimp/files/patch-lib_c_wrapper.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-lib_c_wrapper.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-lib_c_wrapper.cpp 2010-06-07 10:56:02.952978580 +0300 @@ -0,0 +1,10 @@ +--- lib/c_wrapper.cpp.orig 2010-06-07 10:43:52.147054247 +0300 ++++ lib/c_wrapper.cpp 2010-06-07 10:44:16.392713467 +0300 +@@ -42,6 +42,7 @@ + #define TR_OBJ_CHECKV(o) Track *obj = (Track *)t; \ + if (obj == NULL) return; + ++#include <stdlib.h> + #include <deque> + + class NotifyData diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-lib_protocol.cpp /usr/ports/audio/libtunepimp/files/patch-lib_protocol.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-lib_protocol.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-lib_protocol.cpp 2010-06-07 10:56:02.867981496 +0300 @@ -0,0 +1,10 @@ +--- lib/protocol.cpp.orig 2010-06-07 10:47:20.653619576 +0300 ++++ lib/protocol.cpp 2010-06-07 10:47:55.249722982 +0300 +@@ -8,6 +8,7 @@ + -------------------------------------------------------------------*/ + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <string> + #include <map> + #include <expat.h> diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-lib_readmeta.cpp /usr/ports/audio/libtunepimp/files/patch-lib_readmeta.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-lib_readmeta.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-lib_readmeta.cpp 2010-06-07 10:56:02.791977632 +0300 @@ -0,0 +1,10 @@ +--- lib/readmeta.cpp.orig 2010-06-07 10:45:38.729200377 +0300 ++++ lib/readmeta.cpp 2010-06-07 10:46:01.634953724 +0300 +@@ -31,6 +31,7 @@ + #endif + + #include <stdio.h> ++#include <stdlib.h> + #ifndef WIN32 + #include <unistd.h> + #endif diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-lib_tunepimp.cpp /usr/ports/audio/libtunepimp/files/patch-lib_tunepimp.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-lib_tunepimp.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-lib_tunepimp.cpp 2010-06-07 10:56:02.908980434 +0300 @@ -0,0 +1,10 @@ +--- lib/tunepimp.cpp.orig 2010-06-07 10:42:02.279074189 +0300 ++++ lib/tunepimp.cpp 2010-06-07 10:42:26.892724626 +0300 +@@ -31,6 +31,7 @@ + #endif + + #include <stdio.h> ++#include <stdlib.h> + #include <map> + using namespace std; + diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-plugins-mp4-mp4.cpp /usr/ports/audio/libtunepimp/files/patch-plugins-mp4-mp4.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-plugins-mp4-mp4.cpp 2007-10-03 02:25:43.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-plugins-mp4-mp4.cpp 2010-06-07 10:56:02.685989032 +0300 @@ -1,6 +1,6 @@ ---- plugins/mp4/mp4.cpp.orig 2006-11-18 02:51:08.000000000 -0800 -+++ plugins/mp4/mp4.cpp 2007-10-02 16:24:06.000000000 -0700 -@@ -231,9 +231,7 @@ +--- plugins/mp4/mp4.cpp.orig 2006-11-18 12:51:08.000000000 +0200 ++++ plugins/mp4/mp4.cpp 2010-06-07 10:36:19.151889361 +0300 +@@ -231,9 +231,7 @@ mp4ReadMetadata(metadata_t *mdata, const strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3); @@ -11,7 +11,7 @@ return 1; } -@@ -315,8 +313,7 @@ +@@ -315,8 +313,7 @@ mp4WriteMetadata(const metadata_t *mdata sprintf(temp, "%d", mdata->nonAlbum); MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t *)temp, strlen(temp) + 1); diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-plugins-wav-wav.cpp /usr/ports/audio/libtunepimp/files/patch-plugins-wav-wav.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-plugins-wav-wav.cpp 2006-04-10 13:08:48.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-plugins-wav-wav.cpp 2010-06-07 10:56:02.573000327 +0300 @@ -1,5 +1,5 @@ ---- plugins/wav/wav.cpp.orig Wed Jun 15 06:15:18 2005 -+++ plugins/wav/wav.cpp Wed Sep 14 17:30:30 2005 +--- plugins/wav/wav.cpp.orig 2006-11-18 12:51:46.000000000 +0200 ++++ plugins/wav/wav.cpp 2010-06-07 10:36:19.157879953 +0300 @@ -34,7 +34,10 @@ #ifdef WIN32 #include <winsock.h> @@ -10,4 +10,4 @@ +#include <arpa/inet.h> #include <sys/param.h> #endif - \ No newline at end of file + diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-plugins_mp3_id3_2_3_meta.cpp /usr/ports/audio/libtunepimp/files/patch-plugins_mp3_id3_2_3_meta.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-plugins_mp3_id3_2_3_meta.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-plugins_mp3_id3_2_3_meta.cpp 2010-06-07 10:56:02.629993570 +0300 @@ -0,0 +1,10 @@ +--- plugins/mp3/id3_2_3_meta.cpp.orig 2010-06-07 10:50:49.216186011 +0300 ++++ plugins/mp3/id3_2_3_meta.cpp 2010-06-07 10:51:05.523284779 +0300 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <stdlib.h> + #include <assert.h> + #include <ctype.h> + #include <musicbrainz/mb_c.h> diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-plugins_mp3_id3_meta.cpp /usr/ports/audio/libtunepimp/files/patch-plugins_mp3_id3_meta.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-plugins_mp3_id3_meta.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-plugins_mp3_id3_meta.cpp 2010-06-07 10:56:02.663996314 +0300 @@ -0,0 +1,10 @@ +--- plugins/mp3/id3_meta.cpp.orig 2010-06-07 10:50:19.617800314 +0300 ++++ plugins/mp3/id3_meta.cpp 2010-06-07 10:50:31.369156541 +0300 +@@ -26,6 +26,7 @@ + ----------------------------------------------------------------------------*/ + + #include <stdio.h> ++#include <stdlib.h> + #include <time.h> + #include <ctype.h> + #include <musicbrainz/mb_c.h> diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-plugins_wma_wma.cpp /usr/ports/audio/libtunepimp/files/patch-plugins_wma_wma.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-plugins_wma_wma.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-plugins_wma_wma.cpp 2010-06-07 10:56:02.487997376 +0300 @@ -0,0 +1,10 @@ +--- plugins/wma/wma.cpp.orig 2010-06-07 10:48:29.988820849 +0300 ++++ plugins/wma/wma.cpp 2010-06-07 10:48:44.871996634 +0300 +@@ -27,6 +27,7 @@ + + #include <string.h> + #include <stdio.h> ++#include <stdlib.h> + #include <wmafile.h> + #include "metadata.h" + #include "plugin.h" diff -ruN --exclude=CVS /usr/ports/audio/libtunepimp.orig/files/patch-plugins_wma_wmafile.cpp /usr/ports/audio/libtunepimp/files/patch-plugins_wma_wmafile.cpp --- /usr/ports/audio/libtunepimp.orig/files/patch-plugins_wma_wmafile.cpp 1970-01-01 03:00:00.000000000 +0300 +++ /usr/ports/audio/libtunepimp/files/patch-plugins_wma_wmafile.cpp 2010-06-07 10:56:02.516992154 +0300 @@ -0,0 +1,10 @@ +--- plugins/wma/wmafile.cpp.orig 2010-06-07 10:49:09.287654896 +0300 ++++ plugins/wma/wmafile.cpp 2010-06-07 10:49:27.385665056 +0300 +@@ -19,6 +19,7 @@ + * USA * + ***************************************************************************/ + ++#include <string.h> + #include <tstring.h> + #include <wmafile.h> + #include <wmatag.h> --- libtunepimp-0.5.3_6,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006070806.o5786Xk6052603>