commit 67330d6c9cb53afb2a82e821a0c9a13fe7d7066e
Author: Jan Rękorajski <[email protected]>
Date: Fri Feb 5 20:25:40 2021 +0100
- make x32 patch rely on compiler, not rpm
sway.spec | 2 --
x32.patch | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/sway.spec b/sway.spec
index 82343a8..1b7c61f 100644
--- a/sway.spec
+++ b/sway.spec
@@ -85,9 +85,7 @@ ZSH completion for sway.
%prep
%setup -q
-%ifarch x32
%patch0 -p1
-%endif
%build
%meson build
diff --git a/x32.patch b/x32.patch
index e1cad37..6761cb6 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,11 +1,14 @@
--- 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 @@
+@@ -75,7 +75,11 @@
clock_gettime(CLOCK_MONOTONIC, &ts);
timespec_sub(&ts, &ts, &start_time);
-- fprintf(stderr, "%02d:%02d:%02d.%03ld ", (int)(ts.tv_sec / 60 / 60),
++#ifdef __ILP32__
+ fprintf(stderr, "%02d:%02d:%02d.%03lld ", (int)(ts.tv_sec / 60 / 60),
++#else
+ fprintf(stderr, "%02d:%02d:%02d.%03ld ", (int)(ts.tv_sec / 60 / 60),
++#endif
(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/67330d6c9cb53afb2a82e821a0c9a13fe7d7066e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
