svn commit: r547340 - head/math/sc-im/files
Baptiste Daroussin
bapt at FreeBSD.org
Wed Sep 2 08:11:59 UTC 2020
Author: bapt
Date: Wed Sep 2 08:11:57 2020
New Revision: 547340
URL: https://svnweb.freebsd.org/changeset/ports/547340
Log:
Fix build with -fno-common (a similar patch exist already upstream)
Added:
head/math/sc-im/files/patch-cmds.c (contents, props changed)
head/math/sc-im/files/patch-cmds__normal.c (contents, props changed)
head/math/sc-im/files/patch-cmds__visual.c (contents, props changed)
head/math/sc-im/files/patch-color.c (contents, props changed)
head/math/sc-im/files/patch-color.h (contents, props changed)
head/math/sc-im/files/patch-filter.c (contents, props changed)
head/math/sc-im/files/patch-filter.h (contents, props changed)
head/math/sc-im/files/patch-input.c (contents, props changed)
head/math/sc-im/files/patch-tui.c (contents, props changed)
Modified:
head/math/sc-im/files/patch-cmds__command.c
Added: head/math/sc-im/files/patch-cmds.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-cmds.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- cmds.c.orig 2019-02-22 18:41:46 UTC
++++ cmds.c
+@@ -65,7 +65,7 @@
+ #endif
+
+ void syncref(register struct enode *e);
+-extern unsigned int shall_quit;
++extern int shall_quit;
+ char insert_edit_submode;
+ struct ent * freeents = NULL; // keep deleted ents around before sync_refs
+ wchar_t interp_line[BUFFERSIZE];
Modified: head/math/sc-im/files/patch-cmds__command.c
==============================================================================
--- head/math/sc-im/files/patch-cmds__command.c Wed Sep 2 08:08:51 2020 (r547339)
+++ head/math/sc-im/files/patch-cmds__command.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -1,5 +1,14 @@
--- cmds_command.c.orig 2019-02-22 18:41:46 UTC
+++ cmds_command.c
+@@ -81,7 +81,7 @@ extern char * rev;
+ extern struct dictionary * user_conf_d;
+
+ wchar_t inputline[BUFFERSIZE];
+-wchar_t interp_line[BUFFERSIZE];
++extern wchar_t interp_line[BUFFERSIZE];
+ int inputline_pos; /**< Position in window. Some chars has 2 chars width */
+ // see https://en.wikipedia.org/wiki/Halfwidth_and_fullwidth_forms
+ int real_inputline_pos; /**< Real position in inputline */
@@ -853,7 +853,7 @@ void do_commandmode(struct block * sb) {
exec_cmd(line);
Added: head/math/sc-im/files/patch-cmds__normal.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-cmds__normal.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- cmds_normal.c.orig 2019-02-22 18:41:46 UTC
++++ cmds_normal.c
+@@ -70,7 +70,7 @@ extern int cmd_multiplier;
+ extern void start_visualmode(int tlrow, int tlcol, int brrow, int brcol);
+ extern void ins_in_line(wint_t d);
+
+-wchar_t interp_line[BUFFERSIZE];
++extern wchar_t interp_line[BUFFERSIZE];
+
+ #ifdef HISTORY_FILE
+ extern struct history * commandline_history;
Added: head/math/sc-im/files/patch-cmds__visual.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-cmds__visual.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- cmds_visual.c.orig 2019-02-22 18:41:46 UTC
++++ cmds_visual.c
+@@ -440,7 +440,7 @@ void do_visualmode(struct block * buf) {
+ sc_error("Locked cells encountered. Nothing changed");
+ return;
+ }
+- wchar_t interp_line[BUFFERSIZE];
++ extern wchar_t interp_line[BUFFERSIZE];
+ if (buf->value == L'{') swprintf(interp_line, BUFFERSIZE, L"leftjustify %s", v_name(r->tlrow, r->tlcol));
+ else if (buf->value == L'}') swprintf(interp_line, BUFFERSIZE, L"rightjustify %s", v_name(r->tlrow, r->tlcol));
+ else if (buf->value == L'|') swprintf(interp_line, BUFFERSIZE, L"center %s", v_name(r->tlrow, r->tlcol));
Added: head/math/sc-im/files/patch-color.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-color.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- color.c.orig 2019-02-22 18:41:46 UTC
++++ color.c
+@@ -60,6 +60,8 @@
+ #include "conf.h"
+ #include "cmds.h"
+
++struct ucolor ucolors[N_INIT_PAIRS] = {};
++
+ static struct dictionary * d_colors_param = NULL;
+
+ struct dictionary * get_d_colors_param() {
Added: head/math/sc-im/files/patch-color.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-color.h Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- color.h.orig 2019-02-22 18:41:46 UTC
++++ color.h
+@@ -57,7 +57,7 @@ struct ucolor {
+ int blink;
+ };
+
+-struct ucolor ucolors[N_INIT_PAIRS];
++extern struct ucolor ucolors[N_INIT_PAIRS];
+
+ struct dictionary * get_d_colors_param();
+ void start_default_ucolors();
Added: head/math/sc-im/files/patch-filter.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-filter.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- filter.c.orig 2019-02-22 18:41:46 UTC
++++ filter.c
+@@ -61,6 +61,8 @@ static int howmany = 0; /**< how many filters wer
+ static int active = 0; /**< indicates if those filters are applied or not */
+ static int * results = NULL; /**< this keeps the results of the applied filters */
+
++static struct filter_item * filters = NULL;
++
+ /**
+ * \brief Add a filter to filters structure
+ *
Added: head/math/sc-im/files/patch-filter.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-filter.h Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,11 @@
+--- filter.h.orig 2019-02-22 18:41:46 UTC
++++ filter.h
+@@ -44,7 +44,7 @@
+
+ struct filter_item {
+ char * eval;
+-} * filters;
++};
+
+ void show_filters();
+ void add_filter(char * criteria);
Added: head/math/sc-im/files/patch-input.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-input.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,10 @@
+--- input.c.orig 2019-02-22 18:41:46 UTC
++++ input.c
+@@ -64,7 +64,6 @@ static int d; // char read from stdin
+ int return_value; // return value of getch()
+ int cmd_multiplier = 0; // Multiplier
+ int cmd_pending = 0; // Command pending
+-int shall_quit; // Break loop if ESC key is pressed
+
+ /**
+ * \brief Reads stdin for a valid command
Added: head/math/sc-im/files/patch-tui.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/sc-im/files/patch-tui.c Wed Sep 2 08:11:57 2020 (r547340)
@@ -0,0 +1,10 @@
+--- tui.c.orig 2020-09-02 08:06:29 UTC
++++ tui.c
+@@ -102,7 +102,6 @@ WINDOW * main_win;
+ WINDOW * input_win;
+ SCREEN * sstderr;
+ SCREEN * sstdout;
+-srange * ranges;
+
+ /**
+ * \brief Called to start UI
More information about the svn-ports-all
mailing list