>From 2be0c86164bae9a3655c7b2322fca1f623abc18f Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <address@hidden>
Date: Thu, 28 Mar 2019 15:54:47 +0100
Subject: [PATCH 3/3] gnu: qutebrowser: Update to 1.6.1.

* gnu/packages/web-browsers.scm (qutebrowser): Update to 1.6.1.
[inputs]: Remove python-colorama, add python-attrs, qtwebengine.
[arguments]: Use included Makefile to install.
---
 gnu/packages/web-browsers.scm | 61 ++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index b6af572778..e891674412 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -270,21 +270,22 @@ access.")
 (define-public qutebrowser
   (package
     (name "qutebrowser")
-    (version "0.11.0")
+    (version "1.6.1")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/The-Compiler/"
-                           "qutebrowser/releases/download/v" version "/"
-                           "qutebrowser-" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/qutebrowser/qutebrowser")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"))))
+         "1y2z2g9fp7gamm0ak1k48m134bl9b123ikkyq67wfgw4rglzfckm"))))
     (build-system python-build-system)
     (native-inputs
      `(("asciidoc" ,asciidoc)))
     (inputs
-     `(("python-colorama" ,python-colorama)
+     `(("python-attrs" ,python-attrs)
        ("python-cssutils" ,python-cssutils)
        ("python-jinja2" ,python-jinja2)
        ("python-markupsafe" ,python-markupsafe)
@@ -292,40 +293,34 @@ access.")
        ("python-pypeg2" ,python-pypeg2)
        ("python-pyyaml" ,python-pyyaml)
        ("python-pyqt" ,python-pyqt)
-       ("qtwebkit" ,qtwebkit)))
+       ("qtwebkit" ,qtwebkit)           ; TODO: Remove?  Will be deprecated soon.
+       ("qtwebengine" ,qtwebengine)
+       ("sqlite" ,sqlite-with-column-metadata)))
     (arguments
-     `(#:tests? #f                      ;no tests
+     `(#:tests? #f                      ; TODO: Fix error "Permission denied: 'qutebrowser/resources.py'"
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'install-more
            (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (app (string-append out "/share/applications"))
-                    (hicolor (string-append out "/share/icons/hicolor")))
-               (invoke "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc")
-               (install-file "doc/qutebrowser.1"
-                             (string-append out "/share/man/man1"))
-
-               (for-each
-                (lambda (i)
-                  (let ((src  (format #f "icons/qutebrowser-~dx~d.png" i i))
-                        (dest (format #f "~a/~dx~d/apps/qutebrowser.png"
-                                      hicolor i i)))
-                    (mkdir-p (dirname dest))
-                    (copy-file src dest)))
-                '(16 24 32 48 64 128 256 512))
-               (install-file "icons/qutebrowser.svg"
-                             (string-append hicolor "/scalable/apps"))
-               
-               (substitute* "qutebrowser.desktop"
-                 (("Exec=qutebrowser")
-                  (string-append "Exec=" out "/bin/qutebrowser")))
-               (install-file "qutebrowser.desktop" app)
-               #t))))))
+             (invoke "make" "-f" "misc/Makefile"
+                     (string-append "DESTDIR=" (assoc-ref outputs "out"))
+                     "PREFIX="
+                     "install")
+             #t))
+         (add-after 'wrap 'wrap-more
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (wrap-program (string-append (assoc-ref outputs "out") "/bin/qutebrowser")
+               `("PATH" prefix
+                 (,(string-append (assoc-ref inputs "qtwebengine") "/lib/qt5/libexec/")))
+               `("LD_LIBRARY_PATH" prefix
+                 (,(string-append (assoc-ref inputs "sqlite") "/lib"))))
+             #t))
+         )))
     (home-page "https://qutebrowser.org/")
     (synopsis "Minimal, keyboard-focused, vim-like web browser")
     (description "qutebrowser is a keyboard-focused browser with a minimal
-GUI.  It is based on PyQt5 and QtWebKit.")
+GUI.  It is based on PyQt5 and supports two web renderers: QtWebKit and
+QtWebEngine.")
     (license license:gpl3+)))
 
 (define-public vimb
-- 
2.21.0