diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-21 23:17:41 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-06-21 23:17:41 +0200 |
| commit | 8be0a04722995e1bd77b0b3c95dfe272ad91f26c (patch) | |
| tree | 216102357af2ce8b4b757e6b3d41a618681e5da7 | |
| parent | abbe7e8401f3ffdc40c2ff4bf16fa9801fbd0610 (diff) | |
| download | nx-libs-8be0a04722995e1bd77b0b3c95dfe272ad91f26c.tar.gz nx-libs-8be0a04722995e1bd77b0b3c95dfe272ad91f26c.tar.bz2 nx-libs-8be0a04722995e1bd77b0b3c95dfe272ad91f26c.zip | |
fix 057, rebase
| -rw-r--r-- | debian/patches/057_nx-X11-bigendian-ppc64-no-session-window.full.patch | 26 |
1 files changed, 26 insertions, 0 deletions
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 eae46e10d..879590460 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)); + |