Commit 810de47f authored by spang@chromium.org's avatar spang@chromium.org

Revert "Add fontconfig to linux DEPS for embedded builds"

TBR=spang
BUG=318315

This reverts commit af01a3b5.

Review URL: https://codereview.chromium.org/127223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243448 0039d316-1c4b-4281-b951-d872f2087c98
parent 139df301
......@@ -501,10 +501,6 @@ deps_os = {
Var("chromium_git") +
"/external/liblouis.git@3c2daee56250162e5a75830871601d74328d39f5",
# Used for embedded builds. CrOS & Linux use the system version.
"src/third_party/fontconfig/src":
Var("chromium_git") + "/external/fontconfig.git" +
"@4f944971dac3c0bbc6fdd3bf3123e3c8378a3acb",
},
"android": {
"src/third_party/android_tools":
......
Name: fontconfig
URL: http://www.freedesktop.org/wiki/Software/fontconfig/
Version: 2.11.0
License: MIT
License File: src/COPYING
Security Critical: yes
Description:
Fontconfig is a library for configuring and customizing font access.
Modifications:
- None
To import a new snapshot of fontconfig:
- Checkout the latest release tag: git checkout 2.11.0
- Change the DEPS entry to the newly checked out commit.
- Update generated files:
./autogen.sh --enable-libxml2 && make
rsync -R $(git ls-files --others '*.h' '*/*.h') ../include
- Update this README to reflect the new version number.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'targets': [
{
'target_name': 'fontconfig',
'type': '<(component)',
'dependencies' : [
'../zlib/zlib.gyp:zlib',
'../../build/linux/system.gyp:freetype2',
'../libxml/libxml.gyp:libxml',
],
'defines': [
'HAVE_CONFIG_H',
'FC_CACHEDIR="/var/cache/fontconfig"',
'FONTCONFIG_PATH="/etc/fonts"',
],
'sources': [
'src/fcarch.h',
'src/fcatomic.c',
'src/fcblanks.c',
'src/fccache.c',
'src/fccfg.c',
'src/fccharset.c',
'src/fccompat.c',
'src/fcdbg.c',
'src/fcdefault.c',
'src/fcdir.c',
'src/fcformat.c',
'src/fcfreetype.c',
'src/fcfs.c',
'src/fchash.c',
'src/fcinit.c',
'src/fclang.c',
'src/fclist.c',
'src/fcmatch.c',
'src/fcmatrix.c',
'src/fcname.c',
'src/fcobjs.c',
'src/fcpat.c',
'src/fcserialize.c',
'src/fcstat.c',
'src/fcstr.c',
'src/fcxml.c',
'src/ftglue.h',
'src/ftglue.c',
],
'include_dirs': [
'src',
'include',
'include/src',
],
'direct_dependent_settings': {
'include_dirs': [
'src',
],
},
},
],
}
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
extern __typeof (FcFreeTypeCharIndex) IA__FcFreeTypeCharIndex __attribute((visibility("hidden")));
#define FcFreeTypeCharIndex IA__FcFreeTypeCharIndex
extern __typeof (FcFreeTypeCharSetAndSpacing) IA__FcFreeTypeCharSetAndSpacing __attribute((visibility("hidden")));
#define FcFreeTypeCharSetAndSpacing IA__FcFreeTypeCharSetAndSpacing
extern __typeof (FcFreeTypeCharSet) IA__FcFreeTypeCharSet __attribute((visibility("hidden")));
#define FcFreeTypeCharSet IA__FcFreeTypeCharSet
extern __typeof (FcPatternGetFTFace) IA__FcPatternGetFTFace __attribute((visibility("hidden")));
#define FcPatternGetFTFace IA__FcPatternGetFTFace
extern __typeof (FcPatternAddFTFace) IA__FcPatternAddFTFace __attribute((visibility("hidden")));
#define FcPatternAddFTFace IA__FcPatternAddFTFace
extern __typeof (FcFreeTypeQueryFace) IA__FcFreeTypeQueryFace __attribute((visibility("hidden")));
#define FcFreeTypeQueryFace IA__FcFreeTypeQueryFace
#if HAVE_GNUC_ATTRIBUTE
#ifdef __fcfreetype__
# undef FcFreeTypeCharIndex
extern __typeof (FcFreeTypeCharIndex) FcFreeTypeCharIndex __attribute((alias("IA__FcFreeTypeCharIndex"), visibility("default")));
# undef FcFreeTypeCharSetAndSpacing
extern __typeof (FcFreeTypeCharSetAndSpacing) FcFreeTypeCharSetAndSpacing __attribute((alias("IA__FcFreeTypeCharSetAndSpacing"), visibility("default")));
# undef FcFreeTypeCharSet
extern __typeof (FcFreeTypeCharSet) FcFreeTypeCharSet __attribute((alias("IA__FcFreeTypeCharSet"), visibility("default")));
#endif /* __fcfreetype__ */
#ifdef __fcpat__
# undef FcPatternGetFTFace
extern __typeof (FcPatternGetFTFace) FcPatternGetFTFace __attribute((alias("IA__FcPatternGetFTFace"), visibility("default")));
# undef FcPatternAddFTFace
extern __typeof (FcPatternAddFTFace) FcPatternAddFTFace __attribute((alias("IA__FcPatternAddFTFace"), visibility("default")));
#endif /* __fcpat__ */
#ifdef __fcfreetype__
# undef FcFreeTypeQueryFace
extern __typeof (FcFreeTypeQueryFace) FcFreeTypeQueryFace __attribute((alias("IA__FcFreeTypeQueryFace"), visibility("default")));
#endif /* */
#endif /* HAVE_GNUC_ATTRIBUTE */
This diff is collapsed.
#ifndef _FONTCONFIG_SRC_FCSTDINT_H
#define _FONTCONFIG_SRC_FCSTDINT_H 1
#ifndef _GENERATED_STDINT_H
#define _GENERATED_STDINT_H "fontconfig 2.11.0"
/* generated using gnu compiler gcc-4.6.real (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 */
#define _STDINT_HAVE_STDINT_H 1
#include <stdint.h>
#endif
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment