nyxt: fix musl runtime

While we're at it, load versioned libgi-repository.

Fix: #35877
Fix: #36243
Close: #36251
This commit is contained in:
Đoàn Trần Công Danh 2022-03-21 17:04:55 +07:00
parent 9c7a509c7c
commit f9fd85e4f7
3 changed files with 24 additions and 9 deletions

View file

@ -1,12 +1,14 @@
--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig 2022-02-27 09:44:00.327307802 -0700
+++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2022-02-27 09:48:30.875539336 -0700
@@ -12,7 +12,8 @@
Index: nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
===================================================================
--- nyxt-2.2.4.orig/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+++ nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
@@ -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")
- (t (:default "libfixposix")))
- (libfixposix :canary "lfp_buildinfo")
+ (libfixposix :canary "lfp_buildinfo_not_exist")
+ (:unix "libfixposix.so.3")
+ (t (:default "libfixposix")))
(t (:default "libfixposix")))
(load-foreign-library 'libfixposix))

View file

@ -0,0 +1,13 @@
Index: nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
===================================================================
--- nyxt-2.2.4.orig/_build/cl-gobject-introspection/src/init.lisp
+++ nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
@@ -10,7 +10,7 @@
(t "libgobject-2.0"))
(cffi:define-foreign-library girepository
(:darwin "libgirepository-1.0.dylib")
- (:unix (:or "libgirepository-1.0.so" "libgirepository-1.0.so.1"))
+ (:unix (:or "libgirepository-1.0.so.1"))
(:windows (:or "libgirepository-1.0.dll" "libgirepository-1.0.0.dll"
"libgirepository-1.0-1.dll"))
(t "libgirepository-1.0")))

View file

@ -1,12 +1,12 @@
# Template file for 'nyxt'
pkgname=nyxt
version=2.2.4
revision=2
revision=3
create_wrksrc=yes
build_style=gnu-makefile
make_build_target=all
hostmakedepends="sbcl git"
makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
makedepends="webkit2gtk libfixposix-devel libgirepository"
depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"