diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-03-24 07:51:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-03-24 07:51:48 +0000 |
| commit | b783a3e2f6744692c80909a70c3674dd316204dc (patch) | |
| tree | f1e96b860f0c3accf06930f39c9b7d1c53c2bb9b /openembedded/packages/xlibs/xfont | |
| parent | 63e2f3e549fa5ef0388f5e975ff166e287f64cf4 (diff) | |
| download | openembedded-core-b783a3e2f6744692c80909a70c3674dd316204dc.tar.gz openembedded-core-b783a3e2f6744692c80909a70c3674dd316204dc.tar.bz2 openembedded-core-b783a3e2f6744692c80909a70c3674dd316204dc.tar.xz openembedded-core-b783a3e2f6744692c80909a70c3674dd316204dc.zip | |
Move xlibs packages to xlibs/ as per changes in OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@335 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/xlibs/xfont')
| -rw-r--r-- | openembedded/packages/xlibs/xfont/autofoo.patch | 18 | ||||
| -rw-r--r-- | openembedded/packages/xlibs/xfont/scalable.patch | 27 |
2 files changed, 45 insertions, 0 deletions
diff --git a/openembedded/packages/xlibs/xfont/autofoo.patch b/openembedded/packages/xlibs/xfont/autofoo.patch new file mode 100644 index 000000000..4998625c2 --- /dev/null +++ b/openembedded/packages/xlibs/xfont/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 ++++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 +@@ -35,9 +35,9 @@ + dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's + dnl not possible to extract the version number here from Xfont.h + dnl ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) + + # Check for progs diff --git a/openembedded/packages/xlibs/xfont/scalable.patch b/openembedded/packages/xlibs/xfont/scalable.patch new file mode 100644 index 000000000..7f97b9a8f --- /dev/null +++ b/openembedded/packages/xlibs/xfont/scalable.patch @@ -0,0 +1,27 @@ +Index: fontfile/fontdir.c +=================================================================== +RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v +retrieving revision 3.22 +diff -u -r3.22 fontdir.c +--- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 ++++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 +@@ -699,6 +699,11 @@ + */ + if (isscale) + { ++ /* If the fontname says it is scalable, make sure that the ++ * renderer supports OpenScalable and GetInfoScalable. ++ */ ++ if (renderer->OpenScalable && renderer->GetInfoScalable) ++ { + if (vals.values_supplied & SIZE_SPECIFY_MASK) + { + bzero((char *)&zeroVals, sizeof(zeroVals)); +@@ -798,6 +803,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } |