From 32e1da537afa54b22a333a950934e5a81c332ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Tue, 27 Jun 2017 11:00:19 +0200
Subject: [PATCH] 	modified:   x/X11/.X11-20170314-test.eb.swp 
 modified:   x/X11/X11-20170314-test.eb

---
 x/X11/.X11-20170314-test.eb.swp | Bin 20480 -> 16384 bytes
 x/X11/X11-20170314-test.eb      |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x/X11/.X11-20170314-test.eb.swp b/x/X11/.X11-20170314-test.eb.swp
index 26171fc664d2f2691e0cfe81b5d2cc2f87700423..7012ac10e0f02f0244544c55845e42f15390143f 100644
GIT binary patch
delta 829
zcmaLUL1@!Z7zgk#uDaQ*rlL&kWJG(Y9Zl1?vN>G4gQtOG;z6q@lBB5(YtyuexPg#*
zae5KDSm<eb^0Ij-IXb6az37C22k|Ig#36Qg5&cIy7$QFS@jYJNm+yV=)gLkSIulV+
z7pA89v1FPs!bJI@^OqjC3meX@cH|Ss^^k-0UH(Umi|+pLA?as#jQ?4rTsJb^*wc+e
z-PrKv!wX#F1;5A#LVleUe<y0;cf8}6{X_=jU>uG?06wxrEwG^mRhWjea2f{TYmjIY
zzQ6}qgC@M(OY|Jp;2EsK6Uc)AKl+F|u+m4@NyQ`r>%ByGVG_3XAOZ3)2yb^2-2)j8
z!|MRi9mv2pG`tK79Dz5ut_8?K2d(<;E;EhxsFygt)azcJ;oR0t(R~%4a<2@ts%FSa
zNfUI#vgJ}qur&LIp63POrfwI7xmiUpWxJRWWz)1oY!GvjB%Vx3W2q4-E!di6i&jyt
zX}{O8J(l33e<!==vPZq<@Oy@ddewy6<0!bhE%0Aq`<d1`q9vGxGcW)L;Q(yzBYFzA
zp$-|C02YGqIYjghTF`_C5Qi{u@Ez~D3RMX86Gtp2LGTaJVLc|0XTAFq51BypDn(r}
zJBgDT*+s_TF;2t^6~h+h3N=kTH7eNirY51yn3PN<)0n80a=Bt$vrJ93;tAT3Qr0b1
a(CngKF?Dr2W#qppx>DXzVE`rmvHusR`?E^`

delta 928
zcmb`_Pe>GT6u|K}x_@SMbw^?i%)=TkQ@XP*?WSaIoeeA%saEK)QlV6?+L|7+U4rOT
zlq1pF!GDBBL@Wc{N<8$3E>RHFp`sLu^q>S?`ukm+E}i?qhqu4q%+7oB=4G==c3P?G
zi5zTg3p9me!qP-WoSljJ{P9<nTE6PD&*zW~=S78!te9D$ZSHVvY$RyMMms8Y{B5sh
zd*A)f^<sO!#f}qJLc8c24>-znkI1GHjwys(flOx5E0RJ2&DaVjK9!2(FpSd}!hW=&
z1=aY<lh(0@_gKI+6f!&`(;i|REikam*<Flb7$J|OWJwj7L<dwXxJAyuz_Lr^20G!v
z2dBt&9DoZC=u{f@_{dx5&<-~q($istuteu3kyEbbtNj7iHhpwpD3wm>p@7~Lj)bFT
zBv@-U=xSx75!q$zh>CqzU;nY8<f)|jRu7wzTGd>u@mcq4Cfw%Y_EvOh#z<ef*BCv~
zV+<tIz3~QfChj+%$5ka{uGj6e-qnpO)?mmi&ba96WfXe<_shKYiQK_$+`<L4qY{3+
zEEjo!X-wff`q2ObAuN{hU(DkQy5PZ0a?N3OBX6->@>)qv^;+L{Pbo!5#LUI_T5sax
zN+x-f3TSVFmKUlE+H>=Z3Vz}TzGD@0IEfa-utEj1NI=6AGM~dvtlAZH6D#nPnVH5R
rl;aUIakfP2CCZO448#l$!-vPr!Wd#$p|Dvb+?L|F=lUOCuvGm6p>U>&

diff --git a/x/X11/X11-20170314-test.eb b/x/X11/X11-20170314-test.eb
index bf564078..1bec07f9 100644
--- a/x/X11/X11-20170314-test.eb
+++ b/x/X11/X11-20170314-test.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('zlib', '1.2.11'),
     ('Mesa', '17.0.2', '', ('intel', '2017a')),
     ('nettle', '3.3', '', ('intel', '2017a')),
-    ('XKeyboardConfig', '2.21'),
+#    ('XKeyboardConfig', '2.21'),
 ]
 builddependencies = [
     ('Autotools', '20150215'),
@@ -49,7 +49,7 @@ common_specs = {
 server_specs = {
     'sources': [SOURCE_TAR_GZ],
     'start_dir': '%(name)s-%(version)s',
-    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind',
+    'configopts': '--disable-glamor --enable-suid-wrapper --disable-systemd-logind -enable-install-setuid --with-xkb-path=/apps/all/X11/20170314-test/share/X11/xkb', #--with-xkb-path=%(installdir)s/share/X11/xkb
 }
 
 
@@ -158,9 +158,9 @@ preconfigopts = "if [ ! -f configure ]; then ./autogen.sh; fi && "
 modluafooter = 'add_property("state","testing")'
 
 #xkbcommon configuration dir
-postinstallcmds = [
-	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
-]
+#postinstallcmds = [
+#	'ln -s %(installdir)s/share/xcb %(installdir)s/share/X11/xkb'
+#]
 
 # specify that Bundle easyblock should run a full sanity check, rather than just trying to load the module
 full_sanity_check = True