diff options
| author | rillig <rillig> | 2006-06-26 10:21:55 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-06-26 10:21:55 +0000 |
| commit | fe779dd17227da3172979b46d356288dc77b6748 (patch) | |
| tree | d79163ea474a94bf318643a9b40513b3b7931461 /editors | |
| parent | c05384bd67624bc777812b1715e6a23072a81646 (diff) | |
| download | pkgsrc-fe779dd17227da3172979b46d356288dc77b6748.tar.gz | |
Added patch-ae, which resolves a name collision (FT_FILE) with FreeType.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/elvis/distinfo | 3 | ||||
| -rw-r--r-- | editors/elvis/patches/patch-ae | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/editors/elvis/distinfo b/editors/elvis/distinfo index 024f7d361d9..a57b24902f0 100644 --- a/editors/elvis/distinfo +++ b/editors/elvis/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2006/05/15 16:29:19 joerg Exp $ +$NetBSD: distinfo,v 1.7 2006/06/26 10:21:55 rillig Exp $ SHA1 (elvis-2.2_0.tar.gz) = 8c16574b6d36529735b8ced70972ddaf6275a477 RMD160 (elvis-2.2_0.tar.gz) = 9867a3941a84a3db0bcfe4e36dd14132fbcf5805 @@ -6,3 +6,4 @@ Size (elvis-2.2_0.tar.gz) = 1439293 bytes SHA1 (patch-ab) = 3ded3089b617bccc3458e6c9101a339534fd3152 SHA1 (patch-ac) = bbed33584e0301da4265727082336fb941e1638b SHA1 (patch-ad) = 702b08ec1182c3673721de62690a3a7c32983b8a +SHA1 (patch-ae) = 2a8eb92b44fa932fcc51e7af999f1363dd53ff74 diff --git a/editors/elvis/patches/patch-ae b/editors/elvis/patches/patch-ae new file mode 100644 index 00000000000..b29d67c9b29 --- /dev/null +++ b/editors/elvis/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2006/06/26 10:21:55 rillig Exp $ + +--- guix11/xdialog.h.orig 2006-06-26 12:17:12.000000000 +0200 ++++ guix11/xdialog.h 2006-06-26 12:19:24.000000000 +0200 +@@ -1,5 +1,9 @@ + /* xdialog.h */ + ++/* Let's hope that there will be no conflict with FreeType, ++ * which had defined this to FILE. */ ++#undef FT_FILE ++ + typedef enum { + FT_DEFAULT, /* dummy value, for fields with no explicit type */ + FT_ONEOF, /* one of a preset list; includes boolean */ |