diff options
| author | dholland <dholland@pkgsrc.org> | 2012-05-07 18:59:39 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-05-07 18:59:39 +0000 |
| commit | edbdb709e3b956cfb41c7abfbb9c623ecdce2f29 (patch) | |
| tree | 07d517a486332906a02954080b0799e63432cdfc /editors/conglomerate | |
| parent | 707c5f454ab9e39cc7dbc6ddd5bda3d8633de012 (diff) | |
| download | pkgsrc-edbdb709e3b956cfb41c7abfbb9c623ecdce2f29.tar.gz | |
Fix symbol name conflict with clone(2).
Diffstat (limited to 'editors/conglomerate')
| -rw-r--r-- | editors/conglomerate/distinfo | 3 | ||||
| -rw-r--r-- | editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo index 73c520ca2b4..42faf77ff51 100644 --- a/editors/conglomerate/distinfo +++ b/editors/conglomerate/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.9 2006/05/30 19:40:08 joerg Exp $ +$NetBSD: distinfo,v 1.10 2012/05/07 18:59:39 dholland Exp $ SHA1 (conglomerate-0.9.1.tar.gz) = 26174924865f095452c59b595f99a31737c9ece5 RMD160 (conglomerate-0.9.1.tar.gz) = 255f80da8efd672f5ad7ac97d3f1bd6e640c254e Size (conglomerate-0.9.1.tar.gz) = 3291367 bytes SHA1 (patch-aa) = 49275d1a9f81638e8eb945ff7c9732fc01bf0a08 +SHA1 (patch-src_cong-editor-line-iter-simple_c) = 0c77b7efb843a7eb44d77c54a5c1ae2eb26d19c9 diff --git a/editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c b/editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c new file mode 100644 index 00000000000..bf40a161064 --- /dev/null +++ b/editors/conglomerate/patches/patch-src_cong-editor-line-iter-simple_c @@ -0,0 +1,31 @@ +$NetBSD: patch-src_cong-editor-line-iter-simple_c,v 1.1 2012/05/07 18:59:39 dholland Exp $ + +Avoid symbol conflict with clone(2). + +--- src/cong-editor-line-iter-simple.c~ 2004-11-04 19:18:48.000000000 +0000 ++++ src/cong-editor-line-iter-simple.c +@@ -26,13 +26,13 @@ + #include "cong-editor-line-iter-simple.h" + + static CongEditorLineIter* +-clone (CongEditorLineIter *line_iter); ++clone_ (CongEditorLineIter *line_iter); + + static CongEditorAreaLine* + get_line (CongEditorLineIter *line_iter); + + CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSimple, cong_editor_line_iter_simple, CONG_EDITOR_LINE_ITER_SIMPLE, CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, +- CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone; ++ CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = clone_; + CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = get_line;) + + CONG_DEFINE_EMPTY_DISPOSE(cong_editor_line_iter_simple) +@@ -58,7 +58,7 @@ cong_editor_line_iter_simple_new (CongEd + } + + static CongEditorLineIter* +-clone (CongEditorLineIter *line_iter) ++clone_ (CongEditorLineIter *line_iter) + { + CongEditorLineIterSimple* simple_iter = CONG_EDITOR_LINE_ITER_SIMPLE (line_iter); + CongEditorLineIterSimple* new_iter; |