diff options
author | dholland <dholland@pkgsrc.org> | 2012-01-08 22:15:21 +0000 |
---|---|---|
committer | dholland <dholland@pkgsrc.org> | 2012-01-08 22:15:21 +0000 |
commit | 760a548589b9ca62519ac9ac51a2663574863d62 (patch) | |
tree | f67daf9b062f3bbe0be405a1b85bb67109e22c84 /www/amaya | |
parent | 7f5efd82c42796ade866ee26b5c913fadc0b656c (diff) | |
download | pkgsrc-760a548589b9ca62519ac9ac51a2663574863d62.tar.gz |
Fix build problems with gcc 4.5. The code makes no sense so I'm not sure
what I did is going to work... or that the code that was here previously
ever worked or actually did what anyone upstream intended. C++ is fun
that way.
Diffstat (limited to 'www/amaya')
-rw-r--r-- | www/amaya/distinfo | 4 | ||||
-rw-r--r-- | www/amaya/patches/patch-Amaya_amaya_HTMLedit_c | 16 | ||||
-rw-r--r-- | www/amaya/patches/patch-Amaya_thotlib_base_platform_c | 19 |
3 files changed, 38 insertions, 1 deletions
diff --git a/www/amaya/distinfo b/www/amaya/distinfo index 5e9c7c3d90e..0b6687f2b97 100644 --- a/www/amaya/distinfo +++ b/www/amaya/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.23 2011/08/13 19:03:37 dholland Exp $ +$NetBSD: distinfo,v 1.24 2012/01/08 22:15:21 dholland Exp $ SHA1 (amaya-fullsrc-11.3.1.tgz) = 7b180434a8271ecdeb3ae821997619bc3dcd2da4 RMD160 (amaya-fullsrc-11.3.1.tgz) = 12206de82551ed2eb548e3c778909bf0d9cafe43 Size (amaya-fullsrc-11.3.1.tgz) = 37240030 bytes +SHA1 (patch-Amaya_amaya_HTMLedit_c) = bda20efa29e6ace95222d42574e7acd3afb55834 +SHA1 (patch-Amaya_thotlib_base_platform_c) = 034512f7886fb15089a1134538891f9c62c0c90b SHA1 (patch-aa) = bd04e6ee2a23b18696dad50168da5b6f31bbb3a1 SHA1 (patch-ab) = d3280c6137eb1b37f62986a5bfe3fc8a23c4b24c SHA1 (patch-ac) = 3140206116c5dfdbf9257d754c1ea06966d8bd22 diff --git a/www/amaya/patches/patch-Amaya_amaya_HTMLedit_c b/www/amaya/patches/patch-Amaya_amaya_HTMLedit_c new file mode 100644 index 00000000000..554d16ab73c --- /dev/null +++ b/www/amaya/patches/patch-Amaya_amaya_HTMLedit_c @@ -0,0 +1,16 @@ +$NetBSD: patch-Amaya_amaya_HTMLedit_c,v 1.1 2012/01/08 22:15:21 dholland Exp $ + +Hack insane C++ so gcc 4.5 accepts it. No idea if this works. No idea +if it worked before I touched it, either. + +--- Amaya/amaya/HTMLedit.c~ 2009-12-09 10:11:22.000000000 +0000 ++++ Amaya/amaya/HTMLedit.c +@@ -1689,7 +1689,7 @@ void SetREFattribute (Element element, D + { + #ifdef _WX + wxString tmpFile = TtaConvMessageToWX(tempURL); +- wxFile::wxFile (tmpFile, wxFile::write); ++ wxFile tmpFileFile (tmpFile, wxFile::write); + #endif /* _WX */ + } + } diff --git a/www/amaya/patches/patch-Amaya_thotlib_base_platform_c b/www/amaya/patches/patch-Amaya_thotlib_base_platform_c new file mode 100644 index 00000000000..19dcba3fd9c --- /dev/null +++ b/www/amaya/patches/patch-Amaya_thotlib_base_platform_c @@ -0,0 +1,19 @@ +$NetBSD: patch-Amaya_thotlib_base_platform_c,v 1.1 2012/01/08 22:15:21 dholland Exp $ + +Hack insane C++ so gcc 4.5 accepts it. No idea if this works. No idea +if it worked before I touched it, either. + +--- Amaya/thotlib/base/platform.c.orig 2009-12-02 11:23:07.000000000 +0000 ++++ Amaya/thotlib/base/platform.c +@@ -329,9 +329,9 @@ ThotBool TtaFileCopy (CONST char *source + { + tmp = (char *)TtaGetMemory (strlen(targetFileName)+10); + sprintf (tmp, "%s.tmp", targetFileName); +- wxFile::wxFile (targetFile, wxFile::write); ++ wxFile targetFileFile (targetFile, wxFile::write); + tmpFile = TtaConvMessageToWX(tmp); +- wxFile::wxFile (tmpFile, wxFile::write); ++ wxFile tmpFileFile (tmpFile, wxFile::write); + result = wxFile::Exists(targetFile); + if (result) + result = wxConcatFiles (tmpFile, sourceFile, targetFile); |