summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2018-02-15 18:33:15 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-02-15 18:33:15 +0000
commit5b097c73dec7e7979166b3396efcf9e001b42b9e (patch)
tree3e055c2707d1df17ef739a48a85988112155bf47 /third_party
parente40678ed8a22ecd57421877af39cf7f281f618c4 (diff)
downloadpdfium-5b097c73dec7e7979166b3396efcf9e001b42b9e.tar.xz
Fix roll-freetype script
In c3532457d457e868afb8506e047ab353f2651bc0, a cmp was added to the roller script, but it should be cp instead since we want both files to be the same. Change-Id: I12dc32ab1633196267537e4db3a3522058e44a9d Reviewed-on: https://pdfium-review.googlesource.com/26830 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/freetype/README.pdfium4
-rw-r--r--third_party/freetype/include/pstables.h2
-rwxr-xr-xthird_party/freetype/roll-freetype.sh4
3 files changed, 6 insertions, 4 deletions
diff --git a/third_party/freetype/README.pdfium b/third_party/freetype/README.pdfium
index 3e9aa69980..949a30d0a2 100644
--- a/third_party/freetype/README.pdfium
+++ b/third_party/freetype/README.pdfium
@@ -1,7 +1,7 @@
Name: FreeType
URL: http://www.freetype.org/
-Version: VER-2-8-1-145
-Revision: 2c048a8a622e9f44f255aa3316026f124ac9ecbc
+Version: VER-2-9-20
+Revision: 4a03f17449ae45f0dacf4de4694ccd6e5e1b24d1
Security Critical: yes
License: FreeType License (FTL)
License File: FTL.TXT
diff --git a/third_party/freetype/include/pstables.h b/third_party/freetype/include/pstables.h
index 2a2b717d8f..79545ee039 100644
--- a/third_party/freetype/include/pstables.h
+++ b/third_party/freetype/include/pstables.h
@@ -4,7 +4,7 @@
/* */
/* PostScript glyph names. */
/* */
-/* Copyright 2005-2017 by */
+/* Copyright 2005-2018 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
diff --git a/third_party/freetype/roll-freetype.sh b/third_party/freetype/roll-freetype.sh
index 0930a64847..e51a6a9fe2 100755
--- a/third_party/freetype/roll-freetype.sh
+++ b/third_party/freetype/roll-freetype.sh
@@ -14,7 +14,8 @@ FTVERSION=`git -C third_party/freetype/src/ describe --long`
FTCOMMIT=`git -C third_party/freetype/src/ rev-parse HEAD`
# Make sure our copy of pstables.h matches the one in freetype/src.
-cmp third_party/freetype/src/src/psnames/pstables.h \
+# May need to --bypass-hooks to prevent formatting of this file.
+cp third_party/freetype/src/src/psnames/pstables.h \
third_party/freetype/include/pstables.h
sed -i "s/^Version: .*\$/Version: ${FTVERSION%-*}/" \
@@ -23,4 +24,5 @@ sed -i "s/^Revision: .*\$/Revision: ${FTCOMMIT}/" \
third_party/freetype/README.pdfium
git add third_party/freetype/README.pdfium
+git add third_party/freetype/include/pstables.h
git commit --quiet --amend --no-edit