diff options
Diffstat (limited to 'devel/ArX/patches/patch-ae')
| -rw-r--r-- | devel/ArX/patches/patch-ae | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/devel/ArX/patches/patch-ae b/devel/ArX/patches/patch-ae new file mode 100644 index 00000000000..7d25e5f02ae --- /dev/null +++ b/devel/ArX/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1 2007/09/20 20:47:04 wiz Exp $ + +For some weird reason, g++ 3.3.3 complains about a syntax error here. + +--- src/arx/libarx/merge_branches/three_way_merge.cpp.orig 2005-11-17 20:06:21.000000000 +0100 ++++ src/arx/libarx/merge_branches/three_way_merge.cpp 2006-04-11 15:07:43.000000000 +0200 +@@ -143,7 +143,7 @@ Conflicts three_way_merge(const Parsed_N + make_pair(ancestor_temp.string(), + sibling_temp.string()))); + +- path merge_path(path(getenv("HOME"))/".arx/merge3"); ++ path merge_path = (path(getenv("HOME"))/".arx/merge3"); + if(fs::exists(merge_path)) + { + Spawn s; |