public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in games-puzzle/xblockout/files: xblockout-1.1.5-font.patch
@ 2008-10-27 22:42 Alfredo Tupone (tupone)
  0 siblings, 0 replies; 2+ messages in thread
From: Alfredo Tupone (tupone) @ 2008-10-27 22:42 UTC (permalink / raw
  To: gentoo-commits

tupone      08/10/27 22:42:20

  Added:                xblockout-1.1.5-font.patch
  Log:
  Fixing font loading problem. Bug #162048
  (Portage version: 2.1.4.5)

Revision  Changes    Path
1.1                  games-puzzle/xblockout/files/xblockout-1.1.5-font.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-puzzle/xblockout/files/xblockout-1.1.5-font.patch?rev=1.1&view=markup
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

Index: xblockout-1.1.5-font.patch
===================================================================
--- initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
+++ initmenu.c	2008-10-27 23:22:52.000000000 +0100
@@ -408,19 +408,17 @@
   XCharStruct overall_return ;
 
   m->xfont = XLoadQueryFont( x->display , opt->thefont ) ;
-  m->font = XLoadFont( x->display , opt->thefont ) ;
   if ( opt->verbose )
     {
       fprintf(stderr,"font=%s\n", opt->thefont) ;
     }
-  if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
+  if ( m->xfont==0 )
     {
       fprintf(stderr,"Some problems when loading a font... trying others\n") ;
       m->xfont = XLoadQueryFont( x->display , 
 				 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
-      m->font = XLoadFont( x->display , 
-			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
-      if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
+      m->font = m->xfont->fid;
+      if ( m->xfont==0 )
 	{
 	  fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
 	  fprintf(stderr,"Have you A font?\n");
@@ -428,17 +426,17 @@
 	  exit(1) ;
 	}
     }
+  m->font = m->xfont->fid;
   m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ;
-  m->font2 = XLoadFont( x->display , opt->thefont2 ) ;
   if ( opt->verbose )
     {
       fprintf(stderr,"font2=%s\n", opt->thefont2) ;
     }
-  if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 )
+  if ( m->xfont2==0 )
     {
-      m->font2 = m->font ;
       m->xfont2 = m->xfont ;
     }
+  m->font2 = m->xfont2->fid;
 
   xgc.background = x->back_pixel ;
   xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel;






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-puzzle/xblockout/files: xblockout-1.1.5-font.patch
@ 2015-03-12 18:32 Michael Sterrett (mr_bones_)
  0 siblings, 0 replies; 2+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2015-03-12 18:32 UTC (permalink / raw
  To: gentoo-commits

mr_bones_    15/03/12 18:32:26

  Removed:              xblockout-1.1.5-font.patch
  Log:
  old
  
  (Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-03-12 18:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-12 18:32 [gentoo-commits] gentoo-x86 commit in games-puzzle/xblockout/files: xblockout-1.1.5-font.patch Michael Sterrett (mr_bones_)
  -- strict thread matches above, loose matches on Subject: below --
2008-10-27 22:42 Alfredo Tupone (tupone)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox