diff --git a/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch b/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch new file mode 100644 index 0000000..5a8b391 --- /dev/null +++ b/0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch @@ -0,0 +1,38 @@ +From d8d3c78b6ebdf63836951d2dbd2d3d621ff26da2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 16 Apr 2013 14:30:43 +0200 +Subject: [PATCH] dixstruct.h: fix segfaults - char is unsigned for ARM and + PowerPC architectures +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +see ARM related bug reports [1-3] + +[1] https://github.com/archlinuxarm/PKGBUILDs/issues/446I +[2] http://www.raspberrypi.org/phpBB3/viewtopic.php?t=38568&p=321673 +[3] http://lists.linuxtogo.org/pipermail/openembedded-core/2013-April/037805.html + +Signed-off-by: Andreas Müller +Reviewed-by: Mark Kettenis +Signed-off-by: Peter Hutterer +--- + include/dixstruct.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/dixstruct.h b/include/dixstruct.h +index 6784819..aef822c 100644 +--- a/include/dixstruct.h ++++ b/include/dixstruct.h +@@ -96,7 +96,7 @@ typedef struct _Client { + unsigned int clientGone:1; + unsigned int closeDownMode:2; + unsigned int clientState:2; +- char smart_priority; ++ signed char smart_priority; + short noClientException; /* this client died or needs to be killed */ + int priority; + ReplySwapPtr pSwapReplyFunc; +-- +1.8.2.1 + diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d456331..920d15f 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -42,7 +42,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.14.1 -Release: 2%{?gitdate:.%{gitdate}}%{dist} +Release: 3%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -120,6 +120,9 @@ Patch7067: 0001-ephyr-Fix-crash-on-24bpp-host-framebuffer.patch Patch7071: 0001-os-use-libunwind-to-generate-backtraces.patch %endif +# backport from master (#965749) +Patch7072: 0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch + %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri %global sdkdir %{_includedir}/xorg @@ -592,6 +595,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Sun Jun 02 2013 Adam Jackson 1.14.1-3 +- Backport an arm/ppc crash fix from master (#965749) + * Tue May 14 2013 Peter Hutterer 1.14.1-2 - Add -resizeable option to Xephyr, enable by default (#962572) - Fix crash on 24bpp host server (#518960)