From 1094cd450b56bf88b7725123498bd5fd2ab1fb66 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 11 Jan 2017 11:53:33 -0500
Subject: [PATCH] w3m: Switch to maintained debian fork

---
 packages/w3m/build.sh     | 11 ++++++++---
 packages/w3m/main.c.patch | 14 --------------
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 packages/w3m/main.c.patch

diff --git a/packages/w3m/build.sh b/packages/w3m/build.sh
index 5979d831..d5a7c183 100644
--- a/packages/w3m/build.sh
+++ b/packages/w3m/build.sh
@@ -1,8 +1,13 @@
 TERMUX_PKG_HOMEPAGE=http://w3m.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Text based Web browser and pager"
-TERMUX_PKG_VERSION=0.5.3
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/w3m/w3m/w3m-$TERMUX_PKG_VERSION/w3m-${TERMUX_PKG_VERSION}.tar.gz
+_MAJOR_VERSION=0.5.3
+_MINOR_VERSION=20170102
+TERMUX_PKG_VERSION=0.5.3.$_MINOR_VERSION
+# The upstream w3m project is dead, but every linux distribution uses
+# this maintained fork in debian:
+TERMUX_PKG_SRCURL=https://github.com/tats/w3m/archive/v${_MAJOR_VERSION}+git${_MINOR_VERSION}.tar.gz
+TERMUX_PKG_SHA256=7eb8cadfa39daa6e8ecf8244847991f614fdc5319e601f58fc02956bc05b5ab1
+TERMUX_PKG_FOLDERNAME=w3m-${_MAJOR_VERSION}-git${_MINOR_VERSION}
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_DEPENDS="libgc, ncurses, openssl"
 # ac_cv_func_bcopy=yes to avoid w3m defining it's own bcopy function, which
diff --git a/packages/w3m/main.c.patch b/packages/w3m/main.c.patch
deleted file mode 100644
index 573f683f..00000000
--- a/packages/w3m/main.c.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix compiling with newer libgc version.
-
-diff -u -r ../w3m-0.5.3/main.c ./main.c
---- ../w3m-0.5.3/main.c	2011-01-04 04:42:19.000000000 -0500
-+++ ./main.c	2015-11-19 17:34:47.045885249 -0500
-@@ -833,7 +833,7 @@
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
--    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */
-- 
2.11.0