-
-
Notifications
You must be signed in to change notification settings - Fork 392
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature office2013pro #939
Conversation
src/winetricks
Outdated
|
||
# ToDo: Get Mount to work with img file. | ||
# "mount + sudo" and fuseiso work | ||
# archivemount has path-related issue in access.en-us/ and cannot finish installation | ||
w_mount OFFICE15 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kakurasan on your end it was 15.0.4420.1017
. On my end it was 15.0.4420.10173
so I guess, it is arbitrary. We should use OFFICE15 as this is the internal name. It's also done like this in the other office verbs.
What do you think?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should use OFFICE15 as this is the internal name. It's also done like this in the other office verbs.
Right, this is a good idea. The name is also self-explanatory.
src/winetricks
Outdated
w_mount OFFICE15 | ||
|
||
# TODO: unattended installation | ||
w_try "$WINE" "${W_ISO_MOUNT_LETTER}:${file1}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we call this two times for entering the key afterwards?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The unattended installation finishes without key (I'm not sure this is correct):
if test $W_OPT_UNATTENDED; then
cat > "$W_TMP"/config.xml <<_EOF_
<Configuration Product="ProPlus">
<Display Level="none" CompletionNotice="no" SuppressModal="yes" AcceptEula="yes" />
</Configuration>
_EOF_
w_try "$WINE" "${W_ISO_MOUNT_LETTER}:setup.exe" /config "$W_TMP_WIN"\\config.xml
else
w_try "$WINE" "${W_ISO_MOUNT_LETTER}:setup.exe"
fi
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that for having a complete unattended install, there is also the msxml override to be done silently.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added 38d8dca
"config.xml" will override the OFFICE12 xml file. Should be no problem, though.
src/winetricks
Outdated
|
||
w_call corefonts | ||
w_call msxml6 | ||
w_call riched20 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about other needed packages?
- in this post
dotnet20
is recommended. - and here
msftedit riched30 vb6run
are recommended.riched32
was probably a typo.
on my end it works fine without those packages, but I guess they were added for some reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
according to the latest test result by Yossi Synett on winehq dotnet40
and msxml6
are not necessary. Only riched20
is needed.
another report says:
msxml6)...without this, it will error out during initial setup at around 68% with an XSD parse error
but that is definitely wrong with wine 2.0
and wine 3.0
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think dropping msxml6
is fine and we don't need dotnet20 msftedit riched30 vb6run
. Do we agree here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
linked the winehq bugreports and dropped all other
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vb6run is needed for vba support.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is not needed for installation. I would consider it an optional feature.
|
resolved some "bashisms" |
src/winetricks
Outdated
{ | ||
if [ "$W_ARCH" = "win64" ]; then | ||
w_die "Installation of Office 2013 Pro will not succeed on a 64bit wine prefix" | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use w_package_broken_win64
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
agreed.
would w_package_unsupported_win64
be better?
src/winetricks
Outdated
fi | ||
|
||
if [ ! -x "$(which winbindd 2>/dev/null)" ]; then | ||
w_warn "winbind is required" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's required, it should be w_die.
Aside from that, I'm pretty sure you meant ntlm_auth, not winbindd. At least on debian, winbindd is in sbin, whereas ntlm_auth is in /usr/bin. AFAIK wine doesn't use winbindd (the only references to it are in comments.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ntlm_auth
and winbindd
are both installed together with winbind so I was actually copying the part from Adobe Digital Editions. Will change that to ntlm_auth
.
src/winetricks
Outdated
fi | ||
|
||
#link from https://www.askvg.com/direct-download-link-microsoft-office-2013-professional-plus-free-trial/ | ||
if ! test -f "$W_CACHE"/office2013pro/OFFICE15.iso; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't do that, w_download checks if it exists for you (and this would break if the shasum didn't match)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
src/winetricks
Outdated
w_call riched20 | ||
|
||
# As of Wine 3.0, D3D11 works without this setting on Intel HD Graphics 510 | ||
if w_wine_version_in 3.0, ; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should use w_workaround_wine_bug (with a linked bug report).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's wine bug 38648
src/winetricks
Outdated
# archivemount has path-related issue in access.en-us/ and cannot finish installation | ||
w_mount OFFICE15 | ||
|
||
# TODO: unattended installation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: but please use FIXME, not TODO
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly good now (though I haven't tested). Please also squash commits and use a message like:
office2003pro: new verb
src/winetricks
Outdated
|
||
|
||
if w_workaround_wine_bug 43581 "wine's libxml2 has problems parsing some regex strings"; then | ||
w_call msxml6 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should say wine's msxml6, libxml2 is a separate project
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. The bug is real, I don't doubt that. I'm saying libxml2 isn't part of wine. The wine components are msxml{3,4,6}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
94f402a#diff-90b1fb64c3f0a6c10d15531fb2008296R11999
not sure how to comment it correctly. Should be fine like this now.
@austin987 unfortunately, squashing also deleted your review comments. Did you request anything else besides squashing in your last review? I just installed and had no major problem with the installation on There are a lot of stub and semi-stub as well as timeouts etc. The log is very long but office installs. Word 2013 works a little bit better than PowerPoint. Both not perfect. |
@ukos-git, nope, you did all I asked. You had a comment before about needing to run word before PowerPoint. If that's true, it should be a warning at the end of the verb. (If you do, remove the extra newline at 11997. If not, no worry) |
You had a comment before about needing to run word before PowerPoint.
I am not sure about this. PowerPoint has some unreported issues. If I find out what‘s causing the start Problems I will report it on winehq.
|
src/winetricks
Outdated
w_call msxml6 | ||
fi | ||
|
||
if w_workaround_wine_bug 38648 "DirectX < 11 has problems with black window after installation"; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this needed on Wine 3.0+? If not, a version number should be added, e.g. ,2.22
to run for all Wine versions less than 3.0. See https://github.com/Winetricks/winetricks/blob/master/src/winetricks#L2542 and https://github.com/Winetricks/winetricks/blob/master/src/winetricks#L2563
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I confirmed Wine 2.22 needs this and 3.0 doesn't need on Intel HD Graphics 510.
if w_workaround_wine_bug 38648 "Wine < 3.0 has problems with black window after installation" ,3.0; then
If adding ,2.22
, it's not applied when using Wine 2.22.
Here is a test verb (wwbtest.verb
):
w_metadata wwbtest settings \
title="w_workaround_wine_bug test"
load_wwbtest()
{
"$WINE" --version
if w_workaround_wine_bug 38648 "test" ,3.0; then
echo "Wine < 3.0"
else
echo "Wine 3.0 or newer"
fi
if w_workaround_wine_bug 38648 "test2" ,2.22; then
echo "Wine < 2.22"
else
echo "Wine 2.22 or newer"
fi
}
Results:
[Wine 2.11]
wine-2.11
------------------------------------------------------
Working around wine bug 38648 -- test
------------------------------------------------------
Wine < 3.0
------------------------------------------------------
Working around wine bug 38648 -- test2
------------------------------------------------------
Wine < 2.22
[Wine 2.22]
wine-2.22
------------------------------------------------------
Working around wine bug 38648 -- test
------------------------------------------------------
Wine < 3.0
Current Wine does not have Wine bug 38648, so not applying workaround
Wine 2.22 or newer
[Wine 3.0]
wine-3.0
Current Wine does not have Wine bug 38648, so not applying workaround
Wine 3.0 or newer
Current Wine does not have Wine bug 38648, so not applying workaround
Wine 2.22 or newer
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could do similar for msxml as I did not require it when installing through wine-3.0 and wine-2.1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
requested changes by @austin987 done but I cannot accept it.
src/winetricks
Outdated
w_call riched20 | ||
|
||
|
||
if w_workaround_wine_bug 43581 "wine has problems parsing some regex strings during installation."; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
according to the bugreport it happened at wine 2.14
. Should I require a wine version < 2.2. I did not have problems with msxml. Adding the version will help determining at which wine version it actually occurs.
src/winetricks
Outdated
fi | ||
|
||
# "mount + sudo" and fuseiso work | ||
# archivemount has path-related issue in access.en-us/ and cannot finish installation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just notes for me (not related to this PR). We can remove this for now.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
src/winetricks
Outdated
w_call riched20 | ||
|
||
|
||
if w_workaround_wine_bug 43581 "wine has problems parsing some regex strings during installation."; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Wine" would be better.
if w_workaround_wine_bug 43581 "Wine has problems parsing some regex strings during installation."; then
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
powerpoint issues
src/winetricks
Outdated
w_set_winver win7 | ||
|
||
w_call corefonts | ||
w_call riched20 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a start-issue for PowerPoint using wine-3.0
. It is starting the installer. Not pressing "reboot" works around this. I do not have these issues on my other pc. I tried to install the elsewhere reported requirements msftedit riched30 vb6run
but it does not help. Can anybody confirm?
The log from wine and backtrace.
Should I move this over to winehq or does anyone have a solution for it on winetricks?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
installed on a clean wine-3.0 prefix (unattended installation).
powerpoint now once tried to repair and afterwards complained on a missing license key. Now it starts perfectly.
Could it have been due to the DirectX workaround that is now dropped on wine<3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to force gecko install? The activation window needs it and if I am on a non-standard-wine prefix it will not get installed. Note: ie8 is not bringing gecko to work. |
src/winetricks
Outdated
title="Microsoft Office 2013 Professional" \ | ||
publisher="Microsoft" \ | ||
year="2013" \ | ||
media="cd" \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@austin987 This verb doesn't use physical disc or cached image (it downloads an ISO image). Would it be better to specify media="download"
instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't dug too deep to see if it would cause problems (e.g. with iso parts), but I suspect you want download.
That said, I'm about 98% it should work as download rather than cd.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it is a downloaded cd. But you're right: download is the option to use here.
a4c5879
src/winetricks
Outdated
fi | ||
|
||
w_umount | ||
w_wineserver -w |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you swap the order? Now I consider it's better to unmount after wineserver -w
.
w_wineserver -w
w_umount
This is one of my mistakes, sorry.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ukos-git I think it is a good idea to provide information about known problems (use |
@austin987 can you approve? |
@ukos-git a couple minor tweaks to text. After that, please squash to one commit (git rebase -i origin/master), then it's ready as far as I'm concerned :) |
src/winetricks
Outdated
w_wineserver -w | ||
w_umount | ||
|
||
w_warn "Microsoft Office 2013 is far away from running stable under wine 3. It should not be used in a productive environment." |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use either wine 3.0 (or some version number) or 3.x, not just '3'.
src/winetricks
Outdated
w_call riched20 | ||
|
||
|
||
if w_workaround_wine_bug 43581 "Wine has problems parsing some regex strings during installation."; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the period at the end for consistency.
src/winetricks
Outdated
w_die "winbind (part of samba) is required for the installation" | ||
fi | ||
|
||
#link from https://www.askvg.com/direct-download-link-microsoft-office-2013-professional-plus-free-trial/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a big deal, but since there are other things, please add a space between '#' and "Link from"
Support for Microsoft Office 2013 Pro. * automatic iso download and mount. * referenced the correct wine bugs * @kakurasan fix fo unattended install = warning = Microsoft Office 2013 (namely Powerpoint and Word) has some unresolved stability issues. The install and run can be considered working but it ocasionally crashes and unsaved work will get lost.
@austin987 updated with requested changes. squashed to one commit |
Lovely, thanks for your patience (and thanks @kakurasan for reviewing as well). |
@ukos-git Thank you for contributing (and fixing my mistakes). |
@ukos-git I have been using Office 2013 (word/Excel) with great success thanks to your gist. However, ever since I have upgraded to Gnome 40/latest mesa and wine 6.10 (using Manjaro) it broke. Is there something I have to override/setup in wine? |
As discussed on issue 937 this is a MR for office2013 support.