[arch-commits] Commit in nx/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Jan 13 09:33:31 UTC 2013
Date: Sunday, January 13, 2013 @ 04:33:31
Author: andyrtr
Revision: 175081
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
nx/repos/extra-i686/PKGBUILD
(from rev 175080, nx/trunk/PKGBUILD)
nx/repos/extra-i686/nx-cflags.patch
(from rev 175080, nx/trunk/nx-cflags.patch)
nx/repos/extra-x86_64/PKGBUILD
(from rev 175080, nx/trunk/PKGBUILD)
nx/repos/extra-x86_64/nx-cflags.patch
(from rev 175080, nx/trunk/nx-cflags.patch)
Deleted:
nx/repos/extra-i686/PKGBUILD
nx/repos/extra-i686/nx-cflags.patch
nx/repos/extra-x86_64/PKGBUILD
nx/repos/extra-x86_64/nx-cflags.patch
------------------------------+
extra-i686/PKGBUILD | 284 ++++++++++++++++++++---------------------
extra-i686/nx-cflags.patch | 108 +++++++--------
extra-x86_64/PKGBUILD | 284 ++++++++++++++++++++---------------------
extra-x86_64/nx-cflags.patch | 108 +++++++--------
4 files changed, 396 insertions(+), 388 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-01-13 09:32:53 UTC (rev 175080)
+++ extra-i686/PKGBUILD 2013-01-13 09:33:31 UTC (rev 175081)
@@ -1,140 +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.17
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-#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)
-md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
-
-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 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
- make 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')
-
- 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
-}
-
-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')
-
- 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() {
-
- 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 175080, nx/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-01-13 09:33:31 UTC (rev 175081)
@@ -0,0 +1,144 @@
+# $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.17
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+#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)
+md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
+
+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')
+
+ 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
+}
+
+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
+ 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() {
+
+ pkgdesc="NX headers"
+
+ install -dm755 ${pkgdir}/usr/include/nx
+ cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}
Deleted: extra-i686/nx-cflags.patch
===================================================================
--- extra-i686/nx-cflags.patch 2013-01-13 09:32:53 UTC (rev 175080)
+++ extra-i686/nx-cflags.patch 2013-01-13 09:33:31 UTC (rev 175081)
@@ -1,54 +0,0 @@
---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
-+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
-@@ -7,8 +7,7 @@
-
- dnl Set our default compilation flags.
-
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
-
- dnl Reset default linking directives.
-
---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
-+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CFLAGS="-O3"
--
- dnl Reset default linking directives.
-
- LIBSTATIC=""
---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
-+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Reset default linking directives.
-
- LIBSTATIC=""
---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
-+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
-
- if test -d "../nx-X11/exports/include" ; then
Copied: nx/repos/extra-i686/nx-cflags.patch (from rev 175080, nx/trunk/nx-cflags.patch)
===================================================================
--- extra-i686/nx-cflags.patch (rev 0)
+++ extra-i686/nx-cflags.patch 2013-01-13 09:33:31 UTC (rev 175081)
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+
+ if test -d "../nx-X11/exports/include" ; then
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-01-13 09:32:53 UTC (rev 175080)
+++ extra-x86_64/PKGBUILD 2013-01-13 09:33:31 UTC (rev 175081)
@@ -1,140 +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.17
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-#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)
-md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
-
-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 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
- make 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')
-
- 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
-}
-
-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')
-
- 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() {
-
- 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 175080, nx/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-01-13 09:33:31 UTC (rev 175081)
@@ -0,0 +1,144 @@
+# $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.17
+pkgrel=3
+arch=('i686' 'x86_64')
+url="http://wiki.x2go.org/"
+license=('GPL')
+#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)
+md5sums=('aac9a999d4b38dedd476409e5fc2c4aa')
+
+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')
+
+ 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
+}
+
+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
+ 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() {
+
+ pkgdesc="NX headers"
+
+ install -dm755 ${pkgdir}/usr/include/nx
+ cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}
Deleted: extra-x86_64/nx-cflags.patch
===================================================================
--- extra-x86_64/nx-cflags.patch 2013-01-13 09:32:53 UTC (rev 175080)
+++ extra-x86_64/nx-cflags.patch 2013-01-13 09:33:31 UTC (rev 175081)
@@ -1,54 +0,0 @@
---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
-+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
-@@ -7,8 +7,7 @@
-
- dnl Set our default compilation flags.
-
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
-
- dnl Reset default linking directives.
-
---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
-+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CFLAGS="-O3"
--
- dnl Reset default linking directives.
-
- LIBSTATIC=""
---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
-+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Reset default linking directives.
-
- LIBSTATIC=""
---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
-+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
-
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
-
- if test -d "../nx-X11/exports/include" ; then
Copied: nx/repos/extra-x86_64/nx-cflags.patch (from rev 175080, nx/trunk/nx-cflags.patch)
===================================================================
--- extra-x86_64/nx-cflags.patch (rev 0)
+++ extra-x86_64/nx-cflags.patch 2013-01-13 09:33:31 UTC (rev 175081)
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+
+ if test -d "../nx-X11/exports/include" ; then
More information about the arch-commits
mailing list