ambrevar pushed a commit to branch wip-next-browser2
in repository guix.
commit 06676a061b4aa0ee832d55801e1f17987fce976c
Author: Pierre Neidhardt <[email protected]>
Date: Mon Oct 15 15:02:51 2018 +0200
next (FIX delete patch)
---
.../patches/next-fix-duplicate-function.patch | 39 ----------------------
gnu/packages/web-browsers.scm | 6 ++--
2 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/patches/next-fix-duplicate-function.patch
b/gnu/packages/patches/next-fix-duplicate-function.patch
deleted file mode 100644
index ce28698..0000000
--- a/gnu/packages/patches/next-fix-duplicate-function.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7b6ea6d375e547a6e465504656f819b1f4807d13 Mon Sep 17 00:00:00 2001
-From: Pierre Neidhardt <[email protected]>
-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 c6844c8..566334e 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -326,7 +326,7 @@ GUI. It is based on PyQt5 and QtWebKit.")
(license license:gpl3+)))
(define-public next-browser-core
- (let ((commit "ccc289b44610ada4ae9c875910af7720e85b546b"))
+ (let ((commit "c69106030df63e5a2fa907e638dfea77dff3b682"))
(package
(name "next-browser-core")
(version (git-version "0.0.8" "1" commit))
@@ -335,8 +335,8 @@ 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"))
+ ;; (patches
+ ;; (search-patches "next-fix-duplicate-function.patch"))
(sha256
(base32
"0rccs9w49p577l12kgykccxrjkr03rf1cfz9mvxbjzc8g82dya2k"))
