summaryrefslogtreecommitdiff
path: root/extra/nxserver
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-05-28 20:14:47 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-05-28 20:14:47 +0000
commitedec45419def1b81bd663a2859684ef55ba56269 (patch)
treecaa3c2d5f4e55b38e7740a39d80a21507679c586 /extra/nxserver
parent483f7de4ab6a706517279a24d2efc969f4a1996d (diff)
Mon May 28 20:14:39 UTC 2012
Diffstat (limited to 'extra/nxserver')
-rw-r--r--extra/nxserver/NXproto.h.64bit.diff66
-rw-r--r--extra/nxserver/PKGBUILD95
-rw-r--r--extra/nxserver/nx-3.5.0-libpng15.patch30
-rw-r--r--extra/nxserver/nxcompsh-gcc43.patch19
4 files changed, 0 insertions, 210 deletions
diff --git a/extra/nxserver/NXproto.h.64bit.diff b/extra/nxserver/NXproto.h.64bit.diff
deleted file mode 100644
index ac326ebcd..000000000
--- a/extra/nxserver/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/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD
deleted file mode 100644
index 242c5f08b..000000000
--- a/extra/nxserver/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 148864 2012-02-05 11:53:19Z ibiru $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
-
-pkgname=nxserver
-pkgver=3.5.0
-pkgrel=5
-pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme."
-arch=(i686 x86_64)
-url="http://nomachine.com/"
-license=('GPL')
-depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver
- 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2'
- 'xorg-sessreg')
-makedepends=('imake')
-source=(
-#X11 support programs and libraries
-http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common
-#X11 Agent sources
-http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common
-#Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz
-http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz
-# gcc 43 fix
-nxcompsh-gcc43.patch
-nx-3.5.0-libpng15.patch)
-options=(!libtool)
-md5sums=('12060433a74ac61a1c776d1d6d136117'
- '84c7f1575d9a1506370125ed050514ab'
- 'cf38ec1e5a5f6453946cd387c14f2684'
- 'ad8c0f133122c6d07732ca69c8759410'
- '0a36c7e6a86c6c741179464b8f79c487'
- '84ade443b79ea079380b754aba9d392e'
- '488bb4d9b8e9f82dc272b4e6e9c57d30'
- 'abde2ccc33e31fc695031c2cfb60f3dd'
- '90a762dd9eb19c8c97876ad837923857'
- 'b6c279654dac421fc3dd1a27d66ff53c'
- '2966353cabb96829eab291212ef078dc')
-
-build() {
- cd ${srcdir}
-
- # nxcomp
- cd ${srcdir}/nxcomp
- patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch
- ./configure --prefix=/opt/NX
- make
- # nxcompshad
- cd ${srcdir}/nxcompshad
- ./configure --prefix=/opt/NX
- make
- # nxcompsh
- cd ${srcdir}/nxcompsh
- patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch
- ./configure --prefix=/opt/NX
- make
- # nxproxy
- cd ${srcdir}/nxproxy
- ./configure --prefix=/opt/NX
- make
- # nx-X11
- cd ${srcdir}/nx-X11
- make World
- # nxcompext
- cd ${srcdir}/nxcompext
- ./configure --prefix=/opt/NX
- make
-}
-
-package() {
- mkdir -p ${pkgdir}/opt/NX/bin
- mkdir -p ${pkgdir}/opt/NX/lib
-
- # nxcompshad
- cd ${srcdir}/nxcompshad
- cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib
- # nxproxy
- cd ${srcdir}/nxproxy
- make prefix=${pkgdir}/opt/NX install
- # nx-X11
- cd ${srcdir}/nx-X11
- cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib
- cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib
- cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib
- install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent
- install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth
- # nxcompext
- cd ${srcdir}/nxcompext
- cp -a libXcompext.so* ${pkgdir}/opt/NX/lib
-} \ No newline at end of file
diff --git a/extra/nxserver/nx-3.5.0-libpng15.patch b/extra/nxserver/nx-3.5.0-libpng15.patch
deleted file mode 100644
index c8f2a9559..000000000
--- a/extra/nxserver/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/extra/nxserver/nxcompsh-gcc43.patch b/extra/nxserver/nxcompsh-gcc43.patch
deleted file mode 100644
index 681a0dab5..000000000
--- a/extra/nxserver/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.
-