2006-12-08 20:39:45 +01:00
|
|
|
$FreeBSD$
|
|
|
|
|
|
|
|
|
|
--- ../src/solaris/native/sun/awt/font/fontpath.c.orig Fri Dec 8 10:52:19 2006
|
|
|
|
|
+++ ../src/solaris/native/sun/awt/font/fontpath.c Fri Dec 8 10:54:02 2006
|
|
|
|
|
@@ -426,7 +426,7 @@
|
|
|
|
|
JNIEXPORT jstring JNICALL Java_sun_awt_font_NativeFontWrapper_getFontPath(JNIEnv *env, jclass obj, jboolean noType1)
|
|
|
|
|
{
|
|
|
|
|
#ifndef __solaris__
|
|
|
|
|
- char *ptr = "/usr/X11R6/lib/X11/fonts/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/tt";
|
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
2008-04-19 19:56:05 +02:00
|
|
|
+ char *ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:%%LOCALBASE%%/lib/X11/fonts/TrueType:%%LOCALBASE%%/lib/X11/fonts/tt";
|
2006-12-08 20:39:45 +01:00
|
|
|
#else
|
|
|
|
|
char *ptr = getSolarisFontLocations((int) (noType1==JNI_TRUE));
|
|
|
|
|
#endif
|
