| 1 |
tupone 08/10/27 22:42:20 |
| 2 |
|
| 3 |
Added: xblockout-1.1.5-font.patch |
| 4 |
Log: |
| 5 |
Fixing font loading problem. Bug #162048 |
| 6 |
(Portage version: 2.1.4.5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-puzzle/xblockout/files/xblockout-1.1.5-font.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xblockout-1.1.5-font.patch |
| 15 |
=================================================================== |
| 16 |
--- initmenu.c.old 2008-10-27 23:23:43.000000000 +0100 |
| 17 |
+++ initmenu.c 2008-10-27 23:22:52.000000000 +0100 |
| 18 |
@@ -408,19 +408,17 @@ |
| 19 |
XCharStruct overall_return ; |
| 20 |
|
| 21 |
m->xfont = XLoadQueryFont( x->display , opt->thefont ) ; |
| 22 |
- m->font = XLoadFont( x->display , opt->thefont ) ; |
| 23 |
if ( opt->verbose ) |
| 24 |
{ |
| 25 |
fprintf(stderr,"font=%s\n", opt->thefont) ; |
| 26 |
} |
| 27 |
- if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 ) |
| 28 |
+ if ( m->xfont==0 ) |
| 29 |
{ |
| 30 |
fprintf(stderr,"Some problems when loading a font... trying others\n") ; |
| 31 |
m->xfont = XLoadQueryFont( x->display , |
| 32 |
"-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ; |
| 33 |
- m->font = XLoadFont( x->display , |
| 34 |
- "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ; |
| 35 |
- if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 ) |
| 36 |
+ m->font = m->xfont->fid; |
| 37 |
+ if ( m->xfont==0 ) |
| 38 |
{ |
| 39 |
fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n"); |
| 40 |
fprintf(stderr,"Have you A font?\n"); |
| 41 |
@@ -428,17 +426,17 @@ |
| 42 |
exit(1) ; |
| 43 |
} |
| 44 |
} |
| 45 |
+ m->font = m->xfont->fid; |
| 46 |
m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ; |
| 47 |
- m->font2 = XLoadFont( x->display , opt->thefont2 ) ; |
| 48 |
if ( opt->verbose ) |
| 49 |
{ |
| 50 |
fprintf(stderr,"font2=%s\n", opt->thefont2) ; |
| 51 |
} |
| 52 |
- if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 ) |
| 53 |
+ if ( m->xfont2==0 ) |
| 54 |
{ |
| 55 |
- m->font2 = m->font ; |
| 56 |
m->xfont2 = m->xfont ; |
| 57 |
} |
| 58 |
+ m->font2 = m->xfont2->fid; |
| 59 |
|
| 60 |
xgc.background = x->back_pixel ; |
| 61 |
xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel; |
Archives