diff options
author | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
---|---|---|
committer | Chris Larson <kergoth@openedhand.com> | 2006-08-15 11:58:37 +0000 |
commit | ca10363baac7de9581ec90ab47957f973e1dbdc4 (patch) | |
tree | 2000b53f806c79510671d8fd1a6a36125f8b25b3 /meta/packages/xserver/xserver-xorg/freetype.patch | |
parent | c210d01a7ca8c00ddc45d292878b89086b137129 (diff) | |
download | poky-ca10363baac7de9581ec90ab47957f973e1dbdc4.tar.gz |
Numerous new xorg package versions from upstream OE. Pester me if any local changes got inadvertantly lost, or if any packages need upgrading.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@607 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/xserver/xserver-xorg/freetype.patch')
-rw-r--r-- | meta/packages/xserver/xserver-xorg/freetype.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/meta/packages/xserver/xserver-xorg/freetype.patch b/meta/packages/xserver/xserver-xorg/freetype.patch deleted file mode 100644 index 0ba3dd5627..0000000000 --- a/meta/packages/xserver/xserver-xorg/freetype.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- xc/lib/font/FreeType/Imakefile.old 2005-06-03 20:18:51.000000000 +0100 | ||
2 | +++ xc/lib/font/FreeType/Imakefile 2005-06-03 20:18:52.000000000 +0100 | ||
3 | @@ -20,7 +20,7 @@ | ||
4 | |||
5 | INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ | ||
6 | -I$(SERVERSRC)/include $(EXTRAINCLUDES) \ | ||
7 | - -I$(INCLUDESRC) | ||
8 | + -I$(INCLUDESRC) $(CC_STAGING) | ||
9 | |||
10 | SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c | ||
11 | OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o | ||
12 | --- xc/config/cf/X11.tmpl.old 2005-06-03 20:40:24.000000000 +0100 | ||
13 | +++ xc/config/cf/X11.tmpl 2005-06-03 20:40:40.000000000 +0100 | ||
14 | @@ -3371,7 +3371,7 @@ | ||
15 | |||
16 | #if BuildFreetype2Library || HasFreetype2 | ||
17 | #if Freetype2IncDirStandard | ||
18 | -FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config | ||
19 | +FREETYPE2INCLUDES = `pkg-config --cflags freetype2` | ||
20 | #else | ||
21 | FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config | ||
22 | #endif | ||