[PATCH 0/1] w3m: Change source and update

[PATCH 0/1] w3m: Change source and update

[Leo Famulari]

This patch fixes bug#16791. There is some background in the bug's thread
[0].

Basically, our current source for w3m seems to be abandoned [1].

There is an active development fork at Debian [2] that fixes bug#16791.
They have also fixed several other SSL/TLS issues, as well as both of
the patches / substitutions currently applied to our package. They are
also addressing bugs and integrating patches from other distros (at
least, I saw work from Ubuntu and Gentoo).

I think the Debian repo is our best source for w3m.

I have emailed the person doing most of the work in the Debian repo for
advice about packaging, such as which branch and tags are most suitable.

Until they reply, here is my best effort patch, based on the latest
non-Debian release tag on the master branch.

[0]
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16791

[1]
http://sourceforge.net/p/w3m/

[2]
http://anonscm.debian.org/cgit/collab-maint/w3m.git

Leo Famulari (1):
  gnu: w3m: Update to 0.5.3+git20151119.

 gnu-system.am                              |  1 -
 gnu/packages/patches/w3m-fix-compile.patch | 15 ---------------
 gnu/packages/w3m.scm                       | 24 +++++++++---------------
 3 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 gnu/packages/patches/w3m-fix-compile.patch

-- 
2.6.4

[PATCH 1/1] gnu: w3m: Update to 0.5.3+git20151119.

[Leo Famulari]

Fixes <http://bugs.gnu.org/16791>.

* gnu/packages/w3m.scm (w3m): Update to 0.5.3+git20151119.
[source]: Remove patch.
[arguments]: Remove substition.
* gnu/packages/patches/w3m-fix-compile.patch: Delete file.
* gnu-system.am (dist_patch_DATA): Remove it.
---
 gnu-system.am                              |  1 -
 gnu/packages/patches/w3m-fix-compile.patch | 15 ---------------
 gnu/packages/w3m.scm                       | 24 +++++++++---------------
 3 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 gnu/packages/patches/w3m-fix-compile.patch

diff --git a/gnu-system.am b/gnu-system.am
index c0f8fac..125679a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -695,7 +695,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/valgrind-enable-arm.patch		\
   gnu/packages/patches/vpnc-script.patch			\
   gnu/packages/patches/vtk-mesa-10.patch			\
-  gnu/packages/patches/w3m-fix-compile.patch			\
   gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch	\
   gnu/packages/patches/weechat-python.patch			\
   gnu/packages/patches/weex-vacopy.patch			\
diff --git a/gnu/packages/patches/w3m-fix-compile.patch b/gnu/packages/patches/w3m-fix-compile.patch
deleted file mode 100644
index 5604052..0000000
--- a/gnu/packages/patches/w3m-fix-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.archlinux.org/task/33397
-
-diff -aur old/main.c new/main.c
---- main.c	2013-01-14 18:16:14.216210053 -0600
-+++ main.c	2013-01-14 18:17:28.816220559 -0600
-@@ -833,7 +833,8 @@
-     mySignal(SIGPIPE, SigPipe);
- #endif
-
--    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+    orig_GC_warn_proc = GC_get_warn_proc();
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-     err_msg = Strnew();
-     if (load_argc == 0) {
-	/* no URL specified */
diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index d114d0a..5bf9234 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -27,34 +28,27 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages)
   #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu))
 
 (define-public w3m
   (package
     (name "w3m")
-    (version "0.5.3")
+    (version "0.5.3+git20151119")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/w3m/w3m-"
-                                 version ".tar.gz"))
+             (method git-fetch)
+             (uri (git-reference
+                   (url "git://anonscm.debian.org/collab-maint/w3m.git")
+                   (commit (string-append "v" version))))
+             (file-name (string-append name "-" version))
              (sha256
               (base32
-               "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"))
-
-             ;; cf. https://bugs.archlinux.org/task/33397
-             (patches (list (search-patch "w3m-fix-compile.patch")))
-             (patch-flags '("-p0"))))
+               "089955gzwgdzanvyk5m26kw7c5pcil7laq97c1cfk6644ffmbfg2"))))
     (build-system gnu-build-system)
     (arguments `(#:tests? #f  ; no check target
                  #:phases (alist-cons-before
                            'configure 'fix-perl
                            (lambda _
-                             ;; https://launchpad.net/bugs/935540
-                             ;; 'struct file_handle' is used by 'glibc'
-                             (substitute* '("istream.c" "istream.h")
-                              (("struct[[:blank:]]+file_handle")
-                               "struct w3m_file_handle"))
                              (substitute* '("scripts/w3mmail.cgi.in"
                                             "scripts/dirlist.cgi.in")
                                (("@PERL@") (which "perl"))))
-- 
2.6.4