python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 17:54:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4491 from radarhere/windows_updates

Browse Source 
Updated fribidi and harfbuzz
This commit is contained in:
Hugo van Kemenade 2020-03-30 00:34:42 +03:00 committed by GitHub
commit 75b8c366b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test-windows.yml vendored
View File

@ -251,7 +251,7 @@ jobs:
set BUILD=%GITHUB_WORKSPACE%\winbuild\build set BUILD=%GITHUB_WORKSPACE%\winbuild\build
set INCLUDE=%INCLUDE%;%INCLIB% set INCLUDE=%INCLUDE%;%INCLIB%
set LIB=%LIB%;%INCLIB% set LIB=%LIB%;%INCLIB%
cd /D %BUILD%\harfbuzz-2.6.1 cd /D %BUILD%\harfbuzz-2.6.4
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }} call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }}
echo on echo on
set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF set CMAKE=cmake.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES:BOOL=OFF
@ -269,7 +269,7 @@ jobs:
set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\V7.1A\Include
set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32 set INCLIB=%GITHUB_WORKSPACE%\winbuild\depends\msvcr10-x32
set BUILD=%GITHUB_WORKSPACE%\winbuild\build set BUILD=%GITHUB_WORKSPACE%\winbuild\build
cd /D %BUILD%\fribidi-1.0.7 cd /D %BUILD%\fribidi-1.0.9
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }} call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }}
echo on echo on
copy /Y /B %GITHUB_WORKSPACE%\winbuild\fribidi.cmake CMakeLists.txt copy /Y /B %GITHUB_WORKSPACE%\winbuild\fribidi.cmake CMakeLists.txt

12
winbuild/config.py
View File

@ -98,14 +98,14 @@ libs = {
"dir": "libimagequant-e5d454bc7f5eb63ee50c84a83a7fa5ac94f68ec4", "dir": "libimagequant-e5d454bc7f5eb63ee50c84a83a7fa5ac94f68ec4",
}, },
"harfbuzz": { "harfbuzz": {
"url": "https://github.com/harfbuzz/harfbuzz/archive/2.6.1.zip", "url": "https://github.com/harfbuzz/harfbuzz/archive/2.6.4.zip",
"filename": "harfbuzz-2.6.1.zip", "filename": "harfbuzz-2.6.4.zip",
"dir": "harfbuzz-2.6.1", "dir": "harfbuzz-2.6.4",
}, },
"fribidi": { "fribidi": {
"url": "https://github.com/fribidi/fribidi/archive/v1.0.7.zip", "url": "https://github.com/fribidi/fribidi/archive/v1.0.9.zip",
"filename": "fribidi-1.0.7.zip", "filename": "fribidi-1.0.9.zip",
"dir": "fribidi-1.0.7", "dir": "fribidi-1.0.9",
}, },
"libraqm": { "libraqm": {
"url": "https://github.com/HOST-Oman/libraqm/archive/v0.7.0.zip", "url": "https://github.com/HOST-Oman/libraqm/archive/v0.7.0.zip",