rpms/xorg-x11-server-Xwayland
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix C compatibility issue on i686

Browse Source 
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
This commit is contained in:
Florian Weimer 2024-01-29 07:50:10 +01:00
parent 054de483c2
commit a331324d7c
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
xorg-x11-server-Xwayland-c89.patch Normal file
View File

@ -0,0 +1,43 @@
From 134e7ca314294b00ab3aa05d4ac94e0902e6235f Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Mon, 29 Jan 2024 07:37:10 +0100
Subject: [PATCH] Use correct pointer types on i386
Content-type: text/plain
And other 32-bit architectures, where uint32_t and CARD32 are not the
same type. Otherwise the build will fail with GCC 14.
Submitted upstream: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1255>
---
hw/xwayland/xwayland-glamor.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index c6aa8eb..4b4fc44 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -214,7 +214,7 @@ xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
static Bool
xwl_get_formats(struct xwl_format *format_array, int format_array_len,
- uint32_t *num_formats, uint32_t **formats)
+ CARD32 *num_formats, CARD32 **formats)
{
*num_formats = 0;
*formats = NULL;
@@ -235,9 +235,9 @@ xwl_get_formats(struct xwl_format *format_array, int format_array_len,
static Bool
xwl_get_formats_for_device(struct xwl_dmabuf_feedback *xwl_feedback, drmDevice *device,
- uint32_t *num_formats, uint32_t **formats)
+ CARD32 *num_formats, CARD32 **formats)
{
- uint32_t *ret = NULL;
+ CARD32 *ret = NULL;
uint32_t count = 0;
/* go through all matching sets of tranches for the window's device */
--
2.43.0

6
xorg-x11-server-Xwayland.spec
View File

@ -9,7 +9,7 @@
Summary: Xwayland
Name: xorg-x11-server-Xwayland
Version: 23.2.4
Release: 2%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
Release: 3%{?gitdate:.%{gitdate}git%{shortcommit}}%{?dist}
URL: http://www.x.org
%if 0%{?gitdate}
@ -17,6 +17,7 @@ Source0: https://gitlab.freedesktop.org/xorg/%{pkgname}/-/archive/%{commit}/%{
%else
Source0: https://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.xz
%endif
Patch1: xorg-x11-server-Xwayland-c89.patch
License: MIT
@ -137,6 +138,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
%{_libdir}/pkgconfig/xwayland.pc
%changelog
* Mon Jan 29 2024 Florian Weimer <fweimer@redhat.com> - 23.2.4-3
- Fix C compatibility issue on i686
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild