fix build on x32

see https://sourceware.org/bugzilla/show_bug.cgi?id=16437

diff --git a/sway.spec b/sway.spec
index ae57d75f2c5015b471fee9a23c5a24b1f87d801b..82343a8d53242054570d0f4eb475f0ce10c72a56 100644 (file)
--- a/sway.spec
+++ b/sway.spec
@@ -6,6 +6,7 @@ License:        MIT
 Group:         Applications
 Source0:       https://github.com/swaywm/sway/releases/download/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: 9a7edc89abfc3f36d47546457e0bc901
+Patch0:                x32.patch
 URL:           https://swaywm.org/
 BuildRequires: OpenGLESv2-devel
 BuildRequires: bash-completion
@@ -84,6 +85,9 @@ ZSH completion for sway.
 
 %prep
 %setup -q
+%ifarch x32
+%patch0 -p1
+%endif
 
 %build
 %meson build

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..e1cad37
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- sway-1.5.1/common/log.c.orig       2020-11-10 17:47:31.000000000 +0100
++++ sway-1.5.1/common/log.c    2021-02-03 11:01:15.711496602 +0100
+@@ -75,7 +75,7 @@
+       clock_gettime(CLOCK_MONOTONIC, &ts);
+       timespec_sub(&ts, &ts, &start_time);
+ 
+-      fprintf(stderr, "%02d:%02d:%02d.%03ld ", (int)(ts.tv_sec / 60 / 60),
++      fprintf(stderr, "%02d:%02d:%02d.%03lld ", (int)(ts.tv_sec / 60 / 60),
+               (int)(ts.tv_sec / 60 % 60), (int)(ts.tv_sec % 60),
+               ts.tv_nsec / 1000000);
+