diff --git a/wine-1.7.47.tar.bz2 b/wine-1.7.47.tar.bz2 deleted file mode 100644 index eac07da..0000000 --- a/wine-1.7.47.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba74f75aec400dc4b1d64ddc29560e4946837e73cb19d9c231604ff0147bbb2e -size 22398577 diff --git a/wine-1.7.47.tar.bz2.sign b/wine-1.7.47.tar.bz2.sign deleted file mode 100644 index 07043e7..0000000 --- a/wine-1.7.47.tar.bz2.sign +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlWfzXwACgkQ9ebp7rlGHdeCvwCgxqAjGg1PFJfxcfz9R8myxMWy -W2QAn3foapSl2LUwTUtd6yu2TqNmp2sj -=24BB ------END PGP SIGNATURE----- diff --git a/wine-1.7.48.tar.bz2 b/wine-1.7.48.tar.bz2 new file mode 100644 index 0000000..a01d967 --- /dev/null +++ b/wine-1.7.48.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3f55ce56e2092d49b317fea8802e314be2b2170fd434f5e45f7141773946c8e +size 22444016 diff --git a/wine-1.7.48.tar.bz2.sign b/wine-1.7.48.tar.bz2.sign new file mode 100644 index 0000000..5e2aa58 --- /dev/null +++ b/wine-1.7.48.tar.bz2.sign @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlW3yEYACgkQ9ebp7rlGHdetnQCfZxS8fc4e75KC+IrGjw7udbjb +ntMAniWJv0IEVoF2zKAlF3IstnUSqZHB +=J+6k +-----END PGP SIGNATURE----- diff --git a/wine.changes b/wine.changes index 658a04d..96cd19f 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jul 29 16:27:02 UTC 2015 - meissner@suse.com + +- Updated to 1.7.48 development snapshot + - Fleshed out OpenMP implementation. + - I/O stream support in the MSVCIRT C++ runtime. + - Support for pixel snapping in DirectWrite. + - More support for OpenGL core contexts. + - Various bug fixes. +- winetricks update + ------------------------------------------------------------------- Fri Jul 10 13:58:37 UTC 2015 - meissner@suse.com diff --git a/wine.spec b/wine.spec index 13481aa..3604026 100644 --- a/wine.spec +++ b/wine.spec @@ -57,15 +57,19 @@ BuildRequires: sane-backends-devel BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.47 +Version: 1.7.48 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ Group: System/Emulators/PC Url: http://www.winehq.org/ -Source0: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2 +# while sf is down +#Source0: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2 +Source0: http://mirrors.ibiblio.org/wine/source/1.7/wine-%{version}.tar.bz2 Source41: wine.keyring -Source42: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2.sign +# while sf is down +#Source42: http://downloads.sourceforge.net/project/wine/Source/%{name}-%{version}.tar.bz2.sign +Source42: http://mirrors.ibiblio.org/wine/source/1.7/%{name}-%{version}.tar.bz2.sign Source1: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks Source11: https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks.1 Source2: http://kegel.com/wine/wisotool diff --git a/winetricks b/winetricks index 3c69608..3f066df 100644 --- a/winetricks +++ b/winetricks @@ -378,7 +378,7 @@ w_try_unzip() # Not always installed, use Windows 7-zip as a fallback: if test -x "`which unzip 2>/dev/null`" then - # FreeBSD ships unzip, but it doesn't support self compressed exectuables + # FreeBSD ships unzip, but it doesn't support self compressed executables # If it fails ,fall back to 7-zip: unzip -o -q -d"$destdir" "$zipfile" "$@" ret=$? @@ -709,7 +709,7 @@ w_download_to() if [ -x "`which aria2c 2>/dev/null`" ] then # Basic aria2c support. - aria2c -c -o "$_W_file" "$_W_url" + aria2c -c -d "$_W_cache" -o "$_W_file" "$_W_url" elif [ -x "`which wget 2>/dev/null`" ] then # Use -nd to insulate ourselves from people who set -x in WGETRC @@ -4415,14 +4415,14 @@ w_metadata cabinet dlls \ title="Microsoft cabinet.dll" \ publisher="Microsoft" \ year="2002" \ - media="manual_download" \ + media="download" \ file1="mdac_typ.exe" \ installed_file1="$W_SYSTEM32_DLLS_WIN/cabinet.dll" load_cabinet() { # http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en - w_download_manual http://download.cnet.com/Microsoft-Data-Access-Components-MDAC-2-7-Service-Pack-1-Refresh/3000-10250_4-10729498.html mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee + w_download http://web.archive.org/web/20080731135848/http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee w_try_cabextract --directory="$W_TMP" "$W_CACHE"/cabinet/$file1 w_try cp "$W_TMP"/cabinet.dll "$W_SYSTEM32_DLLS"/cabinet.dll @@ -5579,15 +5579,15 @@ w_metadata dotnet30 dlls \ title="MS .NET 3.0" \ publisher="Microsoft" \ year="2006" \ - media="manual_download" \ + media="download" \ conflicts="dotnet11 dotnet20sp1 dotnet20sp2 dotnet30sp1 dotnet35 dotnet35sp1 dotnet45" \ - file1="netframework3.exe" \ + file1="dotnetfx3.exe" \ installed_file1="c:/windows/Microsoft.NET/Framework/v3.0/Microsoft .NET Framework 3.0/logo.bmp" load_dotnet30() { # http://msdn.microsoft.com/en-us/netframework/bb264589.aspx - w_download_manual http://www.oldversion.com/download-.Net-Framework-3.0.html netframework3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039 + w_download http://web.archive.org/web/20120509084326/http://download.microsoft.com/download/3/F/0/3F0A922C-F239-4B9B-9CB0-DF53621C57D9/dotnetfx3.exe f3d2c3c7e4c0c35450cf6dab1f9f2e9e7ff50039 w_call remove_mono @@ -6190,6 +6190,30 @@ load_glut() w_warn "If you want to compile glut programs, add c:/glut-3.7.6-bin to LIB and INCLUDE" } +#---------------------------------------------------------------- + +w_metadata gmdls dlls \ + title="General MIDI DLS Collection" \ + publisher="Microsoft / Roland" \ + year="1999" \ + media="download" \ + file1="../directx8/DX81Redist.exe" \ + installed_file1="$W_SYSTEM32_DLLS_WIN/drivers/gm.dls" + +load_gmdls() +{ + w_download_to directx8 http://web.archive.org/web/20070403193305/http://download.microsoft.com/download/whistler/Update/8.1/W982KMeXP/EN-US/DX81Redist.exe ea2345f602741343e97a5ece5d1d2c3cc44296c3 + + w_try_unzip "$W_TMP" "$W_CACHE"/directx8/DX81Redist.exe "*/*/DirectX.cab" + w_try_cabextract -d "$W_TMP" -F gm16.dls "$W_TMP"/*/*/DirectX.cab + w_try mv "$W_TMP"/gm16.dls "$W_SYSTEM32_DLLS"/drivers/gm.dls + if test "$W_ARCH" = "win64" + then + w_try cd "$W_SYSTEM64_DLLS"/drivers + w_try ln -s ../../syswow64/drivers/gm.dls + fi +} + #---------------------------------------------------------------- # um, codecs are kind of clustered here. They probably deserve their own real category. @@ -6423,7 +6447,7 @@ w_metadata mdac27 dlls \ title="Microsoft Data Access Components 2.7 sp1" \ publisher="Microsoft" \ year="2006" \ - media="manual_download" \ + media="download" \ file1="mdac_typ.exe" \ installed_file1="$W_COMMONFILES_X86_WIN/System/ADO/msado26.tlb" @@ -6435,7 +6459,7 @@ load_mdac27() fi # http://www.microsoft.com/downloads/en/details.aspx?FamilyId=9AD000F2-CAE7-493D-B0F3-AE36C570ADE8&displaylang=en - w_download_manual http://download.cnet.com/Microsoft-Data-Access-Components-MDAC-2-7-Service-Pack-1-Refresh/3000-10250_4-10729498.html mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee + w_download http://web.archive.org/web/20060202021126/http://download.microsoft.com/download/3/b/f/3bf74b01-16ba-472d-9a8c-42b2b4fa0d76/mdac_typ.exe f68594d1f578c3b47bf0639c46c11c5da161feee load_native_mdac w_set_winver nt40 w_try "$WINE" "$W_CACHE"/mdac27/mdac_typ.exe ${W_OPT_UNATTENDED:+ /q /C:"setup /QNT"} @@ -6490,17 +6514,17 @@ load_mfc40() w_metadata mozillabuild apps \ title="Mozilla build environment" \ publisher="The Mozilla Foundation" \ - year="2010" \ + year="2015" \ media="download" \ - file1="MozillaBuildSetup-1.5.1.exe" \ - installed_file1="c:/mozilla-build/start-l10n.bat" \ + file1="MozillaBuildSetup-2.0.0.exe" \ + installed_file1="c:/mozilla-build/moztools/bin/nsinstall.exe" \ homepage="https://wiki.mozilla.org/MozillaBuild" load_mozillabuild() { - w_download http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.5.1.exe 216c52eafe42df7559e8451f4e40a28e9c0f8133 + w_download http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-2.0.0.exe daba4bc03ae9014c68611fd36b05dcc4083c6fdb cd "$W_CACHE/$W_PACKAGE" - w_try "$WINE" MozillaBuildSetup-1.5.1.exe $W_UNATTENDED_SLASH_S + w_try "$WINE" MozillaBuildSetup-2.0.0.exe $W_UNATTENDED_SLASH_S } #---------------------------------------------------------------- @@ -8119,6 +8143,7 @@ load_xmllite() en*) w_download http://download.microsoft.com/download/f/9/6/f964059a-3747-4ed8-9326-ba1e639031b1/WindowsXP-KB915865-v11-x86-ENU.exe 226d246a1c64e693791de5c727509002d089b0d5 ;; fr*) w_download http://download.microsoft.com/download/4/1/d/41de58a0-6715-4d3e-99e7-ff0c11283d1b/WindowsXP-KB915865-v11-x86-FRA.exe abb70b6a96be7dce453b00877739e90c6f3efba0 ;; de*) w_download http://download.microsoft.com/download/9/b/6/9b67efdb-cce3-4247-a2e0-386673859a1b/WindowsXP-KB915865-v11-x86-DEU.exe a03a325815acf9d624db58ab94a140a5586e64c8 ;; + ja*) w_download http://download.microsoft.com/download/f/5/c/f5cf73b7-4dc4-4042-815d-29d2fd24ae6f/WindowsXP-KB915865-v11-x86-JPN.exe eaf443d04d9b13cb86f927f8a7fe372268386395 ;; *) w_die "sorry, xmllite install not yet implemented for language $LANG" ;; esac @@ -8141,6 +8166,7 @@ load_xmllite() en*) w_try "$WINE" WindowsXP-KB915865-v11-x86-ENU.exe $W_UNATTENDED_SLASH_Q ;; fr*) w_try "$WINE" WindowsXP-KB915865-v11-x86-FRA.exe $W_UNATTENDED_SLASH_Q ;; de*) w_try "$WINE" WindowsXP-KB915865-v11-x86-DEU.exe $W_UNATTENDED_SLASH_Q ;; + ja*) w_try "$WINE" WindowsXP-KB915865-v11-x86-JPN.exe $W_UNATTENDED_SLASH_Q ;; esac } @@ -8324,25 +8350,18 @@ w_metadata corefonts fonts \ load_corefonts() { - # See http://corefonts.sf.net - # TODO: let user pick mirror, - # see http://corefonts.sourceforge.net/msttcorefonts-2.0-1.spec for how - # TODO: add more fonts - - # Added More Fonts (see msttcorefonts) - # [*] Pointed w_download to sites that actually contained the - # fonts to w_download of 04-03-2008) - #w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/andale32.exe c4db8cbe42c566d12468f5fdad38c43721844c69 - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344 - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51 - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057 - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2 - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060 - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a - w_download $WINETRICKS_SOURCEFORGE/project/corefonts/the%20fonts/final/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f + # FIXME: why is this commented out? Should be removed or enabled. + #w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/andale32.exe c4db8cbe42c566d12468f5fdad38c43721844c69 + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arial32.exe 6d75f8436f39ab2da5c31ce651b7443b4ad2916e + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/arialb32.exe d45cdab84b7f4c1efd6d1b369f50ed0390e3d344 + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/comic32.exe 2371d0327683dcc5ec1684fe7c275a8de1ef9a51 + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/courie32.exe 06a745023c034f88b4135f5e294fece1a3c1b057 + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/georgi32.exe 90e4070cb356f1d811acb943080bf97e419a8f1e + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/impact32.exe 86b34d650cfbbe5d3512d49d2545f7509a55aad2 + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/times32.exe 20b79e65cdef4e2d7195f84da202499e3aa83060 + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/trebuc32.exe 50aab0988423efcc9cf21fac7d64d534d6d0a34a + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/verdan32.exe f5b93cedf500edc67502f116578123618c64a42a + w_download ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/ms-ttf/webdin32.exe 2fb4a42c53e50bc70707a7b3c57baf62ba58398f # Natively installed versions of these fonts will cause the installers # to exit silently. Because there are apps out there that depend on the @@ -8520,15 +8539,17 @@ w_metadata fakejapanese fonts \ load_fakejapanese() { w_call takao - # Loads Takao fonts and sets aliases for MS Gothic and MS PGothic, mainly for Japanese language support + # Loads Takao fonts and sets aliases for MS Gothic, MS UI Gothic, and MS PGothic, mainly for Japanese language support # Aliases to set: # MS Gothic --> TakaoGothic + # MS UI Gothic --> TakaoGothic # MS PGothic --> TakaoPGothic # MS Mincho --> TakaoMincho # MS PMincho --> TakaoPMincho # These aliases were taken from what was listed in Ubuntu's fontconfig definitions. w_register_font_replacement "MS Gothic" "TakaoGothic" + w_register_font_replacement "MS UI Gothic" "TakaoGothic" w_register_font_replacement "MS PGothic" "TakaoPGothic" w_register_font_replacement "MS Mincho" "TakaoMincho" w_register_font_replacement "MS PMincho" "TakaoPMincho" @@ -9173,6 +9194,28 @@ load_foobar2000() w_declare_exe "$W_PROGRAMS_X86_WIN\\foobar2000" "foobar2000.exe" } +#---------------------------------------------------------------- + +w_metadata iceweasel apps \ + title="GNU Icecat 31.7.0" \ + publisher="GNU Foundation" \ + year="2015" \ + media="download" \ + file1="icecat-31.7.0.en-US.win32.zip" \ + installed_exe1="$W_PROGRAMS_X86_WIN/icecat/icecat.exe" + +load_iceweasel() +{ + if w_workaround_wine_bug 29077 "" 1.7.25, + then + w_warn "Visit about:config, search for dom.ipc, and set those booleans false if you want to use flash." + fi + + w_download https://ftp.gnu.org/gnu/gnuzilla/31.7.0/icecat-31.7.0.en-US.win32.zip cf52a728c1af29065b7dc7bdddc9265a79eb5328 + w_try_unzip "${W_PROGRAMS_X86_UNIX}" "${W_CACHE}/${W_PACKAGE}/${file1}" +} + + #---------------------------------------------------------------- w_metadata irfanview apps \ @@ -9962,6 +10005,69 @@ _EOF_ #---------------------------------------------------------------- +w_metadata psdkwin71 apps \ + title="MS Windows 7.1 SDK" \ + publisher="Microsoft" \ + year="2010" \ + media="download" \ + file1="winsdk_web.exe" \ + installed_exe1="C:/Program Files/Microsoft SDKs/Windows/v7.1/Bin/SetEnv.Cmd" + +load_psdkwin71() +{ + w_call dotnet20 + w_call dotnet40 + w_call mfc42 # need mfc42u, or setup will abort + # http://www.microsoft.com/downloads/details.aspx?FamilyID=c17ba869-9671-4330-a63e-1fd44e0e2505&displaylang=en + w_download http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe a8717ebb20a69c7efa85232bcb9899b8b07f98cf + cd "$W_CACHE"/psdkwin71 + if w_workaround_wine_bug 21596 + then + w_warn "When given a choice, select only C++ compilers and headers, the other options don't work yet. See http://bugs.winehq.org/show_bug.cgi?id=21596" + fi + # don't have a working unattended recipe. Maybe we'll have to + # do an autohotkey script until msft gets its act together: + # http://social.msdn.microsoft.com/Forums/en-US/windowssdk/thread/c053b616-7d5b-405d-9841-ec465a8e21d5 + w_try "$WINE" winsdk_web.exe + + if w_workaround_wine_bug 21362 + then + # Assume user installed in default location + cat > "$W_TMP"/set-psdk71.reg <<_EOF_ +REGEDIT4 + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs] + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows] +"CurrentVersion"="v7.1" +"CurrentInstallFolder"="C:\\\Program Files\\\Microsoft SDKs\\\Windows\\\v7.1\\\" + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1] +"InstallationFolder"="C:\\\Program Files\\\Microsoft SDKs\\\Windows\\\v7.1\\\" +"ProductVersion"="7.0.7600.0.30514" +"ProductName"="Microsoft Windows SDK for Windows 7 (7.0.7600.0.30514)" + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDKBuild] +"ComponentName"="Microsoft Windows SDK Headers and Libraries" +"InstallationFolder"="C:\\\Program Files\\\Microsoft SDKs\\\Windows\\\v7.1\\\" +"ProductVersion"="7.0.7600.0.30514" + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDKTools] +"ComponentName"="Microsoft Windows SDK Headers and Libraries" +"InstallationFolder"="C:\\\Program Files\\\Microsoft SDKs\\\Windows\\\v7.1\\\bin\\\" +"ProductVersion"="7.0.7600.0.30514" + +[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDKWin32Tools] +"ComponentName"="Microsoft Windows SDK Utilities for Win32 Development" +"InstallationFolder"="C:\\\Program Files\\\Microsoft SDKs\\\Windows\\\v7.1\\\bin\\\" +"ProductVersion"="7.0.7600.0.30514" +_EOF_ + w_try_regedit "$W_TMP_WIN"\\set-psdk71.reg + fi +} + +#---------------------------------------------------------------- + w_metadata python26 dlls \ title="Python Interpreter, version 2.6.2" \ publisher="Python Software Foundaton" \ @@ -10003,27 +10109,49 @@ load_python26() #---------------------------------------------------------------- w_metadata python26_comtypes dlls \ - title="Comtypes 0.6.2 for Python 2.6" \ + title="Comtypes for Python 2.6" \ publisher="theller" \ - year="2010" \ + year="2014" \ media="download" \ - file1="comtypes-0.6.2.zip" \ - installed_file1="c:/Python26/Lib/site-packages/comtypes-0.6.2-py2.6.egg-info" \ - homepage="http://sourceforge.net/projects/comtypes" + file1="1.1.1.zip" \ + installed_file1="c:/Python26/Lib/site-packages/comtypes-1.1.1-py2.6.egg/EGG-INFO/PKG-INFO" \ + homepage="https://github.com/enthought/comtypes/releases" load_python26_comtypes() { w_call python26 + w_call python26_setuptools - w_download $WINETRICKS_SOURCEFORGE/comtypes/0.6.2/comtypes-0.6.2.zip b84f4e3050652d494e8c8d9d6d6f221c124ffba9 + w_download https://github.com/enthought/comtypes/archive/${file1} 080921ede048063a3be273f5dca3acc469dfe361 - w_try_unzip "$W_TMP" "$W_CACHE/$W_PACKAGE"/comtypes-0.6.2.zip - cd "$W_TMP"/comtypes-0.6.2 + w_try_unzip "$W_TMP" "${W_CACHE}/${W_PACKAGE}/${file1}" + cd "$W_TMP/comtypes-$(basename ${file1} .zip)" w_try "$WINE" "C:\Python26\python.exe" setup.py install } #---------------------------------------------------------------- +w_metadata python26_setuptools dlls \ + title="Setuptools 18.0.1 for Python 2.6" \ + publisher="Python Packaging Authority" \ + year="2010" \ + media="download" \ + file1="ez_setup.py" \ + installed_file1="c:/Python26/Lib/site-packages/setuptools.pth" \ + homepage="https://pypi.python.org/pypi/setuptools" + +load_python26_setuptools() +{ + w_call python26 + + w_download https://bootstrap.pypa.io/ez_setup.py 50e215cb8efd8a9c982ca6894a057c2bea22d86f + + cd "$W_CACHE/$W_PACKAGE" + w_try "$WINE" "C:\Python26\python.exe" ${file1} +} + +#---------------------------------------------------------------- + w_metadata spotify apps \ title="Spotify - All the music, all the time" \ publisher="Spotify" \ @@ -10171,44 +10299,6 @@ _EOF_ #---------------------------------------------------------------- -w_metadata songbird apps \ - title="Songbird" \ - publisher="POTI" \ - year="2013" \ - media="download" \ - file1="Songbird_2.2.0-2453_windows-i686-msvc8.exe" \ - installed_exe1="$W_PROGRAMS_X86_WIN/Songbird/songbird.exe" \ - homepage="http://sourceforge.net/projects/songbird.mirror/" - -load_songbird() -{ - w_download http://sourceforge.net/projects/songbird.mirror/files/Songbird%202.2.0/Songbird_2.2.0-2453_windows-i686-msvc8.exe 5f9e95ea9015c485602add7b759c956088cae7f1 - cd "$W_CACHE/songbird" - if test $W_OPT_UNATTENDED - then - w_ahk_do " - run, $file1 /S - SetTitleMatchMode, 2 - ;1033 error alert during silent install - WinWait, Songbird Setup, 1033 - Sleep 1000 - ControlClick, Button1 - WinWaitClose - " - else - w_try "$WINE" $file1 - fi - - if w_workaround_wine_bug 35041 - then - w_warn "Run songbird with taskset -c 0 to avoid a doublefree/crash in libX11" - fi - - w_declare_exe "$W_PROGRAMS_X86_WIN\\Songbird" songbird.exe -} - -#---------------------------------------------------------------- - w_metadata steam apps \ title="Steam" \ publisher="Valve" \