diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2020-06-04 10:35:05 +0100 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2020-06-06 10:44:09 +0000 |
| commit | 638617c7eb358297b689d629f92be9956af796a3 (patch) | |
| tree | 4703c1a7c101539fb75b38bb3284c0d0c1aa5d0d /recipes | |
| parent | 3c3e77fe023635c5131a145f7dd212a7398933b6 (diff) | |
harfbuzz: update to v2.6.7
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/494>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/harfbuzz.recipe | 10 | ||||
| -rw-r--r-- | recipes/harfbuzz/0001-Use-Python3-in-gen-def.py.patch | 23 |
2 files changed, 3 insertions, 30 deletions
diff --git a/recipes/harfbuzz.recipe b/recipes/harfbuzz.recipe index 6c4cff16..94ab51eb 100644 --- a/recipes/harfbuzz.recipe +++ b/recipes/harfbuzz.recipe @@ -3,10 +3,10 @@ class Recipe(recipe.Recipe): name = 'harfbuzz' - version = '2.6.1' + version = '2.6.7' stype = SourceType.TARBALL - url = 'https://www.freedesktop.org/software/%(name)s/release/%(name)s-%(version)s.tar.xz' - tarball_checksum = 'c651fb3faaa338aeb280726837c2384064cdc17ef40539228d88a1260960844f' + url = 'https://github.com/%(name)s/%(name)s/releases/download/%(version)s/%(name)s-%(version)s.tar.xz' + tarball_checksum = '49e481d06cdff97bf68d99fa26bdf785331f411614485d892ea4c78eb479b218' licenses = [{License.BSD_like: ['COPYING']}] deps = ['fontconfig', 'cairo', 'glib'] configure_options = "--enable-static --with-icu=no" @@ -19,10 +19,6 @@ class Recipe(recipe.Recipe): patches = ['harfbuzz/0001-build-checkout-for-gnustl-for-android.patch'] def prepare(self): - if self.config.platform != Platform.WINDOWS: - self.patches = ['harfbuzz/0001-Use-Python3-in-gen-def.py.patch', - 'harfbuzz/0001-build-checkout-for-gnustl-for-android.patch'] - if self.config.target_platform == Platform.ANDROID: v = DistroVersion.get_android_api_version(self.config.target_distro_version) if self.config.target_arch in [Architecture.ARM, Architecture.ARMv7, Architecture.X86] and v < 21: diff --git a/recipes/harfbuzz/0001-Use-Python3-in-gen-def.py.patch b/recipes/harfbuzz/0001-Use-Python3-in-gen-def.py.patch deleted file mode 100644 index f4a146c2..00000000 --- a/recipes/harfbuzz/0001-Use-Python3-in-gen-def.py.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ef8e39311dfcf6938b9594af8660b3238c79b9e1 Mon Sep 17 00:00:00 2001 -From: Cerbero Build System <cerbero@gstreamer.freedesktop.org> -Date: Wed, 19 Dec 2018 00:40:00 +0000 -Subject: [PATCH] Use Python3 in gen-def.py - ---- - src/gen-def.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-def.py b/src/gen-def.py -index ad1606e..f45df80 100755 ---- a/src/gen-def.py -+++ b/src/gen-def.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - from __future__ import print_function, division, absolute_import - --- -2.19.2 - - |