[arch-commits] Commit in nx/repos (4 files)

Andreas Radke andyrtr at archlinux.org
Tue Nov 25 18:34:42 UTC 2014


    Date: Tuesday, November 25, 2014 @ 19:34:42
  Author: andyrtr
Revision: 227095

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  nx/repos/extra-i686/PKGBUILD
    (from rev 227094, nx/trunk/PKGBUILD)
  nx/repos/extra-x86_64/PKGBUILD
    (from rev 227094, nx/trunk/PKGBUILD)
Deleted:
  nx/repos/extra-i686/PKGBUILD
  nx/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |  302 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |  151 ------------------------
 extra-x86_64/PKGBUILD |  151 ------------------------
 3 files changed, 302 insertions(+), 302 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-11-25 18:34:09 UTC (rev 227094)
+++ extra-i686/PKGBUILD	2014-11-25 18:34:42 UTC (rev 227095)
@@ -1,151 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.28
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-#options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # runtime dependencies from subpackages
-             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr'
-             'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends
-             )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-sha1sums=('b5a97ae10770ca0f496e4398eab984c0bcff3500')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-  # 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"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-
-  # fix a broken Makefiles
-  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
-  make \
-    PREFIX=/usr \
-    CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
-    
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-	
-  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/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  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() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-	
-  install -dm755 ${pkgdir}/usr/lib/nx
-  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() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp' 'fontconfig')
-  optdepends=('libxext: for Xinerama support')
-	
-  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}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-  # add symlinks required for proper Xinerama support # FS#41037
-  cd ${pkgdir}/usr/lib/nx/X11/Xinerama
-  ln -sv /usr/lib/libX11.so.6 libNX_X11.so.6
-  ln -sv /usr/lib/libXext.so.6 libNX_Xext.so.6
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext' 'libxml2')
-	
-  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}/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} . # files should move to nx-compext pkg
-}
-
-package_x2go-agent() {
-  
-  pkgdesc="Wrapper arround nxagent to use with x2goserver"
-  depends=('nxagent')
-  provides=('x2goagent')
-  replaces=('x2goagent')
-	
-  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
-  # this is a nxagent symlink
-  ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
-
-  # 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() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/extra-i686/PKGBUILD (from rev 227094, nx/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-11-25 18:34:42 UTC (rev 227095)
@@ -0,0 +1,151 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
+pkgver=3.5.0.28
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+#options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # runtime dependencies from subpackages
+             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr'
+             'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends
+             )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
+sha1sums=('b5a97ae10770ca0f496e4398eab984c0bcff3500')
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+  # 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"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+
+  # fix a broken Makefiles
+  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
+
+  make \
+    PREFIX=/usr \
+    CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+    
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+	
+  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/libXcomp.so{,.3,.${pkgver}} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  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() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx
+  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() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp' 'fontconfig')
+  optdepends=('libxext: for Xinerama support')
+	
+  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}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
+  # add symlinks required for proper Xinerama support # FS#41037
+  cd ${pkgdir}/usr/lib/nx/X11/Xinerama
+  ln -sv /usr/lib/libX11.so.6 libNX_X11.so.6
+  ln -sv /usr/lib/libXext.so.6 libNX_Xext.so.6
+}
+
+package_nxagent() {
+  
+  pkgdesc="NX X server based on Xnest"
+  depends=('nx-xcompext' 'libxml2')
+	
+  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}/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} . # files should move to nx-compext pkg
+}
+
+package_x2go-agent() {
+  
+  pkgdesc="Wrapper arround nxagent to use with x2goserver"
+  depends=('nxagent')
+  provides=('x2goagent')
+  replaces=('x2goagent')
+	
+  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
+  # this is a nxagent symlink
+  ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
+
+  # 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() {
+
+  pkgdesc="NX headers"
+  
+  install -dm755 ${pkgdir}/usr/include/nx
+  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}  

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-11-25 18:34:09 UTC (rev 227094)
+++ extra-x86_64/PKGBUILD	2014-11-25 18:34:42 UTC (rev 227095)
@@ -1,151 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
-pkgver=3.5.0.28
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-#options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # runtime dependencies from subpackages
-             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr'
-             'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends
-             )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-sha1sums=('b5a97ae10770ca0f496e4398eab984c0bcff3500')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-  # 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"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-
-  # fix a broken Makefiles
-  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
-  make \
-    PREFIX=/usr \
-    CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
-    
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-	
-  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/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  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() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-	
-  install -dm755 ${pkgdir}/usr/lib/nx
-  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() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp' 'fontconfig')
-  optdepends=('libxext: for Xinerama support')
-	
-  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}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-  # add symlinks required for proper Xinerama support # FS#41037
-  cd ${pkgdir}/usr/lib/nx/X11/Xinerama
-  ln -sv /usr/lib/libX11.so.6 libNX_X11.so.6
-  ln -sv /usr/lib/libXext.so.6 libNX_Xext.so.6
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext' 'libxml2')
-	
-  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}/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} . # files should move to nx-compext pkg
-}
-
-package_x2go-agent() {
-  
-  pkgdesc="Wrapper arround nxagent to use with x2goserver"
-  depends=('nxagent')
-  provides=('x2goagent')
-  replaces=('x2goagent')
-	
-  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
-  # this is a nxagent symlink
-  ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
-
-  # 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() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  

Copied: nx/repos/extra-x86_64/PKGBUILD (from rev 227094, nx/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-11-25 18:34:42 UTC (rev 227095)
@@ -0,0 +1,151 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
+pkgver=3.5.0.28
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+#options=('!makeflags') # '!strip')
+makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # runtime dependencies from subpackages
+             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr'
+             'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends
+             )
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
+sha1sums=('b5a97ae10770ca0f496e4398eab984c0bcff3500')
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # debug flags
+#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
+#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
+
+  # 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"
+
+  HOSTCONF="config/cf/host.def"
+  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
+  # Respect LDFLAGS
+  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
+  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
+  popd
+
+  # fix a broken Makefiles
+  sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
+
+  make \
+    PREFIX=/usr \
+    CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+    
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+	
+  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/libXcomp.so{,.3,.${pkgver}} .
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp')
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
+  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() {
+  
+  pkgdesc="Xcompext/Xcompshad library for NX"
+  depends=('libxcomp' 'nx-x11')
+	
+  install -dm755 ${pkgdir}/usr/lib/nx
+  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() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp' 'fontconfig')
+  optdepends=('libxext: for Xinerama support')
+	
+  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}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
+  # add symlinks required for proper Xinerama support # FS#41037
+  cd ${pkgdir}/usr/lib/nx/X11/Xinerama
+  ln -sv /usr/lib/libX11.so.6 libNX_X11.so.6
+  ln -sv /usr/lib/libXext.so.6 libNX_Xext.so.6
+}
+
+package_nxagent() {
+  
+  pkgdesc="NX X server based on Xnest"
+  depends=('nx-xcompext' 'libxml2')
+	
+  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}/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} . # files should move to nx-compext pkg
+}
+
+package_x2go-agent() {
+  
+  pkgdesc="Wrapper arround nxagent to use with x2goserver"
+  depends=('nxagent')
+  provides=('x2goagent')
+  replaces=('x2goagent')
+	
+  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
+  # this is a nxagent symlink
+  ln -sv /usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/x2go/bin/x2goagent 
+
+  # 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() {
+
+  pkgdesc="NX headers"
+  
+  install -dm755 ${pkgdir}/usr/include/nx
+  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}  


More information about the arch-commits mailing list