Update gcc-4.4 patch. Thanks to Yu Yuwei in bug #297721.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 57 insertions, 5 deletions

diff --git a/media-sound/mac/ChangeLog b/media-sound/mac/ChangeLog
index 8b6ce71f9411..7f89acafa6a2 100644
--- a/media-sound/mac/ChangeLog
+++ b/media-sound/mac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mac
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/ChangeLog,v 1.8 2009/12/20 20:31:00 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/ChangeLog,v 1.9 2009/12/21 17:03:42 billie Exp $
+
+  21 Dec 2009; Daniel Pielmeier <billie@gentoo.org> mac-3.99.4.5.4.ebuild,
+  +files/mac-3.99.4.5.4-gcc44.patch:
+  Update gcc-4.4 patch. Thanks to Yu Yuwei in bug #297721.
 
   20 Dec 2009; Daniel Pielmeier <billie@gentoo.org> mac-3.99.4.5.4.ebuild:
   Fix epatch.
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index e1f23886477c..835ab97cdca5 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1,7 +1,8 @@
 AUX mac-3.99.4.5-gcc44.patch 1515 RMD160 bfc5a73e42d16079c4e36c00a58769da4f5c9511 SHA1 667dd159b961f337a8782adf1642795f390cef2c SHA256 4a2951c5618b8777359baaa774530d2864b57b70a8494291cd52ccc874692fe5
+AUX mac-3.99.4.5.4-gcc44.patch 2588 RMD160 e5c9240dd41be3fce4dc2aad7813b27fe232c026 SHA1 a092a76a1c2dbb569d3755980fd1a06b6efc03b8 SHA256 cfec1481d0a5ccffb0f177fad662f1cff2298c88f3cc896c438187fe874545ef
 DIST mac-3.99-u4-b5-s4.tar.gz 427978 RMD160 986849a0f332e1d8f87f9954c34ecd90dbe4749c SHA1 fe706e1847b9c2f67f282c113d94305ac4e35bb2 SHA256 6270532925559bdc8dbc4ef4ca8befb5508c255a667e50382fc40b92a625544f
 DIST mac-3.99-u4-b5.tar.gz 421234 RMD160 34b5ba553f7ffa858249258dad9f64c60f0b6ac0 SHA1 f215c265c2cba719834c989498d5a8d2457b54de SHA256 d59ac5b1fa375a78eadbd5d9bb638ad0229185b42b562dbb04b0dab6475b6651
-EBUILD mac-3.99.4.5.4.ebuild 1389 RMD160 9a578374d0760e1501ca7c65b614b912875b0977 SHA1 4191fbefbf4d70c71471745acde740faa612f0b6 SHA256 b497eb7e9ab35c1076fe120fd6fe56a1f6c43959c3480d29eab8032de45c4b01
+EBUILD mac-3.99.4.5.4.ebuild 1379 RMD160 eb03292b7e8f6ccd3292c33146e953c625cbee81 SHA1 3371760d60383c3da2bdf52bfafedaebccf3d346 SHA256 61fd67c4c9a768968a17acf03db14323b5d161f51296b43e298d9e82cfdae9a2
 EBUILD mac-3.99.4.5.ebuild 1230 RMD160 aeb571f791f4b542ed20cf86c317f7afdde514f6 SHA1 cb425cfde525ae1ae50b79b1e75dbc464a2dff60 SHA256 8e996066a028003458d8ed7c043fb945d33d7d207804e3f768b931974e9b33de
-MISC ChangeLog 957 RMD160 a87b3b1cc4d49830da87f0e5cd6e5bf9252201b7 SHA1 a2e74276327b6d91ebbc413ea5d5287f9689a3ef SHA256 040b5b9fe485faf428e630e453a89e33d3fca893d4f2d67eeeb9a8987d867093
+MISC ChangeLog 1129 RMD160 ec0146298fdd70d48a2da7e094173ae19f3ddcd9 SHA1 e449b7ee5dc83d565889154b4da5fc8a58a8c4df SHA256 5451e856ff5329638c6397a64ee7695b5d024b6c1e7a07e3d5bb9b5d2e0a49cf
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b
diff --git a/media-sound/mac/files/mac-3.99.4.5.4-gcc44.patch b/media-sound/mac/files/mac-3.99.4.5.4-gcc44.patch
new file mode 100644
index 000000000000..2d5ed3296728
--- /dev/null
+++ b/media-sound/mac/files/mac-3.99.4.5.4-gcc44.patch
@@ -0,0 +1,47 @@
+diff -Nuar mac-3.99-u4-b5-s4-orig/src/MACLib/APECompressCreate.cpp mac-3.99-u4-b5-s4/src/MACLib/APECompressCreate.cpp
+--- mac-3.99-u4-b5-s4-orig/src/MACLib/APECompressCreate.cpp	2008-03-12 16:25:54.000000000 +0100
++++ mac-3.99-u4-b5-s4/src/MACLib/APECompressCreate.cpp	2009-12-21 17:44:59.000000000 +0100
+@@ -279,14 +279,14 @@
+         nDataSize = (((nNumberOfFrames - 1) * m_nSamplesPerFrame + nFinalFrameBlocks) * m_wfeInput.nBlockAlign);
+         for (i = 0; i < nHeaderBytes; i++)
+         {
+-            if ((p = strstr((const char *)pHeaderData+i,"RIFF"))) {
++            if ((p = strstr((char *)pHeaderData+i,"RIFF"))) {
+                 ULONG_TO_UCHAR_LE((unsigned char *)p+4,nDataSize + nHeaderBytes - 8);
+                 break;
+             }
+         }
+         for (i = 0; i < nHeaderBytes; i++)
+         {
+-            if ((p = strstr((const char *)pHeaderData+i,"data"))) {
++            if ((p = strstr((char *)pHeaderData+i,"data"))) {
+                 ULONG_TO_UCHAR_LE((unsigned char *)p+4,nDataSize);
+                 break;
+             }
+diff -Nuar mac-3.99-u4-b5-s4-orig/src/MACLib/APELink.cpp mac-3.99-u4-b5-s4/src/MACLib/APELink.cpp
+--- mac-3.99-u4-b5-s4-orig/src/MACLib/APELink.cpp	2006-06-01 11:00:57.000000000 +0200
++++ mac-3.99-u4-b5-s4/src/MACLib/APELink.cpp	2009-12-21 17:38:52.000000000 +0100
+@@ -63,10 +63,10 @@
+     if (pData != NULL)
+     {
+         // parse out the information
+-        char * pHeader = strstr(pData, APE_LINK_HEADER);
+-        char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
+-        char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
+-        char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
++        const char * pHeader = strstr(pData, APE_LINK_HEADER);
++        const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
++        const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
++        const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
+ 
+         if (pHeader && pImageFile && pStartBlock && pFinishBlock)
+         {
+@@ -81,7 +81,7 @@
+                 
+                 // get the path
+                 char cImageFile[MAX_PATH + 1]; int nIndex = 0;
+-                char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
++                const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
+                 while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
+                     cImageFile[nIndex++] = *pImageCharacter++;
+                 cImageFile[nIndex] = 0;
diff --git a/media-sound/mac/mac-3.99.4.5.4.ebuild b/media-sound/mac/mac-3.99.4.5.4.ebuild
index dacd7876eb34..ca28d4a97413 100644
--- a/media-sound/mac/mac-3.99.4.5.4.ebuild
+++ b/media-sound/mac/mac-3.99.4.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.4.ebuild,v 1.2 2009/12/20 20:31:00 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mac/mac-3.99.4.5.4.ebuild,v 1.3 2009/12/21 17:03:42 billie Exp $
 
 EAPI=2
 
@@ -28,7 +28,7 @@ S=${WORKDIR}/${MY_P}
 RESTRICT="mirror"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.99.4.5-gcc44.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	sed -i -e 's:-O3::' configure || die
 }