[SM-Commit] GIT changes to master grimoire by Eric Sandall (b28b6c62f2821a33c6bb0943c708d3f954e3d806)

Eric Sandall scm at sourcemage.org
Wed Apr 21 01:14:58 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 audio-libs/libtunepimp/HISTORY     |    5 +++++
 audio-libs/libtunepimp/PRE_BUILD   |    4 +++-
 audio-libs/libtunepimp/gcc44.patch |   16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit b28b6c62f2821a33c6bb0943c708d3f954e3d806
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    libtunepimp: Fix compilation with GCC 4.4 (Bug #15641)
    
    Upstream filed at http://bugs.musicbrainz.org/ticket/5722

diff --git a/audio-libs/libtunepimp/HISTORY b/audio-libs/libtunepimp/HISTORY
index c7a75f4..9667e51 100644
--- a/audio-libs/libtunepimp/HISTORY
+++ b/audio-libs/libtunepimp/HISTORY
@@ -1,3 +1,8 @@
+2010-04-20 Eric Sandall <sandalle at sourcemage.org>
+	* PRE_BUILD: Apply gcc44.patch (Bug #15641 and
+	  http://bugs.musicbrainz.org/ticket/5722)
+	* gcc44.patch: Created to fix compilation with GCC 4.4
+
 2009-02-10 Julien "_kaze_" ROZO <julien at rozo.org>
 	* gcc43.patch: added patch on mp4.cpp, to fix compilation issue
 
diff --git a/audio-libs/libtunepimp/PRE_BUILD b/audio-libs/libtunepimp/PRE_BUILD
index 3958a58..df5554d 100755
--- a/audio-libs/libtunepimp/PRE_BUILD
+++ b/audio-libs/libtunepimp/PRE_BUILD
@@ -1,3 +1,5 @@
 default_pre_build                               &&
 cd $SOURCE_DIRECTORY                            &&
-zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1
+zcat $SCRIPT_DIRECTORY/gcc43.patch | patch -p1  &&
+patch $SOURCE_DIRECTORY/lib/fileio.cpp \
+      $SCRIPT_DIRECTORY/gcc44.patch
diff --git a/audio-libs/libtunepimp/gcc44.patch b/audio-libs/libtunepimp/gcc44.patch
new file mode 100644
index 0000000..539f631
--- /dev/null
+++ b/audio-libs/libtunepimp/gcc44.patch
@@ -0,0 +1,16 @@
+diff -Naur libtunepimp-0.5.3.orig/lib/fileio.cpp libtunepimp-0.5.3/lib/fileio.cpp
+--- libtunepimp-0.5.3.orig/lib/fileio.cpp	2010-04-20 22:08:13.355562828 -0700
++++ libtunepimp-0.5.3/lib/fileio.cpp	2010-04-20 22:09:05.204812864 -0700
+@@ -124,10 +124,10 @@
+ 
+ void tmktempname(const char *path, char *newPath, int newPathLen)
+ {
+-    char *ptr, *temp;
++    char *temp;
+ 
+     temp = (char *)malloc(strlen(path) + 32);
+-    ptr = strrchr(path, dirSepChar);
++    const char *ptr = strrchr(path, dirSepChar);
+     if (ptr)
+     {
+         int len = (int)(ptr - path);



More information about the SM-Commit mailing list