diff --git a/news/trn/Makefile b/news/trn/Makefile index 56357296069..54303ca3e8b 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2020/03/20 16:44:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.26 2021/02/06 21:18:58 naddy Exp $ COMMENT= threaded newsreader @@ -9,7 +9,7 @@ MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=trn/} V=77 DISTNAME= trn-4.0-test$V PKGNAME= trn-4.0.$V -REVISION= 2 +REVISION= 3 PERMIT_PACKAGE=Yes # Technically, we could put trn on CD-Rom, provided we include the distfile diff --git a/news/trn/patches/patch-scan_h b/news/trn/patches/patch-scan_h new file mode 100644 index 00000000000..35d494312a8 --- /dev/null +++ b/news/trn/patches/patch-scan_h @@ -0,0 +1,76 @@ +$OpenBSD: patch-scan_h,v 1.1 2021/02/06 21:18:58 naddy Exp $ + +fix for -fno-common + +Index: scan.h +--- scan.h.orig ++++ scan.h +@@ -64,36 +64,36 @@ struct scontext { + + /* the current values */ + +-long* s_ent_sort; /* sorted list of entries in the context */ +-long s_ent_sort_max; /* maximum index of sorted array */ +-long s_ent_sorted_max; /* maximum index *that is sorted* */ +-long* s_ent_index; /* indexes into ent_sorted */ +-long s_ent_index_max; /* maximum entry number added */ ++EXT long* s_ent_sort; /* sorted list of entries in the context */ ++EXT long s_ent_sort_max; /* maximum index of sorted array */ ++EXT long s_ent_sorted_max; /* maximum index *that is sorted* */ ++EXT long* s_ent_index; /* indexes into ent_sorted */ ++EXT long s_ent_index_max; /* maximum entry number added */ + +-int s_page_size; /* number of entries allocated for page */ ++EXT int s_page_size; /* number of entries allocated for page */ + /* (usually fixed, > max screen lines) */ +-PAGE_ENT* page_ents; /* array of entries on page */ ++EXT PAGE_ENT* page_ents; /* array of entries on page */ + /* -1 means not initialized for top and bottom entry */ +-long s_top_ent; /* top entry on page */ +-long s_bot_ent; /* bottom entry (note change) */ +-bool s_refill; /* does the page need refilling? */ ++EXT long s_top_ent; /* top entry on page */ ++EXT long s_bot_ent; /* bottom entry (note change) */ ++EXT bool s_refill; /* does the page need refilling? */ + /* refresh entries */ +-bool s_ref_all; /* refresh all on page */ +-bool s_ref_top; /* top status bar */ +-bool s_ref_bot; /* bottom status bar */ ++EXT bool s_ref_all; /* refresh all on page */ ++EXT bool s_ref_top; /* top status bar */ ++EXT bool s_ref_bot; /* bottom status bar */ + /* -1 for the next two entries means don't refresh */ +-short s_ref_status; /* line to start refreshing status from */ +-short s_ref_desc; /* line to start refreshing descript. from */ ++EXT short s_ref_status; /* line to start refreshing status from */ ++EXT short s_ref_desc; /* line to start refreshing descript. from */ + /* screen sizes */ +-short s_top_lines; /* lines for top status bar */ +-short s_bot_lines; /* lines for bottom status bar */ +-short s_status_cols; /* characters for status column */ +-short s_cursor_cols; /* characters for cursor column */ +-short s_itemnum_cols; /* characters for item number column */ +-short s_desc_cols; /* characters for description column */ ++EXT short s_top_lines; /* lines for top status bar */ ++EXT short s_bot_lines; /* lines for bottom status bar */ ++EXT short s_status_cols; /* characters for status column */ ++EXT short s_cursor_cols; /* characters for cursor column */ ++EXT short s_itemnum_cols; /* characters for item number column */ ++EXT short s_desc_cols; /* characters for description column */ + /* pointer info */ +-short s_ptr_page_line; /* page_ent index */ +-long s_flags; /* misc. flags */ ++EXT short s_ptr_page_line; /* page_ent index */ ++EXT long s_flags; /* misc. flags */ + + EXT int s_num_contexts INIT(0); + /* array of context structures */ +@@ -102,7 +102,7 @@ EXT SCONTEXT* s_contexts INIT((SCONTEXT*)NULL); + /* current context number */ + EXT int s_cur_context INIT(0); + /* current context type (for fast switching) */ +-int s_cur_type; ++EXT int s_cur_type; + + /* options */ + /* show item numbers by default */