[packages/foot] fix build on x32; rel 2
atler
atler at pld-linux.org
Thu Feb 10 10:21:07 CET 2022
commit c0a37c173aea36e1d3c1b5fbc2d9a1d61e928a3a
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Feb 10 10:20:40 2022 +0100
fix build on x32; rel 2
foot.spec | 4 +++-
x32.patch | 24 ++++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/foot.spec b/foot.spec
index 7cf59b7..c9858ff 100644
--- a/foot.spec
+++ b/foot.spec
@@ -1,11 +1,12 @@
Summary: A fast, lightweight and minimalistic Wayland terminal emulator
Name: foot
Version: 1.11.0
-Release: 1
+Release: 2
License: MIT
Group: Applications/Terminal
Source0: https://codeberg.org/dnkl/foot/archive/%{version}.tar.gz
# Source0-md5: 206a9daad2e2c86c34ba1be497ff2de6
+Patch0: x32.patch
URL: https://codeberg.org/dnkl/foot/
BuildRequires: fcft-devel < 4.0.0
BuildRequires: fcft-devel >= 3.0.0
@@ -71,6 +72,7 @@ ZSH completion for foot command line.
%prep
%setup -q -n %{name}
+%patch0 -p1
%build
%meson build \
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..45c2c17
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,24 @@
+--- foot/render.c.orig 2022-02-05 17:31:16.000000000 +0100
++++ foot/render.c 2022-02-10 10:19:20.686390012 +0100
+@@ -2750,12 +2750,21 @@
+ switch (term->conf->tweak.render_timer) {
+ case RENDER_TIMER_LOG:
+ case RENDER_TIMER_BOTH:
++#if defined(__x86_64__) && defined(__ILP32__)
++ LOG_INFO("frame rendered in %lds %lldns "
++ "(%lds %lldns double buffering)",
++ (long)render_time.tv_sec,
++ render_time.tv_nsec,
++ (long)double_buffering_time.tv_sec,
++ double_buffering_time.tv_nsec);
++#else
+ LOG_INFO("frame rendered in %lds %ldns "
+ "(%lds %ldns double buffering)",
+ (long)render_time.tv_sec,
+ render_time.tv_nsec,
+ (long)double_buffering_time.tv_sec,
+ double_buffering_time.tv_nsec);
++#endif
+ break;
+
+ case RENDER_TIMER_OSD:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/foot.git/commitdiff/c0a37c173aea36e1d3c1b5fbc2d9a1d61e928a3a
More information about the pld-cvs-commit
mailing list