foot: actually fix build.
Backport patches from upstream that added the proper dependencies between source files.
This commit is contained in:
parent
bb297cad7e
commit
b104143572
3 changed files with 64 additions and 2 deletions
23
srcpkgs/foot/patches/build-order-2.patch
Normal file
23
srcpkgs/foot/patches/build-order-2.patch
Normal file
|
@ -0,0 +1,23 @@
|
|||
From 06f84b9aafc14d2e787956c16f6ce32f95e62dd6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
|
||||
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,
|
||||
)
|
41
srcpkgs/foot/patches/build-order.patch
Normal file
41
srcpkgs/foot/patches/build-order.patch
Normal file
|
@ -0,0 +1,41 @@
|
|||
From 18b027f26b4f849cf533bc806368a9ccec3b3975 Mon Sep 17 00:00:00 2001
|
||||
From: Craig Barnes <craigbarnes@protonmail.com>
|
||||
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 <primary-selection-unstable-v1.h>, 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,
|
||||
)
|
|
@ -15,8 +15,6 @@ license="MIT"
|
|||
homepage="https://codeberg.org/dnkl/foot"
|
||||
distfiles="${homepage}/archive/${version}.tar.gz"
|
||||
checksum=7ae523bf9882c0e5d56e2afdf6e25f5f77cffcc78ba1f316ffda3f36e2570b4a
|
||||
# attempts to compile before xdg-shell.h is available
|
||||
disable_parallel_build=yes
|
||||
|
||||
post_install() {
|
||||
vlicense LICENSE
|
||||
|
|
Loading…
Reference in a new issue