diff options
| author | sbd <sbd> | 2011-08-01 04:30:51 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2011-08-01 04:30:51 +0000 |
| commit | 3b3067b0e1c65d036f055d4f1f45013756dc6dcb (patch) | |
| tree | 6aba3aaa3d8d6430a140e08253f3bf76fb20c131 | |
| parent | 52e16f85872b5146299d0b93636aaf65a118c7a0 (diff) | |
| download | pkgsrc-3b3067b0e1c65d036f055d4f1f45013756dc6dcb.tar.gz | |
Pullup ticket #3484 - requested by dholland
devel/tig build fix
Revisions pulled up:
- devel/tig/distinfo 1.5
- devel/tig/patches/patch-tig_c 1.1
- devel/tig/patches/patch-tig_h 1.1
---
Module Name: pkgsrc
Committed By: dholland
Date: Sun Jul 31 22:15:36 UTC 2011
Modified Files:
pkgsrc/devel/tig: distinfo
Added Files:
pkgsrc/devel/tig/patches: patch-tig_c patch-tig_h
Log Message:
Fix broken build.
| -rw-r--r-- | devel/tig/distinfo | 4 | ||||
| -rw-r--r-- | devel/tig/patches/patch-tig_c | 20 | ||||
| -rw-r--r-- | devel/tig/patches/patch-tig_h | 13 |
3 files changed, 36 insertions, 1 deletions
diff --git a/devel/tig/distinfo b/devel/tig/distinfo index 24a9c85e22a..ff045fbbb7b 100644 --- a/devel/tig/distinfo +++ b/devel/tig/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.4 2011/04/10 10:24:47 ryoon Exp $ +$NetBSD: distinfo,v 1.4.2.1 2011/08/01 04:30:51 sbd Exp $ SHA1 (tig-0.17.tar.gz) = a48e9d08d96f8b49b65cf86602112c7c8e1a4804 RMD160 (tig-0.17.tar.gz) = 303c0920e7f2b8b8bb74d65cf0bb3e914501ecd4 Size (tig-0.17.tar.gz) = 168918 bytes SHA1 (patch-aa) = 36dfa1084701d7950928075c4c764530b65a233e +SHA1 (patch-tig_c) = fad2b7fb1c931a9c54380bea67a84c28014613b8 +SHA1 (patch-tig_h) = 49143512a967e77796ebf64013249d5bd516951e diff --git a/devel/tig/patches/patch-tig_c b/devel/tig/patches/patch-tig_c new file mode 100644 index 00000000000..f1f3b12a4b8 --- /dev/null +++ b/devel/tig/patches/patch-tig_c @@ -0,0 +1,20 @@ +$NetBSD: patch-tig_c,v 1.1.2.2 2011/08/01 04:30:52 sbd Exp $ + +--- tig.c.orig 2011-03-07 01:50:11.000000000 +0000 ++++ tig.c +@@ -1897,12 +1897,12 @@ redraw_display(bool clear) + */ + + #define TOGGLE_MENU \ +- TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, NULL) \ ++ TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, (struct enum_map *)NULL) \ + TOGGLE_(DATE, 'D', "dates", &opt_date, date_map) \ + TOGGLE_(AUTHOR, 'A', "author names", &opt_author, author_map) \ + TOGGLE_(GRAPHIC, '~', "graphics", &opt_line_graphics, graphic_map) \ +- TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, NULL) \ +- TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, NULL) ++ TOGGLE_(REV_GRAPH, 'g', "revision graph", &opt_rev_graph, (struct enum_map *)NULL) \ ++ TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, (struct enum_map *)NULL) + + static void + toggle_option(enum request request) diff --git a/devel/tig/patches/patch-tig_h b/devel/tig/patches/patch-tig_h new file mode 100644 index 00000000000..a0e2892a9df --- /dev/null +++ b/devel/tig/patches/patch-tig_h @@ -0,0 +1,13 @@ +$NetBSD: patch-tig_h,v 1.1.2.2 2011/08/01 04:30:52 sbd Exp $ + +--- tig.h~ 2011-03-07 01:50:11.000000000 +0000 ++++ tig.h +@@ -68,7 +68,7 @@ + #define MIN(x, y) ((x) < (y) ? (x) : (y)) + #define MAX(x, y) ((x) > (y) ? (x) : (y)) + +-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) ++#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + #define STRING_SIZE(x) (sizeof(x) - 1) + + #define SIZEOF_STR 1024 /* Default string size. */ |