cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update for Option WITH_GNUSTEP_LIBART

Browse Source
This commit is contained in:
Dirk Meyer 2003-06-03 03:38:07 +00:00
parent e3eff6078d
commit e33fa8a0f9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=82129
2 changed files with 114 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
x11-toolkits/gnustep-back/files/patch-ftfont.m
View File

@ -1,5 +1,5 @@
--- Source/art/ftfont.m.orig Mon Feb 10 18:46:06 2003
+++ Source/art/ftfont.m Sun Mar 30 22:06:30 2003
--- Source/art/ftfont.m.orig Sun May 11 19:23:43 2003
+++ Source/art/ftfont.m Tue Jun 3 05:25:16 2003
@@ -79,9 +79,9 @@
@interface FTFontInfo : GSFontInfo <FTFontInfo>
{
@ -12,7 +12,7 @@
FTFaceInfo *face_info;
@@ -743,7 +743,7 @@
@@ -748,7 +748,7 @@
int use_sbit;
FTC_SBit sbit;
@ -21,7 +21,37 @@
FT_Matrix ftmatrix;
FT_Vector ftdelta;
@@ -1135,7 +1135,7 @@
@@ -800,23 +800,23 @@
int rh = face_info->render_hints_hack;
if (rh & 0x10000)
{
- cur.type = ftc_image_grays;
+ cur.image_type = ftc_image_grays;
rh = (rh >> 8) & 0xff;
}
else
{
- cur.type = ftc_image_mono;
+ cur.image_type = ftc_image_mono;
rh = rh & 0xff;
}
if (rh & 1)
- cur.type |= ftc_image_flag_autohinted;
+ cur.image_type |= ftc_image_flag_autohinted;
if (!(rh & 2))
- cur.type |= ftc_image_flag_unhinted;
+ cur.image_type |= ftc_image_flag_unhinted;
}
else if (xx < 8)
- cur.type = ftc_image_grays | ftc_image_flag_unhinted;
+ cur.image_type = ftc_image_grays | ftc_image_flag_unhinted;
else
- cur.type = ftc_image_grays;
+ cur.image_type = ftc_image_grays;
}
else
{
@@ -1163,7 +1163,7 @@
int use_sbit;
FTC_SBit sbit;
@ -30,7 +60,37 @@
FT_Matrix ftmatrix;
FT_Vector ftdelta;
@@ -1466,7 +1466,7 @@
@@ -1215,23 +1215,23 @@
int rh = face_info->render_hints_hack;
if (rh & 0x10000)
{
- cur.type = ftc_image_grays;
+ cur.image_type = ftc_image_grays;
rh = (rh >> 8) & 0xff;
}
else
{
- cur.type = ftc_image_mono;
+ cur.image_type = ftc_image_mono;
rh = rh & 0xff;
}
if (rh & 1)
- cur.type |= ftc_image_flag_autohinted;
+ cur.image_type |= ftc_image_flag_autohinted;
if (!(rh & 2))
- cur.type |= ftc_image_flag_unhinted;
+ cur.image_type |= ftc_image_flag_unhinted;
}
else if (xx < 8)
- cur.type = ftc_image_grays | ftc_image_flag_unhinted;
+ cur.image_type = ftc_image_grays | ftc_image_flag_unhinted;
else
- cur.type = ftc_image_grays;
+ cur.image_type = ftc_image_grays;
}
else
{
@@ -1521,7 +1521,7 @@
/* TODO: try to more efficiently? */
/* TODO: set up all this stuff in -init... for the raw metric case */
float xx, yy;
@ -39,7 +99,37 @@
FTC_SBit sbit;
cur = imgd;
@@ -1547,7 +1547,7 @@
@@ -1534,23 +1534,23 @@
int rh = face_info->render_hints_hack;
if (rh & 0x10000)
{
- cur.type = ftc_image_grays;
+ cur.image_type = ftc_image_grays;
rh = (rh >> 8) & 0xff;
}
else
{
- cur.type = ftc_image_mono;
+ cur.image_type = ftc_image_mono;
rh = rh & 0xff;
}
if (rh & 1)
- cur.type |= ftc_image_flag_autohinted;
+ cur.image_type |= ftc_image_flag_autohinted;
if (!(rh & 2))
- cur.type |= ftc_image_flag_unhinted;
+ cur.image_type |= ftc_image_flag_unhinted;
}
else if (xx < 8)
- cur.type = ftc_image_grays | ftc_image_flag_unhinted;
+ cur.image_type = ftc_image_grays | ftc_image_flag_unhinted;
else
- cur.type = ftc_image_grays;
+ cur.image_type = ftc_image_grays;
if ((error=FTC_SBitCache_Lookup(ftc_sbitcache, &cur, glyph, &sbit, NULL)))
{
@@ -1605,7 +1605,7 @@
- (NSRect) boundingRectForGlyph: (NSGlyph)glyph
{
@ -47,8 +137,8 @@
+ FTC_Image_Desc *cur;
FT_BBox bbox;
FT_Glyph g;
@@ -1618,7 +1618,7 @@
FT_Error error;
@@ -1682,7 +1682,7 @@
FTC_SBit sbit;
@ -57,7 +147,7 @@
cmap.face_id = imgd.font.face_id;
@@ -1831,7 +1831,7 @@
@@ -1895,7 +1895,7 @@
unichar *uch;
int ulen;
@ -66,7 +156,7 @@
FT_Matrix ftmatrix;
@@ -2003,7 +2003,7 @@
@@ -2065,7 +2065,7 @@
int use_sbit;
FTC_SBit sbit;
@ -75,3 +165,15 @@
FT_Matrix ftmatrix;
FT_Vector ftdelta;
@@ -2111,9 +2111,9 @@
/* if (cur.font.pix_width < 16 && cur.font.pix_height < 16 &&
cur.font.pix_width > 6 && cur.font.pix_height > 6)
- cur.type = ftc_image_mono;
+ cur.image_type = ftc_image_mono;
else*/
- cur.type = ftc_image_grays, subpixel = YES, cur.font.pix_width *= 3, x *= 3;
+ cur.image_type = ftc_image_grays, subpixel = YES, cur.font.pix_width *= 3, x *= 3;
// imgd.type|=|ftc_image_flag_unhinted; /* TODO? when? */
}
else

2
x11-toolkits/gnustep-back/pkg-plist
View File

@ -7,6 +7,7 @@ System/Library/Bundles/libgnustep-%%BACK%%.bundle/stamp.make
%%SYSTEMLIBRARY%%/Headers/gnustep/gsc/gscolors.h
%%SYSTEMLIBRARY%%/Headers/gnustep/x11/XGServer.h
%%SYSTEMLIBRARY%%/Headers/gnustep/x11/XGServerWindow.h
%%USE_ART%%%%SYSTEMLIBRARY%%/Headers/gnustep/art/ARTContext.h
%%USE_XDPS%%%%SYSTEMLIBRARY%%/Headers/gnustep/xdps/NSDPSContext.h
%%USE_XLIB%%%%SYSTEMLIBRARY%%/Headers/gnustep/xlib/XGContext.h
%%USE_XLIB%%%%SYSTEMLIBRARY%%/Headers/gnustep/xlib/XGGState.h
@ -15,6 +16,7 @@ System/Library/Bundles/libgnustep-%%BACK%%.bundle/stamp.make
%%USE_XLIB%%System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/font_cacher
System/Tools/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/gpbs
@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/x11
%%USE_ART%%@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/art
%%USE_XDPS%%@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/xdps
%%USE_XLIB%%@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/xlib
@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/gsc