next: rebuild against OpenSSL

This commit is contained in:
John 2021-01-06 23:57:50 +01:00
parent 8ecf1ee7f9
commit 2283ff8e9e
2 changed files with 34 additions and 3 deletions

View file

@ -0,0 +1,31 @@
commit 8350ff933c37faa15101662516d8614a9c301a36
Author: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Thu Mar 5 16:43:55 2020 +0100
Work around Guix compilation error of define-key.
Error happens in search-buffer's search-over-buffers which calls define-key.
; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
; (NEXT:DEFINE-KEY "C-s"
; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
; :KEYMAP NEXT::KEYMAP)
;
; caught WARNING:
; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
Maybe the type is wrong. But our define-key lambdalist is weird anyways.
diff --git a/source/keymap.lisp b/source/keymap.lisp
index bbcb9d21..e29bdf3a 100644
--- source/keymap.lisp
+++ source/keymap.lisp
@@ -144,7 +144,7 @@
(setf (key-chord-stack *browser*) nil))
(t (setf (key-chord-stack *browser*) nil))))))
-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
+;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
@export
(defun define-key (&rest key-command-pairs
&key keymap

View file

@ -1,12 +1,12 @@
# Template file for 'next'
pkgname=next
version=1.5.0
revision=1
revision=2
wrksrc=nyxt-${version}
build_style=gnu-makefile
hostmakedepends="sbcl curl pkg-config"
makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
depends="sqlite xclip libfixposix-devel libressl-devel"
makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
depends="dbus sqlite xclip libfixposix-devel openssl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"