diff options
| author | dholland <dholland@pkgsrc.org> | 2014-05-11 02:19:04 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2014-05-11 02:19:04 +0000 |
| commit | dc28ab8f80926c2595fc898f4694f0d66cea89e1 (patch) | |
| tree | 9872b5a297d3b17af91b27d9a561ed62c6b506b3 /games | |
| parent | 492e1f957bec237d10f6f8a5ccc8a19c4f5a2330 (diff) | |
| download | pkgsrc-dc28ab8f80926c2595fc898f4694f0d66cea89e1.tar.gz | |
Fall back to fixed (like elsewhere in the program) if helvetica is
missing, instead of bombing. Helps if people forget to install X
fonts, or if their native X fonts are messed up. PKGREVISION -> 8
Diffstat (limited to 'games')
| -rw-r--r-- | games/xfrisk/Makefile | 4 | ||||
| -rw-r--r-- | games/xfrisk/distinfo | 3 | ||||
| -rw-r--r-- | games/xfrisk/patches/patch-utils_c | 21 |
3 files changed, 25 insertions, 3 deletions
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile index d799ecf2dc6..e4df8354268 100644 --- a/games/xfrisk/Makefile +++ b/games/xfrisk/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.30 2013/04/06 19:42:42 rodent Exp $ +# $NetBSD: Makefile,v 1.31 2014/05/11 02:19:04 dholland Exp $ # DISTNAME= xfrisk-1.2 -PKGREVISION= 7 +PKGREVISION= 8 CATEGORIES= games MASTER_SITES= http://www.tuxick.net/xfrisk/files/ diff --git a/games/xfrisk/distinfo b/games/xfrisk/distinfo index 56cf5fe9ae4..7a87ccda9e4 100644 --- a/games/xfrisk/distinfo +++ b/games/xfrisk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2013/01/15 16:21:34 morr Exp $ +$NetBSD: distinfo,v 1.11 2014/05/11 02:19:04 dholland Exp $ SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a @@ -9,3 +9,4 @@ SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd SHA1 (patch-ae) = 173820eabda55fce02fedae4be2d853ba7d5b31f SHA1 (patch-gui_c) = 7317a10b1883a5f230c5dd8e3be89d10598d4fb4 +SHA1 (patch-utils_c) = 83c56baeb506dc9ca26b6ccc9279fee9e881f41f diff --git a/games/xfrisk/patches/patch-utils_c b/games/xfrisk/patches/patch-utils_c new file mode 100644 index 00000000000..23d564725ad --- /dev/null +++ b/games/xfrisk/patches/patch-utils_c @@ -0,0 +1,21 @@ +$NetBSD: patch-utils_c,v 1.1 2014/05/11 02:19:04 dholland Exp $ + +Fall back to fixed if helvetica is missing, instead of croaking. + +--- utils.c~ 1999-11-13 21:58:32.000000000 +0000 ++++ utils.c +@@ -700,8 +700,12 @@ Int32 UTIL_PopupDialog(CString strTitle, + if (pLabelFont==NULL) + if ((pLabelFont=XLoadQueryFont(hDisplay, "*helvetica-b*-o-*14*"))==NULL) + { +- printf("Can't find the font \"*helvetica-b*-o-*14*\"!!\n"); +- UTIL_ExitProgram(-1); ++ pLabelFont = XLoadQueryFont(hDisplay, "fixed"); ++ if (pLabelFont==NULL) ++ { ++ printf("Can't find the font \"fixed\"!!\n"); ++ UTIL_ExitProgram(-1); ++ } + } + + /* Sanity check */ |