- fix cast
- preserve CFLAGS - from Peter Stromberg <home@wilfried.net>
This commit is contained in:
parent
9a4de0e40c
commit
ca06737746
21
x11/xfstt/patches/patch-Makefile
Normal file
21
x11/xfstt/patches/patch-Makefile
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1 2001/01/19 04:13:41 jasoni Exp $
|
||||
--- Makefile.orig Mon May 31 08:28:44 1999
|
||||
+++ Makefile Thu Jan 18 18:43:30 2001
|
||||
@@ -2,13 +2,13 @@
|
||||
MISCOPT =
|
||||
OPT = $(MISCOPT) $(MAXOPT)
|
||||
|
||||
-CFLAGS = $(OPT) -DMAGNIFY=0 -DNDEBUG
|
||||
+CFLAGS += $(OPT) -DMAGNIFY=0 -DNDEBUG
|
||||
#CFLAGS = -fprofile-arcs -ftest-coverage -DMAGNIFY=0
|
||||
-CFLAGS = -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
|
||||
+#CFLAGS = -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0
|
||||
#CFLAGS = -O -Wall -pedantic -DDEBUG $(MISCOPT)
|
||||
|
||||
-LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11
|
||||
-LFLAGS = -g -L/usr/X11R6/lib
|
||||
+#LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11
|
||||
+LFLAGS = -L${X11BASE}/lib
|
||||
|
||||
CC = c++
|
||||
LD = c++
|
22
x11/xfstt/patches/patch-TTFont_cpp
Normal file
22
x11/xfstt/patches/patch-TTFont_cpp
Normal file
@ -0,0 +1,22 @@
|
||||
$OpenBSD: patch-TTFont_cpp,v 1.1 2001/01/19 04:13:41 jasoni Exp $
|
||||
--- TTFont.cpp.orig Mon Nov 8 04:35:13 1999
|
||||
+++ TTFont.cpp Thu Jan 18 18:45:19 2001
|
||||
@@ -344,7 +344,7 @@ int TTFont::getXLFDbase( char* result)
|
||||
|
||||
|
||||
// some fonts have only unicode names -> try to convert them to ascii
|
||||
- convbuf = malloc(sizeof(char) * 256);
|
||||
+ convbuf = (char*)malloc(sizeof(char) * 256);
|
||||
int lenFamily;
|
||||
char* strFamily = nameTable->getString( 1, 1, &lenFamily, convbuf);
|
||||
if( !strFamily) {
|
||||
@@ -353,7 +353,7 @@ int TTFont::getXLFDbase( char* result)
|
||||
}
|
||||
|
||||
if (strFamily == convbuf)
|
||||
- convbuf = malloc(sizeof(char) * 256);
|
||||
+ convbuf = (char*)malloc(sizeof(char) * 256);
|
||||
int lenSub;
|
||||
char* strSubFamily = nameTable->getString( 1, 2, &lenSub, convbuf);
|
||||
if( !strFamily) {
|
||||
|
Loading…
Reference in New Issue
Block a user