[packages/foot] fix race with header generation; rel 2
atler
atler at pld-linux.org
Wed Apr 23 12:57:57 CEST 2025
commit b2ae03f8183d86315f3269859811cf7315580fc2
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Apr 23 12:03:02 2025 +0200
fix race with header generation; rel 2
foot.spec | 4 +++-
header-gen-race.patch | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
---
diff --git a/foot.spec b/foot.spec
index 7d90784..0ea164b 100644
--- a/foot.spec
+++ b/foot.spec
@@ -5,12 +5,13 @@
Summary: A fast, lightweight and minimalistic Wayland terminal emulator
Name: foot
Version: 1.22.0
-Release: 1
+Release: 2
License: MIT
Group: Applications/Terminal
Source0: https://codeberg.org/dnkl/foot/releases/download/%{version}/%{name}-%{version}.tar.gz
# Source0-md5: ffe00f17300f19bac5eb6d0f933ed3a7
Patch0: x32.patch
+Patch1: header-gen-race.patch
URL: https://codeberg.org/dnkl/foot/
BuildRequires: fcft-devel < 4.0.0
BuildRequires: fcft-devel >= 3.3.1
@@ -83,6 +84,7 @@ ZSH completion for foot command line.
%prep
%setup -q
%patch -P0 -p1
+%patch -P1 -p1
%build
%meson \
diff --git a/header-gen-race.patch b/header-gen-race.patch
new file mode 100644
index 0000000..11a6e83
--- /dev/null
+++ b/header-gen-race.patch
@@ -0,0 +1,37 @@
+From bc8d6d1ff350672cae7d7e6572eab2d10b1b415e Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Wed, 23 Apr 2025 11:44:41 +0200
+Subject: [PATCH] build: fix race when generating emoji-variation-sequences.h
+
+d3f692990ef6 moved emoji-variation-sequences.h header inclusion from
+vt.c to terminal.c. these two files are part of different libraries
+hence target for generating emoji-variation-sequences.h needs to be
+moved too.
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ed2dc7e4..3d97040d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -253,7 +253,7 @@ vtlib = static_library(
+ 'osc.c', 'osc.h',
+ 'sixel.c', 'sixel.h',
+ 'vt.c', 'vt.h',
+- builtin_terminfo, emoji_variation_sequences, srgb_funcs,
++ builtin_terminfo, srgb_funcs,
+ wl_proto_src + wl_proto_headers,
+ version,
+ dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb, utf8proc],
+@@ -265,6 +265,7 @@ pgolib = static_library(
+ 'grid.c', 'grid.h',
+ 'selection.c', 'selection.h',
+ 'terminal.c', 'terminal.h',
++ emoji_variation_sequences,
+ wl_proto_src + wl_proto_headers,
+ dependencies: [libepoll, pixman, fcft, tllist, wayland_client, xkb, utf8proc],
+ link_with: vtlib,
+--
+2.49.0
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/foot.git/commitdiff/b2ae03f8183d86315f3269859811cf7315580fc2
More information about the pld-cvs-commit
mailing list