[X2Go-Commits] [nx-libs] 05/06: fix 057, rebase

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 8be0a04722995e1bd77b0b3c95dfe272ad91f26c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 21 23:17:41 2014 +0200

    fix 057, rebase
---
 ...11-bigendian-ppc64-no-session-window.full.patch |   26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch b/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch
index eae46e1..8795904 100644
--- a/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch
+++ b/debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch
@@ -41,3 +41,29 @@ Abstract:
    }
    #ifdef WARNING
    else
+@@ -3352,7 +3358,10 @@
+ 
+   if (nxagentOption(Rootless) && nxagentWindowTopLevel(pWin))
+   {
+-    nxagentGetEventMask(pWin, (Mask*)&attributes.event_mask);
++    /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */
++    Mask tmp_mask = attributes.event_mask;
++    nxagentGetEventMask(pWin, &tmp_mask);
++    attributes.event_mask = (int)tmp_mask;
+ 
+     XChangeWindowAttributes(nxagentDisplay, nxagentWindow(pWin), mask, &attributes);
+   }
+--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
++++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+@@ -1665,7 +1665,10 @@
+ 
+     attributes.background_pixel = nxagentBlackPixel;
+ 
+-    nxagentGetDefaultEventMask((Mask*)&attributes.event_mask);
++    /* Assume that the mask fits in int... broken on Big Endian 64bit systems. */
++    Mask tmp_mask = attributes.event_mask;
++    nxagentGetDefaultEventMask(&tmp_mask);
++    attributes.event_mask = (int)tmp_mask;
+ 
+     attributes.colormap = nxagentDefaultVisualColormap(nxagentDefaultVisual(pScreen));
+ 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git