--- smage/trunk/core/tigervnc/tigervnc-1.8.0-r1.smage2	2017/08/24 08:31:23	10560
+++ smage/trunk/core/tigervnc/tigervnc-1.8.0-r1.smage2	2017/08/24 08:41:04	10561
@@ -62,7 +62,6 @@
 	mirror://${PNAME}/${PNAME}-1.3.0-shebang.patch
 	mirror://${PNAME}/${PNAME}-1.4.2-getmaster.patch
 	mirror://${PNAME}/${PNAME}-1.7.0-xorg119.patch
-	mirror://${PNAME}/${PNAME}-1.7.0-xserver119.patch
 )
 
 UP2SEPERATOR="v"
@@ -78,7 +77,7 @@
 
 	# patchwork
 	# create X server cookie via mcookie
-	mpatch ${PNAME}-1.1.0-gethomedir.patch || die
+	#mpatch ${PNAME}-1.1.0-gethomedir.patch || die
 
 	# libvnc.so: don't use unexported GetMaster function
 	#mpatch ${PNAME}-1.4.2-getmaster.patch || die
@@ -91,10 +90,9 @@
 
 	# apply the included xorg patch
 	cd ${XORGDDIR}
-	#local xorg_patch_ver="${XORG_PVER%.*}"
-	#xorg_patch_ver="${xorg_patch_ver//.}"
-	#patch -Np1 -i ../xserver${xorg_patch_ver}.patch || die
-	mpatch -Np1 ${PNAME}-1.7.0-xserver119.patch || die
+	local xorg_patch_ver="${XORG_PVER%.*}"
+	xorg_patch_ver="${xorg_patch_ver//.}"
+	patch -Np1 -i ../xserver${xorg_patch_ver}.patch || die
 
 	# reconfigure xorg
 	cd ${XORGDDIR}