fix build on x32

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

diff --git a/wlroots.spec b/wlroots.spec
index 224ecf2c95b9dfce55f3151d9f9e75a4f330eb05..032b1b52911316d1a7f31fff65658ad3b775a899 100644 (file)
--- a/wlroots.spec
+++ b/wlroots.spec
@@ -6,6 +6,7 @@ License:        MIT
 Group:         Libraries
 Source0:       https://github.com/swaywm/wlroots/releases/download/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5: bc9dbfef37385dbe0f4fe129d2329be5
+Patch0:                x32.patch
 URL:           https://github.com/swaywm/wlroots
 BuildRequires: EGL-devel
 BuildRequires: Mesa-libgbm-devel >= 17.1.0
@@ -84,6 +85,9 @@ Static wlroots library.
 
 %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..35ac873
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- wlroots-0.12.0/util/log.c.orig     2020-11-08 15:01:44.000000000 +0100
++++ wlroots-0.12.0/util/log.c  2021-02-03 10:32:04.394433021 +0100
+@@ -47,7 +47,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);
+