From 81e30678a66da1187ba8e505ad8b44fb16608d9d Mon Sep 17 00:00:00 2001 From: travankor Date: Mon, 21 Dec 2020 15:40:35 -0700 Subject: [PATCH] foot: update to 1.6.2. --- srcpkgs/foot/patches/build-order-2.patch | 23 ------------- srcpkgs/foot/patches/build-order.patch | 41 ------------------------ srcpkgs/foot/template | 4 +-- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 srcpkgs/foot/patches/build-order-2.patch delete mode 100644 srcpkgs/foot/patches/build-order.patch diff --git a/srcpkgs/foot/patches/build-order-2.patch b/srcpkgs/foot/patches/build-order-2.patch deleted file mode 100644 index cd75a035d45..00000000000 --- a/srcpkgs/foot/patches/build-order-2.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 06f84b9aafc14d2e787956c16f6ce32f95e62dd6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= -Date: Sun, 20 Dec 2020 12:15:40 +0100 -Subject: [PATCH] meson: add wl_proto_headers to pgo executable - -This fixes a build failure of pgo.o ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 282f736..a9ce24b 100644 ---- meson.build -+++ meson.build -@@ -141,7 +141,7 @@ pgolib = static_library( - executable( - 'pgo', - 'pgo/pgo.c', -- wl_proto_src, -+ wl_proto_src + wl_proto_headers, - dependencies: [math, threads, pixman, wayland_client, fcft, tllist], - link_with: pgolib, - ) diff --git a/srcpkgs/foot/patches/build-order.patch b/srcpkgs/foot/patches/build-order.patch deleted file mode 100644 index f30af63d773..00000000000 --- a/srcpkgs/foot/patches/build-order.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 18b027f26b4f849cf533bc806368a9ccec3b3975 Mon Sep 17 00:00:00 2001 -From: Craig Barnes -Date: Sat, 19 Dec 2020 22:09:03 +0000 -Subject: [PATCH] meson: add missing "wl_proto_headers" dependency for pgolib - and vtlib - -Dependency chains: - -* pgolib -> terminal.c -> terminal.h -> wayland.h -* vtlib -> csi.c -> config.h -> wayland.h - -wayland.h includes , which must be -generated by a custom_target() rule *before* any sources that require -it are built. Failure to fully specify these dependencies can otherwise -result in a race condition, where a dependent source file gets compiled -(and fails with a "header not found" error) before the header itself -has been generated. ---- - meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/meson.build b/meson.build -index 4370acc..282f736 100644 ---- meson.build -+++ meson.build -@@ -122,6 +122,7 @@ vtlib = static_library( - 'osc.c', 'osc.h', - 'sixel.c', 'sixel.h', - 'vt.c', 'vt.h', -+ wl_proto_src + wl_proto_headers, - version, - dependencies: [pixman, fcft, tllist], - link_with: misc, -@@ -132,6 +133,7 @@ pgolib = static_library( - 'grid.c', 'grid.h', - 'selection.c', 'selection.h', - 'terminal.c', 'terminal.h', -+ wl_proto_src + wl_proto_headers, - dependencies: [pixman, fcft, tllist], - link_with: vtlib, - ) diff --git a/srcpkgs/foot/template b/srcpkgs/foot/template index 4f66e4f8e22..544ef9187c1 100644 --- a/srcpkgs/foot/template +++ b/srcpkgs/foot/template @@ -1,6 +1,6 @@ # Template file for 'foot' pkgname=foot -version=1.6.0 +version=1.6.2 revision=1 wrksrc=$pkgname build_style=meson @@ -14,7 +14,7 @@ maintainer="Isaac Freund " license="MIT" homepage="https://codeberg.org/dnkl/foot" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=7ae523bf9882c0e5d56e2afdf6e25f5f77cffcc78ba1f316ffda3f36e2570b4a +checksum=dee10d8153a3ed57e21f5d8c0ed4121ddf83eeb33655728e5b8c46dfa3566a45 post_install() { vlicense LICENSE