diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-12 15:33:58 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-12 15:42:51 +0200 |
commit | feaef69321d473d29d3ffa65c950870382f0f5bc (patch) | |
tree | d8edba6d0fb5fa93711e8bae1eba2b4ceaa9f474 /download | |
parent | dcbf9238ba3354aafbcbfa0c15980587cf31fe96 (diff) |
Don't bundle gdiplus.dll any more
It was needed for Windows 2000 support.
Change-Id: I1c0bec3fd3c76005b843d62c636410201abfa8e1
Diffstat (limited to 'download')
-rwxr-xr-x | download | 49 |
1 files changed, 0 insertions, 49 deletions
@@ -183,10 +183,6 @@ for i in $filelist ; do fi done -if [ "$COM" = "MSC" ]; then - downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1" -fi - if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then # these sources are from a tarball, so get the other source tarballs . $start_dir/sources.ver @@ -230,51 +226,6 @@ if [ "$COM" = "MSC" -a "$CPUNAME" = "INTEL" ]; then echo "<http://www.microsoft.com/downloads/release.asp?releaseid=30682>." exit 1 fi - - # Windows builds need gdiplus.dll in external/gdiplus/ - if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe -a -n "$md5sum" ]; then - # This can be run only on Windows itself (Cygwin) - TMPUNPACK=`cygpath -d $TARFILE_LOCATION/tmp` - chmod a+w $TARFILE_LOCATION/tmp - gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll - chmod +x $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe - - # Run it through cmd so that the UAC prompt is displayed - echo - echo "NOTE: We are running the Microsoft KB958911 security fix installer" - echo "to get gdiplus.dll. You will most probably get a UAC prompt now." - echo "If you trust us, just enter your administrator password." - echo "The security fix is run with the /extract switch to just unpack" - echo "its files." - echo "If you don't trust us, just get gdiplus.dll yourself and put it" - echo "in external/gdiplus/gdiplus.dll." - echo "gdiplus.dll is included in the LibreOffice installer for the benefit of" - echo "Windows 2000 users." - # A few empty lines so that the above is visible even if the taskbar's auto-hide is turned on, - # and the UAC prompt caused it to taise (with a blinking icon for the UAC prompt) - echo - echo - echo - cmd /c "`cygpath -w $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe` /extract:$TMPUNPACK /q" - if [ -f $TARFILE_LOCATION/tmp/$gdiplus_dll_path ]; then - echo "Extraction succeeded" - sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$gdiplus_dll_path | sed "s/ .*//"` - if [ "$sum" = "3a95b4d80a3586ab1e2f0c608608ebac" ]; then - cp $TARFILE_LOCATION/tmp/$gdiplus_dll_path ./external/gdiplus/gdiplus.dll - else - echo "But unexpected checksum of $gdiplus_dll_path" - fi - else - echo "WindowsXP-KB958911-x86-ENU.exe did not unpack the expected $gdiplus_dll_path" - fi - fi - if [ ! -f ./external/gdiplus/gdiplus.dll ]; then - echo "gdiplus.dll is missing in external/gdiplus/." - echo "Get it from the Microsoft site and put it there." - echo "You may have to search Microsoft's website. Last time it was seen at:" - echo "<http://www.microsoft.com/downloads/details.aspx?familyid=6A63AB9C-DF12-4D41-933C-BE590FEAA05A&displaylang=en>." - exit 1 - fi fi if [ "$COM" = "MSC" ]; then |