use bundled freetype on epel7

epel8
Tom Callaway 7 years ago
parent bdba7c7bda
commit 6d9e418792

@ -85,6 +85,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibwebp 1 %global bundlelibwebp 1
%global bundlelibpng 1 %global bundlelibpng 1
%global bundlelibjpeg 1 %global bundlelibjpeg 1
%global bundlefreetype 1
%else %else
%global bundleharfbuzz 0 %global bundleharfbuzz 0
%global bundleopus 1 %global bundleopus 1
@ -92,6 +93,7 @@ BuildRequires: libicu-devel >= 5.4
%global bundlelibwebp 0 %global bundlelibwebp 0
%global bundlelibpng 0 %global bundlelibpng 0
%global bundlelibjpeg 0 %global bundlelibjpeg 0
%global bundlefreetype 0
%endif %endif
# Needs at least harfbuzz 1.7.3 now. # Needs at least harfbuzz 1.7.3 now.
@ -119,7 +121,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
%endif %endif
Version: %{majorversion}.0.3325.162 Version: %{majorversion}.0.3325.162
Release: 1%{?dist} Release: 2%{?dist}
Summary: A WebKit (Blink) powered web browser Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@ -332,7 +334,11 @@ BuildRequires: bzip2-devel
BuildRequires: dbus-glib-devel BuildRequires: dbus-glib-devel
BuildRequires: elfutils-libelf-devel BuildRequires: elfutils-libelf-devel
BuildRequires: flac-devel BuildRequires: flac-devel
%if 0%{?bundlefreetype}
# nothing
%else
BuildRequires: freetype-devel BuildRequires: freetype-devel
%endif
BuildRequires: hwdata BuildRequires: hwdata
BuildRequires: kernel-headers BuildRequires: kernel-headers
BuildRequires: libevent-devel BuildRequires: libevent-devel
@ -478,6 +484,9 @@ Provides: bundled(fdmlibm) = 5.3
Provides: bundled(ffmpeg) = 3.2git Provides: bundled(ffmpeg) = 3.2git
Provides: bundled(fips181) = 2.2.3 Provides: bundled(fips181) = 2.2.3
Provides: bundled(fontconfig) = 2.11.0 Provides: bundled(fontconfig) = 2.11.0
%if 0%{?bundlefreetype}
Provides: bundled(freetype) = 2.9.3
%endif
Provides: bundled(gperftools) = svn144 Provides: bundled(gperftools) = svn144
%if 0%{?bundleharfbuzz} %if 0%{?bundleharfbuzz}
Provides: bundled(harfbuzz) = 1.4.2 Provides: bundled(harfbuzz) = 1.4.2
@ -1043,7 +1052,10 @@ export PATH=$PATH:%{_builddir}/depot_tools
build/linux/unbundle/replace_gn_files.py --system-libraries \ build/linux/unbundle/replace_gn_files.py --system-libraries \
flac \ flac \
%if 0%{?bundlefreetype}
%else
freetype \ freetype \
%endif
%if 0%{?bundleharfbuzz} %if 0%{?bundleharfbuzz}
%else %else
harfbuzz-ng \ harfbuzz-ng \
@ -1572,6 +1584,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
* Fri Mar 16 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.162-2 * Fri Mar 16 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.162-2
- disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file) - disable StartupNotify in chromium-browser.desktop (not in google-chrome desktop file)
(bz1545241) (bz1545241)
- use bundled freetype on epel7
* Wed Mar 14 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.162-1 * Wed Mar 14 2018 Tom Callaway <spot@fedoraproject.org> 65.0.3325.162-1
- update to 65.0.3325.162 - update to 65.0.3325.162

Loading…
Cancel
Save