[PR PATCH] nyxt: remove runtime deps on *-devel

[PR PATCH] nyxt: remove runtime deps on *-devel

[jbenden]

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

There is a new pull request by jbenden against master on the void-packages repository

https://github.com/jbenden/void-packages nyxt-fixup
https://github.com/void-linux/void-packages/pull/35877

nyxt: remove runtime deps on *-devel
#### 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)

#### About

The current package requires shared libraries referenced inside development packages (`*-devel` because the libraries are referred to by `libXYZ.so` filenames).

This patch fixes this small defect.

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

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

From ec45269a9d9ec97c17b17f2f739f8ea040cdf3c0 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 27 Feb 2022 10:15:07 -0700
Subject: [PATCH] nyxt: remove runtime deps on *-devel

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 12 ++++++++++++
 srcpkgs/nyxt/patches/002-webkit2gtk.patch  | 14 ++++++++++++++
 srcpkgs/nyxt/template                      |  4 ++--
 3 files changed, 28 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))
+ \f
+ 
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..9801137e4bad 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 <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"

Re: [PR REVIEW] nyxt: remove runtime deps on *-devel

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/35877#discussion_r829210579

Comment:
We may want to add this line to template:
```sh
shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1"
```

Re: [PR REVIEW] nyxt: remove runtime deps on *-devel

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/35877#discussion_r829210579

Comment:
We may want to add this line to template:
```sh
shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1"
```

Re: [PR PATCH] [Updated] nyxt: remove runtime deps on *-devel

[jbenden]

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

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

https://github.com/jbenden/void-packages nyxt-fixup
https://github.com/void-linux/void-packages/pull/35877

nyxt: remove runtime deps on *-devel
#### 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)

#### About

The current package requires shared libraries referenced inside development packages (`*-devel` because the libraries are referred to by `libXYZ.so` filenames).

This patch fixes this small defect.

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

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

From 8f2a3810851a1cbc7bccae26badefaf81aecf70b Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 27 Feb 2022 10:15:07 -0700
Subject: [PATCH] nyxt: remove runtime deps on *-devel

Signed-off-by: Joseph Benden <joe@benden.us>
---
 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))
+ \f
+ 
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 <sudo-woodo3@protonmail.com>"
 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

Re: [PR REVIEW] nyxt: remove runtime deps on *-devel

[jbenden]

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

New review comment by jbenden on void-packages repository

https://github.com/void-linux/void-packages/pull/35877#discussion_r829512178

Comment:
It's been added. I did think the depends entries would handle it?

Re: [PR REVIEW] nyxt: remove runtime deps on *-devel

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/35877#discussion_r829609850

Comment:
It will prevent accidental update of webkit2gtk fixposix gi-repository that change SONAME.

Re: [PR PATCH] [Closed]: nyxt: remove runtime deps on *-devel

[sgn]

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

There's a closed pull request on the void-packages repository

nyxt: remove runtime deps on *-devel
https://github.com/void-linux/void-packages/pull/35877

Description:
#### 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)

#### About

The current package requires shared libraries referenced inside development packages (`*-devel` because the libraries are referred to by `libXYZ.so` filenames).

This patch fixes this small defect.