summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
Diffstat (limited to 'development')
-rw-r--r--development/amaya/amaya.SlackBuild7
-rw-r--r--development/amaya/amaya_gcc45x.patch25
2 files changed, 30 insertions, 2 deletions
diff --git a/development/amaya/amaya.SlackBuild b/development/amaya/amaya.SlackBuild
index 319321fcb6..3661c3ec9f 100644
--- a/development/amaya/amaya.SlackBuild
+++ b/development/amaya/amaya.SlackBuild
@@ -4,17 +4,17 @@
# Written by Vincent Batts, http://hashbangbash.com/
+# Modified by the SlackBuilds.org team
+
PRGNAM=amaya
VERSION=${VERSION:-11.3.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -56,6 +56,9 @@ find . \
# Apply a patch so wxWidgets builds with the newer gtk
( cd wxWidgets ; cat $CWD/newgtk.patch | patch -p1 || exit 1 )
+# Apply patch for gcc 4.5.x
+patch -p1 < $CWD/amaya_gcc45x.patch
+
mkdir -p Amaya/build
cd Amaya/build
CFLAGS="$SLKCFLAGS" \
diff --git a/development/amaya/amaya_gcc45x.patch b/development/amaya/amaya_gcc45x.patch
new file mode 100644
index 0000000000..e2587e1336
--- /dev/null
+++ b/development/amaya/amaya_gcc45x.patch
@@ -0,0 +1,25 @@
+--- Amaya11.3.1/Amaya/thotlib/base/platform.c 2009-12-02 09:23:07.000000000 -0200
++++ Amaya11.3.1_patched/Amaya/thotlib/base/platform.c 2011-03-25 00:43:18.000000000 -0300
+@@ -329,9 +329,9 @@
+ {
+ tmp = (char *)TtaGetMemory (strlen(targetFileName)+10);
+ sprintf (tmp, "%s.tmp", targetFileName);
+- wxFile::wxFile (targetFile, wxFile::write);
++ wxFile (targetFile, wxFile::write);
+ tmpFile = TtaConvMessageToWX(tmp);
+- wxFile::wxFile (tmpFile, wxFile::write);
++ wxFile (tmpFile, wxFile::write);
+ result = wxFile::Exists(targetFile);
+ if (result)
+ result = wxConcatFiles (tmpFile, sourceFile, targetFile);
+--- Amaya11.3.1/Amaya/amaya/HTMLedit.c 2009-12-09 08:11:22.000000000 -0200
++++ Amaya11.3.1_patched/Amaya/amaya/HTMLedit.c 2011-03-25 01:05:24.000000000 -0300
+@@ -1689,7 +1689,7 @@
+ {
+ #ifdef _WX
+ wxString tmpFile = TtaConvMessageToWX(tempURL);
+- wxFile::wxFile (tmpFile, wxFile::write);
++ wxFile (tmpFile, wxFile::write);
+ #endif /* _WX */
+ }
+ }