From c76617847261dbb44667c30b9c2cfe0080481850 Mon Sep 17 00:00:00 2001 From: "David W. Moore" Date: Fri, 18 Oct 2024 19:28:36 -0400 Subject: [PATCH 1/2] nyxt: update to 3.11.8. Closes: #52683 [via git-merge-pr] --- srcpkgs/nyxt/patches/001-libfixposix.patch | 14 ------- srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch | 45 ---------------------- srcpkgs/nyxt/template | 4 +- 3 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 srcpkgs/nyxt/patches/001-libfixposix.patch delete mode 100644 srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch deleted file mode 100644 index 7339c30acbe8ab..00000000000000 --- a/srcpkgs/nyxt/patches/001-libfixposix.patch +++ /dev/null @@ -1,14 +0,0 @@ -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") -+ (libfixposix :canary "lfp_buildinfo_not_exist") -+ (:unix "libfixposix.so.3") - (t (:default "libfixposix"))) - (load-foreign-library 'libfixposix)) - diff --git a/srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch b/srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch deleted file mode 100644 index 2354f7b2756e0e..00000000000000 --- a/srcpkgs/nyxt/patches/fix-sbcl-2.4.5.patch +++ /dev/null @@ -1,45 +0,0 @@ -Source of first patch: https://github.com/andy128k/cl-gobject-introspection/pull/101 -Source of second patch: https://github.com/slburson/fset/pull/46 - -From 4908a84c16349929b309c50409815ff81fb9b3c4 Mon Sep 17 00:00:00 2001 -From: Vasily Postnicov -Date: Sun, 19 May 2024 06:33:44 +0300 -Subject: [PATCH] Fix compilation on not yet released SBCL - ---- - src/init.lisp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/init.lisp b/src/init.lisp -index 8675ee8..194d6aa 100644 ---- a/_build/cl-gobject-introspection/src/init.lisp -+++ b/_build/cl-gobject-introspection/src/init.lisp -@@ -143,4 +143,4 @@ - (destroy-data :pointer) - (connect-flags connect-flags)) - --#+sbcl (sb-ext::set-floating-point-modes :traps nil) -+#+sbcl (sb-int:set-floating-point-modes :traps nil) - -From 67eca709c2a6275692381fbaf018876b2ab11244 Mon Sep 17 00:00:00 2001 -From: Hraban -Date: Fri, 7 Jun 2024 03:58:37 -0400 -Subject: [PATCH] fix: proper external package for sb-int:once-only (#46) - ---- - Code/port.lisp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Code/port.lisp b/Code/port.lisp -index 72f86fe..86673f0 100644 ---- a/_build/fset/Code/port.lisp -+++ b/_build/fset/Code/port.lisp -@@ -363,7 +363,7 @@ - `(if (null ,x) 0 (cl:length ,x)))) - #+sbcl - (defmacro length-nv (x) -- (sb-ext::once-only ((x x)) -+ (sb-int:once-only ((x x)) - `(if (null ,x) 0 (cl:length ,x)))) - #-(or cmu scl sbcl) - (defmacro length-nv (x) diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index abe5fe63011032..b01aa4ce384852 100644 --- a/srcpkgs/nyxt/template +++ b/srcpkgs/nyxt/template @@ -1,6 +1,6 @@ # Template file for 'nyxt' pkgname=nyxt -version=3.11.7 +version=3.11.8 revision=1 create_wrksrc=yes build_style=gnu-makefile @@ -13,7 +13,7 @@ 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=27d11de1e41ca1c319193678f385a5a3e0bfb805da8f687557a77cba24ab01e1 +checksum=4604b15a4d89336d110926ac91c53eff020ae9c8cd96214d7ed1114bcf6a9254 # Disable check because ASDF/USER::PROVE is not installed make_check=no nostrip=yes From 5360cceaa90f5c172819bd50d96ebe55773b86d1 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Wed, 18 Sep 2024 20:17:47 -0300 Subject: [PATCH 2/2] vokoscreen: update to 4.2.0. --- srcpkgs/vokoscreen | 1 + srcpkgs/vokoscreen/template | 16 ---------------- srcpkgs/vokoscreenNG/template | 29 +++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 16 deletions(-) create mode 120000 srcpkgs/vokoscreen delete mode 100644 srcpkgs/vokoscreen/template create mode 100644 srcpkgs/vokoscreenNG/template diff --git a/srcpkgs/vokoscreen b/srcpkgs/vokoscreen new file mode 120000 index 00000000000000..81e249e55bf719 --- /dev/null +++ b/srcpkgs/vokoscreen @@ -0,0 +1 @@ +vokoscreenNG \ No newline at end of file diff --git a/srcpkgs/vokoscreen/template b/srcpkgs/vokoscreen/template deleted file mode 100644 index 94e4012dfcca33..00000000000000 --- a/srcpkgs/vokoscreen/template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'vokoscreen' -pkgname=vokoscreen -version=2.5.0 -revision=1 -build_style=qmake -hostmakedepends="pkg-config qt5-host-tools qt5-qmake" -makedepends="alsa-lib-devel libX11-devel libXrandr-devel qt5-devel qt5-x11extras-devel v4l-utils-devel" -depends="ffmpeg" -short_desc="Easy to use screencast creator" -maintainer="Duncaen " -license="GPL-2.0-only" -homepage="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html" -distfiles="https://github.com/vkohaupt/vokoscreen/archive/${version}.tar.gz" -checksum=7f5d9abfa3b4a1f7ce657838f5169cd80a590be490dacd0ad1751853a38f4245 - -CFLAGS="-fcommon" diff --git a/srcpkgs/vokoscreenNG/template b/srcpkgs/vokoscreenNG/template new file mode 100644 index 00000000000000..a4b298b627c337 --- /dev/null +++ b/srcpkgs/vokoscreenNG/template @@ -0,0 +1,29 @@ +# Template file for 'vokoscreenNG' +pkgname=vokoscreenNG +version=4.2.0 +revision=1 +build_style=qmake +build_wrksrc="src" +hostmakedepends="pkg-config qt6-base-devel qt6-tools-devel" +makedepends="alsa-lib-devel libX11-devel libXrandr-devel pipewire-devel + pulseaudio-devel gst-plugins-base1-devel qt6-multimedia-devel + xdg-desktop-portal gstreamer1-devel" +depends="ffmpeg6 gstreamer1-pipewire gst-plugins-ugly1 gst-plugins-good1" +short_desc="Easy to use screencast creator" +maintainer="Duncaen " +license="GPL-2.0-only" +homepage="http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html" +distfiles="https://github.com/vkohaupt/vokoscreenNG/archive/${version}.tar.gz" +checksum=5f74fc575ae18e8e62f13f891d79c1c720077f6b630085a02f7576c223cb431c + +post_install() { + vbin vokoscreenNG + vinstall applications/vokoscreenNG.desktop 644 usr/share/applications + vinstall applications/vokoscreenNG.png 644 usr/share/pixmaps +} + +vokoscreen_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +}