patch applied... http://code.x2go.org/gitweb?p=nx-libs.git;a=commitdiff;h=655173ff215dde1a167...
I had to tweak the patch by hand so it could get applied fully. Not sure what went wrong, so I just place a reminder here to make sure patches apply against latest Git code well enough.
Oh, I see you removed some necessary addressof operators, which now makes the code fail on compilation. :/
I'll send a patch against the patch, I guess that should be OK.
Btw: git-quiltimport couldn't apply some other patch because the nxcomp directory was called "nxcomp-ubuntu" in one part of the patch, for some weird reason. I'll also send a patch for that and let you decide whether to include it or not (as maybe this is a git-quiltimport limitation and the real quilt stuff is more intelligent to figure out fuzzy file locations.)