rpms/tigervnc
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Apply upstream patch to fix byte order (bug #1206060).

Browse Source 
Resolves: rhbz#1206060
This commit is contained in:
Tim Waugh 2015-04-09 15:52:43 +01:00
parent f6112722dd
commit c629b7c302
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tigervnc.spec
View File

@ -57,6 +57,9 @@ Patch15: tigervnc-xserver117.patch
# This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg # This is tigervnc-%{version}/unix/xserver116.patch rebased on the latest xorg
Patch100: tigervnc-xserver116-rebased.patch Patch100: tigervnc-xserver116-rebased.patch
# Apply upstream patch to fix byte order (bug #1206060).
Patch101: xorg-x11-server-byte-order.patch
%description %description
Virtual Network Computing (VNC) is a remote display system which Virtual Network Computing (VNC) is a remote display system which
allows you to view a computing 'desktop' environment not only on the 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" chmod -x "$all"
done done
%patch100 -p1 -b .xserver116-rebased %patch100 -p1 -b .xserver116-rebased
%patch101 -p1 -b .byte-order
popd popd
# Applied Debian patch to fix busy loop when run from inetd in nowait # Applied Debian patch to fix busy loop when run from inetd in nowait
@ -353,7 +357,7 @@ fi
%changelog %changelog
* Thu Apr 9 2015 Tim Waugh <twaugh@redhat.com> - 1.4.3-3 * Thu Apr 9 2015 Tim Waugh <twaugh@redhat.com> - 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 <twaugh@redhat.com> - 1.4.3-2 * Fri Mar 6 2015 Tim Waugh <twaugh@redhat.com> - 1.4.3-2
- Don't disable Xinerama extension (upstream #147). - Don't disable Xinerama extension (upstream #147).

39
xorg-x11-server-byte-order.patch Normal file
View File

@ -0,0 +1,39 @@
From 1f679da30a33f3ddad14bc6b2be0795160ae12b8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
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 <ajax@redhat.com>
---
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 <X11/Xarch.h>
/* 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 <X11/Xarch.h>
#endif /* _XORG_SERVER_H_ */
--
2.1.0