Accepting request 580226 from Emulators

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/580226
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=245
This commit is contained in:
Dominique Leuenberger 2018-02-26 22:26:36 +00:00 committed by Git OBS Bridge
commit 38694f2dc6
8 changed files with 379 additions and 100 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f33c021b9fdd35954c812dc09dc243f13796c254b41bb5fc47250f7cca42099
size 19730700

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlp0rJAACgkQzvrI6q8X
UZ1bcBAAq1l5U6x1NBTQgoaMGCAyBJKMNNJggqro/zssvD1TXBf6QJfHiRVLgRv/
syWfbKitr1oBy7DEvW3Nbfr3imr14V51oYn7pG9w3eQk8e619j757qI8MZ0laz1v
UZzTOHFEbhZpYHFH8rSK1ysnCKxzdxoDqqoCN68tGq6fB4mCrGxP0G6jLeyWpnLF
sU5cACszTm/VdbOjgr7ZT414NZskTLsJ6Li3JSupCs5BScw9cBuCfmedqYJHhUOK
brfH7TV4Vbv0pvvrF2IyBZGN/7bMnKFPj/lVzAZgDpobchtGC+2zEGZBNsm3J7LP
BaGXrOe8rs1FQMTv2G3IgvOA8xyoTjLT+NroIk/jWjbv/fM0s+N0p1hdD7UdP1ce
RfjD/LU4WKLfdwILs6Yo9DTt3w80cqxUhh1T4wzl3Ol54wV8aeP7vkY5hVn20CAf
WaMg4XvZUpRmvVPDrlBiIMPJUVCUd3eAzDOFm7nmDOeuyaG/Cg2dUOCGgVLPyGrn
Xv6jCjlEq1m2oEgmtHhp1c+Gzp5esUq4uqKSoCoxbiu1s88vprUliOkD+opYzcvN
DZgwC9DHFYoIPGBJ9/GnKj1bVs+RiJFOCj4aMLLwkplHnlWHuM+SPlDQflC82VrJ
vOSq3cmNJ5Sf8QDRfZ3Rh86aHC1w6gm5zU6WglpQjjnueOKzRCA=
=oH+G
-----END PGP SIGNATURE-----

3
wine-3.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5281066150b981d1c731584ee8f70bae5f38b393d411e29fa910de3ee20221a0
size 19793180

16
wine-3.2.tar.xz.sign Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlqHM24ACgkQzvrI6q8X
UZ1zgw//XaDQoj3P3+tWT33+Q0wwJdpcvT33tNtGe0OCgmbzV+9CFHpyZpmQ3V7O
d0Fmf6Q+oXo6pDHdPZ1m923yQh5t/qYK9qXz+wVWyXIDfEp1J3ms4Uw441wKmNxX
y3DwTLx9sEg3mzSm6FAAwzVGk0g3xIFwzlvkddCdc0qbzmR9m4+onp9UweCkWTuG
n1Hd+WdAfzs+4eDkRKOtJlu461f82dUPi49KFqR2sXDlkp4LdJx2G0PK1LLYgRLN
/1lWeBG7X77K3NHUymnvnXMmg7TECBr4RiVrT2QOrkr7Eat0CRix8uoUvqfrDXh9
xfbwrazdOXaTmQ/KTYLiWIbcOydOQZWo9LL/p0xDVIYdTZ6o7ZZGzY3AnF3DiQK+
N7tyu5cr2MSskU0yR8yN1d10/6yhqXNX9iG4wzeLRHaQU0F+wKqrOtO37cgYcTQg
aigax7us2rDed5l6yRlOhpgo9+AgwT+mkh7nlOqcx9wyjSLOZQfeF6epDhlz8wwQ
S3j3mMOgS2QlJde6sMQQcpATDAzILg125lo1US8WlA1q9kgF0QnnWIg/2P9ov/sG
W/PBQodCvHo7oEDSu9RTZ09IhfeHq4a7zCj2zt9X0TtWK5Z6wOAOd4KilaL5M3/o
CoBXuZ9ssA+xJ69+2gCzABYb26zrTTE7oHrxmg/WfOncLdbhCFA=
=Eh2i
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Feb 19 12:23:23 UTC 2018 - meissner@suse.com
- Update to 3.2 development release
- Separate implementation of USER controls for ComCtl32 v6.
- Multisample texture support in Direct3D.
- Support for HID gamepads.
- More event support in MSHTML.
- Obsolete DOS code removed.
- Various bug fixes.
- Updated winetricks
-------------------------------------------------------------------
Sat Feb 3 21:27:49 UTC 2018 - meissner@suse.com

