[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2012-04-21 Thread andyrtr
Date: Saturday, April 21, 2012 @ 18:55:40
  Author: andyrtr
Revision: 156616

upgpkg: nx-common 3.5.0-5

increase pkgrel

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-21 22:50:01 UTC (rev 156615)
+++ PKGBUILD2012-04-21 22:55:40 UTC (rev 156616)
@@ -4,7 +4,7 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=4.2
+pkgrel=5
 pkgdesc=NoMachine NX common package for client and server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -36,7 +36,6 @@
 package() {
   install -dm755 ${pkgdir}/usr/{bin,lib/nx}
 
-
   # nxcompsh
   cd ${srcdir}/nxcompsh
   cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2012-04-16 Thread andyrtr
Date: Monday, April 16, 2012 @ 14:21:41
  Author: andyrtr
Revision: 156292

upgpkg: nx-common 3.5.0-4.2

add required symlinks

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-16 18:16:02 UTC (rev 156291)
+++ PKGBUILD2012-04-16 18:21:41 UTC (rev 156292)
@@ -4,7 +4,7 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc=NoMachine NX common package for client and server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -36,10 +36,17 @@
 package() {
   install -dm755 ${pkgdir}/usr/{bin,lib/nx}
 
+
   # nxcompsh
   cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed?
+  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} .
+  # ^ really needed?
+
   # nxssh
   cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh
+  install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh
+  cd ${pkgdir}/usr/bin
+  ln -sv /usr/lib/nx/bin/nxssh .
 }



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2012-04-15 Thread andyrtr
Date: Sunday, April 15, 2012 @ 10:20:08
  Author: andyrtr
Revision: 156188

upgpkg: nx-common 3.5.0-4.1

mv files to /usr; use new nx-libs

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |   46 --
 1 file changed, 16 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 14:12:20 UTC (rev 156187)
+++ PKGBUILD2012-04-15 14:20:08 UTC (rev 156188)
@@ -4,56 +4,42 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=4
+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' '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'
+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'
- '2966353cabb96829eab291212ef078dc')
+ 'b6c279654dac421fc3dd1a27d66ff53c')
 
 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
+  ./configure --prefix=/usr/lib/nx
   make
+
   # nxssh
   cd ${srcdir}/nxssh
-  ./configure --prefix=/opt/NX
+  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() {
-  mkdir -p ${pkgdir}/opt/NX/bin
-  mkdir -p ${pkgdir}/opt/NX/lib 
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
 
-  # nxcomp
-  cd ${srcdir}/nxcomp
-  cp -a libXcomp.so* ${pkgdir}/opt/NX/lib
   # nxcompsh
   cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib
+  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed?
   # nxssh
   cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh
+  install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh
 }



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2012-03-15 Thread Pierre Schmitz
Date: Thursday, March 15, 2012 @ 14:23:18
  Author: pierre
Revision: 153542

upgpkg: nx-common 3.5.0-4

openssl 1.0.1 rebuild

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-15 18:19:26 UTC (rev 153541)
+++ PKGBUILD2012-03-15 18:23:18 UTC (rev 153542)
@@ -4,12 +4,12 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=3
+pkgrel=4
 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')
+depends=('libjpeg-turbo' 'libpng' 'openssl' '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



[arch-commits] Commit in nx-common/trunk (PKGBUILD nx-3.5.0-libpng15.patch)

2012-01-20 Thread andyrtr
Date: Friday, January 20, 2012 @ 16:11:29
  Author: andyrtr
Revision: 147023

upgpkg: nx-common 3.5.0-3

libpng rebuild

Added:
  nx-common/trunk/nx-3.5.0-libpng15.patch
Modified:
  nx-common/trunk/PKGBUILD

-+
 PKGBUILD|   13 +
 nx-3.5.0-libpng15.patch |   30 ++
 2 files changed, 39 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 20:50:51 UTC (rev 147022)
+++ PKGBUILD2012-01-20 21:11:29 UTC (rev 147023)
@@ -4,32 +4,37 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=2
+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.4.5' 'openssl=1.0.0' 'gcc-libs' 
'bash')
+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)
+   nxcompsh-gcc43.patch
+   nx-3.5.0-libpng15.patch)
 options=(!libtool)
 md5sums=('ad8c0f133122c6d07732ca69c8759410'
  '84ade443b79ea079380b754aba9d392e'
  'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
- 'b6c279654dac421fc3dd1a27d66ff53c')
+ '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

Added: nx-3.5.0-libpng15.patch
===
--- nx-3.5.0-libpng15.patch (rev 0)
+++ nx-3.5.0-libpng15.patch 2012-01-20 21:11:29 UTC (rev 147023)
@@ -0,0 +1,30 @@
+diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp
+--- nxcomp.orig/Pgn.cpp2010-03-01 19:18:59.0 +0200
 nxcomp/Pgn.cpp 2011-09-13 16:35:12.0 +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);
+   }



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2011-06-22 Thread andyrtr
Date: Wednesday, June 22, 2011 @ 16:29:20
  Author: andyrtr
Revision: 128326

