- links: bump version to 2.19

make/neutrino-plugins.mk

@@ -145,15 +145,15 @@ $(D)/neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR)
 
 # -----------------------------------------------------------------------------
 
-LINKS_VER = 2.17
+LINKS_VER = 2.19
 
 $(ARCHIVE)/links-$(LINKS_VER).tar.bz2:
 	$(WGET) http://links.twibright.com/download/links-$(LINKS_VER).tar.bz2
 
-LINKS_PATCH  = links-$(LINKS_VER).patch
-LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch
-LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch
-LINKS_PATCH += links-$(LINKS_VER)-accept_https_play.patch
+LINKS_PATCH  = links.patch
+LINKS_PATCH += links-ac-prog-cxx.patch
+LINKS_PATCH += links-input-$(BOXTYPE).patch
+LINKS_PATCH += links-accept_https_play.patch
 
 $(D)/links: $(D)/libpng $(D)/libjpeg $(D)/openssl $(ARCHIVE)/links-$(LINKS_VER).tar.bz2 $(SHAREPLUGINS) | $(TARGET_DIR)
 	$(REMOVE)/links-$(LINKS_VER)

patches/links-2.17-ac-prog-cxx.patch → patches/links-ac-prog-cxx.patch

@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -16,9 +16,11 @@ image_formats="GIF PNG XBM"
+@@ -21,9 +21,11 @@ image_formats="GIF PNG XBM"
  AM_CONFIG_HEADER(config.h)
  
  dnl Checks for programs.

patches/links-2.17.patch → patches/links.patch

@@ -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
  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 font_inc.c framebuf.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 dos.c drivers.c error.c file.c finger.c fn_impl.c font_inc.c framebuf.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 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 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
  # 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:
@@ -30,23 +30,23 @@
  @ATHEOS_GR_TRUE@links_LDADD = atheos.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 font_inc.c framebuf.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 dos.c drivers.c error.c file.c finger.c fn_impl.c font_inc.c framebuf.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 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 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
  
  CXXFLAGS = @CXXFLAGS@
  
 @@ -101,7 +101,7 @@
- jsint.o kbd.o language.o listedit.o lru.o mailto.o main.o memory.o \
- menu.o objreq.o os_dep.o pmshell.o png.o sched.o select.o session.o \
- smb.o string.o suffix.o svg.o svgalib.o terminal.o tiff.o types.o url.o \
--view.o view_gr.o vms.o x.o xbm.o
-+view.o view_gr.o vms.o x.o xbm.o rcmouse.o rc.o rcinput.o
+ imgcache.o jpeg.o jsint.o kbd.o language.o listedit.o lru.o mailto.o \
+ main.o memory.o menu.o objreq.o os_dep.o pmshell.o png.o sched.o \
+ select.o session.o smb.o string.o suffix.o svg.o svgalib.o terminal.o \
+-tiff.o types.o url.o view.o view_gr.o vms.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
+ @ATHEOS_GR_TRUE@links_DEPENDENCIES =  atheos.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@regexp.o
 --- a/bfu.c
 +++ b/bfu.c
-@@ -1506,7 +1506,7 @@
+@@ -1544,7 +1544,7 @@
  				x_display_dlg_item(dlg, di, 1);
  				break;
  			}
@@ -68,7 +68,7 @@
  #if SIZEOF_UNSIGNED_LONG >= 8 || defined(__x86_64__) || defined(__aarch64__)
 --- a/configure
 +++ b/configure
-@@ -8399,7 +8399,7 @@
+@@ -8403,7 +8403,7 @@
  fi
  done
  
@@ -90,7 +90,7 @@
  	fi
 --- a/default.c
 +++ b/default.c
-@@ -747,7 +747,7 @@
+@@ -750,7 +750,7 @@
  		}
  	}
  #endif
@@ -99,7 +99,7 @@
  #ifdef WIN
  /* When we run in Cygwin without Cygwin environment, it reports home "/".
     Unfortunatelly, it can't write anything to that directory */
-@@ -796,7 +796,7 @@
+@@ -799,7 +799,7 @@
  #ifdef OPENVMS
  		add_to_strn(&home_links, cast_uchar "links");
  #else
@@ -108,7 +108,7 @@
  #endif
  	}
  	EINTRLOOP(rs, stat(cast_const_char home_links, &st));
-@@ -2042,7 +2042,7 @@
+@@ -2073,7 +2073,7 @@
  	if (links_home) mem_free(links_home);
  }
  
@@ -119,16 +119,16 @@
  unsigned char ggr_mode[MAX_STR_LEN] = "";
 --- a/dither.c
 +++ b/dither.c
-@@ -321,7 +321,7 @@
+@@ -347,7 +347,7 @@
  	outp[0]=bt>>16;\
  	outp[1]=gt>>16;\
  	outp[2]=rt>>16;\
 -	outp[3]=0;\
 +	outp[3]=0xFF;\
  	outp+=4;
