Sun Feb 5 17:25:01 UTC 2012

4 files changed, 0 insertions, 174 deletions

diff --git a/staging/nx-common/NXproto.h.64bit.diff b/staging/nx-common/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/staging/nx-common/NXproto.h.64bit.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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 */
diff --git a/staging/nx-common/PKGBUILD b/staging/nx-common/PKGBUILD
deleted file mode 100644
index 372871404..000000000
--- a/staging/nx-common/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 147024 2012-01-20 21:12:16Z andyrtr $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nx-common
-pkgver=3.5.0
-pkgrel=3
-pkgdesc="NoMachine NX common package for client and server"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://nomachine.com/"
-depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.5.7' 'openssl>=1.0.0' 'gcc-libs' 'bash')
-makedepends=('xorg-server-devel')
-source=( #Compression libs and proxy sources
-	http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz
-	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
-	nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('ad8c0f133122c6d07732ca69c8759410'
-         '84ade443b79ea079380b754aba9d392e'
-         'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
-         'b6c279654dac421fc3dd1a27d66ff53c'
-         '2966353cabb96829eab291212ef078dc')
-
-build() {
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
-
-  ./configure --prefix=/opt/NX
-  make
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- 
-  ./configure --prefix=/opt/NX
-  make
-  # nxssh
-  cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
-  make
-}
-
-package() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib 
-
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
-  # nxcompsh
-  cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
-  # nxssh
-  cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
-}
diff --git a/staging/nx-common/nx-3.5.0-libpng15.patch b/staging/nx-common/nx-3.5.0-libpng15.patch
deleted file mode 100644
index c8f2a9559..000000000
--- a/staging/nx-common/nx-3.5.0-libpng15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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);
-   }
diff --git a/staging/nx-common/nxcompsh-gcc43.patch b/staging/nx-common/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/staging/nx-common/nxcompsh-gcc43.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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.
-