- Give patches a better name.
- Add patch from FreeBSD to prevent xfstt from crashing.
This commit is contained in:
parent
8c0c5f5190
commit
3d2517695f
@ -1,13 +0,0 @@
|
||||
--- xfstt.cpp.orig Mon Jan 24 23:32:27 2000
|
||||
+++ xfstt.cpp Mon Jan 24 23:36:32 2000
|
||||
@@ -11,8 +11,8 @@
|
||||
#define UNSTRAPLIMIT 10500U
|
||||
|
||||
// Change these if you don't lie being FHS complient
|
||||
-#define TTFONTDIR "/usr/share/fonts/truetype"
|
||||
-#define TTCACHEDIR "/var/cache/xfstt"
|
||||
+#define TTFONTDIR "/usr/X11R6/lib/X11/fonts/TrueType"
|
||||
+#define TTCACHEDIR "/usr/X11R6/lib/X11/fonts/TrueType"
|
||||
|
||||
#define TTINFO_LEAF "ttinfo.dir"
|
||||
#define TTNAME_LEAF "ttname.dir"
|
28
x11/xfstt/patches/patch-xfstt_cpp
Normal file
28
x11/xfstt/patches/patch-xfstt_cpp
Normal file
@ -0,0 +1,28 @@
|
||||
--- xfstt.cpp.orig Sat Dec 11 12:23:45 1999
|
||||
+++ xfstt.cpp Mon Sep 18 09:25:40 2000
|
||||
@@ -11,8 +11,8 @@
|
||||
#define UNSTRAPLIMIT 10500U
|
||||
|
||||
// Change these if you don't lie being FHS complient
|
||||
-#define TTFONTDIR "/usr/share/fonts/truetype"
|
||||
-#define TTCACHEDIR "/var/cache/xfstt"
|
||||
+#define TTFONTDIR "/usr/X11R6/lib/X11/fonts/TrueType"
|
||||
+#define TTCACHEDIR "/usr/X11R6/lib/X11/fonts/TrueType"
|
||||
|
||||
#define TTINFO_LEAF "ttinfo.dir"
|
||||
#define TTNAME_LEAF "ttname.dir"
|
||||
@@ -470,10 +470,12 @@
|
||||
raster->getFontExtent( &xfs->fe);
|
||||
|
||||
int used = (xfs->fe.bitmaps + xfs->fe.bmplen) - xfs->fe.buffer;
|
||||
+ int bmpoff = xfs->fe.bitmaps - xfs->fe.buffer;
|
||||
xfs->fe.buffer = (U8*)shrinkMem( xfs->fe.buffer, used);
|
||||
- if( xfs->fe.buffer)
|
||||
+ if( xfs->fe.buffer) {
|
||||
xfs->fe.buflen = used;
|
||||
- else {
|
||||
+ xfs->fe.bitmaps = xfs->fe.buffer + bmpoff;
|
||||
+ } else {
|
||||
xfs->fid = 0; //###
|
||||
xfs = 0;
|
||||
}
|
Loading…
Reference in New Issue
Block a user