Wed Jan 9 00:06:34 PST 2013

1 files changed, 58 insertions, 63 deletions

diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 804244272..94ba80f98 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -1,23 +1,19 @@
-# $Id: PKGBUILD 168379 2012-10-09 16:19:56Z andyrtr $
+# $Id: PKGBUILD 174924 2013-01-09 04:17:18Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.15
-pkgrel=2
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
+pkgver=3.5.0.17
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
-options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
+#options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependencies from subpackages
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
              )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-        nx-x11.ld.so.conf.d
-        nx-cflags.patch)
-md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
-         'f2ec60c7e2d81bef2f7292d2b33681a6'
-         'd0c5b88aac0473e19699cf62d84b9d5f')
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
+md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
 
 build() {
   cd "${srcdir}/nx-libs-$pkgver"
@@ -26,17 +22,7 @@ build() {
 #  export CFLAGS="-march=x86-64 -O1 -g -pipe"
 #  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
 
-
-  # Gentoo hacks to honor cflags
-  patch -Np0 -i ${srcdir}/nx-cflags.patch
-
-  # Run autoreconf in all neeed folders
-  for i in nxcomp nxcompext nxcompshad nxproxy; do
-     cd ${i}
-     autoreconf -vfi #${i}
-     cd ..
-  done
-  
+  # honour CFLAGS in X11 build - upstream fixed so far only the other libs
   # From xorg-x11-6.9.0-r3.ebuild
   pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
 
@@ -47,7 +33,11 @@ build() {
   echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
   echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
   popd
-    
+
+  # fix two broken Makefiles
+  sed -i "s:/usr/local:/usr:" Makefile
+  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
+
   make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
   # fake install
   mkdir $srcdir/fakeinstall
@@ -59,10 +49,11 @@ package_libxcomp() {
   pkgdesc="NX X compression library"
   depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
 	
-  install -dm755 ${pkgdir}/usr/lib/nx/lib
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  install -dm755 ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx
+  # symlinks
   cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
+  ln -sv /usr/lib/nx/libXcomp.so{,.3,.3.5.0} .
 }
 
 package_nxproxy() {
@@ -71,14 +62,10 @@ package_nxproxy() {
   depends=('libxcomp')
   
   install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxproxy .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy ${pkgdir}/usr/lib/nx/bin/nxproxy
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
+  # the wrapper
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
 }
 
 package_nx-xcompext() {
@@ -87,12 +74,13 @@ package_nx-xcompext() {
   depends=('libxcomp' 'nx-x11')
 	
   install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
-  ln -sv libXcompext.so.3.5.0 libXcompext.so
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
+  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
+
+  # symlinks
   cd ${pkgdir}/usr/lib/
   ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
+  #ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
 }
 
 package_nx-x11() {
@@ -100,40 +88,47 @@ package_nx-x11() {
   pkgdesc="NX-X11 lib for the NX framework"
   depends=('libxcomp')
 	
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
-
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxauth .
-  
+  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
+  # nxauth
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
   # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxauth
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
 }
 
 package_nxagent() {
   
   pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
+  depends=('nx-xcompext' 'libxml2')
 	
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxagent .
-  
+  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
   # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxagent
-  # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
+  
+  # additional files for documentation
+  cp -a ${srcdir}/fakeinstall/usr/share/nx/SecurityPolicy ${pkgdir}/usr/share/nx
+  
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompshad.so* ${pkgdir}/usr/lib/nx
+  # symlinks
   cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
+  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . # files should move to nx-compext pkg
+}
+
+package_x2go-agent() {
+  
+  pkgdesc="Wrapper arround nxagent to use with x2goserver"
+  depends=('nxagent')
+	
+  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
+  # this is a nxagent symlink
+  cp -a ${srcdir}/fakeinstall/usr/lib/x2go/bin/x2goagent ${pkgdir}/usr/lib/x2go/bin
+  # the wrapper
+  cp -a ${srcdir}/fakeinstall/usr/bin/x2goagent ${pkgdir}/usr/bin
+  
+  cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/x2go.xpm ${pkgdir}/usr/share/pixmaps
+  cp -a ${srcdir}/fakeinstall/usr/share/x2go/rgb ${pkgdir}/usr/share/x2go
+  cp -a ${srcdir}/fakeinstall/usr/share/x2go/versions/VERSION.x2goagent ${pkgdir}/usr/share/x2go/versions
 }
 
 package_nx-headers() {