diff --git a/0001-Ensure-all-BufAlloc-calls-have-trailing-semicolon.patch b/0001-Ensure-all-BufAlloc-calls-have-trailing-semicolon.patch new file mode 100644 index 0000000..8c8aced --- /dev/null +++ b/0001-Ensure-all-BufAlloc-calls-have-trailing-semicolon.patch @@ -0,0 +1,49 @@ +From f81a37f37f37e82ada1eb66735a978af761ae764 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Wed, 20 Nov 2024 17:14:49 -0800 +Subject: [PATCH libXrender] Ensure all BufAlloc calls have trailing semicolon + +Most already did, this fixes 3 outliers, so they build with +libx11@563ddd4ff5575e3f8bbf635cbdc339b09a7e285e + +Signed-off-by: Alan Coopersmith +Part-of: +(cherry picked from commit 6663858e918923d02c466298670c992a8437a17b) +--- + src/Glyph.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Glyph.c b/src/Glyph.c +index 48e40c3..5148484 100644 +--- a/src/Glyph.c ++++ b/src/Glyph.c +@@ -477,7 +477,7 @@ XRenderCompositeText8 (Display *dpy, + { + int this_chars = nchars > MAX_8 ? MAX_8 : nchars; + +- BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) ++ BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)); + elt->len = this_chars; + elt->deltax = xDst; + elt->deltay = yDst; +@@ -588,7 +588,7 @@ XRenderCompositeText16 (Display *dpy, + int this_chars = nchars > MAX_16 ? MAX_16 : nchars; + int this_bytes = this_chars * 2; + +- BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) ++ BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)); + elt->len = this_chars; + elt->deltax = xDst; + elt->deltay = yDst; +@@ -694,7 +694,7 @@ XRenderCompositeText32 (Display *dpy, + { + int this_chars = nchars > MAX_32 ? MAX_32 : nchars; + int this_bytes = this_chars * 4; +- BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) ++ BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)); + elt->len = this_chars; + elt->deltax = xDst; + elt->deltay = yDst; +-- +2.54.0 + diff --git a/libXrender.spec b/libXrender.spec index f6b9daa..d6afbac 100644 --- a/libXrender.spec +++ b/libXrender.spec @@ -5,7 +5,7 @@ Summary: X.Org X11 libXrender runtime library Name: libXrender Version: 0.9.10 -Release: 16%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 17%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} License: MIT URL: http://www.x.org @@ -17,6 +17,10 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 %endif +# https://redhat.atlassian.net/browse/RHEL-183538 +# https://gitlab.freedesktop.org/xorg/lib/libxrender/-/merge_requests/14 +Patch0: 0001-Ensure-all-BufAlloc-calls-have-trailing-semicolon.patch + Requires: libX11 >= 1.5.99.902 BuildRequires: make @@ -37,6 +41,7 @@ X.Org X11 libXrender development package %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch 0 -p1 %build autoreconf -v --install --force @@ -68,6 +73,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_libdir}/pkgconfig/xrender.pc %changelog +* Mon Jun 29 2026 Olivier Fourdan - 0.9.10-17 +- Fix build with newer libX11 + Resolves: RHEL-183538 + * Mon Aug 09 2021 Mohan Boddu - 0.9.10-16 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688