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/xfont | |
| parent | 63e2f3e549fa5ef0388f5e975ff166e287f64cf4 (diff) | |
| download | poky-b783a3e2f6744692c80909a70c3674dd316204dc.tar.gz | |
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/xfont')
| -rw-r--r-- | openembedded/packages/xfont/files/autofoo.patch | 18 | ||||
| -rw-r--r-- | openembedded/packages/xfont/files/scalable.patch | 27 | ||||
| -rw-r--r-- | openembedded/packages/xfont/xfont_1.4.2.bb | 18 | ||||
| -rw-r--r-- | openembedded/packages/xfont/xfont_cvs.bb | 17 |
4 files changed, 0 insertions, 80 deletions
diff --git a/openembedded/packages/xfont/files/autofoo.patch b/openembedded/packages/xfont/files/autofoo.patch deleted file mode 100644 index 4998625c24..0000000000 --- a/openembedded/packages/xfont/files/autofoo.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | |||
| 2 | # | ||
| 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher | ||
| 4 | # | ||
| 5 | |||
| 6 | --- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 | ||
| 7 | +++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 | ||
| 8 | @@ -35,9 +35,9 @@ | ||
| 9 | dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's | ||
| 10 | dnl not possible to extract the version number here from Xfont.h | ||
| 11 | dnl | ||
| 12 | +AC_CONFIG_AUX_DIR(.) | ||
| 13 | AM_INIT_AUTOMAKE([dist-bzip2]) | ||
| 14 | AM_CONFIG_HEADER(config.h) | ||
| 15 | -AC_CONFIG_AUX_DIR(.) | ||
| 16 | AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) | ||
| 17 | |||
| 18 | # Check for progs | ||
diff --git a/openembedded/packages/xfont/files/scalable.patch b/openembedded/packages/xfont/files/scalable.patch deleted file mode 100644 index 7f97b9a8f6..0000000000 --- a/openembedded/packages/xfont/files/scalable.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | Index: fontfile/fontdir.c | ||
| 2 | =================================================================== | ||
| 3 | RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v | ||
| 4 | retrieving revision 3.22 | ||
| 5 | diff -u -r3.22 fontdir.c | ||
| 6 | --- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 | ||
| 7 | +++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 | ||
| 8 | @@ -699,6 +699,11 @@ | ||
| 9 | */ | ||
| 10 | if (isscale) | ||
| 11 | { | ||
| 12 | + /* If the fontname says it is scalable, make sure that the | ||
| 13 | + * renderer supports OpenScalable and GetInfoScalable. | ||
| 14 | + */ | ||
| 15 | + if (renderer->OpenScalable && renderer->GetInfoScalable) | ||
| 16 | + { | ||
| 17 | if (vals.values_supplied & SIZE_SPECIFY_MASK) | ||
| 18 | { | ||
| 19 | bzero((char *)&zeroVals, sizeof(zeroVals)); | ||
| 20 | @@ -798,6 +803,7 @@ | ||
| 21 | bitmap->name.name); | ||
| 22 | } | ||
| 23 | } | ||
| 24 | + } | ||
| 25 | } | ||
| 26 | return TRUE; | ||
| 27 | } | ||
diff --git a/openembedded/packages/xfont/xfont_1.4.2.bb b/openembedded/packages/xfont/xfont_1.4.2.bb deleted file mode 100644 index 7ef1d2b17f..0000000000 --- a/openembedded/packages/xfont/xfont_1.4.2.bb +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | SECTION = "x11/libs" | ||
| 2 | LICENSE = "BSD-X" | ||
| 3 | PRIORITY = "optional" | ||
| 4 | MAINTAINER = "Greg Gilbert <greg@treke.net>" | ||
| 5 | DEPENDS = "xproto xtrans zlib" | ||
| 6 | DESCRIPTION = "X font library (used by the X server)." | ||
| 7 | PR = "r2" | ||
| 8 | |||
| 9 | SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ | ||
| 10 | file://scalable.patch;patch=1 \ | ||
| 11 | file://autofoo.patch;patch=1" | ||
| 12 | S = "${WORKDIR}/libXfont-${PV}" | ||
| 13 | |||
| 14 | inherit autotools pkgconfig | ||
| 15 | |||
| 16 | do_stage() { | ||
| 17 | autotools_stage_all | ||
| 18 | } | ||
diff --git a/openembedded/packages/xfont/xfont_cvs.bb b/openembedded/packages/xfont/xfont_cvs.bb deleted file mode 100644 index 1873d74dfc..0000000000 --- a/openembedded/packages/xfont/xfont_cvs.bb +++ /dev/null | |||
| @@ -1,17 +0,0 @@ | |||
| 1 | PV = "0.0+cvs${SRCDATE}" | ||
| 2 | LICENSE = "BSD-X" | ||
| 3 | SECTION = "x11/libs" | ||
| 4 | PRIORITY = "optional" | ||
| 5 | MAINTAINER = "Greg Gilbert <greg@treke.net>" | ||
| 6 | DEPENDS = "xproto xtrans zlib" | ||
| 7 | DESCRIPTION = "X font library (used by the X server)." | ||
| 8 | |||
| 9 | SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont \ | ||
| 10 | file://scalable.patch;patch=1" | ||
| 11 | S = "${WORKDIR}/Xfont" | ||
| 12 | |||
| 13 | inherit autotools pkgconfig | ||
| 14 | |||
| 15 | do_stage() { | ||
| 16 | autotools_stage_all | ||
| 17 | } | ||
