aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/054_nx-X11_ppc64-ftbfs.full.patch14
-rw-r--r--debian/patches/series1
3 files changed, 18 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 11ed19a35..e3bde8887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
nx-libs (2:3.5.0.23-0x2go1) UNRELEASED; urgency=low
- * Continue development...
+ [ Orion Poplawski ]
+ * Add patch: 054_nx-X11_ppc64-ftbfs.full.patch. Fix FTBFS on ppc64
+ architecture. (Fixes: #411).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 04 Jan 2014 22:02:16 +0100
diff --git a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch b/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch
new file mode 100644
index 000000000..66c9c6d2e
--- /dev/null
+++ b/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch
@@ -0,0 +1,14 @@
+Description: Fix FTBFS on ppc64 architecture
+Author: Orion Poplawski <orion@cora.nwra.com>
+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
+--- a/nx-X11/lib/GL/mesa/main/Imakefile.inc 2014-01-04 13:39:35.000000000 -0700
++++ b/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/debian/patches/series b/debian/patches/series
index b970eb729..9888e56f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,6 +27,7 @@
051_nxcomp_macos105-fdisset.full+lite.patch
052_nxcomp_macos10-nxauth-location.full+lite.patch
053_nx-X11_no-xcomp1-install-target.full.patch
+054_nx-X11_ppc64-ftbfs.full.patch
101_nxagent_set-rgb-path.full.patch
102_xserver-xext_set-securitypolicy-path.full.patch
103_nxagent_set-X0-config-path.full.patch