From 32bba35a35b9d3ba1b9b3252116457c01712ec8e 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 09:15:45 +0200
Subject: [PATCH 1/2] 	modified:   x/X11/.X11-20170314-test.eb.swp 
 deleted:    x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp

---
 x/X11/.X11-20170314-test.eb.swp               | Bin 4096 -> 20480 bytes
 .../.xorg-server-1.19.3-intel-2017a.eb.swp    | Bin 12288 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp

diff --git a/x/X11/.X11-20170314-test.eb.swp b/x/X11/.X11-20170314-test.eb.swp
index 6e0e4e95755afe456124f53dbcdc753f17a943f0..26171fc664d2f2691e0cfe81b5d2cc2f87700423 100644
GIT binary patch
literal 20480
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
RXXyf*CruMCSX5m%{ttSdfMfsw

delta 19
acmZozz}TR$;U)9L1Xd<qhRq+C1$Y2PWCkSw

diff --git a/x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp b/x/xorg-server/.xorg-server-1.19.3-intel-2017a.eb.swp
deleted file mode 100644
index f1524cd5233c7f7c9a26ba7945860bff2b524c39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2O=}ZD7{{mL(Q46)sOXp;riJcqHYt=AdXOR_Qlzh@)(|JVlVs>-XPMc}3sU+C
zJb3Zq)#7*1qn-sngC6`CJ~P>ts!%)$$}{k1-kxV(ev?bsf4jQ-aGfssiv-FHA#ZMN
z>>a;)zI%O{5W&s3UC1Q1bLSMJ2jMx>r&9sXG83Gx>RORXJF;s$nJ>y<6pWPadPeAh
z&}Z9T=!eUG-IHl960cSbm$)z5rwd~P2_S(#ATUkpwXkXfXDfH<wW~XSkb@ye00|%g
zB!C2v01`j~NB{}^F9h;ziX6dZE|eFdWj*yvU3RfT0!RP}AOR$R1dsp{Kmter2_OL^
zfCT<Q0vtZ>A6+8k<}@50zW>wm4&Sa2@)h(M^a1o9^cu7Y+5p`F-3DC*eY#A@M^Fwj
zpl6^}&<bc7GzXdieTO~1fZl<QL2p4XL3^MYs0s=|_AEC*Sdah`Kmter2_OL^fCP{L
z5<mifi9lb)MIxev8$(wq8%V<lIV2Pci={Sfh3>PqOxXfuiEP_SrcqMFf;AT=VI7%>
z)3~4k=4KlOIYDF4aT%_i3X|I$!&8}$TTxF$2d#|fJ-hJ>LYi*1Io5b2#%;xQyyjff
zcCDIU3vCVB)`gfaBU6#*iLeuOzs}|-$AJYx7i<mG)q1#S=e^u+US^-ftqa5LWVqy4
z{hG~>MJCc%q>&W%Q2XE@ZIW3)F~^)|yU!!7jLWfB?a=1TI`jDNnG?^q%5ulm^I~au
zI}u(t;eDm4=ZVzyO(A1%sKGTZ?C43D8Jk@6V=qx%na1!YMin{|twJa6Xsnm#nOO;f
z;c)1We1INs9rffu1Q0I=GA?)$j7pa|YnJ&gckA)a=Gy(%_Px#4gQrdSORH28^|(y!
zL$H+h1-v>uGuY7WUBRYqq)P3WGo`ab0;Ei&WtPJ@BvrP1g4&0tTh7%^rJ*?tMM?{*
zI<DQIPvBr`NGCV*E2O9TBI8|Q7qGYa=`urkAcG1a<>nB>CiZwn>;Y~6jEx@nILCdW
Rq60fM`RNo|tn&lG$PcW<9ZCQI


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 2/2] 	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