diff options
| author | bungeman <bungeman@chromium.org> | 2015-04-27 11:44:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-27 18:45:01 +0000 |
| commit | dfd59a02cb534d20419dd62af462e47865bd7747 (patch) | |
| tree | 8be6da3c81029407051fd528683853545f8f95a8 | |
| parent | 035c54c9b61dbebeb7e01155e4931e03e8efe200 (diff) | |
| download | chromium_src-dfd59a02cb534d20419dd62af462e47865bd7747.zip chromium_src-dfd59a02cb534d20419dd62af462e47865bd7747.tar.gz chromium_src-dfd59a02cb534d20419dd62af462e47865bd7747.tar.bz2 | |
Roll src/third_party/freetype2 495a23fce9cd:1dd5f5f4a90
Summary of changes available at:
https://chromium.googlesource.com/chromium/src/third_party/freetype2/+log/495a23fce9cd..1dd5f5f4a90
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
This updates from Precise FreeType 2.4.8-1ubuntu2.1 to 2.4.8-1ubuntu2.2.
BUG=454426
Review URL: https://codereview.chromium.org/1108843002
Cr-Commit-Position: refs/heads/master@{#327087}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | third_party/freetype2/README.chromium | 20 |
2 files changed, 17 insertions, 5 deletions
@@ -414,7 +414,7 @@ deps_os = { # Note that this is different from Android's freetype repo. 'src/third_party/freetype2/src': - Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '495a23fce9cd125f715dc20643d14fed226d76ac', + Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + '1dd5f5f4a909866f15c92a45c9702bce290a0151', # Build tools for Chrome OS. 'src/third_party/chromite': diff --git a/third_party/freetype2/README.chromium b/third_party/freetype2/README.chromium index 9442685..f1afa52 100644 --- a/third_party/freetype2/README.chromium +++ b/third_party/freetype2/README.chromium @@ -1,6 +1,6 @@ Name: freetype2 URL: git://git.sv.nongnu.org/freetype/freetype2.git -Version: 2.4.8-1ubuntu2.1 +Version: 2.4.8-1ubuntu2.2 Security Critical: no License: BSD License File: NOT_SHIPPED @@ -10,10 +10,22 @@ Description: This mirrors the version of Freetype2 that was distributed with Ubuntu Precise (Version 2.4.8, git hash 9d7f0957fbd10fdbabf9815e37857a910ad4f4ac, plus applicable debian/patches-freetype as seen in -https://launchpad.net/ubuntu/lucid/+source/freetype ). On Ubuntu Precise -this code should be the same as the result of +https://launchpad.net/ubuntu/lucid/+source/freetype ). -apt-get source freetype && cd freetype-2.4.8/ && ./debian/rules patch +To get the code and patches: + +sudo apt-add-repository -s "deb http://archive.ubuntu.com/ubuntu precise-security main" +sudo apt-key update +sudo apt-get update +apt-get source -t precise freetype=2.4.8-1ubuntu2.2 + +and then to apply the patches (quilt): + +cd freetype-2.4.8/ +./debian/rules patch + +The tree produced by this should match the tree in this repo on the +chromium/ubuntu/precise branch. The build files should approximate the output of |