Cleanup

3 files changed, 14 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ddc2dfa6c833..f0457817a73a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,11 +7,10 @@ pkgbase = vmware-workstation
 	arch = x86_64
 	license = custom
 	makedepends = sqlite
-	makedepends = python2
+	makedepends = python
 	makedepends = unzip
 	makedepends = uefitool-git
 	depends = dkms
-	depends = ncurses5-compat-libs
 	depends = fuse2
 	depends = gtkmm3
 	depends = libcanberra
@@ -90,7 +89,7 @@ pkgbase = vmware-workstation
 	sha256sums = 7c3b6a7871b19e31fafdcc2631751dd9569196740d8e7c2026653d155c0c8da0
 	sha256sums = ed819604cb9c0f204e377f16b8678103467d2cf4a50129932e2b1a9a000ad8cf
 	sha256sums = 29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c
-	sha256sums = d0b16c21246468869ae26cc33d64eb2790c2e9446702a40916770c9d634ef03d
+	sha256sums = 4fb4a7914aee656df170e35b3ef952aaaa2ed10161e560dfa097688861127b1d
 	sha256sums = 392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91
 
 pkgname = vmware-workstation
diff --git a/PKGBUILD b/PKGBUILD
index 4df3a8e876dd..300b71f95530 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,7 +41,6 @@ provides=(
 )
 depends=(
   dkms
-  ncurses5-compat-libs
   fuse2
   gtkmm3
   libcanberra
@@ -51,8 +50,6 @@ depends=(
   # needed to use Arch GTK3 library (for theme integration)
   gtk3
   gcr
-  # needed to replace internal libs:
-  #zlib
 )
 optdepends=(
   'linux-headers: build modules against Arch kernel'
@@ -150,7 +147,7 @@ _unlocker_ver=3.0.2
 _efi_unlocker_ver=1.0.0
 
 makedepends+=(
-  python2
+  python
   unzip
   uefitool-git
 )
@@ -164,7 +161,7 @@ source+=(
 sha256sums+=(
   'ed819604cb9c0f204e377f16b8678103467d2cf4a50129932e2b1a9a000ad8cf'
   '29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c'
-  'd0b16c21246468869ae26cc33d64eb2790c2e9446702a40916770c9d634ef03d'
+  '4fb4a7914aee656df170e35b3ef952aaaa2ed10161e560dfa097688861127b1d'
   '392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91'
 )
 
@@ -392,8 +389,7 @@ fi
     vmware-vmblock-fuse \
     vmware-vprobe \
     vmware-wssc-adminTool \
-    vmware-zenity \
-    #vmware-unity-helper
+    vmware-zenity
   do
     ln -s /usr/lib/vmware/bin/appLoader "$pkgdir/usr/lib/vmware/bin/$link"
   done
@@ -462,7 +458,7 @@ fi
 
 if [ -n "$_enable_macOS_guests" ]; then
   msg "Patching VMware for macOS guest support"
-  python2 "$srcdir/unlocker.py" > /dev/null
+  python "$srcdir/unlocker.py" > /dev/null
 
   for isoimage in ${_fusion_isoimages[@]}
   do
@@ -491,10 +487,4 @@ fi
   sed -i '/^StartupNotify=.*/a StartupWMClass=vmware' "$pkgdir/usr/share/applications/vmware-workstation.desktop"
   sed -i '/^StartupNotify=.*/a StartupWMClass=vmplayer' "$pkgdir/usr/share/applications/vmware-player.desktop"
   sed -i '/^StartupNotify=.*/a StartupWMClass=vmware-netcfg' "$pkgdir/usr/share/applications/vmware-netcfg.desktop"
-
-  # 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/unlocker.patch b/unlocker.patch
index 9d4456622935..7c32fa83f288 100644
--- a/unlocker.patch
+++ b/unlocker.patch
@@ -2,7 +2,7 @@ diff --git a/unlocker.py b/unlocker.py
 index decbc51..0f9d3f6 100755
 --- a/unlocker.py
 +++ b/unlocker.py
-@@ -44,6 +44,7 @@ Offset  Length  Struct Type Description
+@@ -44,6 +44,7 @@
  from __future__ import print_function
  import codecs
  import os
@@ -10,7 +10,7 @@ index decbc51..0f9d3f6 100755
  import struct
  import sys
  
-@@ -55,7 +56,10 @@ if sys.version_info < (2, 7):
+@@ -55,7 +56,11 @@
  if sys.platform == 'win32' \
          or sys.platform == 'cli':
      # noinspection PyUnresolvedReferences
@@ -19,10 +19,11 @@ index decbc51..0f9d3f6 100755
 +        from winreg import *
 +    else:
 +        from _winreg import *
++
  
  
  def bytetohex(data):
-@@ -301,9 +305,10 @@ def patchbase(name):
+@@ -301,9 +306,10 @@ def patchbase(name):
      f = open(name, 'r+b')
  
      # Entry to search for in GOS table
@@ -36,7 +37,7 @@ index decbc51..0f9d3f6 100755
  
      # Read file into string variable
      base = f.read()
-@@ -311,11 +316,8 @@ def patchbase(name):
+@@ -311,19 +317,14 @@ def patchbase(name):
      # Loop through each entry and set top bit
      # 0xBE --> 0xBF (WKS 12)
      # 0x3E --> 0x3F (WKS 14)
@@ -50,9 +51,10 @@ index decbc51..0f9d3f6 100755
          f.seek(offset + 32)
          flag = ord(f.read(1))
          flag = set_bit(flag, 0)
-@@ -323,7 +325,6 @@ def patchbase(name):
+-        flag = chr(flag)
          f.seek(offset + 32)
-         f.write(flag)
+-        f.write(flag)
++        f.write(bytes([flag]))
          print('GOS Patched flag @: ' + hex(offset))
 -        offset += 40