Update to 15.0.0

9 files changed, 86 insertions, 97 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eab9d2592fd7..2367a7fe5735 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,13 @@
 pkgbase = vmware-workstation
 	pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC.
-	pkgver = 14.1.3
-	pkgrel = 3
+	pkgver = 15.0.0
+	pkgrel = 1
 	url = https://www.vmware.com/products/workstation-for-linux.html
 	install = vmware-workstation.install
 	arch = x86_64
 	license = custom
 	makedepends = sqlite
 	makedepends = python2
-	makedepends = python2-six
 	makedepends = unzip
 	depends = dkms
 	depends = ncurses5-compat-libs
@@ -37,7 +36,7 @@ pkgbase = vmware-workstation
 	backup = etc/vmware/ssl/hostd.ssl.config
 	backup = etc/pam.d/vmware-authd
 	backup = etc/conf.d/vmware
-	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-14.1.3-9474260.x86_64.bundle
+	source = https://download3.vmware.com/software/wkst/file/VMware-Workstation-Full-15.0.0-10134415.x86_64.bundle
 	source = bootstrap
 	source = vmware-vix-bootstrap
 	source = config
@@ -48,6 +47,7 @@ pkgbase = vmware-workstation
 	source = datastores.xml
 	source = environments.xml
 	source = proxy.xml
+	source = vmAutoStart.xml
 	source = vmware-hostd-certificates.service
 	source = vmware-hostd.service
 	source = vmware-networks-configuration.service
@@ -57,20 +57,21 @@ pkgbase = vmware-workstation
 	source = Makefile
 	source = vmmon.patch
 	source = vmnet.patch
-	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.3/9472307/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
-	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/10.1.3/9472307/packages/com.vmware.fusion.tools.darwin.zip.tar
+	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/11.0.0/10120384/packages/com.vmware.fusion.tools.darwinPre15.zip.tar
+	source = https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/11.0.0/10120384/packages/com.vmware.fusion.tools.darwin.zip.tar
 	source = unlocker.py
-	sha256sums = 29d128ad6e1f2fc72414fd80d5bc8f82f186f1e21ab09db44441f1e84b5e0373
+	sha256sums = 00c50710ef23a88fdff2d6c81554820d45797c62c8d72630cd2c69fd43014d94
 	sha256sums = 12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e
 	sha256sums = da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141
-	sha256sums = d9a5f8b919d52aa2f279d8eaf0bb495780eb9fd8bbc2c58bba223cdca78cc991
+	sha256sums = 53af82a619c8b1bca39bb493beb0ff031c978bb763715ef264b135f4a1d67d1e
 	sha256sums = d50aa0a3fe94025178965d988e18d41eb60aa1ce2b28ee6e3ca15edeabfa2ca7
 	sha256sums = 8e4d08668a66be79a900521792b39c16a026cc90659241edee80b64e701bfbcd
-	sha256sums = de71ada1f5d5132fa75646a4f35cac2e50c54f250c315461633719c4b9cb3614
-	sha256sums = 9f508d5f7ce4b69d9f40f6fb0ff0fb3d5b26a3c48658da994bf63975d1b589ab
+	sha256sums = b94959a11b28e51b541321be0588190eb10825e9ff55cbd16eb01483a839a69f
+	sha256sums = 6873de5bf5a9ebb795101693919ce73b52f65c2f2c232584bb1382dce60f1d51
 	sha256sums = 434cd4aa440d36b75ee20e0b588aaad874bb0d796173990bc4046667c66f5099
-	sha256sums = 57c7568a89e8af1914cf7aea84d8fefd6e7af4155557081292344326d652ae70
+	sha256sums = 27a64a3811b864c945fb2de318f4beffabdb59bccd3a77820ec7b547cf5fe430
 	sha256sums = 3c802523606184a5e8ebbe931d9c6c70d83ff8c6833b9f48aa264f0bd5a18a88
+	sha256sums = ad522a8cbc6103134ce5e677a01b503cd21875cbceb37bd13fd870ebd9ad0e6d
 	sha256sums = f9440479f3ae5ad0a39bba3150276627878bf83d6879444fb327c53a1dbb5a4d
 	sha256sums = 70301aa4eff4f42d7d39b276445dc7d8f44b8a0e184775e8a9e3055bb9d8590a
 	sha256sums = e3812b78158672c7d96b6a58877681462f3fbdfe99a948b32c80c755c8682450
