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 =================================================================== --- PKGBUILD 2013-03-15 16:00:55 UTC (rev 180062) +++ PKGBUILD 2013-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.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"