commit 7fbee8f5db382f7018fa858fee136e6bd88d15dc
Author: Jan Palus <[email protected]>
Date: Mon Aug 12 01:12:52 2024 +0200
fix 32bit build with gcc 14; rel 2
gcc14.patch | 18 ++++++++++++++++++
xorg-xserver-Xwayland.spec | 4 +++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/xorg-xserver-Xwayland.spec b/xorg-xserver-Xwayland.spec
index 13f8ba4..1412799 100644
--- a/xorg-xserver-Xwayland.spec
+++ b/xorg-xserver-Xwayland.spec
@@ -12,11 +12,12 @@ Summary: Xwayland - X server integrated into a Wayland
window system
Summary(pl.UTF-8): Xwayland - serwer X integrowalny w Wayland
Name: xorg-xserver-Xwayland
Version: 24.1.2
-Release: 1
+Release: 2
License: MIT
Group: X11/Servers
Source0:
https://xorg.freedesktop.org/releases/individual/xserver/xwayland-%{version}.tar.xz
# Source0-md5: 312c5cf17d1b147df1b787fd170958e1
+Patch0: gcc14.patch
URL: https://xorg.freedesktop.org/
BuildRequires: Mesa-dri-devel
%{?with_glamor:BuildRequires: Mesa-libgbm-devel >= 21.3}
@@ -115,6 +116,7 @@ zbudowanego serwera.
%prep
%setup -q -n xwayland-%{version}
+%patch0 -p1
%build
%meson build \
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..ab199bc
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,18 @@
+--- xwayland-24.1.2/os/backtrace.c.orig 2024-08-07 11:22:21.000000000
+0200
++++ xwayland-24.1.2/os/backtrace.c 2024-08-12 01:09:59.818418901 +0200
+@@ -92,12 +92,13 @@
+ ErrorFSigSafe("Registers at frame #%d:\n", frame);
+
+ for (i = 0; i < num_regs; i++) {
+- uint64_t val;
+- ret = unw_get_reg(&cursor, regs[i].regnum, &val);
++ unw_word_t unw_val;
++ ret = unw_get_reg(&cursor, regs[i].regnum, &unw_val);
+ if (ret < 0) {
+ ErrorFSigSafe("unw_get_reg(%s) failed: %s [%d]\n",
+ regs[i].name, unw_strerror(ret), ret);
+ } else {
++ uint64_t val = unw_val;
+ ErrorFSigSafe(" %s: 0x%" PRIx64 "\n", regs[i].name, val);
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-xserver-Xwayland.git/commitdiff/7fbee8f5db382f7018fa858fee136e6bd88d15dc
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
