sc-im: Update to 0.8.2 0.8.2 Changes - Improved yank and undo alloc'ing. Malloc as much we need from start in a long batch and avoid small mallocs. - Changed the way lua scripts are referenced in formulas. Now they are input as any other string formula, like this: \"@lua("script_name.lua", 1) being 1 if the reference should be added to the depgraph or not, making it evaluated just once or every time the depgraph is evaluated. NOTE that if set to 0 and the cell is referenced by another cell, it will be executed nonetheless. - Added new exec_lua configuration variable. - Rows now can have height higher than one LINE. See fj and fk in normal mode or :formatrow in command mode. - Wrap cell content. new autowrap config value. works when nooverlap and notruncate are set. - Open URL or file specified on cell (PR 401) - Import mkd files - Multiple frozen rows/columns (fr / fc in normal mode) - Added mapping_timeout configuration variable with a default value of 1500ms (used to be a fixed value of 800ms). - Added mouse support in insert and command mode. The selection of a cell gets copied to inputbar. - Added command_timeout configuration variable. - handle hidden rows/cols in undo/redo of ir/ic/dr/dc - Added backwards search with '?' - Restore \\* from old SC. \\{char} fills the cell with n occurrences of {char} to complete its width - Store frozen rows and cols when saving file - Added :formatcol command (handling its undo as well) - Added :formatrow command (handling its undo as well) - Added undo of freeze row and col - Handle \n in cell input, and with autowrap - Handle undoing changes in row height produced by string input - Changed input bar from window to pad: permits entering string longer than COLS. - @count counts cells with strings as well, and not just with numbers. - Handle entering a label after :datefmt for datetime value edition. - New dracula / papercolor themes. - Added EvalRange() so that the graph is not evaluated entirely all the time. - Replaced 'EvalAll' with 'EvalRange'. - Removed unneeded parameters on EvalJustVertex" - Added eval_order in EvalRange and rebuild_graph. - Added @evaluate / @sevaluate functions - Handle @nval dependencies. - Handle @mycol/@myrow calls during startup when no EvalJustOneVertex is yet called - Added @getent (FR issue #451) - The saving format for :w command would be according to current file format. #493 - modified savefile() of file.c to check current file format before saving a file. - Keep consistent with other format such as csv and save the file with the same format as current file. - Added HELP_HIGHLIGHT definition color for help page. - Renamed GRID_PAIR to GRID_EVEN in color.c. - UNDO of :fsum is handled by let. - calc_offscr_rows/cols rewriten and renamed to calc_mobile_rows/cols Fixes - Fix old sc bug - issue #371 - Fix when saving sc files of cells that has some string expressions - issue #541 - Fix leak in nval. - Fix Issue #372. - Free lua memory at exit. - Fix when saving marks in file after importing xlsx file and saving it in sc format. - EXPR and NUMBER colors were overloaded by STRING color #546 - Fix markdown export when empty col was added left to data - Fix in :showrows command. - :fsum added to command mode commands. It was missing. - Added :showcols command that was missing. - Handled issue #429 - handled issue #374 - Ignore SIGWINCH outside ncurses. - triggers: Avoid segfault when not being able to load module. Issue #325 0.8.1 New features - Braille support - Added latex export - issue #394 - Added mappings for command mode - Work on issues #225 and #247: support mapping of 単 and other special chars - Basic ODS file import - Paste to a range of selected cells - (actually added on v0.8 - issue 438 - PR 445) - Added txtdelim | for csv files import - issue 409 - Added macros to --version (show version) - Support higher versions of lua. - Handle ESC key in mappings. related to issue #492. - Added freeze to visual mode - issue #459 Changes - Recognise SPACE in mappings rather than simple ' ' - Visual change: Moved cmd multiplier to the left of mode - Changed default headings colors - many improvements to the config facility and usage - PR 519 - improved sort for 65k rows Fixes - Fix issues on CIRCULAR REFERENCES: #473 #201 #475 #321. these were as hard. - Fix issue 417 and added a date type in xlsx import. - Fix Engformat overlap text y n炭mero. Mostraba * (actually fixed on v0.8) - Fix column header display - overflow with column width 2 and column with two letters - PR 517 - Fix isnumeric test to recognise floats: affects copy/paste - PR 450 - Fix issue setting conf variables like nonumeric - Fix when showing empty text - 944844505d7cdb7d3d392a5c1d2b3ffde40a1fff - Fix issue #227 - this was hard. used to segfault and keep wrong reference after deleting row that is last in range of expr. ex. @avg(B1:B4) and deleting row 4 - Fix issue #433: large memory use with multiple linked cells. - Fix issue #287 - valueize didnt update depgraph - Solved issue #399. 'g' command of NORMAL_MODE changed to 'gt'" - Fixed vmaps in get_mappings function. - Fixed bug on 'error' in gram.y - comment on issue #482 - Fix issue #457: cursor position could add empty rows or columns when exporting csv files - Fix issue #288: ^ misbehaving when having fixed rows - Fix in mouse clicks - Fix possible memory leak in add freeze - XLSX: Free memory leak when looking for specified sheet. - XLSX: Avoid segfault when using shared formulas. issue #218.diff -r1.26 -r1.27 pkgsrc/math/sc-im/Makefile
(sjmulder)
@@ -1,17 +1,16 @@ | @@ -1,17 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.26 2021/07/26 01:03:28 sjmulder Exp $ | 1 | # $NetBSD: Makefile,v 1.27 2021/07/26 01:38:05 sjmulder Exp $ | |
2 | 2 | |||
3 | DISTNAME= sc-im-0.8.0 | 3 | DISTNAME= sc-im-0.8.2 | |
4 | PKGREVISION= 3 | |||
5 | CATEGORIES= math | 4 | CATEGORIES= math | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=andmarti1424/} | |
7 | GITHUB_TAG= v${PKGVERSION_NOREV} | 6 | GITHUB_TAG= v${PKGVERSION_NOREV} | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= https://github.com/andmarti1424/sc-im/ | 9 | HOMEPAGE= https://github.com/andmarti1424/sc-im/ | |
11 | COMMENT= Curses-based spreadsheet program based on sc | 10 | COMMENT= Curses-based spreadsheet program based on sc | |
12 | LICENSE= original-bsd | 11 | LICENSE= original-bsd | |
13 | 12 | |||
14 | BUILD_DIRS= src | 13 | BUILD_DIRS= src | |
15 | INSTALL_DIRS= src | 14 | INSTALL_DIRS= src | |
16 | 15 | |||
17 | .include "../../mk/bsd.prefs.mk" | 16 | .include "../../mk/bsd.prefs.mk" |
@@ -1,8 +1,9 @@ | @@ -1,8 +1,9 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.1 2019/01/30 12:58:24 leot Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2021/07/26 01:38:05 sjmulder Exp $ | |
2 | bin/sc-im | 2 | bin/sc-im | |
3 | bin/scopen | |||
3 | man/man1/sc-im.1 | 4 | man/man1/sc-im.1 | |
4 | share/sc-im/plot_bar | 5 | share/sc-im/plot_bar | |
5 | share/sc-im/plot_line | 6 | share/sc-im/plot_line | |
6 | share/sc-im/plot_pie | 7 | share/sc-im/plot_pie | |
7 | share/sc-im/plot_scatter | 8 | share/sc-im/plot_scatter | |
8 | share/sc-im/sc-im_help | 9 | share/sc-im/sc-im_help |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2021/03/28 12:28:00 sjmulder Exp $ | 1 | $NetBSD: distinfo,v 1.4 2021/07/26 01:38:05 sjmulder Exp $ | |
2 | 2 | |||
3 | SHA1 (sc-im-0.8.0.tar.gz) = a603402d0e15e642c677e43be08794f3231aa407 | 3 | SHA1 (sc-im-0.8.2.tar.gz) = 3dde8f1e4d95e7b6e121cbdfa680955773a6eedd | |
4 | RMD160 (sc-im-0.8.0.tar.gz) = a5684587c8e594d8df108212cbaf002c66c4b76e | 4 | RMD160 (sc-im-0.8.2.tar.gz) = afabf063feda1800fd07e6ee13b4036c7d5a200f | |
5 | SHA512 (sc-im-0.8.0.tar.gz) = 616178d9ca4b169fb2849a9f8554452e39279b68507132d77007435b57e205c9f24961778e6178867b996575eaa80242de8757a9fb927e0c2d8cd63513436ec9 | 5 | SHA512 (sc-im-0.8.2.tar.gz) = ae02fd31eb7254208de26802ed6d8b21d77ce2d6997f4a2de5bd2f0a002c763f67f53e6c8e49d66ded096ecd8bf50b1117015e9a0356eaf11c3caef22cf4552c | |
6 | Size (sc-im-0.8.0.tar.gz) = 1386374 bytes | 6 | Size (sc-im-0.8.2.tar.gz) = 1619617 bytes | |
7 | SHA1 (patch-src_Makefile) = d691b9b6de32aff4cc69807dada655cb691ee147 | 7 | SHA1 (patch-src_Makefile) = a8775db5d5a91cb1ee53946e4eff4fe3390a9dc5 |
@@ -1,32 +1,31 @@ | @@ -1,32 +1,31 @@ | |||
1 | $NetBSD: patch-src_Makefile,v 1.2 2021/03/28 12:28:00 sjmulder Exp $ | 1 | $NetBSD: patch-src_Makefile,v 1.3 2021/07/26 01:38:05 sjmulder Exp $ | |
2 | 2 | |||
3 | - Make libdl and curses flags overridable | 3 | - Make libdl and curses flags overridable | |
4 | - Make color support opt in so we can control it | 4 | - Make color support opt in so we can control it | |
5 | - Remove hardcoded paths for NetBSD | |||
5 | 6 | |||
6 | --- src/Makefile.orig 2021-03-18 16:42:21.000000000 +0000 | 7 | --- src/Makefile.orig 2021-05-13 17:38:26.000000000 +0000 | |
7 | +++ src/Makefile | 8 | +++ src/Makefile | |
8 | @@ -36,8 +36,8 @@ CFLAGS += -DLIBDIR=\"$(LIBDIR)\" | 9 | @@ -37,7 +37,7 @@ CFLAGS += -DDFLT_PAGER=\"less\" | |
9 | CFLAGS += -DDFLT_PAGER=\"less\" | |||
10 | # Sets default editor. Its use in case EDITOR env variable is not set | 10 | # Sets default editor. Its use in case EDITOR env variable is not set | |
11 | CFLAGS += -DDFLT_EDITOR=\"vim\" | 11 | CFLAGS += -DDFLT_EDITOR=\"vim\" | |
12 | -# Comment out to disable color support | 12 | # Comment out to disable color support | |
13 | -CFLAGS += -DUSECOLORS | 13 | -CFLAGS += -DUSECOLORS | |
14 | +# Uncomment to enable color support | |||
15 | +#CFLAGS += -DUSECOLORS | 14 | +#CFLAGS += -DUSECOLORS | |
16 | # Command history file, relative to HISTORY_DIR directory. Comment out to disable commandline history | 15 | # Command history file, relative to HISTORY_DIR directory. Comment out to disable commandline history | |
17 | CFLAGS += -DHISTORY_FILE=\"$(HISTORY_FILE)\" -DHISTORY_DIR=\"$(HISTORY_DIR)\" | 16 | CFLAGS += -DHISTORY_FILE=\"$(HISTORY_FILE)\" -DHISTORY_DIR=\"$(HISTORY_DIR)\" | |
18 | # Configuration file, relative to CONFIG_DIR directory | 17 | # Configuration file, relative to CONFIG_DIR directory | |
19 | @@ -107,25 +107,27 @@ endif | 18 | @@ -94,25 +94,27 @@ endif | |
20 | 19 | |||
21 | # dynamic linking (not available in BSD) | 20 | # dynamic linking (not available in BSD) | |
22 | ifneq ($(shell uname -s | grep -o BSD),BSD) | 21 | ifneq ($(shell uname -s | grep -o BSD),BSD) | |
23 | - LDLIBS += -ldl | 22 | - LDLIBS += -ldl | |
24 | + LDLIBS_DL += -ldl | 23 | + LDLIBS_DL += -ldl | |
25 | endif | 24 | endif | |
26 | 25 | |||
27 | +LDLIBS += $(LDLIBS_DL) | 26 | +LDLIBS += $(LDLIBS_DL) | |
28 | + | 27 | + | |
29 | ifneq (, $(shell which pkg-config)) | 28 | ifneq (, $(shell which pkg-config)) | |
30 | # Any system with pkg-config | 29 | # Any system with pkg-config | |
31 | 30 | |||
32 | # NOTE: ncursesw (required) | 31 | # NOTE: ncursesw (required) | |
@@ -40,44 +39,41 @@ $NetBSD: patch-src_Makefile,v 1.2 2021/0 | @@ -40,44 +39,41 @@ $NetBSD: patch-src_Makefile,v 1.2 2021/0 | |||
40 | + CFLAGS_CURSES ?= $(shell pkg-config --cflags ncursesw) | 39 | + CFLAGS_CURSES ?= $(shell pkg-config --cflags ncursesw) | |
41 | + LDLIBS_CURSES ?= $(shell pkg-config --libs ncursesw) | 40 | + LDLIBS_CURSES ?= $(shell pkg-config --libs ncursesw) | |
42 | else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no) | 41 | else ifneq ($(shell pkg-config --exists ncurses || echo 'no'),no) | |
43 | # hopefully this includes wide character support then | 42 | # hopefully this includes wide character support then | |
44 | - CFLAGS += $(shell pkg-config --cflags ncurses) | 43 | - CFLAGS += $(shell pkg-config --cflags ncurses) | |
45 | - LDLIBS += $(shell pkg-config --libs ncurses) | 44 | - LDLIBS += $(shell pkg-config --libs ncurses) | |
46 | + CFLAGS_CURSES ?= $(shell pkg-config --cflags ncurses) | 45 | + CFLAGS_CURSES ?= $(shell pkg-config --cflags ncurses) | |
47 | + LDLIBS_CURSES ?= $(shell pkg-config --libs ncurses) | 46 | + LDLIBS_CURSES ?= $(shell pkg-config --libs ncurses) | |
48 | else | 47 | else | |
49 | - LDLIBS += -lncursesw | 48 | - LDLIBS += -lncursesw | |
50 | + LDLIBS_CURSES ?= -lncursesw | 49 | + LDLIBS_CURSES ?= -lncursesw | |
51 | endif | 50 | endif | |
52 | 51 | |||
53 | # NOTE: libxml and libzip are required for xlsx file import support | 52 | # NOTE: libxlsreader (libxls) is required for xls file reading support | |
54 | @@ -150,21 +152,24 @@ else ifeq ($(shell uname -s),Darwin) | 53 | @@ -153,21 +155,14 @@ else ifeq ($(shell uname -s),Darwin) | |
55 | # macOS without pkg-config | 54 | # macOS without pkg-config | |
56 | 55 | |||
57 | # macOS' ncurses is built with wide-char support | 56 | # macOS' ncurses is built with wide-char support | |
58 | - LDFLAGS += -lncurses | 57 | - LDFLAGS += -lncurses | |
59 | + LDLIBS_CURSES += -lncurses | 58 | -else ifeq ($(shell uname -s),NetBSD) | |
60 | else ifeq ($(shell uname -s),NetBSD) | 59 | - # NetBSD without pkg-config | |
61 | # NetBSD without pkg-config | 60 | - | |
62 | ||||
63 | - CFLAGS += -I/usr/pkg/include | 61 | - CFLAGS += -I/usr/pkg/include | |
64 | - CFLAGS += -I/usr/pkg/include/ncursesw | 62 | - CFLAGS += -I/usr/pkg/include/ncursesw | |
65 | + CFLAGS += -I/usr/pkg/include | 63 | - | |
66 | + CFLAGS_CURSES += -I/usr/pkg/include/ncursesw | 64 | - LDFLAGS += -L/usr/pkg/lib | |
67 | 65 | - LDFLAGS += -Wl,-R/usr/pkg/lib | ||
68 | LDFLAGS += -L/usr/pkg/lib | 66 | - | |
69 | LDFLAGS += -Wl,-R/usr/pkg/lib | |||
70 | ||||
71 | - LDLIBS += -lncursesw | 67 | - LDLIBS += -lncursesw | |
72 | + LDLIBS_CURSES += -lncursesw | 68 | + LDLIBS_CURSES += -lncurses | |
73 | else | 69 | else | |
74 | - LDFLAGS += -lncursesw | 70 | - LDFLAGS += -lncursesw | |
75 | + LDLIBS_CURSES += -lncursesw | 71 | + LDLIBS_CURSES += -lncursesw | |
76 | endif | 72 | endif | |
77 | 73 | |||
78 | +CFLAGS += $(CFLAGS_CURSES) | 74 | +CFLAGS += $(CFLAGS_CURSES) | |
79 | +LDLIBS += $(LDLIBS_CURSES) | 75 | +LDLIBS += $(LDLIBS_CURSES) | |
80 | + | 76 | + | |
81 | OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o | 77 | OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o | |
82 | 78 | |||
83 | .PHONY : all clean install docs man_install man_uninstall | 79 | .PHONY : all clean install docs man_install man_uninstall |