Date: Sunday, April 15, 2012 @ 10:20:58 Author: andyrtr Revision: 156191
archrelease: copy trunk to staging-i686, staging-x86_64 Added: nx-common/repos/staging-i686/ nx-common/repos/staging-i686/NXproto.h.64bit.diff (from rev 156189, nx-common/trunk/NXproto.h.64bit.diff) nx-common/repos/staging-i686/PKGBUILD (from rev 156189, nx-common/trunk/PKGBUILD) nx-common/repos/staging-i686/nx-3.5.0-libpng15.patch (from rev 156189, nx-common/trunk/nx-3.5.0-libpng15.patch) nx-common/repos/staging-i686/nxcompsh-gcc43.patch (from rev 156189, nx-common/trunk/nxcompsh-gcc43.patch) nx-common/repos/staging-x86_64/ nx-common/repos/staging-x86_64/NXproto.h.64bit.diff (from rev 156190, nx-common/trunk/NXproto.h.64bit.diff) nx-common/repos/staging-x86_64/PKGBUILD (from rev 156190, nx-common/trunk/PKGBUILD) nx-common/repos/staging-x86_64/nx-3.5.0-libpng15.patch (from rev 156190, nx-common/trunk/nx-3.5.0-libpng15.patch) nx-common/repos/staging-x86_64/nxcompsh-gcc43.patch (from rev 156190, nx-common/trunk/nxcompsh-gcc43.patch) ----------------------------------------+ staging-i686/NXproto.h.64bit.diff | 66 +++++++++++++++++++++++++++++++ staging-i686/PKGBUILD | 45 +++++++++++++++++++++ staging-i686/nx-3.5.0-libpng15.patch | 30 ++++++++++++++ staging-i686/nxcompsh-gcc43.patch | 19 ++++++++ staging-x86_64/NXproto.h.64bit.diff | 66 +++++++++++++++++++++++++++++++ staging-x86_64/PKGBUILD | 45 +++++++++++++++++++++ staging-x86_64/nx-3.5.0-libpng15.patch | 30 ++++++++++++++ staging-x86_64/nxcompsh-gcc43.patch | 19 ++++++++ 8 files changed, 320 insertions(+) Copied: nx-common/repos/staging-i686/NXproto.h.64bit.diff (from rev 156189, nx-common/trunk/NXproto.h.64bit.diff) =================================================================== --- staging-i686/NXproto.h.64bit.diff (rev 0) +++ staging-i686/NXproto.h.64bit.diff 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,66 @@ +--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 ++++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 +@@ -26,6 +26,30 @@ + #include <X11/Xmd.h> + #include <X11/Xproto.h> + ++/* ++ Copied from Xproto.h ++ */ ++ ++/* For the purpose of the structure definitions in this file, ++we must redefine the following types in terms of Xmd.h's types, which may ++include bit fields. All of these are #undef'd at the end of this file, ++restoring the definitions in X.h. */ ++ ++#define Window CARD32 ++#define Drawable CARD32 ++#define Font CARD32 ++#define Pixmap CARD32 ++#define Cursor CARD32 ++#define Colormap CARD32 ++#define GContext CARD32 ++#define Atom CARD32 ++#define VisualID CARD32 ++#define Time CARD32 ++#define KeyCode CARD8 ++#define KeySym CARD32 ++ ++/* End copied from Xproto.h */ ++ + #define sz_xNXGetControlParametersReq 4 + #define sz_xNXGetCleanupParametersReq 4 + #define sz_xNXGetImageParametersReq 4 +@@ -343,9 +367,9 @@ + CARD8 dstDepth; + CARD32 srcLength B32; + CARD32 dstLength B32; +- INT16 srcX B16, srcY B16; ++ CARD16 srcX B16, srcY B16; + CARD16 srcWidth B16, srcHeight B16; +- INT16 dstX B16, dstY B16; ++ CARD16 dstX B16, dstY B16; + CARD16 dstWidth B16, dstHeight B16; + } xNXPutPackedImageReq; + +@@ -463,4 +487,20 @@ + } + #endif + ++/* Copied from Xproto.h */ ++ ++/* restore these definitions back to the typedefs in X.h */ ++#undef Window ++#undef Drawable ++#undef Font ++#undef Pixmap ++#undef Cursor ++#undef Colormap ++#undef GContext ++#undef Atom ++#undef VisualID ++#undef Time ++#undef KeyCode ++#undef KeySym ++ + #endif /* NXproto_H */ Copied: nx-common/repos/staging-i686/PKGBUILD (from rev 156189, nx-common/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributed: eliott <eli...@solarblue.net>, Andre Naumann <anaum...@sparced.org> + +pkgname=nx-common +pkgver=3.5.0 +pkgrel=4.1 +pkgdesc="NoMachine NX common package for client and server" +arch=('i686' 'x86_64') +license=('GPL') +url="http://nomachine.com/" +depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' +makedepends=('xorg-server-devel' 'nx-headers') +source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz + nxcompsh-gcc43.patch) +options=('!libtool') +md5sums=('84ade443b79ea079380b754aba9d392e' + 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' + 'b6c279654dac421fc3dd1a27d66ff53c') + +build() { + # nxcompsh + cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + ./configure --prefix=/usr/lib/nx + make + + # nxssh + cd ${srcdir}/nxssh + sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib + make +} + +package() { + install -dm755 ${pkgdir}/usr/{bin,lib/nx} + + # nxcompsh + cd ${srcdir}/nxcompsh + cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed? + # nxssh + cd ${srcdir}/nxssh + install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh +} Copied: nx-common/repos/staging-i686/nx-3.5.0-libpng15.patch (from rev 156189, nx-common/trunk/nx-3.5.0-libpng15.patch) =================================================================== --- staging-i686/nx-3.5.0-libpng15.patch (rev 0) +++ staging-i686/nx-3.5.0-libpng15.patch 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } Copied: nx-common/repos/staging-i686/nxcompsh-gcc43.patch (from rev 156189, nx-common/trunk/nxcompsh-gcc43.patch) =================================================================== --- staging-i686/nxcompsh-gcc43.patch (rev 0) +++ staging-i686/nxcompsh-gcc43.patch 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,19 @@ +--- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 ++++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 +@@ -18,10 +18,12 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++ ++using namespace std; + + // + // Error handling macros. + Copied: nx-common/repos/staging-x86_64/NXproto.h.64bit.diff (from rev 156190, nx-common/trunk/NXproto.h.64bit.diff) =================================================================== --- staging-x86_64/NXproto.h.64bit.diff (rev 0) +++ staging-x86_64/NXproto.h.64bit.diff 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,66 @@ +--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 ++++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 +@@ -26,6 +26,30 @@ + #include <X11/Xmd.h> + #include <X11/Xproto.h> + ++/* ++ Copied from Xproto.h ++ */ ++ ++/* For the purpose of the structure definitions in this file, ++we must redefine the following types in terms of Xmd.h's types, which may ++include bit fields. All of these are #undef'd at the end of this file, ++restoring the definitions in X.h. */ ++ ++#define Window CARD32 ++#define Drawable CARD32 ++#define Font CARD32 ++#define Pixmap CARD32 ++#define Cursor CARD32 ++#define Colormap CARD32 ++#define GContext CARD32 ++#define Atom CARD32 ++#define VisualID CARD32 ++#define Time CARD32 ++#define KeyCode CARD8 ++#define KeySym CARD32 ++ ++/* End copied from Xproto.h */ ++ + #define sz_xNXGetControlParametersReq 4 + #define sz_xNXGetCleanupParametersReq 4 + #define sz_xNXGetImageParametersReq 4 +@@ -343,9 +367,9 @@ + CARD8 dstDepth; + CARD32 srcLength B32; + CARD32 dstLength B32; +- INT16 srcX B16, srcY B16; ++ CARD16 srcX B16, srcY B16; + CARD16 srcWidth B16, srcHeight B16; +- INT16 dstX B16, dstY B16; ++ CARD16 dstX B16, dstY B16; + CARD16 dstWidth B16, dstHeight B16; + } xNXPutPackedImageReq; + +@@ -463,4 +487,20 @@ + } + #endif + ++/* Copied from Xproto.h */ ++ ++/* restore these definitions back to the typedefs in X.h */ ++#undef Window ++#undef Drawable ++#undef Font ++#undef Pixmap ++#undef Cursor ++#undef Colormap ++#undef GContext ++#undef Atom ++#undef VisualID ++#undef Time ++#undef KeyCode ++#undef KeySym ++ + #endif /* NXproto_H */ Copied: nx-common/repos/staging-x86_64/PKGBUILD (from rev 156190, nx-common/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Tobias Powalowski <tp...@archlinux.org> +# Contributed: eliott <eli...@solarblue.net>, Andre Naumann <anaum...@sparced.org> + +pkgname=nx-common +pkgver=3.5.0 +pkgrel=4.1 +pkgdesc="NoMachine NX common package for client and server" +arch=('i686' 'x86_64') +license=('GPL') +url="http://nomachine.com/" +depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' +makedepends=('xorg-server-devel' 'nx-headers') +source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz + nxcompsh-gcc43.patch) +options=('!libtool') +md5sums=('84ade443b79ea079380b754aba9d392e' + 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' + 'b6c279654dac421fc3dd1a27d66ff53c') + +build() { + # nxcompsh + cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + ./configure --prefix=/usr/lib/nx + make + + # nxssh + cd ${srcdir}/nxssh + sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib + make +} + +package() { + install -dm755 ${pkgdir}/usr/{bin,lib/nx} + + # nxcompsh + cd ${srcdir}/nxcompsh + cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed? + # nxssh + cd ${srcdir}/nxssh + install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh +} Copied: nx-common/repos/staging-x86_64/nx-3.5.0-libpng15.patch (from rev 156190, nx-common/trunk/nx-3.5.0-libpng15.patch) =================================================================== --- staging-x86_64/nx-3.5.0-libpng15.patch (rev 0) +++ staging-x86_64/nx-3.5.0-libpng15.patch 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } Copied: nx-common/repos/staging-x86_64/nxcompsh-gcc43.patch (from rev 156190, nx-common/trunk/nxcompsh-gcc43.patch) =================================================================== --- staging-x86_64/nxcompsh-gcc43.patch (rev 0) +++ staging-x86_64/nxcompsh-gcc43.patch 2012-04-15 14:20:58 UTC (rev 156191) @@ -0,0 +1,19 @@ +--- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 ++++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 +@@ -18,10 +18,12 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++ ++using namespace std; + + // + // Error handling macros. +