diff --git a/REPO b/REPO index ececf9c..b16a61e 100644 --- a/REPO +++ b/REPO @@ -203,10 +203,11 @@ f:5a14c859c4e4ed24b002596bc44b7950:freepats/Pkgfile f:171a3b067aa2d35a435ee2d37df065d4:freepats/.footprint f:2a554a60d4ecb1d238d474b6d97a310e:freepats/.signature f:627ed74e27650ad8b5f860f26a174def:nyxt/post-install -f:5032243f0e79fc9eba691c8696c4f490:nyxt/Pkgfile +f:fc7aabc4553cfd31db95c2581557ab35:nyxt/Pkgfile f:2d96d7d7eca42a769654492256c21a3a:nyxt/.footprint -f:f0dce5a88d0c0b947d395c7476d193ab:nyxt/vi-keybindings.patch -f:ff29be9eeeb579189b96f48e079c6f18:nyxt/.signature +f:029a192b30f5a2ba4ddd19e5d2908e07:nyxt/vi-keybindings.patch +f:5aff1de3df032289bf27138cbdadcd9d:nyxt/.signature +f:c6a24e0b9d24788f4703350e48b03c94:nyxt/libfixposix.patch f:b77ab2594e0d23fb0cc1e6650f3d89df:ltris/Pkgfile f:6d981a43e4eb7a44d8007e29fdc3bfe2:ltris/.footprint f:99f5ee73d3148bc3e422dfa5c31d21f4:ltris/.signature diff --git a/nyxt/.signature b/nyxt/.signature index 238a656..7d34db4 100644 --- a/nyxt/.signature +++ b/nyxt/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/jmq.pub -RWTTPlFarK9CxPJNY+aXsDBXazFXJo/HHSYltDmoFh5lO6j2u/Qz9nPQy+AbZpF2KHi2vu8hQKX0QejBVu8LQVfwn5x9TuWmiwI= -SHA256 (Pkgfile) = d797fbf3ebdb1f62b159708f121dc5c3662164cbdb1c2424bf24dbdcb6c9efab +RWTTPlFarK9CxJK6ReTfSL63/XRM/RiIrGtglM47j9a1l4MtCFKq7L2+wCEjgYgHIIo3zMKIboyujGFcbQ77CJCTMeRyJhNvlg4= +SHA256 (Pkgfile) = 4c238dc06cfe934caa43a2b77d8f5b6b543f6768c63f44b4dddff7eb5c0bc97a SHA256 (.footprint) = 425ef66a2d223ca7ff4d166a291ad251a3df83150896e858e77e7b5824c13d6b SHA256 (nyxt-3.11.8-source-with-submodules.tar.xz) = 4604b15a4d89336d110926ac91c53eff020ae9c8cd96214d7ed1114bcf6a9254 -SHA256 (vi-keybindings.patch) = fd504b17f9f705ac745301646f45fa6ae53c534804f056e68680118a489b1e8b +SHA256 (vi-keybindings.patch) = 378d91c3d1e816fcd4ae5a9cf635c80c5c21c599419e96c3ed43361c9bc3209b +SHA256 (libfixposix.patch) = 4ff0a7abbd49f5b18c91579c94e7177fae06fe8188664b5ae80909f8cc557394 diff --git a/nyxt/Pkgfile b/nyxt/Pkgfile index 9d56e22..073ce39 100644 --- a/nyxt/Pkgfile +++ b/nyxt/Pkgfile @@ -7,12 +7,13 @@ name=nyxt version=3.11.8 release=1 -source=(https://github.com/atlas-engineer/nyxt/releases/download/$version/$name-$version-source-with-submodules.tar.xz vi-keybindings.patch) +source=(https://github.com/atlas-engineer/nyxt/releases/download/$version/$name-$version-source-with-submodules.tar.xz vi-keybindings.patch libfixposix.patch) build() { - # some tweaks to the vi keymap - patch -d source/mode -i $SRC/vi-keybindings.patch + for p in $SRC/*.patch; do + patch -Np1 -i $p + done make all make PREFIX=/usr DESTDIR=$PKG install diff --git a/nyxt/libfixposix.patch b/nyxt/libfixposix.patch new file mode 100644 index 0000000..fe402f8 --- /dev/null +++ b/nyxt/libfixposix.patch @@ -0,0 +1,12 @@ +--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2024-08-01 15:53:09.000000000 +0000 ++++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2024-09-04 11:43:08.596508014 +0000 +@@ -11,7 +11,8 @@ + ;; FIXME: move this into an ASDF operation + (eval-when (:compile-toplevel :load-toplevel :execute) + (define-foreign-library +- (libfixposix :canary "lfp_buildinfo") ++ (libfixposix :canary "lfp_buildinfo_not_exist") ++ (:unix "libfixposix.so.3") + (t (:default "libfixposix"))) + (load-foreign-library 'libfixposix)) + diff --git a/nyxt/vi-keybindings.patch b/nyxt/vi-keybindings.patch index 09db766..91c2a23 100644 --- a/nyxt/vi-keybindings.patch +++ b/nyxt/vi-keybindings.patch @@ -1,5 +1,5 @@ ---- base.lisp 2022-09-19 08:05:47.000000000 -0000 -+++ base.lisp 2022-10-25 09:01:09.162395453 -0000 +--- a/source/mode/base.lisp 2022-09-19 08:05:47.000000000 -0000 ++++ b/source/mode/base.lisp 2022-10-25 09:01:09.162395453 -0000 @@ -101,8 +101,9 @@ This mode is a good candidate to be pass "C-x C-c" 'quit) keyscheme:vi-normal