[packages/sway] fix build on x32

atler atler at pld-linux.org
Wed Feb 3 11:08:30 CET 2021


commit b43053b91988850d74e05fd3927880b68ed07ab5
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Feb 3 11:04:59 2021 +0100

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

 sway.spec |  4 ++++
 x32.patch | 11 +++++++++++
 2 files changed, 15 insertions(+)
---
diff --git a/sway.spec b/sway.spec
index ae57d75..82343a8 100644
--- 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
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);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sway.git/commitdiff/b43053b91988850d74e05fd3927880b68ed07ab5



More information about the pld-cvs-commit mailing list