appveyor.yml | 16 ++++++++-------- src/hb-ot-layout.cc | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit a657f23ca31237d652b5c101ed24194b6aeadaf8 Author: Dominik Röttsches <d...@roettsches.de> Date: Mon Feb 20 21:52:07 2017 +0200 Blacklist another instance of Padauk (#419) In https://crbug.com/681813 another instance of Padauk was identified triggering collapsed glyphs. Blacklist this version by patching hb-ot-layout.cc to print out gdef, gsub, and gpos table length, then adding those to the list of blacklisted versions. diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index a1682a5..e78e152 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -133,6 +133,9 @@ _hb_ot_layout_create (hb_face_t *face) || (1330 == gdef_len && 57938 == gpos_len && 109904 == gsub_len) /* 91fcc10cf15e012d27571e075b3b4dfe31754a8a padauk-3.0/Padauk-bookbold.ttf */ || (1330 == gdef_len && 58972 == gpos_len && 109904 == gsub_len) + /* sha1sum: c26e41d567ed821bed997e937bc0c41435689e85 Padauk.ttf + * "Padauk Regular" "Version 2.5", see https://crbug.com/681813 */ + || (1004 == gdef_len && 14836 == gpos_len && 59092 == gsub_len) ) { /* Many versions of Tahoma have bad GDEF tables that incorrectly classify some spacing marks commit 70202983f57fe85b2d3b56a9c205effeee66222d Author: ebraminio <ebra...@gnu.org> Date: Sat Feb 18 10:37:36 2017 +0330 [ci] Disable vcpkg freetype installation and fix Appveyor CI (#422) diff --git a/appveyor.yml b/appveyor.yml index 2a0e7c5..67f6114 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,18 +32,18 @@ install: - C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-x86_64-ragel" - 'if "%compiler%"=="msvc" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%' - - 'if "%compiler%"=="msvc" git clone https://github.com/Microsoft/vcpkg' - - 'if "%compiler%"=="msvc" cd vcpkg' - - 'if "%compiler%"=="msvc" powershell -exec bypass scripts\bootstrap.ps1' - - 'if "%compiler%"=="msvc" vcpkg install freetype:%VCPKG_ARCH%' - - 'if "%compiler%"=="msvc" copy installed\%VCPKG_ARCH%\debug\lib\freetyped.lib installed\%VCPKG_ARCH%\lib' - - 'if "%compiler%"=="msvc" cd ..' +# - 'if "%compiler%"=="msvc" git clone https://github.com/Microsoft/vcpkg' +# - 'if "%compiler%"=="msvc" cd vcpkg' +# - 'if "%compiler%"=="msvc" powershell -exec bypass scripts\bootstrap.ps1' +# - 'if "%compiler%"=="msvc" vcpkg install freetype:%VCPKG_ARCH%' +# - 'if "%compiler%"=="msvc" copy installed\%VCPKG_ARCH%\debug\lib\freetyped.lib installed\%VCPKG_ARCH%\lib' +# - 'if "%compiler%"=="msvc" cd ..' build_script: - 'if "%compiler%"=="msvc" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh; make distdir"' - 'if "%compiler%"=="msvc" cd harfbuzz-*\win32' - - 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1 FREETYPE=1 FREETYPE_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\include ADDITIONAL_LIB_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\lib' - - 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1 FREETYPE=1 install' + - 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1' # FREETYPE=1 FREETYPE_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\include ADDITIONAL_LIB_DIR=..\..\vcpkg\installed\%VCPKG_ARCH%\lib' + - 'if "%compiler%"=="msvc" nmake /f Makefile.vc CFG=%CFG% UNISCRIBE=1 DIRECTWRITE=1 install' # FREETYPE=1 install' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "pacman --noconfirm -S mingw-w64-$MSYS2_ARCH-{freetype,cairo,icu,gettext,gobject-introspection,gcc,gcc-libs,glib2,graphite2,pkg-config}"' - 'if "%compiler%"=="msys2" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; ./autogen.sh --with-uniscribe --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 --build=$MINGW_CHOST --host=$MINGW_CHOST --prefix=$MINGW_PREFIX; make; make check"'
_______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/harfbuzz