diff options
| author | Raymond Danks <raymond@edanks.com> | 2006-07-24 19:46:41 +0000 |
|---|---|---|
| committer | Raymond Danks <raymond@edanks.com> | 2006-07-24 19:46:41 +0000 |
| commit | dd0c887b669ed5f2fdfa21118f4b32d096e92816 (patch) | |
| tree | 52a9bb766480ea9983a6e3e5d4ae600e0a482f2c /packages/xorg-lib/libxfont | |
| parent | b88c8ee5fdd3c5bda8a7fea778c3d7b09b180622 (diff) | |
xorg-*: Massive rename to conform to X11R7.x_a.b.c versioning and xorg-* directory structure.
This is the first step for the update to X11R7.1.
This will not build and will be followed by more patches and updates.
Diffstat (limited to 'packages/xorg-lib/libxfont')
| -rw-r--r-- | packages/xorg-lib/libxfont/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xorg-lib/libxfont/autofoo.patch | 18 | ||||
| -rw-r--r-- | packages/xorg-lib/libxfont/scalable.patch | 27 |
3 files changed, 45 insertions, 0 deletions
diff --git a/packages/xorg-lib/libxfont/.mtn2git_empty b/packages/xorg-lib/libxfont/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libxfont/.mtn2git_empty diff --git a/packages/xorg-lib/libxfont/autofoo.patch b/packages/xorg-lib/libxfont/autofoo.patch new file mode 100644 index 0000000000..4998625c24 --- /dev/null +++ b/packages/xorg-lib/libxfont/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/packages/xorg-lib/libxfont/scalable.patch b/packages/xorg-lib/libxfont/scalable.patch new file mode 100644 index 0000000000..7f97b9a8f6 --- /dev/null +++ b/packages/xorg-lib/libxfont/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; + } |