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

Andreas Radke andyrtr at archlinux.org
Wed Nov 8 18:59:22 UTC 2017


    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
===================================================================
--- PKGBUILD	2017-11-08 18:18:23 UTC (rev 309053)
+++ PKGBUILD	2017-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 <git-admin at x2go.org>
               '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 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() {



More information about the arch-commits mailing list