@@ -78,11 +79,11 @@ pkgbase = vmware-workstation
 	sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d
 	sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487
 	sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d
-	sha256sums = 9f93fa48c658474080482f2714c30bf0a850f40c2d7c739473dc9c489ce3da7b
+	sha256sums = 687cf3419ef0f01f883724f0b9807cc5613c3fe1b50ca3b653add9ed2283613b
 	sha256sums = c2e981d5d6a4fab4d33d4e3df394bdb597834fae14ebb535a40271c3f2677f0d
-	sha256sums = 87a5356c947af3651c240b5ebf3f1e1bcf2c4bba58c466a23bd1d7f5adba0830
-	sha256sums = bcd4fafd41e627c2ab9a86d562f74ef27822b61a346306e848a67161732005aa
-	sha256sums = b739b0c99fb20dc44838ce137e254773b7be051f327eb67fd8cb1342a3ecf344
+	sha256sums = a5c405eb46d3155b46accfb3e8cc513115937a44e5b02e637f4ee2d71dd6d8ef
+	sha256sums = 5549df5e55b08d6d36381c812689e15de595225cacc055106705282be88be52f
+	sha256sums = cb9ecff2d9210ea0022d5ac1b2c274dba0ec9b79c031386627f2a668913e1a38
 
 pkgname = vmware-workstation
 
diff --git a/PKGBUILD b/PKGBUILD
index 78999e55365a..675c5d541d73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,10 +14,10 @@
 
 #PKGEXT=.pkg.tar
 pkgname=vmware-workstation
-pkgver=14.1.3
-_buildver=9474260
+pkgver=15.0.0
+_buildver=10134415
 _pkgver=${pkgver}_${_buildver}
-pkgrel=3
+pkgrel=1
 pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.'
 arch=(x86_64)
 url='https://www.vmware.com/products/workstation-for-linux.html'
