diff options
Diffstat (limited to 'extra/nx/PKGBUILD')
-rw-r--r-- | extra/nx/PKGBUILD | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 4893e36fd..b618238ab 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175081 2013-01-13 09:33:31Z andyrtr $ +# $Id: PKGBUILD 180978 2013-03-29 10:06:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') -pkgver=3.5.0.17 -pkgrel=3 +pkgver=3.5.0.20 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" license=('GPL') @@ -12,12 +12,18 @@ license=('GPL') 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=('9dd4b22579cf048c14c9c75302553f18' + 'f681bc66827cd7ddff4b81b983c20401') 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 + # debug flags # export CFLAGS="-march=x86-64 -O1 -g -pipe" # export CXXFLAGS="-march=x86-64 -O1 -g -pipe" @@ -126,7 +132,8 @@ package_x2go-agent() { 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 |