diff options
| author | drochner <drochner@pkgsrc.org> | 2009-02-19 12:36:15 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-02-19 12:36:15 +0000 |
| commit | b773a8b35d1cca9f9139454df24db7d85c0a007a (patch) | |
| tree | 3f75458f004aa4a1f2f14476799f79e883b7b586 /games | |
| parent | c06768031aaa03ffa395037cde0346cdff34951a (diff) | |
| download | pkgsrc-b773a8b35d1cca9f9139454df24db7d85c0a007a.tar.gz | |
update to 1.1.6
change: use a 20pt font as "bigfont", avoids problems on systems
where the original 24pt font is not found
pkgsrc change: fix the code which does font replacement in case
a font is not found (following an idea from gentoo but done correctly)
thanks to Felix Resch for pointers and testing
Diffstat (limited to 'games')
| -rw-r--r-- | games/xblockout/Makefile | 5 | ||||
| -rw-r--r-- | games/xblockout/distinfo | 9 | ||||
| -rw-r--r-- | games/xblockout/patches/patch-ac | 49 |
3 files changed, 56 insertions, 7 deletions
diff --git a/games/xblockout/Makefile b/games/xblockout/Makefile index ba2722f6b13..bb9b83aa006 100644 --- a/games/xblockout/Makefile +++ b/games/xblockout/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2007/02/06 17:08:19 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2009/02/19 12:36:15 drochner Exp $ # -DISTNAME= xbl-1.1.5 -PKGREVISION= 1 +DISTNAME= xbl-1.1.6 CATEGORIES= games MASTER_SITES= http://www710.univ-lyon1.fr/~exco/XBL/ diff --git a/games/xblockout/distinfo b/games/xblockout/distinfo index 12caad336e0..66d0514c238 100644 --- a/games/xblockout/distinfo +++ b/games/xblockout/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.2 2007/02/06 17:08:19 joerg Exp $ +$NetBSD: distinfo,v 1.3 2009/02/19 12:36:15 drochner Exp $ -SHA1 (xbl-1.1.5.tar.gz) = 14503060ccf82d23430fe08e78ba4998723ec174 -RMD160 (xbl-1.1.5.tar.gz) = 30cf9f6b1c251b267f0ebe0b85f349e9dce3dd44 -Size (xbl-1.1.5.tar.gz) = 136508 bytes +SHA1 (xbl-1.1.6.tar.gz) = 05b368c20fd16a99346540a5352a011b56926ef3 +RMD160 (xbl-1.1.6.tar.gz) = 4e726544b0e9f2b9481e1e216658fc4412dfbd1c +Size (xbl-1.1.6.tar.gz) = 136504 bytes SHA1 (patch-aa) = f53468bfbc23a7c0085bc2b15cce044cddf2338a SHA1 (patch-ab) = c006a72d511f01011666e1caf5173ba1f03b3494 +SHA1 (patch-ac) = 5ff43d789bec5d98dc88352c57ae0f40378b0427 diff --git a/games/xblockout/patches/patch-ac b/games/xblockout/patches/patch-ac new file mode 100644 index 00000000000..883d9d92c42 --- /dev/null +++ b/games/xblockout/patches/patch-ac @@ -0,0 +1,49 @@ +$NetBSD: patch-ac,v 1.1 2009/02/19 12:36:15 drochner Exp $ + +--- initmenu.c.orig 2005-11-07 21:40:38.000000000 +0100 ++++ initmenu.c +@@ -408,37 +408,34 @@ void inittext(struct menu *m, struct opt + 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 ) ++ "fixed" ) ; ++ if ( m->xfont==0 ) + { +- fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n"); ++ fprintf(stderr,"You haven't \"fixed\"\n"); + fprintf(stderr,"Have you A font?\n"); + fprintf(stderr,"Retry with -font option\n"); + 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; |