@@ -77,6 +77,7 @@ source=(
   'datastores.xml'
   'environments.xml'
   'proxy.xml'
+  'vmAutoStart.xml'
 
   'vmware-hostd-certificates.service'
   'vmware-hostd.service'
@@ -90,19 +91,20 @@ source=(
   'vmnet.patch'
 )
 sha256sums=(
-  '29d128ad6e1f2fc72414fd80d5bc8f82f186f1e21ab09db44441f1e84b5e0373'
+  '00c50710ef23a88fdff2d6c81554820d45797c62c8d72630cd2c69fd43014d94'
 
   '12e7b16abf8d7e858532edabb8868919c678063c566a6535855b194aac72d55e'
   'da1698bf4e73ae466c1c7fc93891eba4b9c4581856649635e6532275dbfea141'
-  'd9a5f8b919d52aa2f279d8eaf0bb495780eb9fd8bbc2c58bba223cdca78cc991'
+  '53af82a619c8b1bca39bb493beb0ff031c978bb763715ef264b135f4a1d67d1e'
   'd50aa0a3fe94025178965d988e18d41eb60aa1ce2b28ee6e3ca15edeabfa2ca7'
   '8e4d08668a66be79a900521792b39c16a026cc90659241edee80b64e701bfbcd'
-  'de71ada1f5d5132fa75646a4f35cac2e50c54f250c315461633719c4b9cb3614'
+  'b94959a11b28e51b541321be0588190eb10825e9ff55cbd16eb01483a839a69f'
 
-  '9f508d5f7ce4b69d9f40f6fb0ff0fb3d5b26a3c48658da994bf63975d1b589ab'
+  '6873de5bf5a9ebb795101693919ce73b52f65c2f2c232584bb1382dce60f1d51'
   '434cd4aa440d36b75ee20e0b588aaad874bb0d796173990bc4046667c66f5099'
-  '57c7568a89e8af1914cf7aea84d8fefd6e7af4155557081292344326d652ae70'
+  '27a64a3811b864c945fb2de318f4beffabdb59bccd3a77820ec7b547cf5fe430'
   '3c802523606184a5e8ebbe931d9c6c70d83ff8c6833b9f48aa264f0bd5a18a88'
+  'ad522a8cbc6103134ce5e677a01b503cd21875cbceb37bd13fd870ebd9ad0e6d'
 
   'f9440479f3ae5ad0a39bba3150276627878bf83d6879444fb327c53a1dbb5a4d'
   '70301aa4eff4f42d7d39b276445dc7d8f44b8a0e184775e8a9e3055bb9d8590a'
@@ -112,22 +114,22 @@ sha256sums=(
 
   '05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487'
   '6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d'
-  '9f93fa48c658474080482f2714c30bf0a850f40c2d7c739473dc9c489ce3da7b'
+  '687cf3419ef0f01f883724f0b9807cc5613c3fe1b50ca3b653add9ed2283613b'
   'c2e981d5d6a4fab4d33d4e3df394bdb597834fae14ebb535a40271c3f2677f0d'
 )
 options=(!strip emptydirs)
 
 
-_isoimages=(freebsd linux linuxPreGlibc25 netware solaris windows winPre2k winPreVista)
+_isoimages=(linux linuxPreGlibc25 netware solaris windows winPre2k winPreVista)
+_isovirtualprinterimages=(Linux Windows)
 
 if [ -n "$_enable_macOS_guests" ]; then
 
-_vmware_fusion_ver=10.1.3_9472307
+_vmware_fusion_ver=11.0.0_10120384
 # List of VMware Fusion versions: https://softwareupdate.vmware.com/cds/vmw-desktop/fusion/
 
 makedepends+=(
   python2
-  python2-six
   unzip
 )
 
@@ -137,9 +139,9 @@ source+=(
   'unlocker.py'
 )
 sha256sums+=(
-  '87a5356c947af3651c240b5ebf3f1e1bcf2c4bba58c466a23bd1d7f5adba0830'
-  'bcd4fafd41e627c2ab9a86d562f74ef27822b61a346306e848a67161732005aa'
-  'b739b0c99fb20dc44838ce137e254773b7be051f327eb67fd8cb1342a3ecf344'
+  'a5c405eb46d3155b46accfb3e8cc513115937a44e5b02e637f4ee2d71dd6d8ef'
+  '5549df5e55b08d6d36381c812689e15de595225cacc055106705282be88be52f'
+  'cb9ecff2d9210ea0022d5ac1b2c274dba0ec9b79c031386627f2a668913e1a38'
 )
 
 _fusion_isoimages=(darwin darwinPre15)
@@ -216,7 +218,6 @@ package() {
     vmware-vix-core/bin/* \
     vmware-vprobe/bin/* \
     vmware-workstation-server/{vmware-hostd,vmware-vim-cmd,vmware-wssc-adminTool} \
-    vmware-network-editor-ui/bin/* \
     vmware-player-app/bin/* \
     "$pkgdir/usr/bin"
 
@@ -241,10 +242,9 @@ package() {
     "$pkgdir/etc/vmware"
 
   cp -r \
-    vmware-vix-lib-Workstation1400/lib/Workstation-14.0.0 \
+    vmware-vix-lib-Workstation1500/lib/Workstation-15.0.0 \
     vmware-vix-core/{lib/*,vixwrapper-config.txt} \
     "$pkgdir/usr/lib/vmware-vix"
-  cp vmware-vix-core/vix-perl.tar.nogz "$pkgdir/usr/lib/vmware-vix/vix-perl.tar.gz"
 
   cp -r \
     vmware-vix-core/doc/* \
@@ -278,11 +278,17 @@ package() {
     install -Dm 644 "vmware-tools-$isoimage/$isoimage.iso.sig" "$pkgdir/usr/lib/vmware/isoimages/$isoimage.iso.sig"
   done
 
+  for isoimage in ${_isovirtualprinterimages[@]}
+  do
+    install -Dm 644 "vmware-virtual-printer/VirtualPrinter-$isoimage.iso" "$pkgdir/usr/lib/vmware/isoimages/VirtualPrinter-$isoimage.iso"
+  done
+
   install -Dm 644 "vmware-workstation/doc/EULA" "$pkgdir/usr/share/licenses/$pkgname/VMware Workstation - EULA.txt"
   install -Dm 644 "vmware-workstation/doc"/*open_source_licenses.txt "$pkgdir/usr/share/licenses/$pkgname"
   mv "$pkgdir/usr/lib/vmware-ovftool/vmware.eula" "$pkgdir/usr/share/licenses/$pkgname/VMware OVF Tool component for Linux - EULA.txt"
   rm "$pkgdir/usr/lib/vmware-ovftool"/{vmware-eula.rtf,open_source_licenses.txt,manifest.xml}
 
+  install -d -m 755 "$pkgdir/usr/lib/vmware-installer/$vmware_installer_version"/{lib/lib,artwork}
   install -Dm 755 "$srcdir/configure-initscript.sh" "$pkgdir/usr/lib/vmware-installer/$vmware_installer_version/bin/configure-initscript.sh"
 
   install -Dm 644 "vmware-vmx/etc/modprobe.d/modprobe-vmware-fuse.conf" "$pkgdir/etc/modprobe.d/vmware-fuse.conf"
@@ -293,7 +299,7 @@ package() {
   install -Dm 644 vmware-installer/bootstrap "$pkgdir/etc/vmware-installer/bootstrap"
   install -Dm 644 "$srcdir/vmware-vix-bootstrap" "$pkgdir/etc/vmware-vix/bootstrap"
 
-  for hostd_file in config datastores environments proxy; do
+  for hostd_file in config datastores environments proxy vmAutoStart; do
     install -Dm 644 "$srcdir/$hostd_file.xml" "$pkgdir/etc/vmware/hostd/$hostd_file.xml"
   done
 
@@ -348,6 +354,7 @@ package() {
     vmware-modconfig-console \
     vmware-mount \
     vmware-netcfg \
+    vmware-setup-helper \
     vmware-tray \
     vmware-vim-cmd \
     vmware-vmblock-fuse \
@@ -360,7 +367,15 @@ package() {
   done
 
   for link in \
+    vmrest
+  do
+    ln -s /usr/lib/vmware/bin/appLoader "$pkgdir/usr/bin/$link"
+  done
+
+  for link in \
+    vmware-fuseUI \
     vmware-mount \
+    vmware-netcfg \
     vmware-usbarbitrator
   do
     ln -s /usr/lib/vmware/bin/$link "$pkgdir/usr/bin/$link"
@@ -428,7 +443,7 @@ fi
 
   # Define some environment variables for VMware and remove the tests about kernel modules
   install -Dm 644 "$srcdir/vmware-environment.sh" "$pkgdir/etc/conf.d/vmware"
-  for program in vmware vmplayer vmware-netcfg vmware-tray; do
+  for program in vmware vmplayer vmware-tray; do
     sed -e '/export PRODUCT_NAME/asource /etc/conf.d/vmware' \
         -e 's/if "$BINDIR"\/vmware-modconfig --appname=.*/if true ||/' \
         -i "$pkgdir/usr/bin/$program"
@@ -436,4 +451,7 @@ fi
 
   # to solve bugs with incompatibles library versions:
   #ln -sf /usr/lib/libz.so.1 "$pkgdir/usr/lib/vmware/lib/libz.so.1/"
+  
+  # Preview license
+  #install -Dm 644 vmware-workstation/etc/vmware/license-ws-150-e1-201804 "$pkgdir/etc/vmware/license-ws-150-e1-201804"
 }
diff --git a/config b/config
index fce6aadfbde5..faf666debfab 100644
--- a/config
+++ b/config
@@ -11,16 +11,16 @@ bindir = "/usr/bin"
 vmware.fullpath = "/usr/bin/vmware"
 vix.libdir = "/usr/lib/vmware-vix"
 installerDefaults.componentDownloadEnabled = "no"
-installerDefaults.autoSoftwareUpdateEnabled.epoch = "4641104763"
+installerDefaults.autoSoftwareUpdateEnabled.epoch = "9624913987"
 vix.config.version = "1"
-player.product.version = "14.0.0"
-installerDefaults.dataCollectionEnabled.epoch = "7910652514"
+player.product.version = "15.0.0"
+installerDefaults.dataCollectionEnabled.epoch = "6996346951"
 installerDefaults.dataCollectionEnabled = "no"
 installerDefaults.transferVersion = "1"
 installerDefaults.autoSoftwareUpdateEnabled = "no"
-product.buildNumber = "6661328"
+product.buildNumber = "10134415"
 authd.client.port = "902"
 authd.proxy.nfc = "vmware-hostd:ha-nfc"
-product.version = "14.0.0"
-workstation.product.version = "14.0.0"
+product.version = "15.0.0"
+workstation.product.version = "15.0.0"
 product.name = "VMware Workstation"
diff --git a/config.xml b/config.xml
index 68f851ad72dd..ae370e340561 100644
--- a/config.xml
+++ b/config.xml
@@ -480,7 +480,7 @@
     <!--
     Check for version mismatches against the vmkernel.
     This is disabled by default for developers but for all other
-    users, they must keep their vmkernels upto date.
+    users, they must keep their vmkernels up to date.
      -->
     <checkVersionMismatch> false </checkVersionMismatch>
          <!-- <vmDirectory> /home/vmware </vmDirectory> -->
@@ -525,12 +525,7 @@
     <!-- or when adding a new disk to a HW7 or newer VM. -->
     <!-- <useChangeTracking> true </useChangeTracking> -->
 
-    <!-- Setting to enable/disable the use of vigorVim to read the -->
-         <!-- vm configuration information -->
-         <useVigorVim> true </useVigorVim>
-
          <requires>vimsvc</requires>
-
       </vmsvc>
       <vcsvc>
          <path>libvcsvc.so</path>
@@ -877,4 +872,4 @@
    </locale>
    -->
 
-</config>
\ No newline at end of file
+</config>
diff --git a/environments.xml b/environments.xml
index 57a099d3a52d..bf2c0804c315 100644
--- a/environments.xml
+++ b/environments.xml
@@ -43,4 +43,12 @@
        <Descriptor> /etc/vmware/hostd/env/ws-hw14.xml </Descriptor>
        <Options> /etc/vmware/hostd/env/vmconfigoption-ws-hw14.xml</Options>
    </Cfg>
+   <Cfg id = "12">
+       <Descriptor> /etc/vmware/hostd/env/ws-hw15.xml </Descriptor>
+       <Options> /etc/vmware/hostd/env/vmconfigoption-ws-hw15.xml</Options>
+   </Cfg>
+   <Cfg id = "13">
+       <Descriptor> /etc/vmware/hostd/env/ws-hw16.xml </Descriptor>
+       <Options> /etc/vmware/hostd/env/vmconfigoption-ws-hw16.xml</Options>
+   </Cfg>
 </Environment>
diff --git a/unlocker.py b/unlocker.py
index 94d29e0964d3..2787e65d689e 100644
--- a/unlocker.py
+++ b/unlocker.py
@@ -44,9 +44,7 @@ Offset  Length  Struct Type Description
 from __future__ import print_function
 import codecs
 import os
-import six
 import struct
-import subprocess
 import sys
 
 if sys.version_info < (2, 7):
@@ -56,6 +54,7 @@ if sys.version_info < (2, 7):
 # Setup imports depending on whether IronPython or CPython
 if sys.platform == 'win32' \
         or sys.platform == 'cli':
+    # noinspection PyUnresolvedReferences
     from _winreg import *
 
 
@@ -231,7 +230,7 @@ def patchsmc(name, sharedobj):
         # Read file into string variable
         vmx = f.read()
 
-        print('File: ' + name)
+        print('File: ' + name + '\n')
 
         # Setup hex string for vSMC headers
         # These are the private and public key counts
@@ -349,6 +348,7 @@ def patchvmkctl(name):
     print('smcPresent Patched: ' + name)
 
 
+# noinspection PyUnresolvedReferences
 def main():
     # Work around absent Platform module on VMkernel
     if os.name == 'nt' or os.name == 'cli':
@@ -356,19 +356,11 @@ def main():
     else:
         osname = os.uname()[0].lower()
 
-    vmwarebase = ''
-    libvmkctl32 = ''
-    libvmkctl64 = ''
+    # vmwarebase = ''
     vmx_so = False
 
     # Setup default paths
-    if osname == 'darwin':
-        vmx_path = '/Applications/VMware Fusion.app/Contents/Library/'
-        vmx = joinpath(vmx_path, 'vmware-vmx')
-        vmx_debug = joinpath(vmx_path, 'vmware-vmx-debug')
-        vmx_stats = joinpath(vmx_path, 'vmware-vmx-stats')
-
-    elif osname == 'linux':
+    if osname == 'linux':
         vmx_path = '/usr/lib/vmware/bin/'
         vmx = joinpath(vmx_path, 'vmware-vmx')
         vmx_debug = joinpath(vmx_path, 'vmware-vmx-debug')
@@ -379,15 +371,6 @@ def main():
         else:
             vmwarebase = '/usr/lib/vmware/lib/libvmwarebase.so.0/libvmwarebase.so.0'
 
-    elif osname == 'vmkernel':
-        vmx_path = os.path.dirname(os.path.abspath(__file__))
-        vmx = joinpath(vmx_path, '/unlocker/bin/vmx')
-        vmx_debug = joinpath(vmx_path, '/unlocker/bin/vmx-debug')
-        vmx_stats = joinpath(vmx_path, '/unlocker/bin/vmx-stats')
-        vmx_so = True
-        libvmkctl32 = joinpath(vmx_path, '/unlocker/lib/libvmkctl.so')
-        libvmkctl64 = joinpath(vmx_path, '/unlocker/lib64/libvmkctl.so')
-
     elif osname == 'windows':
         reg = ConnectRegistry(None, HKEY_LOCAL_MACHINE)
         key = OpenKey(reg, r'SOFTWARE\Wow6432Node\VMware, Inc.\VMware Workstation')
@@ -409,20 +392,7 @@ def main():
         patchsmc(vmx_stats, vmx_so)
 
     # Patch vmwarebase for Workstation and Player
-    # Not required on Fusion or ESXi as table already has correct flags
-    if vmwarebase != '':
-        patchbase(vmwarebase)
-    else:
-        pass
-
-    # Patch libvmkctl to return Apple SMC present
-    if osname == 'vmkernel':
-        # Patch ESXi 6.0 and 6.5 32 bit .so
-        patchvmkctl(libvmkctl32)
-
-        # Patch ESXi 6.5 64 bit .so
-        if os.path.isfile(libvmkctl64):
-            patchvmkctl(libvmkctl64)
+    patchbase(vmwarebase)
 
 
 if __name__ == '__main__':
diff --git a/vmAutoStart.xml b/vmAutoStart.xml
new file mode 100644
index 000000000000..422da117572b
--- /dev/null
+++ b/vmAutoStart.xml
@@ -0,0 +1,9 @@
+<ConfigRoot>
+  <SystemDefaults>
+    <_type>vim.host.AutoStartManager.SystemDefaults</_type>
+    <startDelay>120</startDelay>
+    <stopAction>PowerOff</stopAction>
+    <stopDelay>120</stopDelay>
+    <waitForHeartbeat>false</waitForHeartbeat>
+  </SystemDefaults>
+</ConfigRoot>
\ No newline at end of file
diff --git a/vmmon.patch b/vmmon.patch
index 2aff1e3a7347..e2ffc3109909 100644
--- a/vmmon.patch
+++ b/vmmon.patch
@@ -21,7 +21,7 @@ diff --git a/vmmon/common/task.c b/vmmon/common/task.c
 index 98cc74a..400ebfe 100644
 --- a/vmmon/common/task.c
 +++ b/vmmon/common/task.c
-@@ -2203,12 +2203,23 @@ TaskSwitchToMonitor(VMCrossPage *crosspage)
+@@ -2308,12 +2308,23 @@ TaskSwitchToMonitor(VMCrossPage *crosspage)
     {
        uint64 raxGetsWiped, rcxGetsWiped;
  
diff --git a/vmware-environment.sh b/vmware-environment.sh
index 7afe1c0f1598..b4bee50db4df 100644
--- a/vmware-environment.sh
+++ b/vmware-environment.sh
@@ -1,14 +1,2 @@
 # Uncomment the line below if you have a problem of incompatible libraries
 #export VMWARE_USE_SHIPPED_LIBS=yes
-
-# Avoid an issue with some keyboard layouts using iBus
-export GTK_IM_MODULE_FILE=/dev/null
-
-# Workaround to use the GTK theme
-if [ -z "$GTK_THEME" ]; then
-	theme=$(gtk-query-settings gtk-theme-name | cut -d '"' -f2)
-	# Hack to know if the theme is compatible with GTK 3.14 (used by VMware)
-	if [ \( -d ~/.themes/"$theme" -a -d ~/.themes/"$theme"/gtk-3.20 \) -o \( -d /usr/share/themes/"$theme" -a -d /usr/share/themes/"$theme"/gtk-3.20 \) ]; then
-		export GTK_THEME="$theme"
-	fi
-fi