- DITHER_TEMPLATE(dither_196)
- ROUND_TEMPLATE(round_196)
-@@ -462,7 +462,7 @@
+ DITHER_TEMPLATE(dither_196, 0)
+ ROUND_TEMPLATE(round_196, 0)
+@@ -494,7 +494,7 @@
  	((unsigned char *)&ret)[0]=(unsigned char)rgb;
  	((unsigned char *)&ret)[1]=rgb>>8;
  	((unsigned char *)&ret)[2]=rgb>>16;
@@ -156,7 +156,7 @@
  static void fb_draw_bitmap(struct graphics_device *dev, struct bitmap *bmp, int x, int y);
  
  static unsigned char *fb_driver_param;
-@@ -269,7 +270,7 @@
+@@ -272,7 +273,7 @@
  
  static void redraw_mouse(void);
  
@@ -165,7 +165,7 @@
  {
  	struct links_event ev;
  	mouse_x += dx;
-@@ -692,6 +693,7 @@
+@@ -698,6 +699,7 @@
  
  static void set_palette(struct palette *pal)
  {
@@ -173,7 +173,7 @@
  	struct fb_cmap cmap;
  	int i;
  	unsigned short *red = pal->red;
-@@ -868,7 +870,7 @@
+@@ -874,7 +876,7 @@
  	EINTRLOOP(rs, ioctl(TTY, VT_GETMODE, &vt_omode));
  	if (rs == -1) {
  		in_gr_operation--;
@@ -182,7 +182,7 @@
  	}
  	memcpy(&vt_mode, &vt_omode, sizeof(vt_mode));
  
-@@ -880,7 +882,7 @@
+@@ -886,7 +888,7 @@
  	EINTRLOOP(rs, ioctl(TTY, VT_SETMODE, &vt_mode));
  	if (rs == -1) {
  		in_gr_operation--;
@@ -191,7 +191,7 @@
  	}
  
  	EINTRLOOP(rs, ioctl(TTY, VT_WAITACTIVE, fb_console));
-@@ -921,6 +923,7 @@
+@@ -927,6 +929,7 @@
  
  static void fb_gpm_in(void *nic)
  {
@@ -199,7 +199,7 @@
  	struct links_event ev;
  	int g;
  	Gpm_Event gev;
-@@ -1014,10 +1017,12 @@
+@@ -1021,10 +1024,12 @@
  	if (current_virtual_device->mouse_handler) current_virtual_device->mouse_handler(current_virtual_device, ev.x, ev.y, (int)ev.b);
  	redraw_mouse();
  	EINTRLOOP(rs, fsync(fb_handle));
@@ -212,7 +212,7 @@
  	Gpm_Connect conn;
  	fb_hgpm = -2;
  	conn.eventMask = (unsigned short)~0U;
-@@ -1042,6 +1047,7 @@
+@@ -1049,6 +1054,7 @@
  #ifdef SIGTTIN
  	install_signal_handler(SIGTTIN, sig_tstp, NULL, 0);
  #endif
@@ -220,7 +220,7 @@
  
  	return 0;
  }
-@@ -1049,12 +1055,14 @@
+@@ -1056,12 +1062,14 @@
  static void unhandle_fb_mouse(void)
  {
  	if (fb_hgpm >= 0) set_handlers(fb_hgpm, (void (*)(void *))NULL, (void (*)(void *))NULL, NULL);
@@ -235,7 +235,7 @@
  #ifdef SIGTSTP
  	install_signal_handler(SIGTSTP, sig_tstp, NULL, 0);
  #endif
-@@ -1086,14 +1094,77 @@
+@@ -1093,14 +1101,77 @@
  {
  	fb_print(seq_show_cursor);
  }
@@ -313,7 +313,7 @@
  }
  
  static unsigned char *fb_init_driver(unsigned char *param, unsigned char *ignore)
-@@ -1205,6 +1276,16 @@
+@@ -1217,6 +1288,16 @@
  	} else {
  		border_bottom = border_top;
  	}
@@ -330,7 +330,7 @@
  	if (*param) goto bad_p;
  
  	EINTRLOOP(rs, fstat(TTY, &st));
-@@ -1240,6 +1321,17 @@
+@@ -1252,6 +1333,17 @@
  		e = stracpy(cast_uchar "Cannot get FB FSCREENINFO.\n");
  		goto fail4;
  	}
