summaryrefslogtreecommitdiffstats
path: root/chrome/installer/linux
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2015-08-11 09:38:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-11 16:38:46 +0000
commit7577de462e5d3d7256f5a86ba8f90aea72193af3 (patch)
tree2a1f6eed8e31ad2c0dee7b4f63c84be5849835ad /chrome/installer/linux
parent888bbf99a19d08f09b95cb5fdfbf1e80d8a979d6 (diff)
downloadchromium_src-7577de462e5d3d7256f5a86ba8f90aea72193af3.zip
chromium_src-7577de462e5d3d7256f5a86ba8f90aea72193af3.tar.gz
chromium_src-7577de462e5d3d7256f5a86ba8f90aea72193af3.tar.bz2
Revert of Linux: Depend on liberation-fonts package. (patchset #1 id:1 of https://codereview.chromium.org/1283543004/ )
Reason for revert: The liberation-fonts package on Fedora is a lie. See https://crbug.com/519322 Original issue's description: > Linux: Depend on liberation-fonts package. > > Without these fonts, text in the built-in PDF viewer may not display correctly. > > BUG=369991 > > Committed: https://crrev.com/8f7b33b2f79917f2cb2f1df9f926575c070dbae1 > Cr-Commit-Position: refs/heads/master@{#342645} TBR=mmoss@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=369991 Review URL: https://codereview.chromium.org/1286743002 Cr-Commit-Position: refs/heads/master@{#342830}
Diffstat (limited to 'chrome/installer/linux')
-rwxr-xr-xchrome/installer/linux/debian/build.sh2
-rwxr-xr-xchrome/installer/linux/rpm/build.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index c79f036..c7f75a2 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -290,7 +290,7 @@ rm -rf "$DUMMY_STAGING_DIR"
# Additional dependencies not in the dpkg-shlibdeps output.
# - Pull a more recent version of NSS than required by runtime linking, for
# security and stability updates in NSS.
-ADDITION_DEPS="ca-certificates, fonts-liberation, libappindicator1, libcurl3, \
+ADDITION_DEPS="ca-certificates, libappindicator1, libcurl3, \
libnss3 (>= 3.14.3), lsb-base (>=3.2), xdg-utils (>= 1.0.2), wget"
# Fix-up libnspr dependency due to renaming in Ubuntu (the old package still
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index 506701a..6110905 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -127,7 +127,6 @@ do_package() {
# https://bugzilla.redhat.com/show_bug.cgi?id=538158
# https://bugzilla.novell.com/show_bug.cgi?id=556248
DEPENDS="lsb >= 4.0, \
- liberation-fonts, \
libcurl.so.4${EMPTY_VERSION}${PKG_ARCH}, \
libnss3.so(NSS_3.14.3)${PKG_ARCH}, \
wget, \