[nx-libs/epel7] Add patch to fix ppc64 build

[Orion Poplawski]

commit 3f11179bb40bda8d8dae7564a53af9aec51a0eeb
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Jan 24 12:20:17 2014 -0700

    Add patch to fix ppc64 build

 nx-libs-ppc64.patch |   12 ++++++++++++
 nx-libs.spec        |    5 +++++
 2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/nx-libs-ppc64.patch b/nx-libs-ppc64.patch
new file mode 100644
index 0000000..6b25778
--- /dev/null
+++ b/nx-libs-ppc64.patch
@@ -0,0 +1,12 @@
+diff -up nx-libs-3.5.0.22/nx-X11/lib/GL/mesa/main/Imakefile.inc.ppc64 nx-libs-3.5.0.22/nx-X11/lib/GL/mesa/main/Imakefile.inc
+--- nx-libs-3.5.0.22/nx-X11/lib/GL/mesa/main/Imakefile.inc.ppc64	2014-01-04 13:39:35.000000000 -0700
++++ nx-libs-3.5.0.22/nx-X11/lib/GL/mesa/main/Imakefile.inc	2014-01-24 12:04:00.085272615 -0700
+@@ -1,5 +1,8 @@
+ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
+ 
++/* gcc on ppc64 defines this, causes macro recursion with pixel below */
++#undef pixel
++
+ #ifndef MesaBuildDir
+ #define MesaBuildDir $(GLXLIBSRC)/mesa/main/
+ #endif
diff --git a/nx-libs.spec b/nx-libs.spec
index e54fa1b..dfee7e7 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -16,6 +16,9 @@ Source0:        http://code.x2go.org/releases/source/%{name}/%{name}-%{version}-
 # debian/roll-tarballs.sh HEAD server
 # mv _releases_/source/nx-libs/nx-libs-HEAD-full.tar.gz .
 #Source0:       ns-libs-HEAD-full.tar.gz
+# Fix ppc64 build by undefining pixel macro
+# http://bugs.x2go.org/cgi-bin/bugreport.cgi?bug=411
+Patch0:         nx-libs-ppc64.patch
 
 BuildRequires:  autoconf
 BuildRequires:  expat-devel
@@ -483,6 +486,7 @@ information on NX.
 
 %prep
 %setup -q
+%patch0 -p1 -b .ppc64
 # Install into /usr
 sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
 # Use rpm optflags
@@ -889,6 +893,7 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
 %changelog
 * Fri Jan 24 2014 Orion Poplawski <orion at cora.nwra.com> - 3.5.0.22-2
 - Set compile flags properly on arm and ppc64
+- Add patch to fix ppc64 build
 
 * Sun Jan 5 2014 Orion Poplawski <orion at cora.nwra.com> - 3.5.0.22-1
 - Update to 3.5.0.22