diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-08-02 15:04:18 +0000 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-08-02 15:04:18 +0000 |
| commit | 0914be150cc8591bf57bc410eca5beb6aa792b4e (patch) | |
| tree | edfc0fe1145fc1e22f40d804d12df1f9c9b45af2 /packages/xorg-lib | |
| parent | 4921f4cc091572f9704641197609be594cbcdcaf (diff) | |
| parent | 5b8d8a17269570faf8b169f1d7402ddab29b3e60 (diff) | |
merge of b4d676ca1731d058a9e6796e021b076ade646392
and e721389595223c9f6bdea1c71cffa6a144b92e72
Diffstat (limited to 'packages/xorg-lib')
| -rw-r--r-- | packages/xorg-lib/libxfont/no-scalable-crash.patch | 22 | ||||
| -rw-r--r-- | packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb | 3 |
3 files changed, 29 insertions, 0 deletions
diff --git a/packages/xorg-lib/libxfont/no-scalable-crash.patch b/packages/xorg-lib/libxfont/no-scalable-crash.patch new file mode 100644 index 0000000000..90bded6fba --- /dev/null +++ b/packages/xorg-lib/libxfont/no-scalable-crash.patch @@ -0,0 +1,22 @@ +--- /tmp/fontdir.c 2006-08-01 16:17:22.000000000 +0200 ++++ libXfont-1.2.0/src/fontfile/fontdir.c 2006-08-01 16:20:37.248306000 +0200 +@@ -695,6 +695,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)); +@@ -794,6 +799,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } diff --git a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb index 07fbf5f9a6..68148a3657 100644 --- a/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.0-1.0.0.bb @@ -1,5 +1,9 @@ include xorg-lib-common.inc +PR = "r1" +SRC_URI += "file://no-scalable-crash.patch;patch=1" + + DESCRIPTION = "X font library (used by the X server)." LICENSE= "BSD-X" PRIORITY = "optional" diff --git a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb index c0fb08edea..af511be866 100644 --- a/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb +++ b/packages/xorg-lib/libxfont_X11R7.1-1.2.0.bb @@ -1,10 +1,13 @@ include xorg-lib-common.inc +PR = "r1" + DESCRIPTION = "X font library (used by the X server)." LICENSE= "BSD-X" PRIORITY = "optional" SRC_URI = "${XORG_MIRROR}/individual/lib/libXfont-1.2.0.tar.bz2" +SRC_URI += "file://no-scalable-crash.patch;patch=1" DEPENDS += " freetype fontcacheproto zlib xproto xtrans fontsproto libfontenc" PROVIDES = "xfont" |