From c629b7c3023aaad30fef2a1a96067ef4c28ea1ce Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Apr 09 2015 14:52:43 +0000 Subject: Apply upstream patch to fix byte order (bug #1206060). Resolves: rhbz#1206060 --- diff --git a/tigervnc.spec b/tigervnc.spec index ad848d8..6b9aa50 100644 --- a/tigervnc.spec +++ b/tigervnc.spec @@ -57,6 +57,9 @@ Patch15: tigervnc-xserver117.patch # This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg Patch100: tigervnc-xserver116-rebased.patch +# Apply upstream patch to fix byte order (bug #1206060). +Patch101: xorg-x11-server-byte-order.patch + %description Virtual Network Computing (VNC) is a remote display system which allows you to view a computing 'desktop' environment not only on the @@ -161,6 +164,7 @@ for all in `find . -type f -perm -001`; do chmod -x "$all" done %patch100 -p1 -b .xserver116-rebased +%patch101 -p1 -b .byte-order popd # Applied Debian patch to fix busy loop when run from inetd in nowait @@ -353,7 +357,7 @@ fi %changelog * Thu Apr 9 2015 Tim Waugh - 1.4.3-3 -- Rebuild against fixed xorg-x11-server (bug #1206060). +- Apply upstream patch to fix byte order (bug #1206060). * Fri Mar 6 2015 Tim Waugh - 1.4.3-2 - Don't disable Xinerama extension (upstream #147). diff --git a/xorg-x11-server-byte-order.patch b/xorg-x11-server-byte-order.patch new file mode 100644 index 0000000..1d9a542 --- /dev/null +++ b/xorg-x11-server-byte-order.patch @@ -0,0 +1,39 @@ +From 1f679da30a33f3ddad14bc6b2be0795160ae12b8 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 9 Apr 2015 10:19:13 -0400 +Subject: [PATCH] include: Fix endianness setup + +Need to make sure X_{BIG,LITTLE}_ENDIAN actually get defined + +Signed-off-by: Adam Jackson +--- + include/dix-config.h.in | 1 + + include/xorg-server.h.in | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/include/dix-config.h.in b/include/dix-config.h.in +index 1aa77a5..5e53c00 100644 +--- a/include/dix-config.h.in ++++ b/include/dix-config.h.in +@@ -499,6 +499,7 @@ + + /* byte order */ + #undef X_BYTE_ORDER ++#include + + /* Listen on TCP socket */ + #undef LISTEN_TCP +diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in +index 4cb9487..de6462a 100644 +--- a/include/xorg-server.h.in ++++ b/include/xorg-server.h.in +@@ -233,5 +233,6 @@ + + /* byte order */ + #undef X_BYTE_ORDER ++#include + + #endif /* _XORG_SERVER_H_ */ +-- +2.1.0 +