summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Marc Lenoir2019-10-05 11:24:53 +0200
committerJean-Marc Lenoir2019-10-05 11:24:53 +0200
commit914997757fd2604392721657a6d119d152deb480 (patch)
treec177f003ecaf5c5d975cc53e6cbfb01406c337d2
parent4739e1abcd5810cd528cdc3877db721f93703972 (diff)
downloadaur-914997757fd2604392721657a6d119d152deb480.tar.gz
Cleanup
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--unlocker.patch14
3 files changed, 14 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e2e38c1cff..ad7cd1d52f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,7 @@ pkgbase = vmware-workstation14
arch = x86_64
license = custom
makedepends = sqlite
- makedepends = python2
+ makedepends = python
makedepends = unzip
makedepends = uefitool-git
depends = dkms
@@ -93,7 +93,7 @@ pkgbase = vmware-workstation14
sha256sums = 195313791f2c2cf880b0ba6c9d130e40ab6729335c0980fcc40df4209c1ed52b
sha256sums = e36fb99a56a65d2c4d82168c8adb1ed19a9a7aaf75807c667c79a79f4968740a
sha256sums = 29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c
- sha256sums = d0b16c21246468869ae26cc33d64eb2790c2e9446702a40916770c9d634ef03d
+ sha256sums = 4fb4a7914aee656df170e35b3ef952aaaa2ed10161e560dfa097688861127b1d
sha256sums = 392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91
pkgname = vmware-workstation14
diff --git a/PKGBUILD b/PKGBUILD
index ffbc77a5fc7..8792aedaf54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,8 +50,6 @@ depends=(
libaio
pcsclite
hicolor-icon-theme
- # needed to replace internal libs:
- #zlib
)
optdepends=(
'linux-headers: build modules against Arch kernel'
@@ -147,7 +145,7 @@ _unlocker_ver=3.0.2
_efi_unlocker_ver=1.0.0
makedepends+=(
- python2
+ python
unzip
uefitool-git
)
@@ -163,7 +161,7 @@ sha256sums+=(
'195313791f2c2cf880b0ba6c9d130e40ab6729335c0980fcc40df4209c1ed52b'
'e36fb99a56a65d2c4d82168c8adb1ed19a9a7aaf75807c667c79a79f4968740a'
'29e0b0db9c0296ab81eee543803c4bd430e2c69c76e33492910e17280da1c05c'
- 'd0b16c21246468869ae26cc33d64eb2790c2e9446702a40916770c9d634ef03d'
+ '4fb4a7914aee656df170e35b3ef952aaaa2ed10161e560dfa097688861127b1d'
'392c1effcdec516000e9f8ffc97f2586524d8953d3e7d6f2c5f93f2acd809d91'
)
@@ -390,8 +388,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
@@ -452,7 +449,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
@@ -482,7 +479,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/"
}
diff --git a/unlocker.patch b/unlocker.patch
index 9d445662293..7c32fa83f28 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