upgpkg: nx-common 3.5.0-2
upstream update 3.5.0-2

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-22 20:20:30 UTC (rev 128325)
+++ PKGBUILD2011-06-22 20:29:20 UTC (rev 128326)
@@ -4,7 +4,7 @@
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc=NoMachine NX common package for client and server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,14 +12,14 @@
 depends=('libjpeg-turbo=1.1.1' 'libpng=1.4.5' '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-1.tar.gz
+   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-1.tar.gz
+   http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz
nxcompsh-gcc43.patch)
 options=(!libtool)
-md5sums=('30a182146479004ec63b8a1b9adccfcf'
+md5sums=('ad8c0f133122c6d07732ca69c8759410'
  '84ade443b79ea079380b754aba9d392e'
- '9f13262bc0bf5187fcc7e22924955bc7'
+ 'f52fcdb38e09f8dcfb9ff0344dfbbbd6'
  'b6c279654dac421fc3dd1a27d66ff53c')
 
 build() {



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2010-04-02 Thread andyrtr
Date: Friday, April 2, 2010 @ 13:16:35
  Author: andyrtr
Revision: 75689

upgpkg: nx-common 3.4.0-4
rebuild for openssl; update the sources

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-02 14:45:31 UTC (rev 75688)
+++ PKGBUILD2010-04-02 17:16:35 UTC (rev 75689)
@@ -3,7 +3,7 @@
 # Contributed: eliott eli...@solarblue.net, Andre Naumann 
anaum...@sparced.org
 pkgname=nx-common
 pkgver=3.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc=NoMachine NX common package for client and server
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,18 +11,23 @@
 depends=('libjpeg=8' 'libpng=1.4.0' 'openssl=1.0.0' 'gcc-libs' 'audiofile' 
'alsa-lib' 'bash')
 source=(\
 #Compression libs and proxy sources
-http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz \
-http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz \
+http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz \
 # ESD Support
-http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-1.tar.gz
+http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-2.tar.gz
 # 64bit fixes
 NXproto.h.64bit.diff
 nx-gcc44.patch)
 options=(!libtool)
+md5sums=('cba926f2b855231a8fc3e0dabff52855'
+ '18b81d850223ea84de244f8a9509c4b1'
+ '65d55f2a86baa59343432261cabd52ec'
+ '58341ba70dfab92ff38570071fbbf88a'
+ 'c805442f1500d8d6de15ec224f63277e')
 
 build() {
   cd ${srcdir}
-  patch -Np1 -i ${srcdir}/nx-gcc44.patch
+#  patch -Np1 -i ${srcdir}/nx-gcc44.patch
  
   mkdir -p ${pkgdir}/opt/NX/bin
   mkdir -p ${pkgdir}/opt/NX/lib 
@@ -51,8 +56,3 @@
   cd ${pkgdir}/opt/NX/lib
   ln -s libXcomp.so.3 libXcomp.so.1
 }
-md5sums=('3dc3d0bca883ceb0d74d9774d63668c6'
- '14bd903426c32926e0c213f6bc0aba89'
- '023f5a729cbbc05257eda7d9a73d6082'
- '58341ba70dfab92ff38570071fbbf88a'
- 'c805442f1500d8d6de15ec224f63277e')



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2010-04-01 Thread andyrtr
Date: Thursday, April 1, 2010 @ 13:54:04
  Author: andyrtr
Revision: 75492

upgpkg: nx-common 3.4.0-3
rebuild for openssl

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 17:48:08 UTC (rev 75491)
+++ PKGBUILD2010-04-01 17:54:04 UTC (rev 75492)
@@ -3,12 +3,12 @@
 # Contributed: eliott eli...@solarblue.net, Andre Naumann 
anaum...@sparced.org
 pkgname=nx-common
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc=NoMachine NX common package for client and server
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://nomachine.com/;
-depends=('libjpeg=8' 'libpng=1.4.0' 'openssl=0.9.8g' 'gcc-libs' 'audiofile' 
'alsa-lib' 'bash')
+depends=('libjpeg=8' 'libpng=1.4.0' 'openssl=1.0.0' 'gcc-libs' 'audiofile' 
'alsa-lib' 'bash')
 source=(\
 #Compression libs and proxy sources
 http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz \



[arch-commits] Commit in nx-common/trunk (PKGBUILD)

2010-01-21 Thread Tobias Powalowski
Date: Thursday, January 21, 2010 @ 15:21:42
  Author: tpowa
Revision: 64653

upgpkg: nx-common 3.4.0-2
rebuild against png and jpg

Modified:
  nx-common/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-21 18:50:58 UTC (rev 64652)
+++ PKGBUILD2010-01-21 20:21:42 UTC (rev 64653)
@@ -3,12 +3,12 @@
 # Contributed: eliott eli...@solarblue.net, Andre Naumann 
anaum...@sparced.org
 pkgname=nx-common
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=NoMachine NX common package for client and server
 arch=('i686' 'x86_64')
 license=('GPL')
 url=http://nomachine.com/;
-depends=('libjpeg=7' 'libpng' 'openssl=0.9.8g' 'gcc-libs' 'audiofile' 
'alsa-lib' 'bash')
+depends=('libjpeg=8' 'libpng=1.4.0' 'openssl=0.9.8g' 'gcc-libs' 'audiofile' 
'alsa-lib' 'bash')
 source=(\
 #Compression libs and proxy sources
 http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz \