diff options
-rw-r--r-- | audio/mac/gcc4_errors.patch | 26 | ||||
-rw-r--r-- | audio/mac/mac.SlackBuild | 5 |
2 files changed, 30 insertions, 1 deletions
diff --git a/audio/mac/gcc4_errors.patch b/audio/mac/gcc4_errors.patch new file mode 100644 index 0000000000000..8e4bdab8472f3 --- /dev/null +++ b/audio/mac/gcc4_errors.patch @@ -0,0 +1,26 @@ +--- src/MACLib/APELink.cpp 2006-06-01 13:00:57.000000000 +0400 ++++ src/MACLib/APELink.cpp 2009-06-15 00:31:36.081731282 +0400 +@@ -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/audio/mac/mac.SlackBuild b/audio/mac/mac.SlackBuild index 0a377ef314f26..3f9ae17554730 100644 --- a/audio/mac/mac.SlackBuild +++ b/audio/mac/mac.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=mac VERSION=${VERSION:-3.99} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -63,6 +63,9 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-assembly=yes \ --build=$ARCH-slackware-linux +# Patch to fix gcc4 output errors: +patch -p0 < $CWD/gcc4_errors.patch + make make install DESTDIR=$PKG |