01/01: next (FIX)

[Pierre Neidhardt]

ambrevar pushed a commit to branch wip-next-browser
in repository guix.

commit ffdc4e418bb54259ebc05026e90bf8fdb401fa75
Author: Pierre Neidhardt <address@hidden>
Date:   Thu Oct 11 12:24:40 2018 +0200

    next (FIX)
---
 .../patches/next-fix-duplicate-function.patch      | 39 ++++++++++++++++++++++
 gnu/packages/web-browsers.scm                      |  3 ++
 2 files changed, 42 insertions(+)

diff --git a/gnu/packages/patches/next-fix-duplicate-function.patch 
b/gnu/packages/patches/next-fix-duplicate-function.patch
new file mode 100644
index 0000000..ce28698
--- /dev/null
+++ b/gnu/packages/patches/next-fix-duplicate-function.patch
@@ -0,0 +1,39 @@
+From 7b6ea6d375e547a6e465504656f819b1f4807d13 Mon Sep 17 00:00:00 2001
+From: Pierre Neidhardt <address@hidden>
+Date: Thu, 11 Oct 2018 11:14:36 +0200
+Subject: [PATCH] Fix set-url-new-buffer duplicate
+
+---
+ next/source/base.lisp          | 2 +-
+ next/source/document-mode.lisp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/next/source/base.lisp b/next/source/base.lisp
+index 543debe..26eec18 100644
+--- a/next/source/base.lisp
++++ b/next/source/base.lisp
+@@ -53,7 +53,7 @@
+     ;; We can have many urls as positional arguments.
+     (if free-args
+         (loop for url in free-args do
+-             (set-url-new-buffer url t))
++             (%set-url-new-buffer url t))
+         (set-url *start-page-url*))))
+ 
+ (defun initialize-default-key-bindings ()
+diff --git a/next/source/document-mode.lisp b/next/source/document-mode.lisp
+index 4da8546..4e36eec 100644
+--- a/next/source/document-mode.lisp
++++ b/next/source/document-mode.lisp
+@@ -132,7 +132,7 @@ buffer"
+     (history-typed-add input-url))
+   (interface:web-view-set-url (view buffer) input-url))
+ 
+-(defun set-url-new-buffer (input-url &optional disable-history)
++(defun %set-url-new-buffer (input-url &optional disable-history)
+   (let ((new-buffer (generate-new-buffer "default" (document-mode))))
+     (set-visible-active-buffer new-buffer)
+     (set-url-buffer input-url new-buffer disable-history)))
+-- 
+2.19.1
+
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 1c0c395..eb2b4d8 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -332,12 +332,15 @@ GUI.  It is based on PyQt5 and QtWebKit.")
                 (uri (git-reference
                       (url "https://github.com/atlas-engineer/next";)
                       (commit commit)))
+                (patches
+                 (search-patches "next-fix-duplicate-function.patch"))
                 (sha256
                  (base32
                   "1pcpb274zb0qm26rrglgcgzg2d2v7j2aja5685swwyq9rcqlbdf4"))))
       (build-system asdf-build-system/sbcl)
       ;; TODO: Move Common Lisp libraries to "native-inputs"?
       ;; TODO: Does runtime depends on gsettings-desktop-schemas and 
glib-networking?
+      (outputs '("out" "lib"))
       (inputs
        `(("alexandria" ,sbcl-alexandria)
          ("cl-strings" ,sbcl-cl-strings)