[chromium-libs-media-freeworld: 5/8] include copy of third_party/freetype from previous source tree
commit 03f0b9be077019eb073d32292cc30e2fdb2c97de
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Wed Jul 12 16:32:37 2017 -0400
include copy of third_party/freetype from previous source tree
.gitignore | 1 +
chromium.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c60af5..ce8a184 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/chromium-59.0.3071.104-clean.tar.xz
/chromium-59.0.3071.109-clean.tar.xz
/chromium-59.0.3071.115-clean.tar.xz
+/chromium-59.0.3071.109-freetype.tar.bz2
diff --git a/chromium.spec b/chromium.spec
index 2bf42f7..d1a58a0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -220,6 +220,10 @@ Source9: chromium-browser.xml
Source10: https://dl.google.com/dl/edgedl/chrome/policy/policy_templates.zip
Source11: chrome-remote-desktop@.service
Source13: master_preferences
+# Upstream did not include third_party/freetype source code in the tarball for
59.0.3071.115
+# So we copy it from the previous build. :/
+Source14: chromium-59.0.3071.109-freetype.tar.bz2
+
# We can assume gcc and binutils.
BuildRequires: gcc-c++
@@ -545,9 +549,9 @@ members of the Chromium and WebDriver teams.
%setup -q -T -c -n %{name}-policies -a 10
%setup -q -T -c -n depot_tools -a 2
%if 0%{tests}
-%setup -q -n chromium-%{version} -b 1
+%setup -q -n chromium-%{version} -b 1 -a 14
%else
-%setup -q -n chromium-%{version}
+%setup -q -n chromium-%{version} -a 14
%endif
### Chromium Fedora Patches ###
diff --git a/sources b/sources
index 0cd1635..db65c06 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (chromium-59.0.3071.109-clean.tar.xz) =
7158a5b1c228c077275cf1bde79c34d9eabf607c04424df02056700703f2fd2907fc011ad658d759d7c6dd78c303f9c2983eb811cc9f9b6b424b0af615f6eaa7
SHA512 (depot_tools.git-master.tar.gz) =
d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
SHA512 (policy_templates.zip) =
a997bd5d410cf8f0f104fb5b69b60699c9e60eb3f99b42e0aff167843f3a45923a9a99c881cac9cd4472a60ca9c7d1ba897e15d485fbfd66c996419e7fadd3f8
SHA512 (chromium-59.0.3071.115-clean.tar.xz) =
001e6d9b4cae244767de7e85575d4071421d588422ca434461939e9652549bcd43c56fe0c510ab0d7d0a050e97d98f4086b8bf102dbadd7f83dc8827b9ea7ed1
+SHA512 (chromium-59.0.3071.109-freetype.tar.bz2) =
62a698c0229c0eb5ed4d31efd211db70f1183f4f86558bd68a6110214b2f0a61eecdde27efcab359ecee684b3df819b37a75505c1b9ea6bec407d289d6e78a66