Re: [PR PATCH] [Updated] next: rename to nyxt

[egorenar <egorenar@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is an updated pull request by egorenar against master on the void-packages repository

https://github.com/egorenar/void-packages nyxt
https://github.com/void-linux/void-packages/pull/24765

next: rename to nyxt


A patch file from https://github.com/void-linux/void-packages/pull/24765.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-24765.patch --]
[-- Type: text/x-diff, Size: 5110 bytes --]

From 0c6329fae3bbc83a77ac991723687cd8713790fc Mon Sep 17 00:00:00 2001
From: Alexander Egorenkov <egorenar-dev@posteo.net>
Date: Tue, 8 Sep 2020 20:08:21 +0200
Subject: [PATCH] next: rename to nyxt and bump to version 2.0.0

---
 srcpkgs/next                          |  1 +
 srcpkgs/next/patches/sbcl-2.1.0.patch | 31 ----------------------
 srcpkgs/next/template                 | 38 ---------------------------
 srcpkgs/nyxt/template                 | 34 ++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 69 deletions(-)
 create mode 120000 srcpkgs/next
 delete mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
 delete mode 100644 srcpkgs/next/template
 create mode 100644 srcpkgs/nyxt/template

diff --git a/srcpkgs/next b/srcpkgs/next
new file mode 120000
index 000000000000..8d07cc8517be
--- /dev/null
+++ b/srcpkgs/next
@@ -0,0 +1 @@
+nyxt
\ No newline at end of file
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
deleted file mode 100644
index 44c2059d21de..000000000000
--- a/srcpkgs/next/patches/sbcl-2.1.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
deleted file mode 100644
index fd5b877ecd21..000000000000
--- a/srcpkgs/next/template
+++ /dev/null
@@ -1,38 +0,0 @@
-# Template file for 'next'
-pkgname=next
-version=1.5.0
-revision=2
-wrksrc=nyxt-${version}
-build_style=gnu-makefile
-hostmakedepends="sbcl curl pkg-config"
-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"
-homepage="https://next.atlas.engineer/"
-# we need this commit to fix non-x86 builds
-# it is the only commit on top of 0.53 release
-# remove the whole vendoring thing when 0.54 is out
-# this will probably be the next time we update this...
-_ironclad_rev=f215e183e7fe0b66da009c07d70e6f738ea1da03
-distfiles="https://github.com/atlas-engineer/nyxt/archive/${version}.tar.gz
- https://github.com/sharplispers/ironclad/archive/${_ironclad_rev}.tar.gz"
-checksum="bfd1e2e6f43385b8dc07d4860da6ef99d9e94aba4c688eddd05930c5a2e36637
- 988ccefa88b47f97dc8fb52a475a444c0b1bc45fdca64009140d41d397980ca6"
-nostrip=yes
-nopie=yes
-nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
-
-post_extract() {
-	mkdir ${wrksrc}/vendor
-	mv ../ironclad-* ${wrksrc}/vendor/ironclad
-}
-
-pre_install() {
-	export CL_SOURCE_REGISTRY=${wrksrc}/vendor/ironclad
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
new file mode 100644
index 000000000000..b0ba5dd3481e
--- /dev/null
+++ b/srcpkgs/nyxt/template
@@ -0,0 +1,34 @@
+# Template file for 'nyxt'
+pkgname=nyxt
+version=2.0.0
+revision=1
+wrksrc=nyxt
+build_style=gnu-makefile
+hostmakedepends="sbcl curl pkg-config git"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel libgirepository-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel libgirepository-devel"
+short_desc="Keyboard-oriented, extensible web-browser"
+maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://nyxt.atlas.engineer/"
+distfiles="https://nyxt.atlas.engineer/static/release/nyxt.tar.gz"
+checksum=71154bc6ef88f176f3f7783e1c0ecc191b6dcdd996e1c67f2bbc417b651e0355
+nostrip=yes
+nopie=yes
+nocross="https://travis-ci.org/void-linux/void-packages/builds/590346382"
+
+do_build() {
+	make ${makejobs} all
+}
+
+do_install() {
+	make PREFIX=/usr DESTDIR=${DESTDIR} install
+	vlicense licenses/ASSET-LICENSE
+	vlicense licenses/SOURCE-LICENSE
+}
+
+next_package() {
+	depends="nyxt"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}