From: jbenden <jbenden@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] nyxt: fix missing symbol lfp_errno
Date: Mon, 21 Mar 2022 03:59:58 +0100 [thread overview]
Message-ID: <20220321025958.6PuHf5kXhVseuNKutDaTBpNikAHc_N3vcAu2SXAVsI8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36251@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 696 bytes --]
There is an updated pull request by jbenden against master on the void-packages repository
https://github.com/jbenden/void-packages nyxt-lfp-sym
https://github.com/void-linux/void-packages/pull/36251
nyxt: fix missing symbol lfp_errno
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (`x86_64`-`glibc`)
- I built this PR locally inside of a VM, (`x86_64`-`musl`)
#### Notes
This patch is in response to bug report #36243.
Everything seems to check out good on both systems mentioned above.
A patch file from https://github.com/void-linux/void-packages/pull/36251.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nyxt-lfp-sym-36251.patch --]
[-- Type: text/x-diff, Size: 3536 bytes --]
From 866b45d7161b79ac628da63a74d48619a4154b1f Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 20 Mar 2022 16:54:53 -0700
Subject: [PATCH] nyxt: fix missing symbol lfp_errno
Signed-off-by: Joseph Benden <joe@benden.us>
---
srcpkgs/nyxt/patches/001-libfixposix.patch | 18 ++++++++++--------
srcpkgs/nyxt/patches/002-webkit2gtk.patch | 3 ++-
srcpkgs/nyxt/patches/003-libgirepository.patch | 11 +++++++++++
3 files changed, 23 insertions(+), 9 deletions(-)
create mode 100644 srcpkgs/nyxt/patches/003-libgirepository.patch
diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
index 23ef9da26442..4daf86df8e05 100644
--- a/srcpkgs/nyxt/patches/001-libfixposix.patch
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -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 @@
+--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2022-03-20 16:37:34.285638580 -0700
++++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2022-03-20 16:45:25.241621564 -0700
+@@ -11,7 +11,10 @@
+ ;; FIXME: move this into an ASDF operation
(eval-when (:compile-toplevel :load-toplevel :execute)
(define-foreign-library
- (libfixposix :canary "lfp_buildinfo")
-- (t (:default "libfixposix")))
-+ (:unix "libfixposix.so.3")
-+ (t (:default "libfixposix")))
+- (libfixposix :canary "lfp_buildinfo")
++ libfixposix
++ (:unix (:or "libfixposix.so.3.2.0"
++ "libfixposix.so.3"
++ "libfixposix.so"))
+ (t (:default "libfixposix")))
(load-foreign-library 'libfixposix))
\f
-
diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
index 5a0fe2e923d3..a0e493e80b35 100644
--- a/srcpkgs/nyxt/patches/002-webkit2gtk.patch
+++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
@@ -1,12 +1,13 @@
--- 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 @@
+@@ -18,9 +18,10 @@
"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.55.9"
+ "libwebkit2gtk-4.0.so.37"
+ "libwebkit2gtk-4.0.so")))
(use-foreign-library libwebkit2))
diff --git a/srcpkgs/nyxt/patches/003-libgirepository.patch b/srcpkgs/nyxt/patches/003-libgirepository.patch
new file mode 100644
index 000000000000..dd12dd8fcd20
--- /dev/null
+++ b/srcpkgs/nyxt/patches/003-libgirepository.patch
@@ -0,0 +1,11 @@
+--- a/_build/cl-gobject-introspection/src/init.lisp 2022-01-14 03:21:58.000000000 -0700
++++ b/_build/cl-gobject-introspection/src/init.lisp 2022-03-20 12:55:08.298233467 -0700
+@@ -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.0.0" "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")))
next prev parent reply other threads:[~2022-03-21 2:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 0:03 [PR PATCH] " jbenden
2022-03-21 2:52 ` [PR PATCH] [Updated] " jbenden
2022-03-21 2:59 ` jbenden [this message]
2022-03-21 10:06 ` [PR PATCH] [Closed]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220321025958.6PuHf5kXhVseuNKutDaTBpNikAHc_N3vcAu2SXAVsI8@z \
--to=jbenden@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).