diff options
| author | rillig <rillig@pkgsrc.org> | 2006-04-11 17:38:57 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2006-04-11 17:38:57 +0000 |
| commit | a721a81df5f512a40f3cba7f4b52749063948772 (patch) | |
| tree | 34e373dfe09d48ed29991d41ff104eacaa63192f /devel | |
| parent | 3b6df974e14b3a39c84f9020a7d361f38198a3ed (diff) | |
| download | pkgsrc-a721a81df5f512a40f3cba7f4b52749063948772.tar.gz | |
Added a patch that fixes the build on NetBSD 3.0/i386.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/ArX2/distinfo | 3 | ||||
| -rw-r--r-- | devel/ArX2/patches/patch-threewaymerge | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/devel/ArX2/distinfo b/devel/ArX2/distinfo index 6a8c1f22db8..67758f5937c 100644 --- a/devel/ArX2/distinfo +++ b/devel/ArX2/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.7 2006/02/19 18:12:14 joerg Exp $ +$NetBSD: distinfo,v 1.8 2006/04/11 17:38:57 rillig Exp $ SHA1 (ArX-2.2.4.tar.gz) = a575e005cfa2d80a6faced52b0128e9b7ff208df RMD160 (ArX-2.2.4.tar.gz) = 28bcab15b42bd116e736df7b4552ed00c34659ae Size (ArX-2.2.4.tar.gz) = 13561129 bytes SHA1 (patch-aa) = dbd26f2c93ee76655a5f024dd5319e0b462bc797 SHA1 (patch-ab) = 42045fdfc5b731da1fb41271a2f39f980f898588 +SHA1 (patch-threewaymerge) = 854ef7137a066672616ceda234a3f99fba23eddd diff --git a/devel/ArX2/patches/patch-threewaymerge b/devel/ArX2/patches/patch-threewaymerge new file mode 100644 index 00000000000..7e8ff53218b --- /dev/null +++ b/devel/ArX2/patches/patch-threewaymerge @@ -0,0 +1,15 @@ +$NetBSD: patch-threewaymerge,v 1.1 2006/04/11 17:38:57 rillig 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; |