topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- links: bump version to 2.28

master
vanhofen 2 years ago
parent
99ebe193a1
commit
c4f6f4abe3
2 changed files with 42 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package/links/links.mk
  2. 82
      package/links/patches/0001-port-to-neutrino.patch

2
package/links/links.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LINKS_VERSION = 2.25 LINKS_VERSION = 2.28
LINKS_DIR = links-$(LINKS_VERSION) LINKS_DIR = links-$(LINKS_VERSION)
LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2
LINKS_SITE = http://links.twibright.com/download LINKS_SITE = http://links.twibright.com/download

82
package/links/patches/0001-port-to-neutrino.patch
View File

@ -19,8 +19,8 @@
links_LDADD=builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o links_LDADD=builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o
endif endif
-links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc -links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc
+links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc rcmouse.c rc.c rcinput.c rcinput.h +links_SOURCES=af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc rcmouse.c rc.c rcinput.c rcinput.h
# builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h # builtin.c context.c ipret.c javascr.c javascript.c md5.c md5hl.c ns.c pomocny.c regexp.c md5.h ns.h struct.h tree.h typy.h ipret.h javascript.h builtin.h builtin_keys.h
dist-hook: dist-hook:
@ -30,20 +30,20 @@
@HAIKU_GR_TRUE@links_LDADD = haiku.o @HAIKU_GR_TRUE@links_LDADD = haiku.o
@JAVASCRIPT_TRUE@links_LDADD = builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o @JAVASCRIPT_TRUE@links_LDADD = builtin.o context.o ipret.o javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o regexp.o
-links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc -links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc
+links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc rcmouse.c rc.c rcinput.c rcinput.h +links_SOURCES = af_unix.c auth.c beos.c bfu.c block.c bookmark.c cache.c charsets.c compress.c connect.c cookies.c data.c default.c dip.c directfb.c dither.c dns.c doh.c dos.c drivers.c error.c file.c finger.c fn_impl.c fontconf.c font_inc.c framebuf.c freetype.c ftp.c gif.c grx.c hpux.c html.c html_gr.c html_r.c html_tbl.c http.c https.c img.c imgcache.c jpeg.c jsint.c kbd.c language.c listedit.c lru.c mailto.c main.c memory.c menu.c objreq.c os_dep.c pmshell.c png.c sched.c select.c session.c smb.c string.c suffix.c svg.c svgalib.c terminal.c tiff.c types.c url.c view.c view_gr.c vms.c webp.c x.c xbm.c beos.h bits.h cfg.h codepage.h com-defs.h config-vms.h dfb_cur.h hpux.h language.h links.h os_dep.h os_depx.h setup.h arrow.inc certs.inc codepage.inc entity.inc fbcommon.inc language.inc links_ic.inc locase.inc suffix.inc suffix_x.inc uni_7b.inc upcase.inc vpipe.inc rcmouse.c rc.c rcinput.c rcinput.h
CXXFLAGS = @CXXFLAGS@ CXXFLAGS = @CXXFLAGS@
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o mailto.o \ img.o imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o \
main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o sched.o \ mailto.o main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o \
select.o session.o smb.o string.o suffix.o svg.o svgalib.o terminal.o \ sched.o select.o session.o smb.o string.o suffix.o svg.o svgalib.o \
-tiff.o types.o url.o view.o view_gr.o vms.o x.o xbm.o -terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o
+tiff.o types.o url.o view.o view_gr.o vms.o x.o xbm.o rcmouse.o rc.o rcinput.o +terminal.o tiff.o types.o url.o view.o view_gr.o vms.o webp.o x.o xbm.o rcmouse.o rc.o rcinput.o
@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o
@JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \ @JAVASCRIPT_TRUE@links_DEPENDENCIES = builtin.o context.o ipret.o \
@JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \ @JAVASCRIPT_TRUE@javascr.o javascript.o md5.o md5hl.o ns.o pomocny.o \
@JAVASCRIPT_TRUE@regexp.o
--- a/bfu.c --- a/bfu.c
+++ b/bfu.c +++ b/bfu.c
@@ -1544,7 +1544,7 @@ @@ -1544,7 +1544,7 @@
@ -68,7 +68,7 @@
#if SIZEOF_UNSIGNED_LONG >= 8 || defined(__x86_64__) || defined(__aarch64__) #if SIZEOF_UNSIGNED_LONG >= 8 || defined(__x86_64__) || defined(__aarch64__)
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -8582,7 +8582,7 @@ @@ -8586,7 +8586,7 @@
fi fi
done done
@ -90,7 +90,7 @@
fi fi
--- a/default.c --- a/default.c
+++ b/default.c +++ b/default.c
@@ -769,7 +769,7 @@ @@ -766,7 +766,7 @@
home = NULL; home = NULL;
} }
#endif #endif
@ -99,7 +99,7 @@
#ifdef WIN #ifdef WIN
/* When we run in Cygwin without Cygwin environment, it reports home "/". /* When we run in Cygwin without Cygwin environment, it reports home "/".
Unfortunatelly, it can't write anything to that directory */ Unfortunatelly, it can't write anything to that directory */
@@ -820,7 +820,7 @@ @@ -817,7 +817,7 @@
#elif defined(OPENVMS) || defined(HAIKU) #elif defined(OPENVMS) || defined(HAIKU)
add_to_strn(&home_links, cast_uchar "links"); add_to_strn(&home_links, cast_uchar "links");
#else #else
@ -108,7 +108,7 @@
#endif #endif
} }
EINTRLOOP(rs, stat(cast_const_char home_links, &st)); EINTRLOOP(rs, stat(cast_const_char home_links, &st));
@@ -2103,7 +2103,7 @@ @@ -2084,7 +2084,7 @@
if (links_home) mem_free(links_home); if (links_home) mem_free(links_home);
} }
@ -119,7 +119,7 @@
unsigned char ggr_mode[MAX_STR_LEN] = ""; unsigned char ggr_mode[MAX_STR_LEN] = "";
--- a/dither.c --- a/dither.c
+++ b/dither.c +++ b/dither.c
@@ -351,7 +351,7 @@ @@ -353,7 +353,7 @@
outp[0]=bt>>16;\ outp[0]=bt>>16;\
outp[1]=gt>>16;\ outp[1]=gt>>16;\
outp[2]=rt>>16;\ outp[2]=rt>>16;\
@ -128,7 +128,7 @@
outp+=4; outp+=4;
DITHER_TEMPLATE(dither_196, 0) DITHER_TEMPLATE(dither_196, 0)
ROUND_TEMPLATE(round_196, 0) ROUND_TEMPLATE(round_196, 0)
@@ -498,7 +498,7 @@ @@ -500,7 +500,7 @@
((unsigned char *)&ret)[0]=(unsigned char)rgb; ((unsigned char *)&ret)[0]=(unsigned char)rgb;
((unsigned char *)&ret)[1]=rgb>>8; ((unsigned char *)&ret)[1]=rgb>>8;
((unsigned char *)&ret)[2]=rgb>>16; ((unsigned char *)&ret)[2]=rgb>>16;
@ -164,8 +164,8 @@
+void fb_mouse_move(int dx, int dy) +void fb_mouse_move(int dx, int dy)
{ {
struct links_event ev; struct links_event ev;
mouse_x += dx;
@@ -704,6 +705,7 @@ @@ -708,6 +709,7 @@
static void set_palette(struct palette *pal) static void set_palette(struct palette *pal)
{ {
@ -173,7 +173,7 @@
struct fb_cmap cmap; struct fb_cmap cmap;
int i; int i;
unsigned short *red = pal->red; unsigned short *red = pal->red;
@@ -880,7 +882,7 @@ @@ -884,7 +886,7 @@
EINTRLOOP(rs, ioctl(TTY, VT_GETMODE, &vt_omode)); EINTRLOOP(rs, ioctl(TTY, VT_GETMODE, &vt_omode));
if (rs == -1) { if (rs == -1) {
in_gr_operation--; in_gr_operation--;
@ -182,7 +182,7 @@
} }
memcpy(&vt_mode, &vt_omode, sizeof(vt_mode)); memcpy(&vt_mode, &vt_omode, sizeof(vt_mode));
@@ -892,7 +894,7 @@ @@ -896,7 +898,7 @@
EINTRLOOP(rs, ioctl(TTY, VT_SETMODE, &vt_mode)); EINTRLOOP(rs, ioctl(TTY, VT_SETMODE, &vt_mode));
if (rs == -1) { if (rs == -1) {
in_gr_operation--; in_gr_operation--;
@ -191,7 +191,7 @@
} }
EINTRLOOP(rs, ioctl(TTY, VT_WAITACTIVE, fb_console)); EINTRLOOP(rs, ioctl(TTY, VT_WAITACTIVE, fb_console));
@@ -933,6 +935,7 @@ @@ -937,6 +939,7 @@
static void fb_gpm_in(void *nic) static void fb_gpm_in(void *nic)
{ {
@ -199,7 +199,7 @@
struct links_event ev; struct links_event ev;
int g; int g;
Gpm_Event gev; Gpm_Event gev;
@@ -1106,10 +1109,12 @@ @@ -1112,10 +1115,12 @@
if (current_virtual_device->mouse_handler) current_virtual_device->mouse_handler(current_virtual_device, mouse_x, mouse_y, button); if (current_virtual_device->mouse_handler) current_virtual_device->mouse_handler(current_virtual_device, mouse_x, mouse_y, button);
redraw_mouse(); redraw_mouse();
EINTRLOOP(rs, fsync(fb_handle)); EINTRLOOP(rs, fsync(fb_handle));
@ -212,7 +212,7 @@
Gpm_Connect conn; Gpm_Connect conn;
fb_hmice = c_open(cast_uchar "/dev/input/mice", O_RDWR | O_NOCTTY); fb_hmice = c_open(cast_uchar "/dev/input/mice", O_RDWR | O_NOCTTY);
@@ -1179,6 +1184,7 @@ @@ -1185,6 +1190,7 @@
#ifdef SIGTTIN #ifdef SIGTTIN
install_signal_handler(SIGTTIN, sig_tstp, NULL, 0); install_signal_handler(SIGTTIN, sig_tstp, NULL, 0);
#endif #endif
@ -220,7 +220,7 @@
return 0; return 0;
} }
@@ -1186,12 +1192,14 @@ @@ -1192,12 +1198,14 @@
static void unhandle_fb_mouse(void) static void unhandle_fb_mouse(void)
{ {
if (fb_hgpm >= 0) set_handlers(fb_hgpm, (void (*)(void *))NULL, (void (*)(void *))NULL, NULL); if (fb_hgpm >= 0) set_handlers(fb_hgpm, (void (*)(void *))NULL, (void (*)(void *))NULL, NULL);
@ -235,7 +235,7 @@
close_socket(&fb_hmice); close_socket(&fb_hmice);
#ifdef SIGTSTP #ifdef SIGTSTP
@@ -1225,14 +1233,77 @@ @@ -1231,14 +1239,77 @@
{ {
fb_print(seq_show_cursor); fb_print(seq_show_cursor);
} }
@ -313,7 +313,7 @@
} }
static unsigned char *fb_init_driver(unsigned char *param, unsigned char *ignore) static unsigned char *fb_init_driver(unsigned char *param, unsigned char *ignore)
@@ -1351,6 +1422,16 @@ @@ -1357,6 +1428,16 @@
} else { } else {
border_bottom = border_top; border_bottom = border_top;
} }
@ -330,7 +330,7 @@
if (*param) goto bad_p; if (*param) goto bad_p;
EINTRLOOP(rs, fstat(TTY, &st)); EINTRLOOP(rs, fstat(TTY, &st));
@@ -1386,6 +1467,17 @@ @@ -1392,6 +1473,17 @@
e = stracpy(cast_uchar "Cannot get FB FSCREENINFO.\n"); e = stracpy(cast_uchar "Cannot get FB FSCREENINFO.\n");
goto fail4; goto fail4;
} }
@ -348,7 +348,7 @@
#if 0 #if 0
{ {
@@ -1474,7 +1566,9 @@ @@ -1480,7 +1572,9 @@
fb_mem_size = fi.smem_len; fb_mem_size = fi.smem_len;
init_virtual_devices(&fb_driver, NUMBER_OF_DEVICES); init_virtual_devices(&fb_driver, NUMBER_OF_DEVICES);
@ -358,7 +358,7 @@
/* Mikulas: nechodi to na sparcu */ /* Mikulas: nechodi to na sparcu */
if (fb_mem_size < (unsigned)((border_top + fb_ysize + border_bottom) * fb_linesize)) { if (fb_mem_size < (unsigned)((border_top + fb_ysize + border_bottom) * fb_linesize)) {
@@ -1525,6 +1619,10 @@ @@ -1531,6 +1625,10 @@
e = stracpy(cast_uchar "Cannot mmap graphics memory.\n"); e = stracpy(cast_uchar "Cannot mmap graphics memory.\n");
goto fail5; goto fail5;
} }
@ -369,7 +369,7 @@
fb_vmem = fb_mem + border_left * fb_pixelsize + border_top * fb_linesize; fb_vmem = fb_mem + border_left * fb_pixelsize + border_top * fb_linesize;
fb_driver.depth = fb_pixelsize & 7; fb_driver.depth = fb_pixelsize & 7;
fb_driver.depth |= (fb_bits_pp & 31) << 3; fb_driver.depth |= (fb_bits_pp & 31) << 3;
@@ -1643,7 +1741,9 @@ @@ -1649,7 +1747,9 @@
EINTRLOOP(rs, munmap(fb_mem, fb_mapped_size)); EINTRLOOP(rs, munmap(fb_mem, fb_mapped_size));
shutdown_virtual_devices(); shutdown_virtual_devices();
fb_switch_shutdown(); fb_switch_shutdown();
@ -379,7 +379,7 @@
if(fb_driver_param) mem_free(fb_driver_param); if(fb_driver_param) mem_free(fb_driver_param);
/* show cursor */ /* show cursor */
fb_show_cursor(); fb_show_cursor();
@@ -1756,6 +1856,27 @@ @@ -1762,6 +1862,27 @@
dest->skip = (ssize_t)dest->x * fb_pixelsize; dest->skip = (ssize_t)dest->x * fb_pixelsize;
dest->flags = 0; dest->flags = 0;
return 0; return 0;
@ -407,17 +407,17 @@
} }
static void fb_register_bitmap(struct bitmap *bmp) static void fb_register_bitmap(struct bitmap *bmp)
@@ -2078,7 +2199,9 @@ @@ -2084,7 +2205,9 @@
unhandle_fb_mouse(); unhandle_fb_mouse();
fb_old_vd = current_virtual_device; fb_old_vd = current_virtual_device;
current_virtual_device=NULL; current_virtual_device = NULL;
+#ifdef SVGA +#ifdef SVGA
svgalib_block_itrm(fb_kbd); svgalib_block_itrm(fb_kbd);
+#endif +#endif
if (have_cmap && fb_active) set_palette(&old_palette); if (have_cmap && fb_active) set_palette(&old_palette);
EINTRLOOP(rs, fsync(fb_handle)); EINTRLOOP(rs, fsync(fb_handle));
fb_switch_shutdown(); fb_switch_shutdown();
@@ -2095,7 +2218,9 @@ @@ -2101,7 +2224,9 @@
unsigned char *e; unsigned char *e;
if (current_virtual_device) return 0; if (current_virtual_device) return 0;
if (dev != fb_block_dev) return -2; if (dev != fb_block_dev) return -2;
@ -516,7 +516,7 @@
+ +
--- a/menu.c --- a/menu.c
+++ b/menu.c +++ b/menu.c
@@ -3915,16 +3915,16 @@ @@ -4025,16 +4025,16 @@
#ifdef G #ifdef G
static_const struct menu_item file_menu111[] = { static_const struct menu_item file_menu111[] = {
@ -538,7 +538,7 @@
}; };
static_const struct menu_item file_menu21[] = { static_const struct menu_item file_menu21[] = {
@@ -4024,6 +4024,7 @@ @@ -4134,6 +4134,7 @@
/*cast_uchar "", cast_uchar "", M_BAR, NULL, NULL, 0, 0, /*cast_uchar "", cast_uchar "", M_BAR, NULL, NULL, 0, 0,
TEXT_(T_OS_SHELL), cast_uchar "", TEXT_(T_HK_OS_SHELL), menu_shell, NULL, 0, 0,*/ TEXT_(T_OS_SHELL), cast_uchar "", TEXT_(T_HK_OS_SHELL), menu_shell, NULL, 0, 0,*/
x = 1; x = 1;
@ -546,7 +546,7 @@
if (!anonymous && can_open_os_shell(term->environment)) { if (!anonymous && can_open_os_shell(term->environment)) {
e->text = TEXT_(T_OS_SHELL); e->text = TEXT_(T_OS_SHELL);
e->rtext = cast_uchar ""; e->rtext = cast_uchar "";
@@ -4035,6 +4036,7 @@ @@ -4145,6 +4146,7 @@
e++; e++;
x = 0; x = 0;
} }
@ -554,7 +554,7 @@
if (can_resize_window(term)) { if (can_resize_window(term)) {
e->text = TEXT_(T_RESIZE_TERMINAL); e->text = TEXT_(T_RESIZE_TERMINAL);
e->rtext = cast_uchar ""; e->rtext = cast_uchar "";
@@ -4058,15 +4060,15 @@ @@ -4168,15 +4170,15 @@
static void (* const set_frame_ptr)(struct session *ses, struct f_data_c *f, int a) = set_frame; static void (* const set_frame_ptr)(struct session *ses, struct f_data_c *f, int a) = set_frame;
static_const struct menu_item view_menu[] = { static_const struct menu_item view_menu[] = {
@ -1261,7 +1261,7 @@
#ifdef USE_LIBEVENT #ifdef USE_LIBEVENT
#if defined(evtimer_set) && !defined(timeout_set) #if defined(evtimer_set) && !defined(timeout_set)
@@ -655,8 +656,12 @@ @@ -665,8 +666,12 @@
return; return;
} }
#endif #endif
@ -1276,7 +1276,7 @@
FD_CLR(fd, &w_read); FD_CLR(fd, &w_read);
FD_CLR(fd, &x_read); FD_CLR(fd, &x_read);
} }
@@ -943,9 +948,14 @@ @@ -953,9 +958,14 @@
} }
int terminate_loop = 0; int terminate_loop = 0;
@ -1291,7 +1291,7 @@
#if !defined(USE_LIBEVENT) || !defined(USE_POLL) #if !defined(USE_LIBEVENT) || !defined(USE_POLL)
restrict_fds(); restrict_fds();
#endif #endif
@@ -1001,6 +1011,15 @@ @@ -1011,6 +1021,15 @@
nopr(); nopr();
} else } else
#endif #endif

Write Preview
Loading…
Cancel
Save