subject:"\[arch\-commits\] Commit in nx\/trunk \(PKGBUILD\)"

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

2019-12-17 Thread Andreas Radke via arch-commits

Date: Tuesday, December 17, 2019 @ 08:25:07
  Author: andyrtr
Revision: 371589

upgpkg: nx 3.5.99.22-1: upstream update 3.5.99.22

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-17 08:08:31 UTC (rev 371588)
+++ PKGBUILD2019-12-17 08:25:07 UTC (rev 371589)
@@ -2,8 +2,8 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.20
-pkgrel=2
+pkgver=3.5.99.22
+pkgrel=1
 arch=('x86_64')
 #url="https://arctica-project.org;
 url="https://wiki.x2go.org/doku.php;
@@ -19,14 +19,14 @@
  'xorgproto' 'imake'
 )
 
#source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-source=(https://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-1-full.tar.gz{,.asc})
-sha256sums=('d7b7aeb1ea93eef753a0bbe72e5c9501156ca067ca86af8dbbc4a2ce28f7e7cf'
+source=(https://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
+sha256sums=('fe8851d96c2eedfe5caf4d2c0de870e06546471605da8a3742cfbadaad44a65f'
 'SKIP')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

 
 build() {
-  cd "${srcdir}/nx-libs-$pkgver-1"
+  cd "${srcdir}/nx-libs-$pkgver"
   
   # let makepkg zip the man files
   sed -i "s:gzip:#gzip:g" Makefile
@@ -88,7 +88,8 @@
   depends=('nx-x11' 'libxcomp' 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp'
'xorg-xkbcomp' 'libxfont2' 'libxinerama'
'xorg-font-util'  'libxfont2' 'libxinerama' 'pixman'
-   'libxrandr' 'libxtst' 'libxcomposite' 'libxpm' 'libxdamage')
+   'libxrandr' 'libxtst' 'libxcomposite' 'libxpm' 'libxdamage'
+   'libtirpc')
   conflicts=('nx-xcompext')

   install -dm755 
${pkgdir}/usr/{bin,lib/nx/bin,share/nx,share/man/man1,share/pixmaps}
@@ -130,4 +131,3 @@
   rm -rf ${pkgdir}/usr/include/GL
   rm -rf 
${pkgdir}/usr/include/nx-X11/{extensions/XK*.h,nx-X11/extensions/*Xv*.h,nx-X11/Xtrans}
 }
-

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

2019-04-25 Thread Andreas Radke via arch-commits

Date: Thursday, April 25, 2019 @ 06:44:45
  Author: andyrtr
Revision: 352109

upgpkg: nx 3.5.99.20-2

upstream update 3.5.99.20; move back to original X2go project source that 
includes further fixes

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-04-25 06:34:43 UTC (rev 352108)
+++ PKGBUILD2019-04-25 06:44:45 UTC (rev 352109)
@@ -3,9 +3,10 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
 pkgver=3.5.99.20
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
-url="https://arctica-project.org;
+#url="https://arctica-project.org;
+url="https://wiki.x2go.org/doku.php;
 license=('GPL')
 # https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nx-libs.spec
 makedepends=(# runtime dependencies from subpackages
@@ -17,13 +18,15 @@
  # make dependencies
  'xorgproto' 'imake'
 )
-source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-sha256sums=('32964e2fe511a410924d4d5821a0e95bc7326ff303c28d817e6fcf9bff19a42d')
+#source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
+source=(https://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-1-full.tar.gz{,.asc})
+sha256sums=('d7b7aeb1ea93eef753a0bbe72e5c9501156ca067ca86af8dbbc4a2ce28f7e7cf'
+'SKIP')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

 
 build() {
-  cd "${srcdir}/nx-libs-$pkgver"
+  cd "${srcdir}/nx-libs-$pkgver-1"
   
   # let makepkg zip the man files
   sed -i "s:gzip:#gzip:g" Makefile

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

2019-04-23 Thread Andreas Radke via arch-commits

Date: Tuesday, April 23, 2019 @ 19:04:43
  Author: andyrtr
Revision: 352014

upgpkg: nx 3.5.99.20-1

upstream update 3.5.99.20

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-04-23 19:02:16 UTC (rev 352013)
+++ PKGBUILD2019-04-23 19:04:43 UTC (rev 352014)
@@ -2,7 +2,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.19
+pkgver=3.5.99.20
 pkgrel=1
 arch=('x86_64')
 url="https://arctica-project.org;
@@ -18,7 +18,7 @@
  'xorgproto' 'imake'
 )
 
source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-sha256sums=('4fd7c392c591a2fab06ddc598bd7488c81a20125f01cf4ce4dfd2934de4613df')
+sha256sums=('32964e2fe511a410924d4d5821a0e95bc7326ff303c28d817e6fcf9bff19a42d')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel

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

2019-03-06 Thread Andreas Radke via arch-commits

Date: Wednesday, March 6, 2019 @ 19:34:44
  Author: andyrtr
Revision: 347165

upgpkg: nx 3.5.99.19-1

upstream update 3.5.99.19

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-03-06 19:19:19 UTC (rev 347164)
+++ PKGBUILD2019-03-06 19:34:44 UTC (rev 347165)
@@ -2,7 +2,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.18
+pkgver=3.5.99.19
 pkgrel=1
 arch=('x86_64')
 url="https://arctica-project.org;
@@ -18,7 +18,7 @@
  'xorgproto' 'imake'
 )
 
source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-sha256sums=('26b255889e4beada029ed33629ad7c789662816c33691498993ac94decb7aebb')
+sha256sums=('4fd7c392c591a2fab06ddc598bd7488c81a20125f01cf4ce4dfd2934de4613df')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel

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

2019-01-31 Thread Andreas Radke via arch-commits

Date: Thursday, January 31, 2019 @ 21:26:58
  Author: andyrtr
Revision: 344983

upgpkg: nx 3.5.99.18-1

upstream update 3.5.99.18

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2019-01-31 20:15:20 UTC (rev 344982)
+++ PKGBUILD2019-01-31 21:26:58 UTC (rev 344983)
@@ -2,7 +2,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.17
+pkgver=3.5.99.18
 pkgrel=1
 arch=('x86_64')
 url="https://arctica-project.org;
@@ -18,7 +18,7 @@
  'xorgproto' 'imake'
 )
 
source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-sha256sums=('57292cf0d6f48f6ef1312ada7938a063bfe47f876c082c8f0d5a74f302cad923')
+sha256sums=('26b255889e4beada029ed33629ad7c789662816c33691498993ac94decb7aebb')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel

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

2018-11-27 Thread Andreas Radke via arch-commits

Date: Tuesday, November 27, 2018 @ 19:13:41
  Author: andyrtr
Revision: 340502

upgpkg: nx 3.5.99.17-1

upstream update 3.5.99.17

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-11-27 19:13:39 UTC (rev 340501)
+++ PKGBUILD2018-11-27 19:13:41 UTC (rev 340502)
@@ -2,8 +2,8 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.16
-pkgrel=2
+pkgver=3.5.99.17
+pkgrel=1
 arch=('x86_64')
 url="https://arctica-project.org;
 license=('GPL')
@@ -18,7 +18,7 @@
  'xorgproto' 'imake'
 )
 
source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-sha256sums=('b04255509bc73b6ed0eca76cfbf92757eb268454b43e9b0ae4beb79491bd49c9')
+sha256sums=('57292cf0d6f48f6ef1312ada7938a063bfe47f876c082c8f0d5a74f302cad923')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

 
@@ -81,7 +81,7 @@
 package_nxagent() {
   
   pkgdesc="NX X server based on Xnest"
-  backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard})
+  backup=(etc/nxagent/keystrokes.cfg)
   depends=('nx-x11' 'libxcomp' 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp'
'xorg-xkbcomp' 'libxfont2' 'libxinerama'
'xorg-font-util'  'libxfont2' 'libxinerama' 'pixman'
@@ -106,7 +106,7 @@
   touch ${pkgdir}/usr/lib/X11/xkb/keymap.dir
   
   install -dm755 ${pkgdir}/etc/nxagent
-  cp -a ${srcdir}/fakeinstall/etc/nxagent/{keystrokes.cfg,nxagent.keyboard} 
${pkgdir}/etc/nxagent
+  cp -a ${srcdir}/fakeinstall/etc/nxagent/keystrokes.cfg ${pkgdir}/etc/nxagent
 
   # add symlinks required for proper Xinerama support # FS#41037
   install -dm755 ${pkgdir}/usr/lib/nx/X11/Xinerama

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

2018-10-21 Thread Andreas Radke via arch-commits

Date: Sunday, October 21, 2018 @ 12:33:49
  Author: andyrtr
Revision: 336948

upgpkg: nx 3.5.99.16-2

fix FTBFS; FS#60428

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-10-21 12:12:33 UTC (rev 336947)
+++ PKGBUILD2018-10-21 12:33:49 UTC (rev 336948)
@@ -3,7 +3,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
 pkgver=3.5.99.16
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://arctica-project.org;
 license=('GPL')
@@ -30,7 +30,8 @@
 
   make \
 PREFIX=/usr \
-CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include"
+CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include" \
+IMAKE_DEFINES="-DUseTIRPC=YES"
 
   # fake install
   mkdir $srcdir/fakeinstall

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

2018-03-17 Thread Andreas Radke via arch-commits

Date: Saturday, March 17, 2018 @ 10:01:44
  Author: andyrtr
Revision: 319548

upgpkg: nx 3.5.99.16-1

upstream update 3.5.99.16

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-03-17 08:31:21 UTC (rev 319547)
+++ PKGBUILD2018-03-17 10:01:44 UTC (rev 319548)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.15
+pkgver=3.5.99.16
 pkgrel=1
 arch=('x86_64')
 url="https://arctica-project.org;
@@ -19,7 +19,7 @@
  'xorgproto' 'imake'
 )
 
source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
-sha256sums=('10102d01c284afeb3f59ed257b101495a2cc674a18db05e6f9190c7fe301803a')
+sha256sums=('b04255509bc73b6ed0eca76cfbf92757eb268454b43e9b0ae4beb79491bd49c9')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

 
@@ -74,8 +74,6 @@
   cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
   cp -aR ${srcdir}/fakeinstall/usr/lib/libNX* ${pkgdir}/usr/lib
   
-  rm -rfv ${pkgdir}/usr/lib/nx/X11
-
   # fonts symlink
   ln -vsf /usr/share/fonts ${pkgdir}/usr/share/nx/fonts
 }

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

2018-03-09 Thread Andreas Radke via arch-commits

Date: Friday, March 9, 2018 @ 21:16:34
  Author: andyrtr
Revision: 318369

prepare new release - requires further fixes, x2gosever refuses connection

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |  110 ++---
 1 file changed, 48 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-09 21:13:10 UTC (rev 318368)
+++ PKGBUILD2018-03-09 21:16:34 UTC (rev 318369)
@@ -2,45 +2,30 @@
 # Maintainer: Andreas Radke 
 
 pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.33
-pkgrel=2
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
+pkgver=3.5.99.15
+pkgrel=1
 arch=('x86_64')
-url="http://wiki.x2go.org/;
+url="https://arctica-project.org;
 license=('GPL')
-#options=('!makeflags') # '!strip')
-# http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=nx-libs.spec
-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' 
'xorg-xkbcomp' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
-sha256sums=('378665a8098398d6fb642559cc59d23902d3b212aa05de4973a13ac9b325a06a'
-'SKIP')
+# https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nx-libs.spec
+makedepends=(# runtime dependencies from subpackages
+ 'libjpeg-turbo' 'libpng' 'gcc-libs'
+ 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp'
+ 'xorg-xkbcomp' 'libxfont2' 'libxinerama'
+ 'xorg-font-util'  'pixman'
+ 'libxrandr' 'libxtst' 'libxcomposite' 'libxpm' 'libxdamage'
+ # make dependencies
+ 'xorgproto' 'imake'
+)
+source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
+sha256sums=('10102d01c284afeb3f59ed257b101495a2cc674a18db05e6f9190c7fe301803a')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

+
 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
-  
   # let makepkg zip the man files
   sed -i "s:gzip:#gzip:g" Makefile
 
@@ -50,7 +35,14 @@
 
   # fake install
   mkdir $srcdir/fakeinstall
-  make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
+  make install \
+   PREFIX=/usr \
+   DESTDIR="$srcdir/fakeinstall" \
+   LIBDIR=/usr/lib \
+   SHLIBDIR=/usr/lib \
+   INSTALL_DIR="install -dm0755" \
+   INSTALL_FILE="install -pm0644" \
+   INSTALL_PROGRAM="install -pm0755"
 }
 
 package_libxcomp() {
@@ -65,49 +57,38 @@
 package_nxproxy() {
 
   pkgdesc="NX proxy"
-  depends=('libxcomp')
+  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
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
   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
-  cp -a ${srcdir}/fakeinstall/usr/lib/libXcompext.so* ${pkgdir}/usr/lib
-}
-
 package_nx-x11() {
  
   pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp' 'fontconfig' 'xorg-xkbcomp')
-  optdepends=('libxext: for Xinerama support')
+  depends=('libxcomp')

-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin},usr/share/man/man1}
+  install -dm755 ${pkgdir}/usr/{lib/nx/X11,share/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
   cp -aR ${srcdir}/fakeinstall/usr/lib/libNX* ${pkgdir}/usr/lib
   
-  # nxauth
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  cp -a

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

2018-02-19 Thread Andreas Radke via arch-commits

Date: Monday, February 19, 2018 @ 19:39:59
  Author: andyrtr
Revision: 317287

upgpkg: nx 3.5.0.33-2

drop x2go-agent subpackage that is now included in x2goserver

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2018-02-19 19:39:09 UTC (rev 317286)
+++ PKGBUILD2018-02-19 19:39:59 UTC (rev 317287)
@@ -2,9 +2,9 @@
 # Maintainer: Andreas Radke 
 
 pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.33
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://wiki.x2go.org/;
 license=('GPL')
@@ -137,30 +137,6 @@
   ln -sv /usr/lib/libNX_Xinerama.so.1 libNX_Xinerama.so.1
 }
 
-package_x2go-agent() {
-  
-  pkgdesc="Wrapper arround nxagent to use with x2goserver"
-  backup=(etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options})
-  depends=('nxagent')
-  provides=('x2goagent')
-  replaces=('x2goagent')
-   
-  install -dm755 
${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions,man/man1}}
-  # 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/man/man1/x2goagent.1 
${pkgdir}/usr/share/man/man1
-
-  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
-  
-  install -dm755 ${pkgdir}/etc/x2go
-  cp -a 
${srcdir}/fakeinstall/etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options}
 ${pkgdir}/etc/x2go
-}
-
 package_nx-headers() {
 
   pkgdesc="NX headers"

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

2017-11-08 Thread Andreas Radke

Date: Wednesday, November 8, 2017 @ 18:59:06
  Author: andyrtr
Revision: 309054

upgpkg: nx 3.5.0.33-1

upstream update 3.5.0.33; apply file location changed from upstream spec file

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   29 +
 1 file changed, 17 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-11-08 18:18:23 UTC (rev 309053)
+++ PKGBUILD2017-11-08 18:59:06 UTC (rev 309054)
@@ -3,9 +3,9 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.32
-pkgrel=4
-arch=('i686' 'x86_64')
+pkgver=3.5.0.33
+pkgrel=1
+arch=('x86_64')
 url="http://wiki.x2go.org/;
 license=('GPL')
 #options=('!makeflags') # '!strip')
@@ -15,8 +15,8 @@
  'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' 
'xorg-xkbcomp' # makedepends
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
-sha256sums=('be166390ed7c08b96bd62f1e93910d720d105c679481bc389e833003da2a226d'
-  'SKIP')
+sha256sums=('378665a8098398d6fb642559cc59d23902d3b212aa05de4973a13ac9b325a06a'
+'SKIP')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

 build() {
@@ -99,10 +99,8 @@
 
   # 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
+
+  rm -rf ${pkgdir}/usr/lib/nx/X11
 }
 
 package_nxagent() {
@@ -109,7 +107,7 @@
   
   pkgdesc="NX X server based on Xnest"
   backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb})
-  depends=('nx-xcompext' 'libxml2' 'xkeyboard-config')
+  depends=('nx-xcompext' 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp')

   install -dm755 
${pkgdir}/usr/{bin,lib/nx/bin,share/nx,share/man/man1,share/pixmaps}
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
@@ -130,12 +128,19 @@
   
   install -dm755 ${pkgdir}/etc/nxagent
   cp -a 
${srcdir}/fakeinstall/etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb} 
${pkgdir}/etc/nxagent
+
+  # add symlinks required for proper Xinerama support # FS#41037
+  install -dm755 ${pkgdir}/usr/lib/nx/X11/Xinerama
+  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
+  ln -sv /usr/lib/libNX_Xinerama.so.1 libNX_Xinerama.so.1
 }
 
 package_x2go-agent() {
   
   pkgdesc="Wrapper arround nxagent to use with x2goserver"
-  backup=(etc/x2go/{keystrokes.cfg,x2goagent.keyboard,rgb})
+  backup=(etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options})
   depends=('nxagent')
   provides=('x2goagent')
   replaces=('x2goagent')
@@ -153,7 +158,7 @@
   cp -a ${srcdir}/fakeinstall/usr/share/x2go/versions/VERSION.x2goagent 
${pkgdir}/usr/share/x2go/versions
   
   install -dm755 ${pkgdir}/etc/x2go
-  cp -a ${srcdir}/fakeinstall/etc/x2go/{keystrokes.cfg,x2goagent.keyboard,rgb} 
${pkgdir}/etc/x2go
+  cp -a 
${srcdir}/fakeinstall/etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options}
 ${pkgdir}/etc/x2go
 }
 
 package_nx-headers() {

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

2017-03-19 Thread Andreas Radke

Date: Sunday, March 19, 2017 @ 16:14:45
  Author: andyrtr
Revision: 291092

upgpkg: nx 3.5.0.32-4

add missing dep on xorg-xkbcomp; FS#53345

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-03-19 13:59:02 UTC (rev 291091)
+++ PKGBUILD2017-03-19 16:14:45 UTC (rev 291092)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.32
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/;
 license=('GPL')
@@ -12,7 +12,7 @@
 # http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=nx-libs.spec
 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
+ 'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' 
'xorg-xkbcomp' # makedepends
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
 sha256sums=('be166390ed7c08b96bd62f1e93910d720d105c679481bc389e833003da2a226d'
@@ -86,7 +86,7 @@
 package_nx-x11() {
  
   pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp' 'fontconfig')
+  depends=('libxcomp' 'fontconfig' 'xorg-xkbcomp')
   optdepends=('libxext: for Xinerama support')

   install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin},usr/share/man/man1}

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

2017-03-19 Thread Andreas Radke

Date: Sunday, March 19, 2017 @ 09:28:12
  Author: andyrtr
Revision: 291079

upgpkg: nx 3.5.0.32-3

add nxagent missing dep on xkeyboard-config; FS#53345

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2017-03-19 09:00:05 UTC (rev 291078)
+++ PKGBUILD2017-03-19 09:28:12 UTC (rev 291079)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.32
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/;
 license=('GPL')
@@ -109,7 +109,7 @@
   
   pkgdesc="NX X server based on Xnest"
   backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb})
-  depends=('nx-xcompext' 'libxml2')
+  depends=('nx-xcompext' 'libxml2' 'xkeyboard-config')

   install -dm755 
${pkgdir}/usr/{bin,lib/nx/bin,share/nx,share/man/man1,share/pixmaps}
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin

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

2016-03-06 Thread Andreas Radke

Date: Sunday, March 6, 2016 @ 15:28:02
  Author: andyrtr
Revision: 261113

add link comment to upstream spec file

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-06 14:25:38 UTC (rev 261112)
+++ PKGBUILD2016-03-06 14:28:02 UTC (rev 261113)
@@ -9,6 +9,7 @@
 url="http://wiki.x2go.org/;
 license=('GPL')
 #options=('!makeflags') # '!strip')
+# http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=nx-libs.spec
 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

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

2015-12-06 Thread Bartłomiej Piotrowski

Date: Sunday, December 6, 2015 @ 23:52:20
  Author: bpiotrowski
Revision: 253062

C++11 ABI rebuild

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 22:49:56 UTC (rev 253061)
+++ PKGBUILD2015-12-06 22:52:20 UTC (rev 253062)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.32
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/;
 license=('GPL')

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

2015-07-04 Thread Andreas Radke

Date: Saturday, July 4, 2015 @ 10:51:31
  Author: andyrtr
Revision: 241793

upgpkg: nx 3.5.0.32-1

upstream update 3.5.0.32

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2015-07-04 07:19:23 UTC (rev 241792)
+++ PKGBUILD2015-07-04 08:51:31 UTC (rev 241793)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.30
+pkgver=3.5.0.32
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,7 +14,7 @@
  'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # 
makedepends
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
-sha256sums=('60bf86a41f6e7a04a17d5fb471f77a37045c11e06e5e0786b3dc959bb6a3fc5a'
+sha256sums=('be166390ed7c08b96bd62f1e93910d720d105c679481bc389e833003da2a226d'
   'SKIP')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator git-ad...@x2go.org
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 
mike.gabr...@das-netzwerkteam.de

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

2015-03-14 Thread Andreas Radke

Date: Saturday, March 14, 2015 @ 19:23:15
  Author: andyrtr
Revision: 233811

upgpkg: nx 3.5.0.30-1

upstream update 3.5.0.30

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   32 +++-
 1 file changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-14 17:55:21 UTC (rev 233810)
+++ PKGBUILD2015-03-14 18:23:15 UTC (rev 233811)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.29
+pkgver=3.5.0.30
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,10 +14,10 @@
  'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # 
makedepends
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
-sha256sums=('56e1aff8d6453272adae594b5c05c0209ca8ff72c4d0f9582ab1ee3d187836f9'
+sha256sums=('60bf86a41f6e7a04a17d5fb471f77a37045c11e06e5e0786b3dc959bb6a3fc5a'
   'SKIP')
-validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git 
Administrator git-ad...@x2go.org
-
+validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git 
Administrator git-ad...@x2go.org
+  '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 
mike.gabr...@das-netzwerkteam.de
 build() {
   cd ${srcdir}/nx-libs-$pkgver
   
@@ -88,12 +88,14 @@
   depends=('libxcomp' 'fontconfig')
   optdepends=('libxext: for Xinerama support')

-  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
+  install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin},usr/share/man/man1}
   cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
   cp -aR ${srcdir}/fakeinstall/usr/lib/libNX* ${pkgdir}/usr/lib
   
   # nxauth
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxauth.1 
${pkgdir}/usr/share/man/man1
+
   # the wrapper
   cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
   # add symlinks required for proper Xinerama support # FS#41037
@@ -105,16 +107,19 @@
 package_nxagent() {
   
   pkgdesc=NX X server based on Xnest
-  backup=('etc/nxagent/keystrokes.cfg')
+  backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb})
   depends=('nx-xcompext' 'libxml2')

-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
+  install -dm755 
${pkgdir}/usr/{bin,lib/nx/bin,share/nx,share/man/man1,share/pixmaps}
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxagent.1 
${pkgdir}/usr/share/man/man1
+  cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/nxagent.xpm 
${pkgdir}/usr/share/pixmaps
+
   # 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/share/nx/{rgb,SecurityPolicy} 
${pkgdir}/usr/share/nx
   
   cp -a ${srcdir}/fakeinstall/usr/lib/libXcompshad.so* ${pkgdir}/usr/lib
   
@@ -123,30 +128,31 @@
   touch ${pkgdir}/usr/lib/X11/xkb/keymap.dir
   
   install -dm755 ${pkgdir}/etc/nxagent
-  cp -a ${srcdir}/fakeinstall/etc/nxagent/keystrokes.cfg ${pkgdir}/etc/nxagent
+  cp -a 
${srcdir}/fakeinstall/etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb} 
${pkgdir}/etc/nxagent
 }
 
 package_x2go-agent() {
   
   pkgdesc=Wrapper arround nxagent to use with x2goserver
-  backup=('etc/x2go/keystrokes.cfg')
+  backup=(etc/x2go/{keystrokes.cfg,x2goagent.keyboard,rgb})
   depends=('nxagent')
   provides=('x2goagent')
   replaces=('x2goagent')

-  install -dm755 ${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions}}
+  install -dm755 
${pkgdir}/usr/{bin,lib/x2go/bin,share/{pixmaps,x2go/versions,man/man1}}
   # 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/man/man1/x2goagent.1 
${pkgdir}/usr/share/man/man1
+
   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
   
   install -dm755 ${pkgdir}/etc/x2go
-  cp -a ${srcdir}/fakeinstall/etc/x2go/keystrokes.cfg ${pkgdir}/etc/x2go
+  cp -a ${srcdir}/fakeinstall/etc/x2go/{keystrokes.cfg,x2goagent.keyboard,rgb} 
${pkgdir}/etc/x2go
 }
 
 package_nx-headers() {

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

2015-03-13 Thread Andreas Radke

Date: Friday, March 13, 2015 @ 23:00:19
  Author: andyrtr
Revision: 233602

upgpkg: nx 3.5.0.29-1

upstream update 3.5.0.29

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 16 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-13 21:13:59 UTC (rev 233601)
+++ PKGBUILD2015-03-13 22:00:19 UTC (rev 233602)
@@ -3,8 +3,8 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.28
-pkgrel=3
+pkgver=3.5.0.29
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -13,8 +13,10 @@
  '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')
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
+sha256sums=('56e1aff8d6453272adae594b5c05c0209ca8ff72c4d0f9582ab1ee3d187836f9'
+  'SKIP')
+validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git 
Administrator git-ad...@x2go.org
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver
@@ -37,6 +39,9 @@
 
   # fix a broken Makefiles
   sed -i s:-o root -g root :: nxcompshad/Makefile.in
+  
+  # let makepkg zip the man files
+  sed -i s:gzip:#gzip:g Makefile
 
   make \
 PREFIX=/usr \
@@ -52,11 +57,8 @@
   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}} .
+  install -dm755 ${pkgdir}/usr/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/libXcomp.so* ${pkgdir}/usr/lib
 }
 
 package_nxproxy() {
@@ -76,14 +78,8 @@
   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} .
+  install -dm755 ${pkgdir}/usr/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/libXcompext.so* ${pkgdir}/usr/lib
 }
 
 package_nx-x11() {
@@ -94,6 +90,8 @@

   install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
   cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
+  cp -aR ${srcdir}/fakeinstall/usr/lib/libNX* ${pkgdir}/usr/lib
+  
   # nxauth
   cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
   # the wrapper
@@ -118,10 +116,7 @@
   # 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
+  cp -a ${srcdir}/fakeinstall/usr/lib/libXcompshad.so* ${pkgdir}/usr/lib
   
   # Needed for nxagent to find the keymap directory
   install -dm755 ${pkgdir}/usr/lib/X11/xkb

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

2015-03-11 Thread Andreas Radke

Date: Wednesday, March 11, 2015 @ 22:25:27
  Author: andyrtr
Revision: 233368

upgpkg: nx 3.5.0.28-3

add some missing files

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-11 19:26:52 UTC (rev 233367)
+++ PKGBUILD2015-03-11 21:25:27 UTC (rev 233368)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.28
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -107,6 +107,7 @@
 package_nxagent() {
   
   pkgdesc=NX X server based on Xnest
+  backup=('etc/nxagent/keystrokes.cfg')
   depends=('nx-xcompext' 'libxml2')

   install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx}
@@ -121,11 +122,19 @@
   # symlinks
   cd ${pkgdir}/usr/lib/
   ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . # files should move to 
nx-compext pkg
+  
+  # Needed for nxagent to find the keymap directory
+  install -dm755 ${pkgdir}/usr/lib/X11/xkb
+  touch ${pkgdir}/usr/lib/X11/xkb/keymap.dir
+  
+  install -dm755 ${pkgdir}/etc/nxagent
+  cp -a ${srcdir}/fakeinstall/etc/nxagent/keystrokes.cfg ${pkgdir}/etc/nxagent
 }
 
 package_x2go-agent() {
   
   pkgdesc=Wrapper arround nxagent to use with x2goserver
+  backup=('etc/x2go/keystrokes.cfg')
   depends=('nxagent')
   provides=('x2goagent')
   replaces=('x2goagent')
@@ -140,6 +149,9 @@
   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
+  
+  install -dm755 ${pkgdir}/etc/x2go
+  cp -a ${srcdir}/fakeinstall/etc/x2go/keystrokes.cfg ${pkgdir}/etc/x2go
 }
 
 package_nx-headers() {

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

2014-11-25 Thread Andreas Radke

Date: Tuesday, November 25, 2014 @ 19:34:09
  Author: andyrtr
Revision: 227094

upgpkg: nx 3.5.0.28-2

fix broken symlink; FS#42899

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-11-25 16:53:00 UTC (rev 227093)
+++ PKGBUILD2014-11-25 18:34:09 UTC (rev 227094)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.28
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -56,7 +56,7 @@
   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} .
+  ln -sv /usr/lib/nx/libXcomp.so{,.3,.${pkgver}} .
 }
 
 package_nxproxy() {

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

2014-11-14 Thread Andreas Radke

Date: Friday, November 14, 2014 @ 17:55:17
  Author: andyrtr
Revision: 226247

upgpkg: nx 3.5.0.28-1

upstream update 3.5.0.28

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-11-14 16:08:09 UTC (rev 226246)
+++ PKGBUILD2014-11-14 16:55:17 UTC (rev 226247)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.27
+pkgver=3.5.0.28
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,7 +14,7 @@
  'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # 
makedepends
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-sha1sums=('1f78ef671706a8a7e1aa1bd660f83c42426b3043')
+sha1sums=('b5a97ae10770ca0f496e4398eab984c0bcff3500')
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver

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

2014-06-30 Thread Andreas Radke

Date: Monday, June 30, 2014 @ 19:46:43
  Author: andyrtr
Revision: 215853

upgpkg: nx 3.5.0.27-1

upstream update 3.5.0.27; fix FS#41037

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-06-30 17:16:29 UTC (rev 215852)
+++ PKGBUILD2014-06-30 17:46:43 UTC (rev 215853)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.24
+pkgver=3.5.0.27
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,7 +14,7 @@
  'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # 
makedepends
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
-sha1sums=('bd1cdbefe81c9a05dcc2f738639bf4af8f056588')
+sha1sums=('1f78ef671706a8a7e1aa1bd660f83c42426b3043')
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver
@@ -90,6 +90,7 @@
  
   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
@@ -97,6 +98,10 @@
   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() {

[arch-commits] Commit in nx/trunk (PKGBUILD keyboard_rule.diff)

2014-05-07 Thread Andreas Radke

Date: Wednesday, May 7, 2014 @ 20:07:41
  Author: andyrtr
Revision: 212116

upgpkg: nx 3.5.0.24-1

upstream update 3.5.0.24; drop unneeded patch

Modified:
  nx/trunk/PKGBUILD
Deleted:
  nx/trunk/keyboard_rule.diff

+
 PKGBUILD   |   14 +++---
 keyboard_rule.diff |   11 ---
 2 files changed, 3 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-05-07 17:52:16 UTC (rev 212115)
+++ PKGBUILD2014-05-07 18:07:41 UTC (rev 212116)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.22
+pkgver=3.5.0.24
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -13,20 +13,12 @@
  '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
-keyboard_rule.diff)
-md5sums=('739c7a28f3bb6d5f957e6cec9168335d'
- 'f681bc66827cd7ddff4b81b983c20401')
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz)
+sha1sums=('bd1cdbefe81c9a05dcc2f738639bf4af8f056588')
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver
   
-  # fix keyboard layout with xkeyboard-config = 2.6 - doesn't solve proper 
layout detection
-  # upstream needs to do much more work in that area
-  patch -Np1 -i ${srcdir}/keyboard_rule.diff
-  
-  sed -i s/3.5.0.21/3.5.0.22/ VERSION.x2goagent
-  
   # debug flags
 #  export CFLAGS=-march=x86-64 -O1 -g -pipe
 #  export CXXFLAGS=-march=x86-64 -O1 -g -pipe

Deleted: keyboard_rule.diff
===
--- keyboard_rule.diff  2014-05-07 17:52:16 UTC (rev 212115)
+++ keyboard_rule.diff  2014-05-07 18:07:41 UTC (rev 212116)
@@ -1,11 +0,0 @@
 nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 
2013-01-04 13:25:49.0 +0100
-+++ nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.new 
2013-03-15 18:24:54.084216888 +0100
-@@ -140,7 +140,7 @@
- #define XKB_CONFIG_FILE  /etc/nxagent/nxagent.keyboard
- #endif
- #ifndef XKB_DFLT_RULES_FILE
--#define XKB_DFLT_RULES_FILE  xfree86
-+#define XKB_DFLT_RULES_FILE  base
- #endif
- #ifndef XKB_ALTS_RULES_FILE
- #define XKB_ALTS_RULES_FILE  xorg

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

2014-01-05 Thread Andreas Radke

Date: Sunday, January 5, 2014 @ 19:27:42
  Author: andyrtr
Revision: 203211

upgpkg: nx 3.5.0.22-1

upstream update 3.5.0.22

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2014-01-05 17:05:39 UTC (rev 203210)
+++ PKGBUILD2014-01-05 18:27:42 UTC (rev 203211)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.21
+pkgver=3.5.0.22
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -15,7 +15,7 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
 keyboard_rule.diff)
-md5sums=('7143c216cb6eda0408ee8169c50adbe3'
+md5sums=('739c7a28f3bb6d5f957e6cec9168335d'
  'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
@@ -25,6 +25,8 @@
   # upstream needs to do much more work in that area
   patch -Np1 -i ${srcdir}/keyboard_rule.diff
   
+  sed -i s/3.5.0.21/3.5.0.22/ VERSION.x2goagent
+  
   # debug flags
 #  export CFLAGS=-march=x86-64 -O1 -g -pipe
 #  export CXXFLAGS=-march=x86-64 -O1 -g -pipe

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

2013-09-01 Thread Andreas Radke

Date: Sunday, September 1, 2013 @ 17:26:12
  Author: andyrtr
Revision: 193802

upgpkg: nx 3.5.0.21-1

upstream update 3.5.0.21

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-01 14:13:21 UTC (rev 193801)
+++ PKGBUILD2013-09-01 15:26:12 UTC (rev 193802)
@@ -3,18 +3,19 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.20
-pkgrel=2
+pkgver=3.5.0.21
+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
+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
 keyboard_rule.diff)
-md5sums=('9dd4b22579cf048c14c9c75302553f18'
+md5sums=('7143c216cb6eda0408ee8169c50adbe3'
  'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
@@ -94,7 +95,7 @@
 package_nx-x11() {
  
   pkgdesc=NX-X11 lib for the NX framework
-  depends=('libxcomp')
+  depends=('libxcomp' 'fontconfig')

   install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}}
   cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11

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

2013-04-29 Thread Evangelos Foutras

Date: Monday, April 29, 2013 @ 12:55:24
  Author: foutrelis
Revision: 183884

upgpkg: nx 3.5.0.20-2

libpng 1.6 rebuild.

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-04-29 10:47:10 UTC (rev 183883)
+++ PKGBUILD2013-04-29 10:55:24 UTC (rev 183884)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.20
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')

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

2013-03-29 Thread Andreas Radke

Date: Friday, March 29, 2013 @ 11:06:10
  Author: andyrtr
Revision: 180977

upgpkg: nx 3.5.0.20-1

upstream update 3.5.0.20

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-03-29 02:55:03 UTC (rev 180976)
+++ PKGBUILD2013-03-29 10:06:10 UTC (rev 180977)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.19
+pkgver=3.5.0.20
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,7 +14,7 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
 keyboard_rule.diff)
-md5sums=('6343c8bfee72e9b0bc2686c7785d1b0f'
+md5sums=('9dd4b22579cf048c14c9c75302553f18'
  'f681bc66827cd7ddff4b81b983c20401')
 
 build() {

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

2013-03-28 Thread Andreas Radke

Date: Thursday, March 28, 2013 @ 19:39:52
  Author: andyrtr
Revision: 180938

upgpkg: nx 3.5.0.19-1

upstream update 3.5.0.19

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-03-28 18:10:47 UTC (rev 180937)
+++ PKGBUILD2013-03-28 18:39:52 UTC (rev 180938)
@@ -3,8 +3,8 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.18
-pkgrel=2
+pkgver=3.5.0.19
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -14,7 +14,7 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
 keyboard_rule.diff)
-md5sums=('cb321b520c3e157619e4ed5315c9e44c'
+md5sums=('6343c8bfee72e9b0bc2686c7785d1b0f'
  'f681bc66827cd7ddff4b81b983c20401')
 
 build() {

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

2013-03-24 Thread Andreas Radke

Date: Sunday, March 24, 2013 @ 11:35:18
  Author: andyrtr
Revision: 180596

upgpkg: nx 3.5.0.18-2

fix broken x2goagent symlink

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-03-24 09:37:30 UTC (rev 180595)
+++ PKGBUILD2013-03-24 10:35:18 UTC (rev 180596)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.18
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -132,7 +132,8 @@

   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
+  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

[arch-commits] Commit in nx/trunk (PKGBUILD nx-cflags.patch)

2013-03-23 Thread Andreas Radke

Date: Saturday, March 23, 2013 @ 16:41:36
  Author: andyrtr
Revision: 180571

upgpkg: nx 3.5.0.18-1

upstream update 3.5.0.18

Modified:
  nx/trunk/PKGBUILD
Deleted:
  nx/trunk/nx-cflags.patch

-+
 PKGBUILD|9 +
 nx-cflags.patch |   54 --
 2 files changed, 5 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-23 15:27:06 UTC (rev 180570)
+++ PKGBUILD2013-03-23 15:41:36 UTC (rev 180571)
@@ -3,8 +3,8 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
-pkgver=3.5.0.17
-pkgrel=4
+pkgver=3.5.0.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -14,13 +14,14 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
 keyboard_rule.diff)
-md5sums=('aac9a999d4b38dedd476409e5fc2c4aa'
+md5sums=('cb321b520c3e157619e4ed5315c9e44c'
  'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver
   
-  # fix keyboard layout with xkeyboard-config = 2.6
+  # fix keyboard layout with xkeyboard-config = 2.6 - doesn't solve proper 
layout detection
+  # upstream needs to do much more work in that area
   patch -Np1 -i ${srcdir}/keyboard_rule.diff
   
   # debug flags

Deleted: nx-cflags.patch
===
--- nx-cflags.patch 2013-03-23 15:27:06 UTC (rev 180570)
+++ nx-cflags.patch 2013-03-23 15:41:36 UTC (rev 180571)
@@ -1,54 +0,0 @@
 nxcomp/configure.in.orig   2008-12-18 15:48:09.0 +0100
-+++ nxcomp/configure.in2008-12-18 15:54:14.0 +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.orig2008-12-18 15:55:29.0 +0100
-+++ nxcompext/configure.in 2008-12-18 15:55:51.0 +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.0 +0100
-+++ nxcompshad/configure.in2008-12-18 15:56:22.0 +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.0 +0100
-+++ nxproxy/configure.in   2008-12-18 15:57:55.0 +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

[arch-commits] Commit in nx/trunk (PKGBUILD keyboard_rule.diff)

2013-03-15 Thread Andreas Radke

Date: Friday, March 15, 2013 @ 20:12:01
  Author: andyrtr
Revision: 180063

prepare keyboard layout detection, not yet working properly

Added:
  nx/trunk/keyboard_rule.diff
Modified:
  nx/trunk/PKGBUILD

+
 PKGBUILD   |   11 ---
 keyboard_rule.diff |   11 +++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-15 16:00:55 UTC (rev 180062)
+++ PKGBUILD2013-03-15 19:12:01 UTC (rev 180063)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.17
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -12,12 +12,17 @@
 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')
+source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
+keyboard_rule.diff)
+md5sums=('aac9a999d4b38dedd476409e5fc2c4aa'
+ 'f681bc66827cd7ddff4b81b983c20401')
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver
   
+  # fix keyboard layout with xkeyboard-config = 2.6
+  patch -Np1 -i ${srcdir}/keyboard_rule.diff
+  
   # debug flags
 #  export CFLAGS=-march=x86-64 -O1 -g -pipe
 #  export CXXFLAGS=-march=x86-64 -O1 -g -pipe

Added: keyboard_rule.diff
===
--- keyboard_rule.diff  (rev 0)
+++ keyboard_rule.diff  2013-03-15 19:12:01 UTC (rev 180063)
@@ -0,0 +1,11 @@
+--- nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 
2013-01-04 13:25:49.0 +0100
 nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c.new 
2013-03-15 18:24:54.084216888 +0100
+@@ -140,7 +140,7 @@
+ #define XKB_CONFIG_FILE  /etc/nxagent/nxagent.keyboard
+ #endif
+ #ifndef XKB_DFLT_RULES_FILE
+-#define XKB_DFLT_RULES_FILE  xfree86
++#define XKB_DFLT_RULES_FILE  base
+ #endif
+ #ifndef XKB_ALTS_RULES_FILE
+ #define XKB_ALTS_RULES_FILE  xorg

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

2013-01-13 Thread andyrtr

Date: Sunday, January 13, 2013 @ 04:32:53
  Author: andyrtr
Revision: 175080

upgpkg: nx 3.5.0.17-3

add provides/replaces for AUR x2goagent

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-12 21:38:54 UTC (rev 175079)
+++ PKGBUILD2013-01-13 09:32:53 UTC (rev 175080)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.17
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -121,6 +121,8 @@
   
   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

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

2013-01-07 Thread andyrtr

Date: Monday, January 7, 2013 @ 13:55:51
  Author: andyrtr
Revision: 174823

make compile/install more simple, no need for sed here

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2013-01-07 18:49:23 UTC (rev 174822)
+++ PKGBUILD2013-01-07 18:55:51 UTC (rev 174823)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 
'nx-headers')
 pkgver=3.5.0.17
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -34,14 +34,16 @@
   echo #define SharedLibraryLoadFlags -shared ${LDFLAGS}  ${HOSTCONF}
   popd
 
-  # fix two broken Makefiles
-  sed -i s:/usr/local:/usr: Makefile
+  # fix a broken Makefiles
   sed -i s:-o root -g root :: nxcompshad/Makefile.in
 
-  make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include
+  make \
+PREFIX=/usr \
+CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include
+
   # fake install
   mkdir $srcdir/fakeinstall
-  make DESTDIR=$srcdir/fakeinstall install
+  make PREFIX=/usr DESTDIR=$srcdir/fakeinstall install
 }
 
 package_libxcomp() {

[arch-commits] Commit in nx/trunk (PKGBUILD nx-x11.ld.so.conf.d)

2013-01-06 Thread andyrtr

Date: Sunday, January 6, 2013 @ 11:27:31
  Author: andyrtr
Revision: 174753

upgpkg: nx 3.5.0.17-1

upstream update 3.5.0.17; drop cflags patch that went upstream; follow upstream 
file locations closely; add x2go-agent pkg; 

Modified:
  nx/trunk/PKGBUILD
Deleted:
  nx/trunk/nx-x11.ld.so.conf.d

-+
 PKGBUILD|  119 +++---
 nx-x11.ld.so.conf.d |1 
 2 files changed, 57 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-06 10:43:03 UTC (rev 174752)
+++ PKGBUILD2013-01-06 16:27:31 UTC (rev 174753)
@@ -2,22 +2,18 @@
 # Maintainer: Andreas Radke andy...@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 @@
 #  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 @@
   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 @@
   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 @@
   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 .
-  
+  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}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
 }
 
 package_nx-xcompext() {
@@ -87,12 +74,13 @@
   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,42 +88,49 @@
   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

[arch-commits] Commit in nx/trunk (PKGBUILD nx-cflags.patch)

2012-10-08 Thread andyrtr

Date: Monday, October 8, 2012 @ 14:51:45
  Author: andyrtr
Revision: 168321

upgpkg: nx 3.5.0.15-2

honor our CFLAGS/LDFLAGS; this will allow also debug builds

Added:
  nx/trunk/nx-cflags.patch
Modified:
  nx/trunk/PKGBUILD

-+
 PKGBUILD|   37 +
 nx-cflags.patch |   54 ++
 2 files changed, 87 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-08 17:04:46 UTC (rev 168320)
+++ PKGBUILD2012-10-08 18:51:45 UTC (rev 168321)
@@ -4,21 +4,50 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.15
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
-options=('!makeflags')
+options=('!makeflags') # '!strip')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # 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-x11.ld.so.conf.d
+nx-cflags.patch)
 md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
- 'f2ec60c7e2d81bef2f7292d2b33681a6')
+ 'f2ec60c7e2d81bef2f7292d2b33681a6'
+ 'd0c5b88aac0473e19699cf62d84b9d5f')
 
 build() {
   cd ${srcdir}/nx-libs-$pkgver
+  
+  # debug flags
+#  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
+  
+  # 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
+
   make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include
   # fake install
   mkdir $srcdir/fakeinstall

Added: nx-cflags.patch
===
--- nx-cflags.patch (rev 0)
+++ nx-cflags.patch 2012-10-08 18:51:45 UTC (rev 168321)
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig   2008-12-18 15:48:09.0 +0100
 nxcomp/configure.in2008-12-18 15:54:14.0 +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.orig2008-12-18 15:55:29.0 +0100
 nxcompext/configure.in 2008-12-18 15:55:51.0 +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.0 +0100
 nxcompshad/configure.in2008-12-18 15:56:22.0 +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.0 +0100
 nxproxy/configure.in   2008-12-18 15:57:55.0 +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

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

2012-09-21 Thread andyrtr

Date: Friday, September 21, 2012 @ 13:32:54
  Author: andyrtr
Revision: 166909

upgpkg: nx 3.5.0.15-1

upstream update 3.5.0.15

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-09-21 15:33:26 UTC (rev 166908)
+++ PKGBUILD2012-09-21 17:32:54 UTC (rev 166909)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.14
+pkgver=3.5.0.15
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,11 +14,11 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
 nx-x11.ld.so.conf.d)
-md5sums=('f20f5a12e15849bae8a1f2d7b44830ab'
+md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
  'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {
-  cd ${srcdir}/nx-libs_$pkgver
+  cd ${srcdir}/nx-libs-$pkgver
   make CONFIGURE=./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include
   # fake install
   mkdir $srcdir/fakeinstall
@@ -47,7 +47,7 @@
   ln -sv /usr/lib/nx/bin/nxproxy .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxproxy
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
 }
@@ -79,7 +79,7 @@
   ln -sv /usr/lib/nx/bin/nxauth .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  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
@@ -96,10 +96,10 @@
   ln -sv /usr/lib/nx/bin/nxagent .
   
   # the wrapper
-  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  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
+  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

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

2012-06-28 Thread andyrtr

Date: Thursday, June 28, 2012 @ 13:12:15
  Author: andyrtr
Revision: 162702

upgpkg: nx 3.5.0.14-1

upstream update 3.5.0.14

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-06-28 14:45:43 UTC (rev 162701)
+++ PKGBUILD2012-06-28 17:12:15 UTC (rev 162702)
@@ -3,7 +3,7 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.13
+pkgver=3.5.0.14
 pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
@@ -14,7 +14,7 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
 nx-x11.ld.so.conf.d)
-md5sums=('2c80e570d35a25989f8606e1f3620026'
+md5sums=('f20f5a12e15849bae8a1f2d7b44830ab'
  'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {

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

2012-05-12 Thread andyrtr

Date: Saturday, May 12, 2012 @ 08:27:20
  Author: andyrtr
Revision: 158845

upgpkg: nx 3.5.0.13-1

upstream update 3.5.0.13

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-05-12 11:47:35 UTC (rev 158844)
+++ PKGBUILD2012-05-12 12:27:20 UTC (rev 158845)
@@ -3,8 +3,8 @@
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.12
-pkgrel=2
+pkgver=3.5.0.13
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -14,7 +14,7 @@
  )
 
source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz
 nx-x11.ld.so.conf.d)
-md5sums=('a2011e034a318016cf2260c30a567301'
+md5sums=('2c80e570d35a25989f8606e1f3620026'
  'f2ec60c7e2d81bef2f7292d2b33681a6')
 
 build() {

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

2012-04-22 Thread andyrtr

Date: Sunday, April 22, 2012 @ 13:09:43
  Author: andyrtr
Revision: 156664

upgpkg: nx 3.5.0.12-2

fix some file locations and add a few more symlinks; FS#29555

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-22 16:04:02 UTC (rev 156663)
+++ PKGBUILD2012-04-22 17:09:43 UTC (rev 156664)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -41,8 +41,11 @@
   pkgdesc=NX proxy
   depends=('libxcomp')
   
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx
+  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
@@ -55,7 +58,6 @@
   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/libXcompext.so.3.5.0 
${pkgdir}/usr/lib/nx
   cd ${pkgdir}/usr/lib/nx
   ln -sv libXcompext.so.3.5.0 libXcompext.so.3
@@ -69,10 +71,13 @@
   pkgdesc=NX-X11 lib for the NX framework
   depends=('libxcomp')

-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
+  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
+  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 .
+  
   # the wrapper
   cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxauth
@@ -85,8 +90,11 @@
   pkgdesc=NX X server based on Xnest
   depends=('nx-xcompext')

-  install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+  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 .
+  
   # the wrapper
   cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxagent

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

2012-04-21 Thread andyrtr

Date: Saturday, April 21, 2012 @ 17:06:35
  Author: andyrtr
Revision: 156611

add missing libXcompshad libs; install libs to a 2nd place just for testing now

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-04-21 17:49:44 UTC (rev 156610)
+++ PKGBUILD2012-04-21 21:06:35 UTC (rev 156611)
@@ -4,11 +4,11 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.4
+pkgrel=0.5
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
-options=('!makeflags')
+#options=('!makeflags')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
  'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
  )
@@ -69,8 +69,11 @@
   pkgdesc=NX-X11 lib for the NX framework
   depends=('libxcomp')

-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
+#  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/lib}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx/lib
+
   cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
   # the wrapper
   cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
@@ -89,6 +92,13 @@
   # 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
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
 }
 
 package_nx-headers() {

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

2012-04-21 Thread andyrtr

Date: Saturday, April 21, 2012 @ 18:49:18
  Author: andyrtr
Revision: 156614

upgpkg: nx 3.5.0.12-1

libs are only needed in one directory

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-04-21 21:53:51 UTC (rev 156613)
+++ PKGBUILD2012-04-21 22:49:18 UTC (rev 156614)
@@ -4,11 +4,11 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.5
+pkgrel=1
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
-#options=('!makeflags')
+options=('!makeflags')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
  'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
  )
@@ -69,10 +69,8 @@
   pkgdesc=NX-X11 lib for the NX framework
   depends=('libxcomp')

-#  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/lib}
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx/lib
 
   cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
   # the wrapper

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

2012-04-16 Thread andyrtr

Date: Monday, April 16, 2012 @ 14:52:06
  Author: andyrtr
Revision: 156296

upgpkg: nx 3.5.0.12-0.4

add /usr/bin wrapppers; add more symlinks to work with nxclient

Modified:
  nx/trunk/PKGBUILD

--+
 PKGBUILD |   43 ++-
 1 file changed, 26 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-04-16 18:35:37 UTC (rev 156295)
+++ PKGBUILD2012-04-16 18:52:06 UTC (rev 156296)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.3
+pkgrel=0.4
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -30,9 +30,10 @@
   pkgdesc=NX X compression library
   depends=('libjpeg-turbo' 'libpng' 'gcc-libs')

-  cd ${srcdir}/fakeinstall
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
+  install -dm755 ${pkgdir}/usr/lib/nx/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
 }
 
 package_nxproxy() {
@@ -40,9 +41,11 @@
   pkgdesc=NX proxy
   depends=('libxcomp')
   
-  cd ${srcdir}/fakeinstall
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx}
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxproxy
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
 }
 
@@ -51,20 +54,27 @@
   pkgdesc=Xcompext/Xcompshad library for NX
   depends=('libxcomp' 'nx-x11')

-  cd ${srcdir}/fakeinstall
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
+  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/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
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
 }
 
 package_nx-x11() {
-  
+ 
   pkgdesc=NX-X11 lib for the NX framework
   depends=('libxcomp')

-  cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/bin
+  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
+  # 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
 }
@@ -74,18 +84,17 @@
   pkgdesc=NX X server based on Xnest
   depends=('nx-xcompext')

-  cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/usr/{bin,lib/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/nxagent .
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxagent
 }
 
 package_nx-headers() {
 
   pkgdesc=NX headers
   
-  cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/usr/include/nx
   cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
 }

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

2012-04-15 Thread andyrtr

Date: Sunday, April 15, 2012 @ 09:54:31
  Author: andyrtr
Revision: 156184

upgpkg: nx 3.5.0.12-0.2

add nx-headers needed to build nxssh

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 12:22:45 UTC (rev 156183)
+++ PKGBUILD2012-04-15 13:54:31 UTC (rev 156184)
@@ -2,9 +2,9 @@
 # Maintainer: Andreas Radke andy...@archlinux.org
 
 pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent')
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.1
+pkgrel=0.2
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -79,3 +79,12 @@
   cd ${pkgdir}/usr/bin
   ln -sv /usr/lib/nx/nxagent .
 }
+
+package_nx-headers() {
+
+  pkgdesc=NX headers
+  
+  cd ${srcdir}/fakeinstall
+  install -dm755 ${pkgdir}/usr/include/nx
+  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
+}

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

2012-04-15 Thread andyrtr

Date: Sunday, April 15, 2012 @ 11:10:23
  Author: andyrtr
Revision: 156193

upgpkg: nx 3.5.0.12-0.3

add nxauth to x11-libs

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-04-15 14:26:07 UTC (rev 156192)
+++ PKGBUILD2012-04-15 15:10:23 UTC (rev 156193)
@@ -4,7 +4,7 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.2
+pkgrel=0.3
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
@@ -62,8 +62,9 @@
   depends=('libxcomp')

   cd ${srcdir}/fakeinstall
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* 
${pkgdir}/usr/lib/nx
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/bin
   
   install -m 644 $srcdir/nx-x11.ld.so.conf.d 
$pkgdir/etc/ld.so.conf.d/nx.conf
 }
@@ -75,7 +76,7 @@

   cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/usr/{bin,lib/nx}
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
   cd ${pkgdir}/usr/bin
   ln -sv /usr/lib/nx/nxagent .
 }

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

2012-04-14 Thread andyrtr

Date: Saturday, April 14, 2012 @ 16:16:59
  Author: andyrtr
Revision: 156158

build is not smp safe; minor fixes

Modified:
  nx/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2012-04-14 19:39:13 UTC (rev 156157)
+++ PKGBUILD2012-04-14 20:16:59 UTC (rev 156158)
@@ -8,6 +8,7 @@
 arch=('i686' 'x86_64')
 url=http://wiki.x2go.org/;
 license=('GPL')
+options=('!makeflags')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies 
from subpackages
  'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 
'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
  )
@@ -41,14 +42,14 @@
   
   cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
-  cp -a ${srcdir}/fakeinstall/usr/nxproxy ${pkgdir}/usr/bin
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
 }
 
 package_nx-xcompext() {
   
   pkgdesc=Xcompext/Xcompshad library for NX
-  depends=('libxcomp')
+  depends=('libxcomp' 'nx-x11')

   cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/usr/lib/
@@ -58,7 +59,7 @@
 package_nx-x11() {
   
   pkgdesc=NX-X11 lib for the NX framework
-  depends=('zlib')
+  depends=('libxcomp')

   cd ${srcdir}/fakeinstall
   install -dm755 ${pkgdir}/{etc/ld.so.conf.d,/usr/lib/nx}

45 matches

Mail list logo