View File

@ -79,8 +79,8 @@ BuildRequires: update-desktop-files
BuildRequires: valgrind-devel
BuildRequires: xorg-x11-devel
BuildRequires: pkgconfig(libudev)
%define realver 3.1
Version: 3.1
%define realver 3.2
Version: 3.2
Release: 0
Summary: An MS Windows Emulator
License: LGPL-2.1+

View File

@ -6,7 +6,7 @@
# Name of this version of winetricks (YYYYMMDD)
# (This doesn't change often, use the sha256sum of the file when reporting problems)
WINETRICKS_VERSION=20171222-next
WINETRICKS_VERSION=20180217-next
# This is a UTF-8 file
# You should see an o with two dots over it here [ö]
@ -34,7 +34,8 @@ WINETRICKS_VERSION=20171222-next
# - zenity is needed by the GUI, though it can limp along somewhat with kdialog/xmessage.
# - xdg-open (if present) or open (for OS X) is used to open download pages
# for the user when downloads cannot be fully automated.
# - sudo is used to mount .iso images if the user cached them with -k option.
# - pfexec, sudo, or kdesu (gksu/gksudo/kdesudo are deprecated upstream but also still supported)
# are used to mount .iso images if the user cached them with -k option.
# - perl is used to munge steam config files.
# - torify is used with option "--torify" if sites are blocked in single countries.
# On Ubuntu, the following lines can be used to install all the prerequisites:
@ -1776,14 +1777,18 @@ w_umount()
echo "Running $WINETRICKS_SUDO umount $W_ISO_MOUNT_ROOT"
case "$WINETRICKS_SUDO" in
gksudo)
gksu*|kdesudo)
# -l lazy unmount in case executable still running
"$WINETRICKS_SUDO" "umount -l $W_ISO_MOUNT_ROOT"
w_try "$WINETRICKS_SUDO" "rm -rf $W_ISO_MOUNT_ROOT"
;;
kdesu)
"$WINETRICKS_SUDO" -c "umount -l $W_ISO_MOUNT_ROOT"
w_try "$WINETRICKS_SUDO" -c "rm -rf $W_ISO_MOUNT_ROOT"
;;
*)
"$WINETRICKS_SUDO" "umount -l $W_ISO_MOUNT_ROOT"
w_try "$WINETRICKS_SUDO" "rm -rf $W_ISO_MOUNT_ROOT"
"$WINETRICKS_SUDO" umount -l "$W_ISO_MOUNT_ROOT"
w_try "$WINETRICKS_SUDO" rm -rf "$W_ISO_MOUNT_ROOT"
;;
esac
@ -1936,6 +1941,8 @@ w_override_all_dlls()
# -e '/^.*\/icmp$/ d' \
# -e '/^.*\/iphlpapi$/ d' \
# -e '/^.*\/kernel32$/ d' \
# -e '/^.*\/l3codeca.acm$/ d' \
# -e '/^.*\/mfuuid$/ d' \
# -e '/^.*\/mountmgr.sys$/ d' \
# -e '/^.*\/mswsock$/ d' \
# -e '/^.*\/ntdll$/ d' \
@ -1960,11 +1967,12 @@ w_override_all_dlls()
# -e '/^.*\/wsock32$/ d' \
# -e 's,.*/, ,' | sort | fmt -63 | sed 's/$/ \\/'
#
# 2017-09-01: Last list update (wine-2.16)
# 2018-02-18: Last list update (wine-3.2)
w_override_dlls builtin \
acledit aclui activeds actxprxy adsldpc advpack \
acledit aclui activeds actxprxy adsldp adsldpc advpack \
amstream api-ms-win-appmodel-identity-l1-1-0 \
api-ms-win-appmodel-runtime-l1-1-1 \
api-ms-win-appmodel-runtime-l1-1-2 \
api-ms-win-core-apiquery-l1-1-0 \
api-ms-win-core-appcompat-l1-1-1 \
api-ms-win-core-appinit-l1-1-0 \
@ -1984,16 +1992,20 @@ w_override_all_dlls()
api-ms-win-core-errorhandling-l1-1-0 \
api-ms-win-core-errorhandling-l1-1-1 \
api-ms-win-core-errorhandling-l1-1-2 \
api-ms-win-core-errorhandling-l1-1-3 \
api-ms-win-core-fibers-l1-1-0 \
api-ms-win-core-fibers-l1-1-1 \
api-ms-win-core-file-l1-1-0 \
api-ms-win-core-file-l1-2-0 \
api-ms-win-core-file-l1-2-1 \
api-ms-win-core-file-l1-2-2 \
api-ms-win-core-file-l2-1-0 \
api-ms-win-core-file-l2-1-1 \
api-ms-win-core-file-l2-1-2 \
api-ms-win-core-handle-l1-1-0 \
api-ms-win-core-heap-l1-1-0 \
api-ms-win-core-heap-l1-2-0 \
api-ms-win-core-heap-l2-1-0 \
api-ms-win-core-heap-obsolete-l1-1-0 \
api-ms-win-core-interlocked-l1-1-0 \
api-ms-win-core-interlocked-l1-2-0 \
@ -2005,6 +2017,7 @@ w_override_all_dlls()
api-ms-win-core-libraryloader-l1-1-0 \
api-ms-win-core-libraryloader-l1-1-1 \
api-ms-win-core-libraryloader-l1-2-0 \
api-ms-win-core-libraryloader-l1-2-1 \
api-ms-win-core-libraryloader-l1-2-2 \
api-ms-win-core-localization-l1-1-0 \
api-ms-win-core-localization-l1-2-0 \
@ -2012,6 +2025,7 @@ w_override_all_dlls()
api-ms-win-core-localization-l2-1-0 \
api-ms-win-core-localization-obsolete-l1-1-0 \
api-ms-win-core-localization-obsolete-l1-2-0 \
api-ms-win-core-localization-obsolete-l1-3-0 \
api-ms-win-core-localization-private-l1-1-0 \
api-ms-win-core-localregistry-l1-1-0 \
api-ms-win-core-memory-l1-1-0 \
@ -2029,6 +2043,7 @@ w_override_all_dlls()
api-ms-win-core-processthreads-l1-1-0 \
api-ms-win-core-processthreads-l1-1-1 \
api-ms-win-core-processthreads-l1-1-2 \
api-ms-win-core-processtopology-obsolete-l1-1-0 \
api-ms-win-core-profile-l1-1-0 \
api-ms-win-core-psapi-ansi-l1-1-0 \
api-ms-win-core-psapi-l1-1-0 \
@ -2042,13 +2057,17 @@ w_override_all_dlls()
api-ms-win-core-rtlsupport-l1-2-0 \
api-ms-win-core-shlwapi-legacy-l1-1-0 \
api-ms-win-core-shlwapi-obsolete-l1-1-0 \
api-ms-win-core-shlwapi-obsolete-l1-2-0 \
api-ms-win-core-shutdown-l1-1-0 \
api-ms-win-core-sidebyside-l1-1-0 \
api-ms-win-core-stringansi-l1-1-0 \
api-ms-win-core-string-l1-1-0 \
api-ms-win-core-string-l2-1-0 \
api-ms-win-core-string-obsolete-l1-1-0 \
api-ms-win-core-synch-ansi-l1-1-0 \
api-ms-win-core-synch-l1-1-0 \
api-ms-win-core-synch-l1-2-0 \
api-ms-win-core-synch-l1-2-1 \
api-ms-win-core-sysinfo-l1-1-0 \
api-ms-win-core-sysinfo-l1-2-0 \
api-ms-win-core-sysinfo-l1-2-1 \
@ -2061,6 +2080,7 @@ w_override_all_dlls()
api-ms-win-core-url-l1-1-0 api-ms-win-core-util-l1-1-0 \
api-ms-win-core-versionansi-l1-1-0 \
api-ms-win-core-version-l1-1-0 \
api-ms-win-core-version-l1-1-1 \
api-ms-win-core-version-private-l1-1-0 \
api-ms-win-core-windowserrorreporting-l1-1-0 \
api-ms-win-core-winrt-error-l1-1-0 \
@ -2071,6 +2091,7 @@ w_override_all_dlls()
api-ms-win-core-winrt-roparameterizediid-l1-1-0 \
api-ms-win-core-winrt-string-l1-1-0 \
api-ms-win-core-wow64-l1-1-0 \
api-ms-win-core-wow64-l1-1-1 \
api-ms-win-core-xstate-l1-1-0 \
api-ms-win-core-xstate-l2-1-0 \
api-ms-win-crt-conio-l1-1-0 \
@ -2106,9 +2127,12 @@ w_override_all_dlls()
api-ms-win-eventing-legacy-l1-1-0 \
api-ms-win-eventing-provider-l1-1-0 \
api-ms-win-eventlog-legacy-l1-1-0 \
api-ms-win-mm-joystick-l1-1-0 \
api-ms-win-mm-misc-l1-1-1 api-ms-win-mm-mme-l1-1-0 \
api-ms-win-mm-time-l1-1-0 \
api-ms-win-ntuser-dc-access-l1-1-0 \
api-ms-win-ntuser-rectangle-l1-1-0 \
api-ms-win-perf-legacy-l1-1-0 \
api-ms-win-power-base-l1-1-0 \
api-ms-win-power-setting-l1-1-0 \
api-ms-win-rtcore-ntuser-private-l1-1-0 \
@ -2121,6 +2145,7 @@ w_override_all_dlls()
api-ms-win-security-grouppolicy-l1-1-0 \
api-ms-win-security-lsalookup-l1-1-0 \
api-ms-win-security-lsalookup-l1-1-1 \
api-ms-win-security-lsalookup-l2-1-0 \
api-ms-win-security-lsalookup-l2-1-1 \
api-ms-win-security-lsapolicy-l1-1-0 \
api-ms-win-security-provider-l1-1-0 \
@ -2133,15 +2158,16 @@ w_override_all_dlls()
api-ms-win-service-private-l1-1-1 \
api-ms-win-service-winsvc-l1-1-0 \
api-ms-win-service-winsvc-l1-2-0 \
api-ms-win-shcore-scaling-l1-1-1 \
api-ms-win-shell-shellcom-l1-1-0 \
api-ms-win-shell-shellfolders-l1-1-0 apphelp \
appwiz.cpl atl atl100 atl110 atl80 atl90 authz \
avicap32 avifil32 avrt bcrypt bluetoothapis \
browseui bthprops.cpl cabinet cards cfgmgr32 \
clusapi combase comcat comctl32 comdlg32 compstui \
comsvcs concrt140 connect credui crtdll crypt32 \
cryptdlg cryptdll cryptext cryptnet cryptui ctapi32 \
ctl3d32 d2d1 d3d10 d3d10_1 d3d10core d3d11 d3d8 \
avicap32 avifil32 avrt bcrypt bluetoothapis browseui \
bthprops.cpl cabinet cards cdosys cfgmgr32 clusapi \
combase comcat comctl32 comdlg32 compstui comsvcs \
concrt140 connect credui crtdll crypt32 cryptdlg \
cryptdll cryptext cryptnet cryptui ctapi32 ctl3d32 \
d2d1 d3d10 d3d10_1 d3d10core d3d11 d3d12 d3d8 \
d3d9 d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 \
d3dcompiler_36 d3dcompiler_37 d3dcompiler_38 \
d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 \
@ -2149,17 +2175,17 @@ w_override_all_dlls()
d3dcompiler_47 d3dim d3drm d3dx10_33 d3dx10_34 \
d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 \
d3dx10_40 d3dx10_41 d3dx10_42 d3dx10_43 d3dx11_42 \
d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 \
d3dx9_29 d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 \
d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 \
d3dx9_41 d3dx9_42 d3dx9_43 d3dxof davclnt dbgeng \
dciman32 ddrawex devenum dhcpcsvc difxapi dinput \
dinput8 dispex dmband dmcompos dmime dmloader \
dmscript dmstyle dmsynth dmusic dmusic32 dnsapi \
dplay dplayx dpnaddr dpnet dpnhpast dpnlobby \
d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 \
d3dx9_28 d3dx9_29 d3dx9_30 d3dx9_31 d3dx9_32 d3dx9_33 \
d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 \
d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 d3dxof davclnt \
dbgeng dciman32 ddrawex devenum dhcpcsvc dhtmled.ocx \
difxapi dinput dinput8 dispex dmband dmcompos dmime \
dmloader dmscript dmstyle dmsynth dmusic dmusic32 \
dnsapi dplay dplayx dpnaddr dpnet dpnhpast dpnlobby \
dpvoice dpwsockx drmclien dsound dsquery dssenh \
dswave dwmapi dwrite dxdiagn dxgi dxva2 esent evr \
explorerframe ext-ms-win-authz-context-l1-1-0 \
dswave dwmapi dwrite dx8vb dxdiagn dxgi dxva2 esent \
evr explorerframe ext-ms-win-authz-context-l1-1-0 \
ext-ms-win-domainjoin-netjoin-l1-1-0 \
ext-ms-win-gdi-dc-create-l1-1-1 \
ext-ms-win-gdi-dc-l1-2-0 ext-ms-win-gdi-devcaps-l1-1-0 \
@ -2186,8 +2212,8 @@ w_override_all_dlls()
hnetcfg httpapi iccvid ieframe ieproxy imaadp32.acm \
imagehlp imm32 inetcomm inetcpl.cpl inetmib1 infosoft \
initpki inkobj inseng iprop irprops.cpl itircl itss \
joy.cpl jscript jsproxy kernelbase ksuser ktmw32 \
loadperf localspl localui lz32 mapi32 mapistub \
joy.cpl jscript jsproxy kerberos kernelbase ksuser \
ktmw32 loadperf localspl localui lz32 mapi32 mapistub \
mciavi32 mcicda mciqtz32 mciseq mciwave mf mf3216 \
mfplat mfreadwrite mgmtapi midimap mlang mmcndmgr \
mmdevapi mpr mprapi msacm32 msadp32.acm msasn1 \
@ -2206,19 +2232,20 @@ w_override_all_dlls()
objsel odbc32 odbccp32 odbccu32 ole32 oleacc oleaut32 \
olecli32 oledb32 oledlg olepro32 olesvr32 olethk32 \
openal32 opencl packager pdh photometadatahandler \
pidgen powrprof printui prntvpt propsys psapi pstorec \
qcap qedit qmgr qmgrprxy quartz query rasapi32 rasdlg \
regapi resutils riched20 riched32 rpcrt4 rsabase \
rsaenh rstrtmgr rtutils samlib scarddlg sccbase \
schannel schedsvc scrobj scrrun scsiport.sys secur32 \
security sensapi serialui setupapi sfc sfc_os shdoclc \
shdocvw shell32 shfolder shlwapi slbcsp slc snmpapi \
softpub spoolss sspicli sti svrapi sxs t2embed tapi32 \
taskschd tdh tdi.sys traffic ucrtbase uiautomationcore \
uiribbon updspapi url urlmon usbd.sys userenv usp10 \
uxtheme vbscript vcomp vcomp100 vcomp110 vcomp120 \
vcomp140 vcomp90 vcruntime140 version virtdisk vssapi \
wbemdisp wbemprox webservices wer wevtapi wiaservc \
pidgen powrprof printui prntvpt propsys psapi \
pstorec qcap qedit qmgr qmgrprxy quartz query \
rasapi32 rasdlg regapi resutils riched20 riched32 \
rpcrt4 rsabase rsaenh rstrtmgr rtutils samlib sapi \
scarddlg sccbase schannel schedsvc scrobj scrrun \
scsiport.sys secur32 security sensapi serialui \
setupapi sfc sfc_os shcore shdoclc shdocvw shell32 \
shfolder shlwapi slbcsp slc snmpapi softpub spoolss \
sspicli sti svrapi sxs t2embed tapi32 taskschd tdh \
tdi.sys traffic ucrtbase uiautomationcore uiribbon \
updspapi url urlmon usbd.sys userenv usp10 uxtheme \
vbscript vcomp vcomp100 vcomp110 vcomp120 vcomp140 \
vcomp90 vcruntime140 version virtdisk vssapi wbemdisp \
wbemprox wdscore webservices wer wevtapi wiaservc \
wimgapi windowscodecs windowscodecsext winebus.sys \
winegstreamer winehid.sys winemapi wing32 winhttp \
wininet winnls32 winscard winsta wintrust winusb \
@ -3138,14 +3165,32 @@ winetricks_detect_sudo()
fi
if test x"$DISPLAY" != x""; then
if test -x "$(which gksudo 2>/dev/null)"; then
# This should be the default option because some of GUI sudo programs are unmaintained
# See https://github.com/Winetricks/winetricks/issues/912
if test -x "$(which pkexec 2>/dev/null)"; then
# Maintained and recommended, part of Polkit, desktop-independent
# Usage: pkexec command ...
WINETRICKS_SUDO=pkexec
# Austin said "gksu*/kdesu* should stay (at least for a while)" in Feb 2018
# See https://github.com/Winetricks/winetricks/pull/915#issuecomment-362984379
elif test -x "$(which gksudo 2>/dev/null)"; then
# Unmaintained [2009], part of gksu
# Usage: gksudo "command ..."
WINETRICKS_SUDO=gksudo
elif test -x "$(which kdesudo 2>/dev/null)"; then
# Unmaintained [2015] (latest is for KDE4, no KF5 version available)
# https://cgit.kde.org/kdesudo.git/
# Usage: kdesudo "command ..."
WINETRICKS_SUDO=kdesudo
# fall back to the su versions if sudo isn't available (Fedora, etc.):
elif test -x "$(which gksu 2>/dev/null)"; then
# Unmaintained [2009]
# Usage: gksu "command ..."
WINETRICKS_SUDO=gksu
elif test -x "$(which kdesu 2>/dev/null)"; then
# Maintained, KF5 version available
# https://cgit.kde.org/kdesu.git/
# Usage: kdesu -c "command ..."
WINETRICKS_SUDO=kdesu
fi
fi
@ -4309,7 +4354,8 @@ winetricks_cache_iso()
# Horrible hack for Gentoo - make sure we can read from the drive
if ! test -r $WINETRICKS_DEV; then
case "$WINETRICKS_SUDO" in
gksudo) $WINETRICKS_SUDO "chmod 666 $WINETRICKS_DEV" ;;
gksu*|kdesudo) $WINETRICKS_SUDO "chmod 666 $WINETRICKS_DEV" ;;
kdesu) $WINETRICKS_SUDO -c "chmod 666 $WINETRICKS_DEV" ;;
*) $WINETRICKS_SUDO chmod 666 $WINETRICKS_DEV ;;
esac
fi
@ -4457,10 +4503,15 @@ winetricks_mount_cached_iso()
# Linux
# FIXME: find a way to mount or copy from image without sudo
_W_USERID=$(id -u)
# WINETRICKS_IMG may contain spaces and needs to be quoted
case "$WINETRICKS_SUDO" in
gksudo)
gksu*|kdesudo)
w_try $WINETRICKS_SUDO "mkdir -p $W_ISO_MOUNT_ROOT"
w_try $WINETRICKS_SUDO "mount -o ro,loop,uid=$_W_USERID,unhide $WINETRICKS_IMG $W_ISO_MOUNT_ROOT"
w_try $WINETRICKS_SUDO "mount -o ro,loop,uid=$_W_USERID,unhide '$WINETRICKS_IMG' $W_ISO_MOUNT_ROOT"
;;
kdesu)
w_try $WINETRICKS_SUDO -c "mkdir -p $W_ISO_MOUNT_ROOT"
w_try $WINETRICKS_SUDO -c "mount -o ro,loop,uid=$_W_USERID,unhide '$WINETRICKS_IMG' $W_ISO_MOUNT_ROOT"
;;
*)
w_try $WINETRICKS_SUDO mkdir -p $W_ISO_MOUNT_ROOT
@ -6190,45 +6241,30 @@ w_metadata directmusic dlls \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmusic.dll"
file1="../directx9/directx_feb2010_redist.exe"
load_directmusic()
{
# Untested. Based off https://bugs.winehq.org/show_bug.cgi?id=4805 and https://bugs.winehq.org/show_bug.cgi?id=24911
w_warn "You can specify individual DirectMusic verbs instead. e.g. 'winetricks dmsynth dmusic'"
w_call devenum
w_call dmband
w_call dmcompos
w_call dmime
w_call dmloader
w_call dmscript
w_call dmstyle
w_call dmsynth
w_call dmusic
w_call dmusic32
w_call dsound
w_call dswave
w_call quartz
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'devenum.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmband.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmcompos.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmime.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmloader.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmscript.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmstyle.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmsynth.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmusic.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmusic32.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dswave.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'streamci.dll' "$W_TMP/dxnt.cab"
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'quartz.dll' "$W_TMP/dxnt.cab"
w_try_regsvr devenum.dll
w_try_regsvr dmband.dll
w_try_regsvr dmcompos.dll
w_try_regsvr dmime.dll
w_try_regsvr dmloader.dll
w_try_regsvr dmscript.dll
w_try_regsvr dmstyle.dll
w_try_regsvr dmsynth.dll
w_try_regsvr dmusic.dll
w_try_regsvr dswave.dll
w_try_regsvr quartz.dll
w_override_dlls native devenum dmband dmcompos dmime dmloader dmscript dmstyle dmsynth dmusic dmusic32 dswave streamci quartz
# FIXME: dxnt.cab doesn't contain this DLL. Is this really needed?
w_override_dlls native streamci
}
#----------------------------------------------------------------
@ -6406,8 +6442,160 @@ load_dxsdk_jun2010()
#----------------------------------------------------------------
w_metadata dmusic32 dlls \
title="MS dmusic32.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2006" \
media="download" \
file1="../directx9/directx_apr2006_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmusic32.dll"
load_dmusic32()
{
w_download_to directx9 https://download.microsoft.com/download/3/9/7/3972f80c-5711-4e14-9483-959d48a2d03b/directx_apr2006_redist.exe dd8c3d401efe4561b67bd88475201b2f62f43cd23e4acc947bb34a659fa74952
w_try_cabextract -d "$W_TMP" -F DirectX.cab "$W_CACHE"/directx9/directx_apr2006_redist.exe
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F dmusic32.dll "$W_TMP"/DirectX.cab
w_override_dlls native dmusic32
}
#----------------------------------------------------------------
w_metadata dmband dlls \
title="MS dmband.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmband.dll"
load_dmband()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmband.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmband.dll
w_override_dlls native dmband
}
#----------------------------------------------------------------
w_metadata dmcompos dlls \
title="MS dmcompos.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmcompos.dll"
load_dmcompos()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmcompos.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmcompos.dll
w_override_dlls native dmcompos
}
#----------------------------------------------------------------
w_metadata dmime dlls \
title="MS dmime.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmime.dll"
load_dmime()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmime.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmime.dll
w_override_dlls native dmime
}
#----------------------------------------------------------------
w_metadata dmloader dlls \
title="MS dmloader.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmloader.dll"
load_dmloader()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmloader.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmloader.dll
w_override_dlls native dmloader
}
#----------------------------------------------------------------
w_metadata dmscript dlls \
title="MS dmscript.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmscript.dll"
load_dmscript()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmscript.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmscript.dll
w_override_dlls native dmscript
}
#----------------------------------------------------------------
w_metadata dmstyle dlls \
title="MS dmstyle.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmstyle.dll"
load_dmstyle()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmstyle.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmstyle.dll
w_override_dlls native dmstyle
}
#----------------------------------------------------------------
w_metadata dmsynth dlls \
title="MS midi synthesizer from DirectX user redistributable" \
title="MS dmsynth.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
@ -6428,6 +6616,50 @@ load_dmsynth()
#----------------------------------------------------------------
w_metadata dmusic dlls \
title="MS dmusic.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dmusic.dll"
load_dmusic()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dmusic.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dmusic.dll
w_override_dlls native dmusic
}
#----------------------------------------------------------------
w_metadata dswave dlls \
title="MS dswave.dll from DirectX user redistributable" \
publisher="Microsoft" \
year="2010" \
media="download" \
file1="../directx9/directx_feb2010_redist.exe" \
installed_file1="$W_SYSTEM32_DLLS_WIN/dswave.dll"
load_dswave()
{
helper_directx_dl
w_try_cabextract -d "$W_TMP" -L -F dxnt.cab "$W_CACHE"/directx9/$DIRECTX_NAME
w_try_cabextract -d "$W_SYSTEM32_DLLS" -L -F 'dswave.dll' "$W_TMP/dxnt.cab"
w_try_regsvr dswave.dll
w_override_dlls native dswave
}
#----------------------------------------------------------------
w_metadata dotnet11 dlls \
title="MS .NET 1.1" \
publisher="Microsoft" \
@ -7639,9 +7871,9 @@ load_gmdls()
# um, codecs are kind of clustered here. They probably deserve their own real category.
w_metadata allcodecs dlls \
title="All codecs (dirac, ffdshow, icodecs, l3codecx, xvid) except wmp" \
title="All codecs (dirac, ffdshow, icodecs, cinepak, l3codecx, xvid) except wmp" \
publisher="various" \
year="1998-2009" \
year="1995-2009" \
media="download"
load_allcodecs()
@ -7650,6 +7882,7 @@ load_allcodecs()
w_call l3codecx
w_call ffdshow
w_call icodecs
w_call cinepak
w_call xvid
}
@ -7837,6 +8070,32 @@ load_icodecs()
#----------------------------------------------------------------
w_metadata cinepak dlls \
title="Cinepak Codec" \
publisher="Radius" \
year="1995" \
media="download" \
file1="cvid32.zip" \
installed_file1="$W_SYSTEM32_DLLS_WIN/iccvid.dll" \
homepage="http://www.probo.com/cinepak.php"
load_cinepak()
{
w_download "http://www.probo.com/pub/cinepak/cvid32.zip" a41984a954fe77557f228fa8a95cdc05db22bf9ff5429fe4307fd6fc51e11969
if [ -f "$W_SYSTEM32_DLLS/iccvid.dll" ]; then
w_try rm -f "$W_SYSTEM32_DLLS/iccvid.dll"
fi
w_try_unzip "$W_SYSTEM32_DLLS" "${W_CACHE}/${W_PACKAGE}/${file1}" ICCVID.DLL
w_try mv -f "$W_SYSTEM32_DLLS/ICCVID.DLL" "$W_SYSTEM32_DLLS/iccvid.dll"
w_override_dlls native iccvid
}
#----------------------------------------------------------------
w_metadata jet40 dlls \
title="MS Jet 4.0 Service Pack 8" \
publisher="Microsoft" \
@ -10132,6 +10391,7 @@ load_cjkfonts()
{
w_call fakechinese
w_call fakejapanese
w_call fakejapanese_vlgothic
w_call fakekorean
w_call unifont
}
@ -10281,6 +10541,7 @@ w_metadata meiryo fonts \
publisher="Microsoft" \
year="2009" \
media="download" \
conflicts="fakejapanese_vlgothic" \
file1="PowerPointViewer.exe" \
installed_file1="$W_FONTSDIR_WIN/meiryo.ttc"
@ -10565,6 +10826,7 @@ load_fakejapanese_ipamona()
w_metadata fakejapanese_vlgothic fonts \
title="Creates aliases for Japanese Meiryo fonts using VLGothic fonts" \
publisher="Project Vine / Daisuke Suzuki" \
conflicts="meiryo" \
year="2014"
load_fakejapanese_vlgothic()
@ -10908,7 +11170,12 @@ load_allfonts()
do
cmd=$(basename "$file" .vars)
case $cmd in
allfonts|cjkfonts) ;;
# "fake*" verbs need to be skipped because
# this "allfonts" verb is intended to only install real fonts and
# adding font replacements at the same time may invalidate the replacements
# "pptfonts" can be skipped because it only calls other verbs for installing fonts
# See https://github.com/Winetricks/winetricks/issues/899
allfonts|cjkfonts|fake*|pptfonts) ;;
*) w_call "$cmd";;
esac
done

View File

@ -1,5 +1,5 @@
.\" -*- nroff -*-
.TH WINETRICKS 1 "December 2017" "Winetricks 20171222" "Wine Package Manager"
.TH WINETRICKS 1 "February 2018" "Winetricks 20180217" "Wine Package Manager"
.SH NAME
winetricks \- manage virtual Windows environments using Wine
.SH SYNOPSIS