summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-10-26 09:52:46 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-11-02 16:51:17 +0000
commitccce17cb038812017e5df3caee67b47cc9fb4a29 (patch)
tree95f03b25ed846f206ec76c8947bfaf69e9ce654a
parent677aa2e61f1d9deb39f6a1e0700b83a4951ae7e6 (diff)
downloaddefinitions-ccce17cb038812017e5df3caee67b47cc9fb4a29.tar.gz
strata/graphics-common.morph: Upgrade freetype to 2.6.1
Since 2.5.3, freetype depends on HarfBuzz, but HarfBuzz depends on FreeType as well. Build freetype two times to avoid this chicken and egg problem as described in http://sourceforge.net/projects/freetype/files/freetype2/2.5.3/ Change-Id: Ie24f80a429d06577cc89a4c814bfba7a5abfed23
-rw-r--r--strata/graphics-common.morph11
1 files changed, 9 insertions, 2 deletions
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index 03af37a4..46a75b31 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -13,8 +13,8 @@ chunks:
unpetrify-ref: pixman-0.32.6
- name: freetype2
repo: upstream:freetype2
- ref: ec8853cd18e1a0c275372769bdad37a79550ed66
- unpetrify-ref: VER-2-5-3
+ ref: 8cabd919ca63f0e6c12e8405e8542a45d910fa62
+ unpetrify-ref: VER-2-6-1
build-system: autotools
- name: fontconfig
repo: upstream:fontconfig
@@ -73,6 +73,13 @@ chunks:
build-depends:
- freetype2
- ragel-tarball
+- name: freetype2-harfbuzz
+ repo: upstream:freetype2
+ ref: 8cabd919ca63f0e6c12e8405e8542a45d910fa62
+ unpetrify-ref: VER-2-6-1
+ build-system: autotools
+ build-depends:
+ - harfbuzz
- name: libwebp
repo: upstream:libwebp
ref: fcd94e925a9377cccfcf9de6db278126a52b97a4