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 =================================================================== --- PKGBUILD 2014-05-07 17:52:16 UTC (rev 212115) +++ PKGBUILD 2014-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.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"