[packages/wlroots] fix build on x32

atler atler at pld-linux.org
Wed Feb 3 10:37:02 CET 2021


commit 378d42d3f16d5f05dd8ccf411fd50cc98e2a915e
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 3 10:35:31 2021 +0100

    fix build on x32
    
    see https://sourceware.org/bugzilla/show_bug.cgi?id=16437

 wlroots.spec |  4 ++++
 x32.patch    | 11 +++++++++++
 2 files changed, 15 insertions(+)
---
diff --git a/wlroots.spec b/wlroots.spec
index 224ecf2..032b1b5 100644
--- 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
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);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wlroots.git/commitdiff/378d42d3f16d5f05dd8ccf411fd50cc98e2a915e



More information about the pld-cvs-commit mailing list