From 8f2a3810851a1cbc7bccae26badefaf81aecf70b Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sun, 27 Feb 2022 10:15:07 -0700 Subject: [PATCH] nyxt: remove runtime deps on *-devel Signed-off-by: Joseph Benden --- srcpkgs/nyxt/patches/001-libfixposix.patch | 12 ++++++++++++ srcpkgs/nyxt/patches/002-webkit2gtk.patch | 14 ++++++++++++++ srcpkgs/nyxt/template | 5 +++-- 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/nyxt/patches/001-libfixposix.patch create mode 100644 srcpkgs/nyxt/patches/002-webkit2gtk.patch diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch new file mode 100644 index 000000000000..23ef9da26442 --- /dev/null +++ b/srcpkgs/nyxt/patches/001-libfixposix.patch @@ -0,0 +1,12 @@ +--- 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 @@ + (eval-when (:compile-toplevel :load-toplevel :execute) + (define-foreign-library + (libfixposix :canary "lfp_buildinfo") +- (t (:default "libfixposix"))) ++ (:unix "libfixposix.so.3") ++ (t (:default "libfixposix"))) + (load-foreign-library 'libfixposix)) + + diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch new file mode 100644 index 000000000000..5a0fe2e923d3 --- /dev/null +++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch @@ -0,0 +1,14 @@ +--- a/_build/cl-webkit/webkit2/webkit2.init.lisp 2022-01-14 03:22:05.000000000 -0700 ++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp 2022-02-27 09:59:29.175938024 -0700 +@@ -18,9 +18,9 @@ + "libwebkit2gtk-4.0.37.dylib" + "libwebkit2gtk-4.0.dylib")) + (:unix (:or "libwebkit2gtk-4.1.so" +- "libwebkit2gtk-4.0.so" + ;; Fedora only has this one? +- "libwebkit2gtk-4.0.so.37"))) ++ "libwebkit2gtk-4.0.so.37" ++ "libwebkit2gtk-4.0.so"))) + (use-foreign-library libwebkit2)) + + (defcfun "webkit_get_major_version" :int) diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index 8332e1286d2c..c786941e5064 100644 --- a/srcpkgs/nyxt/template +++ b/srcpkgs/nyxt/template @@ -6,8 +6,8 @@ create_wrksrc=yes build_style=gnu-makefile make_build_target=all hostmakedepends="sbcl git" -makedepends="webkit2gtk-devel libfixposix-devel libgirepository-devel" -depends="dbus xclip enchant2 webkit2gtk-devel libfixposix-devel libgirepository-devel" +makedepends="webkit2gtk libfixposix-devel libgirepository-devel" +depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository" short_desc="Keyboard-oriented, extensible web-browser" maintainer="0x0f0f0f " license="BSD-3-Clause" @@ -19,6 +19,7 @@ make_check=no nostrip=yes nopie=yes nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags" +shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1" do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install