diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-08 04:01:08 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-05-08 04:01:08 +0000 |
| commit | 740a52614d0b18baf8d2177a89036a29c8cd3bd8 (patch) | |
| tree | 9aaad8a79eccd1cb350597b1cb3b34ab507ff725 /extra/nx | |
| parent | 2d7e9da010b34660baba072183cce7664dc8956c (diff) | |
Thu May 8 03:53:28 UTC 2014
Diffstat (limited to 'extra/nx')
| -rw-r--r-- | extra/nx/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/nx/keyboard_rule.diff | 11 |
2 files changed, 4 insertions, 23 deletions
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index 63ae8e01f..df23e6412 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203653 2014-01-13 17:17:43Z andyrtr $ +# $Id: PKGBUILD 212117 2014-05-07 18:08:07Z 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.22 +pkgver=3.5.0.24 pkgrel=1 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" @@ -13,20 +13,12 @@ makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # run '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" diff --git a/extra/nx/keyboard_rule.diff b/extra/nx/keyboard_rule.diff deleted file mode 100644 index dccab160b..000000000 --- a/extra/nx/keyboard_rule.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- nx-libs-3.5.0.17/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c 2013-01-04 13:25:49.000000000 +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" |