From 99d5753f8253801efe4cdc4f339d6cd678117a63 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 22 Feb 2024 13:46:34 -0800 Subject: [PATCH] nyxt: update to 3.11.0. Use libwebkit2gtk41 --- srcpkgs/nyxt/patches/002-webkit2gtk.patch | 14 -------------- srcpkgs/nyxt/patches/gir.patch | 13 ------------- srcpkgs/nyxt/template | 12 ++++++------ 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 srcpkgs/nyxt/patches/002-webkit2gtk.patch delete mode 100644 srcpkgs/nyxt/patches/gir.patch diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch deleted file mode 100644 index dd4808382c1d9b..00000000000000 --- a/srcpkgs/nyxt/patches/002-webkit2gtk.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/_build/cl-webkit/webkit2/webkit2.init.lisp 2023-06-19 18:14:54.899937994 +0200 -+++ b/_build/cl-webkit/webkit2/webkit2.init.lisp 2023-06-19 18:15:45.707030674 +0200 -@@ -19,9 +19,9 @@ - "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/patches/gir.patch b/srcpkgs/nyxt/patches/gir.patch deleted file mode 100644 index 39f94a1d4dde5e..00000000000000 --- a/srcpkgs/nyxt/patches/gir.patch +++ /dev/null @@ -1,13 +0,0 @@ -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"))) diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index 9384e409665d0e..d128312c9a6ac0 100644 --- a/srcpkgs/nyxt/template +++ b/srcpkgs/nyxt/template @@ -1,25 +1,25 @@ # Template file for 'nyxt' pkgname=nyxt -version=3.3.0 -revision=2 +version=3.11.0 +revision=1 create_wrksrc=yes build_style=gnu-makefile make_build_target=all hostmakedepends="sbcl git pkg-config" -makedepends="webkit2gtk libfixposix-devel libgirepository openssl-devel" -depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository" +makedepends="libwebkit2gtk41 libfixposix-devel libgirepository openssl-devel" +depends="dbus xclip enchant2 libwebkit2gtk41 libfixposix libgirepository" short_desc="Keyboard-oriented, extensible web-browser" maintainer="Orphaned " license="BSD-3-Clause" homepage="https://nyxt.atlas.engineer/" distfiles="https://github.com/atlas-engineer/nyxt/releases/download/${version}/${pkgname}-${version}-source-with-submodules.tar.xz" -checksum=648809d19f9f971d6025c17a6ad08493af87cb94f96a1edcb994122f9f92436c +checksum=ba5e23970615d5e7a6e2ba204cce7bc585bdbef1fb834b18c1e486c93b5a79c6 # Disable check because ASDF/USER::PROVE is not installed 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" +shlib_requires="libwebkit2gtk-4.1.so.0 libfixposix.so.3 libgirepository-1.0.so.1" post_install() { vlicense licenses/ASSET-LICENSE