Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / gnu / packages / w3m.scm

diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index 64fa78a..e7dd583 100644 (file)
--- 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.
 ;;;
@@ -22,9 +23,9 @@
   #:use-module (gnu packages bdw-gc)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages ncurses)
-  #:use-module (gnu packages openssl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -36,15 +37,18 @@
     (version "0.5.3")
     (source (origin
              (method url-fetch)
-             (uri (string-append "mirror://sourceforge/w3m/w3m-"
-                                 version ".tar.gz"))
+             (uri (string-append "mirror://sourceforge/" name "/" name "/"
+                                 name "-" version "/"
+                                 name "-" version ".tar.gz"))
              (sha256
               (base32
                "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"))
 
              ;; cf. https://bugs.archlinux.org/task/33397
-             (patches (list (search-patch "w3m-fix-compile.patch")))
-             (patch-flags '("-p0"))))
+             (patches (search-patches "w3m-libgc.patch"
+                                      "w3m-force-ssl_verify_server-on.patch"
+                                      "w3m-disable-sslv2-and-sslv3.patch"
+                                      "w3m-disable-weak-ciphers.patch"))))
     (build-system gnu-build-system)
     (arguments `(#:tests? #f  ; no check target
                  #:phases (alist-cons-before
@@ -60,15 +64,16 @@
                                (("@PERL@") (which "perl"))))
                            %standard-phases)))
     (inputs
-     `(("gettext" ,gnu-gettext)
-       ("libgc" ,libgc)
+     `(("libgc" ,libgc)
        ("ncurses" ,ncurses)
        ("openssl" ,openssl)
-       ("perl" ,perl)
-       ("pkg-config" ,pkg-config)
        ("zlib" ,zlib)))
+    (native-inputs
+     `(("gettext" ,gnu-gettext)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
     (home-page "http://w3m.sourceforge.net/")
-    (synopsis "w3m, a text-mode web browser")
+    (synopsis "Text-mode web browser")
     (description
      "w3m is a text-based web browser as well as a pager like 'more' or
 'less'.  With w3m you can browse web pages through a terminal emulator