@@ -348,7 +348,7 @@
  
  #if 0
  	{
-@@ -1328,7 +1420,9 @@
+@@ -1340,7 +1432,9 @@
  	fb_mem_size = fi.smem_len;
  
  	init_virtual_devices(&fb_driver, NUMBER_OF_DEVICES);
@@ -358,7 +358,7 @@
  
  	/* Mikulas: nechodi to na sparcu */
  	if (fb_mem_size < (unsigned)((border_top + fb_ysize + border_bottom) * fb_linesize)) {
-@@ -1379,6 +1473,10 @@
+@@ -1391,6 +1485,10 @@
  		e = stracpy(cast_uchar "Cannot mmap graphics memory.\n");
  		goto fail5;
  	}
@@ -369,7 +369,7 @@
  	fb_vmem = fb_mem + border_left * fb_pixelsize + border_top * fb_linesize;
  	fb_driver.depth = fb_pixelsize & 7;
  	fb_driver.depth |= (fb_bits_pp & 31) << 3;
-@@ -1496,7 +1594,9 @@
+@@ -1507,7 +1605,9 @@
  	EINTRLOOP(rs, munmap(fb_mem, fb_mapped_size));
  	shutdown_virtual_devices();
  	fb_switch_shutdown();
@@ -379,7 +379,7 @@
  	if(fb_driver_param) mem_free(fb_driver_param);
  	/* show cursor */
  	fb_show_cursor();
-@@ -1599,6 +1699,27 @@
+@@ -1615,6 +1715,27 @@
  	dest->skip = dest->x * fb_pixelsize;
  	dest->flags = 0;
  	return 0;
@@ -407,7 +407,7 @@
  }
  
  static void fb_register_bitmap(struct bitmap *bmp)
-@@ -1918,7 +2039,9 @@
+@@ -1937,7 +2058,9 @@
  	unhandle_fb_mouse();
  	fb_old_vd = current_virtual_device;
  	current_virtual_device=NULL;
@@ -417,7 +417,7 @@
  	if (have_cmap && fb_active) set_palette(&old_palette);
  	EINTRLOOP(rs, fsync(fb_handle));
  	fb_switch_shutdown();
-@@ -1933,7 +2056,9 @@
+@@ -1952,7 +2075,9 @@
  	unsigned char *e;
  	if (current_virtual_device) return 0;
  	if (dev != fb_block_dev) return -2;
@@ -516,7 +516,7 @@
 +
 --- a/menu.c
 +++ b/menu.c
-@@ -3438,16 +3438,16 @@
+@@ -3743,16 +3743,16 @@
  
  #ifdef G
  static_const struct menu_item file_menu111[] = {
@@ -538,7 +538,7 @@
  };
  
  static_const struct menu_item file_menu21[] = {
-@@ -3547,6 +3547,7 @@
+@@ -3852,6 +3852,7 @@
  	/*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,*/
  	x = 1;
@@ -546,7 +546,7 @@
  	if (!anonymous && can_open_os_shell(term->environment)) {
  		e->text = TEXT_(T_OS_SHELL);
  		e->rtext = cast_uchar "";
-@@ -3558,6 +3559,7 @@
+@@ -3863,6 +3864,7 @@
  		e++;
  		x = 0;
  	}
@@ -554,7 +554,7 @@
  	if (can_resize_window(term)) {
  		e->text = TEXT_(T_RESIZE_TERMINAL);
  		e->rtext = cast_uchar "";
-@@ -3581,15 +3583,15 @@
+@@ -3886,15 +3888,15 @@
  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[] = {
@@ -576,8 +576,8 @@
 +	{ TEXT_(T_HEADER_INFO), cast_uchar "[cool]", TEXT_(T_HK_HEADER_INFO), menu_head_info, NULL, 0, 0 },
 +//	{ TEXT_(T_FRAME_AT_FULL_SCREEN), cast_uchar "f", TEXT_(T_HK_FRAME_AT_FULL_SCREEN), menu_for_frame, (void *)&set_frame_ptr, 0, 0 },
  	{ cast_uchar "", cast_uchar "", M_BAR, NULL, NULL, 0, 0 },
- 	{ TEXT_(T_HTML_OPTIONS), cast_uchar "", TEXT_(T_HK_HTML_OPTIONS), menu_html_options, NULL, 0, 0 },
- 	{ TEXT_(T_SAVE_HTML_OPTIONS), cast_uchar "", TEXT_(T_HK_SAVE_HTML_OPTIONS), menu_save_html_options, NULL, 0, 0 },
+ 	{ TEXT_(T_SAVE_CLIPBOARD_TO_A_FILE), cast_uchar "", TEXT_(T_HK_SAVE_CLIPBOARD_TO_A_FILE), menu_save_clipboard, NULL, 0, 0 },
+ 	{ TEXT_(T_LOAD_CLIPBOARD_FROM_A_FILE), cast_uchar "", TEXT_(T_HK_LOAD_CLIPBOARD_FROM_A_FILE), menu_load_clipboard, NULL, 0, 0 },
 --- a/rc.c
 +++ b/rc.c
 @@ -0,0 +1,265 @@