[arch-commits] Commit in nxserver/repos/extra-x86_64 (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Aug 24 21:00:37 UTC 2011
Date: Wednesday, August 24, 2011 @ 17:00:37
Author: andyrtr
Revision: 136221
archrelease: copy trunk to extra-x86_64
Added:
nxserver/repos/extra-x86_64/NXproto.h.64bit.diff
(from rev 136220, nxserver/trunk/NXproto.h.64bit.diff)
nxserver/repos/extra-x86_64/PKGBUILD
(from rev 136220, nxserver/trunk/PKGBUILD)
nxserver/repos/extra-x86_64/nxcompsh-gcc43.patch
(from rev 136220, nxserver/trunk/nxcompsh-gcc43.patch)
Deleted:
nxserver/repos/extra-x86_64/NXproto.h.64bit.diff
nxserver/repos/extra-x86_64/PKGBUILD
nxserver/repos/extra-x86_64/nxcompsh-gcc43.patch
----------------------+
NXproto.h.64bit.diff | 132 +++++++++++++++++------------------
PKGBUILD | 184 ++++++++++++++++++++++++-------------------------
nxcompsh-gcc43.patch | 38 +++++-----
3 files changed, 177 insertions(+), 177 deletions(-)
Deleted: NXproto.h.64bit.diff
===================================================================
--- NXproto.h.64bit.diff 2011-08-24 20:59:44 UTC (rev 136220)
+++ NXproto.h.64bit.diff 2011-08-24 21:00:37 UTC (rev 136221)
@@ -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 */
Copied: nxserver/repos/extra-x86_64/NXproto.h.64bit.diff (from rev 136220, nxserver/trunk/NXproto.h.64bit.diff)
===================================================================
--- NXproto.h.64bit.diff (rev 0)
+++ NXproto.h.64bit.diff 2011-08-24 21:00:37 UTC (rev 136221)
@@ -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 */
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-24 20:59:44 UTC (rev 136220)
+++ PKGBUILD 2011-08-24 21:00:37 UTC (rev 136221)
@@ -1,92 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
-
-pkgname=nxserver
-pkgver=3.5.0
-pkgrel=2
-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.4.0' '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-1.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-2.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)
-options=(!libtool)
-md5sums=('54ac7dd8806928b991b0819cf76b37dd'
- '84c7f1575d9a1506370125ed050514ab'
- 'cf38ec1e5a5f6453946cd387c14f2684'
- 'ad8c0f133122c6d07732ca69c8759410'
- '7b0f60d5a3c54f22da7d81aac055836e'
- '84ade443b79ea079380b754aba9d392e'
- '488bb4d9b8e9f82dc272b4e6e9c57d30'
- 'abde2ccc33e31fc695031c2cfb60f3dd'
- '90a762dd9eb19c8c97876ad837923857'
- 'b6c279654dac421fc3dd1a27d66ff53c')
-
-build() {
- cd ${srcdir}
-
- # nxcomp
- cd ${srcdir}/nxcomp
- ./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
Copied: nxserver/repos/extra-x86_64/PKGBUILD (from rev 136220, nxserver/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2011-08-24 21:00:37 UTC (rev 136221)
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
+
+pkgname=nxserver
+pkgver=3.5.0
+pkgrel=3
+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.4.0' '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-5.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)
+options=(!libtool)
+md5sums=('12060433a74ac61a1c776d1d6d136117'
+ '84c7f1575d9a1506370125ed050514ab'
+ 'cf38ec1e5a5f6453946cd387c14f2684'
+ 'ad8c0f133122c6d07732ca69c8759410'
+ '1086a92fb523d0a5d3685b89f1c96b9f'
+ '84ade443b79ea079380b754aba9d392e'
+ '488bb4d9b8e9f82dc272b4e6e9c57d30'
+ 'abde2ccc33e31fc695031c2cfb60f3dd'
+ '90a762dd9eb19c8c97876ad837923857'
+ 'b6c279654dac421fc3dd1a27d66ff53c')
+
+build() {
+ cd ${srcdir}
+
+ # nxcomp
+ cd ${srcdir}/nxcomp
+ ./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
Deleted: nxcompsh-gcc43.patch
===================================================================
--- nxcompsh-gcc43.patch 2011-08-24 20:59:44 UTC (rev 136220)
+++ nxcompsh-gcc43.patch 2011-08-24 21:00:37 UTC (rev 136221)
@@ -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.
-
Copied: nxserver/repos/extra-x86_64/nxcompsh-gcc43.patch (from rev 136220, nxserver/trunk/nxcompsh-gcc43.patch)
===================================================================
--- nxcompsh-gcc43.patch (rev 0)
+++ nxcompsh-gcc43.patch 2011-08-24 21:00:37 UTC (rev 136221)
@@ -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.
+
More information about the arch-commits
mailing list