# HG changeset patch
# User Richard Dunbar <mojo@slitaz.org>
# Date 1670613870 18000
# Node ID aa585fba6e4b82ced3a16d68fdd1a37c9030b3c6
# Parent  dd880df75ff55534d2ab6e2edf171b8de5cf6f0b
Up w3m (0.5.3+git20220429)

diff -r dd880df75ff5 -r aa585fba6e4b w3m/receipt
--- a/w3m/receipt	Fri Dec 02 10:26:08 2022 +0000
+++ b/w3m/receipt	Fri Dec 09 14:24:30 2022 -0500
@@ -7,12 +7,12 @@
 MAINTAINER="mojo@slitaz.org"
 LICENSE="MIT"
 WEB_SITE="https://w3m.sourceforge.net/index.en.html"
-TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="$SF_MIRROR/$PACKAGE/$PACKAGE/$TARBALL"
+TARBALL="w3m_0.5.3+git20220429.orig.tar.xz"
+WGET_URL="https://deb.debian.org/debian/pool/main/w/$PACKAGE/$TARBALL"
 TAGS="web-browser"
 
 DEPENDS="gc libcrypto libssl ncurses imlib2"
-BUILD_DEPENDS="gc gc-dev libcrypto-dev openssl-dev imlib2-dev"
+BUILD_DEPENDS="gc gc-dev libcrypto-dev openssl-dev imlib2-dev gcc83"
 
 current_version()
 {
@@ -23,17 +23,13 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries"
-	for i in  $stuff/*.patch
-	do
-	        if [ -f done.$(basename $i) ]; then
-		       continue
-	        else
-		       patch -p0 < $i && touch done.$(basename $i) || return 1
-	        fi
-	done
-       ./configure --enable-image=x11,fb --with-imagelib=imlib2 $CONFIGURE_ARGS
-	make && make install
+	./configure \
+		CC=gcc-83 \
+		CXX=g++-83 \
+		--enable-image=x11,fb \
+		--with-imagelib=imlib2 \
+		$CONFIGURE_ARGS &&
+		make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r dd880df75ff5 -r aa585fba6e4b w3m/stuff/file_handle.patch
--- a/w3m/stuff/file_handle.patch	Fri Dec 02 10:26:08 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-diff -Naur old/istream.c new/istream.c
---- istream.c	2011-01-04 20:22:22.000000000 +1100
-+++ istream.c	2012-07-04 21:50:51.529661517 +1000
-@@ -22,8 +22,8 @@
- static void basic_close(int *handle);
- static int basic_read(int *handle, char *buf, int len);
- 
--static void file_close(struct file_handle *handle);
--static int file_read(struct file_handle *handle, char *buf, int len);
-+static void file_close(struct file_handle_rofl *handle);
-+static int file_read(struct file_handle_rofl *handle, char *buf, int len);
- 
- static int str_read(Str handle, char *buf, int len);
- 
-@@ -114,7 +114,7 @@
-     stream = New(union input_stream);
-     init_base_stream(&stream->base, STREAM_BUF_SIZE);
-     stream->file.type = IST_FILE;
--    stream->file.handle = New(struct file_handle);
-+    stream->file.handle = New(struct file_handle_rofl);
-     stream->file.handle->f = f;
-     if (closep)
- 	stream->file.handle->close = closep;
-@@ -658,13 +658,13 @@
- }
- 
- static void
--file_close(struct file_handle *handle)
-+file_close(struct file_handle_rofl *handle)
- {
-     handle->close(handle->f);
- }
- 
- static int
--file_read(struct file_handle *handle, char *buf, int len)
-+file_read(struct file_handle_rofl *handle, char *buf, int len)
- {
-     return fread(buf, 1, len, handle->f);
- }
-diff -Naur old/istream.h new/istream.h
---- istream.h	2003-10-21 02:41:56.000000000 +1000
-+++ istream.h	2012-07-04 21:50:51.529661517 +1000
-@@ -20,7 +20,7 @@
- 
- typedef struct stream_buffer *StreamBuffer;
- 
--struct file_handle {
-+struct file_handle_rofl {
-     FILE *f;
-     void (*close) ();
- };
-@@ -53,7 +53,7 @@
- 
- struct file_stream {
-     struct stream_buffer stream;
--    struct file_handle *handle;
-+    struct file_handle_rofl *handle;
-     char type;
-     char iseos;
-     int (*read) ();
diff -r dd880df75ff5 -r aa585fba6e4b w3m/stuff/https.patch
--- a/w3m/stuff/https.patch	Fri Dec 02 10:26:08 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994
-
---- url.c	2011-01-04 14:52:24.000000000 +0530
-+++ url.c	2011-09-02 18:25:43.305652690 +0530
-@@ -82,11 +82,11 @@
-     {"ftp", SCM_FTP},
-     {"local", SCM_LOCAL},
-     {"file", SCM_LOCAL},
--    /*  {"exec", SCM_EXEC}, */
-+    {"exec", SCM_EXEC}, 
-     {"nntp", SCM_NNTP},
--    /*  {"nntp", SCM_NNTP_GROUP}, */
-+    {"nntp", SCM_NNTP_GROUP}, 
-     {"news", SCM_NEWS},
--    /*  {"news", SCM_NEWS_GROUP}, */
-+    {"news", SCM_NEWS_GROUP}, 
-     {"data", SCM_DATA},
- #ifndef USE_W3MMAILER
-     {"mailto", SCM_MAILTO},
diff -r dd880df75ff5 -r aa585fba6e4b w3m/stuff/w3m-0.5.2-gc72.patch
--- a/w3m/stuff/w3m-0.5.2-gc72.patch	Fri Dec 02 10:26:08 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c
---- main.c	2007-05-31 10:19:50.000000000 +0900
-+++ main.c	2009-11-09 08:20:02.184953443 +0900
-@@ -312,7 +312,11 @@
- 	    lock = 0;
- 	}
-     }
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
-+    else if (orig_GC_warn_proc = GC_get_warn_proc())
-+#else
-     else if (orig_GC_warn_proc)
-+#endif
- 	orig_GC_warn_proc(msg, arg);
-     else
- 	fprintf(stderr, msg, (unsigned long)arg);
-@@ -842,7 +846,11 @@
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
-+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-+#else
-     orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+#endif
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */