From 753b773c460e1e9c233fe7e92413a530eff60e61 Mon Sep 17 00:00:00 2001
From: Tatsuya Kinoshita <tats@debian.org>
Date: Tue, 23 Jun 2015 07:00:42 +0900
Subject: Update 020_debian.patch to v0.5.3+git20150623

- Fix broken stage1 bootstrap build (closes: #789539)
---
 debian/patches/020_debian.patch | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'debian')

diff --git a/debian/patches/020_debian.patch b/debian/patches/020_debian.patch
index d1deb5e..a30824c 100644
--- a/debian/patches/020_debian.patch
+++ b/debian/patches/020_debian.patch
@@ -2,10 +2,15 @@ Description: Git master branch of Debian's w3m
 Origin: http://anonscm.debian.org/cgit/collab-maint/w3m.git
 
 diff --git a/ChangeLog b/ChangeLog
-index 88358ef..a188506 100644
+index 88358ef..69f7395 100644
 --- a/ChangeLog
 +++ b/ChangeLog
-@@ -1,3 +1,642 @@
+@@ -1,3 +1,647 @@
++2015-06-23  Daniel Schepler  <dschepler@gmail.com>
++
++	* terms.c: Wrap the functions used by image.c in USE_IMAGE.
++	Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=789539
++
 +2015-05-09  Tatsuya Kinoshita  <tats@debian.org>
 +
 +	* doc-jp/README.siteconf, doc/README.siteconf:
@@ -12355,7 +12360,7 @@ index f9b7b76..f5a2c30 100644
  /fieldset	HTML_N_FIELDSET
  iframe		HTML_IFRAME
 diff --git a/terms.c b/terms.c
-index 7a3c987..79996f1 100644
+index 7a3c987..339b645 100644
 --- a/terms.c
 +++ b/terms.c
 @@ -12,6 +12,7 @@
@@ -12385,10 +12390,11 @@ index 7a3c987..79996f1 100644
  	    isWinConsole = TERM_CYGWIN_RESERVE_IME;
  	}
  #ifdef SUPPORT_WIN9X_CONSOLE_MBCS
-@@ -463,6 +467,260 @@ writestr(char *s)
+@@ -463,6 +467,262 @@ writestr(char *s)
  
  #define MOVE(line,column)       writestr(tgoto(T_cm,column,line));
  
++#ifdef USE_IMAGE
 +void
 +put_image_osc5379(char *url, int x, int y, int w, int h, int sx, int sy, int sw, int sh, int n_terminal_image)
 +{
@@ -12642,11 +12648,12 @@ index 7a3c987..79996f1 100644
 +
 +    return 0;
 +}
++#endif				/* USE_IMAGE */
 +
  #ifdef USE_MOUSE
  #define W3M_TERM_INFO(name, title, mouse)	name, title, mouse
  #define NEED_XTERM_ON   (1)
-@@ -634,7 +892,8 @@ reset_tty(void)
+@@ -634,7 +894,8 @@ reset_tty(void)
      writestr(T_se);		/* reset terminal */
      flush_tty();
      TerminalSet(tty, &d_ioval);
@@ -12656,7 +12663,7 @@ index 7a3c987..79996f1 100644
  }
  
  static MySignalHandler
-@@ -2027,8 +2286,8 @@ sleep_till_anykey(int sec, int purge)
+@@ -2027,8 +2288,8 @@ sleep_till_anykey(int sec, int purge)
  
  #ifdef USE_MOUSE
  
-- 
cgit v1.2.3