[pkgsrc/trunk]: pkgsrc/wm/novawm Add patch to stop seg fault when lucidasans-...

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/53731914e245
branches:  trunk
changeset: 540660:53731914e245
user:      reed <reed%pkgsrc.org@localhost>
date:      Sat Apr 05 18:33:32 2008 +0000

description:
Add patch to stop seg fault when lucidasans-10 font is not available.
(Also sent patch to developer.)

diffstat:

 wm/novawm/Makefile         |   4 ++--
 wm/novawm/distinfo         |   3 ++-
 wm/novawm/patches/patch-ab |  23 +++++++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r b59513d76e94 -r 53731914e245 wm/novawm/Makefile
--- a/wm/novawm/Makefile        Sat Apr 05 17:26:50 2008 +0000
+++ b/wm/novawm/Makefile        Sat Apr 05 18:33:32 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2006/12/15 20:33:02 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2008/04/05 18:33:32 reed Exp $
 #
 
 DISTNAME=      NovaWM-0.8_alpha
 PKGNAME=       novawm-0.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    wm
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=novawm/}
 
diff -r b59513d76e94 -r 53731914e245 wm/novawm/distinfo
--- a/wm/novawm/distinfo        Sat Apr 05 17:26:50 2008 +0000
+++ b/wm/novawm/distinfo        Sat Apr 05 18:33:32 2008 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:43:54 wiz Exp $
+$NetBSD: distinfo,v 1.5 2008/04/05 18:33:32 reed Exp $
 
 SHA1 (NovaWM-0.8_alpha.tar.gz) = 6b881ca2f1673b1da785a6ba9a1421b88f634703
 RMD160 (NovaWM-0.8_alpha.tar.gz) = 71d81d56b60669cd9323b6590b11064e5b376b3d
 Size (NovaWM-0.8_alpha.tar.gz) = 1103082 bytes
 SHA1 (patch-aa) = 8c4b80cce3c5a55a76031fd69bc051155841352c
+SHA1 (patch-ab) = f5d5e07b01457c7465f583ea571472c2bc52cd5b
diff -r b59513d76e94 -r 53731914e245 wm/novawm/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/novawm/patches/patch-ab        Sat Apr 05 18:33:32 2008 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2008/04/05 18:33:32 reed Exp $
+
+--- src/main.cpp.orig  2008-04-05 12:15:04.000000000 -0500
++++ src/main.cpp       2008-04-05 12:15:56.000000000 -0500
+@@ -252,12 +252,16 @@
+       novawmFont = XLoadQueryFont (display, "lucidasans-12");
+       if (!novawmFont)
+       {
+-              printf ("Failed to load font!\n");
++              printf ("Failed to load lucidasans-12 font!\n");
+               novawmFont = XLoadQueryFont (display, "fixed");
+       }
+ 
+       nbFont = XLoadQueryFont (display, "lucidasans-10");
+-
++      if (!nbFont)
++      {
++              printf ("Failed to load lucidasans-10 font!\n");
++              nbFont = XLoadQueryFont (display, "fixed");
++      }
+ 
+       gcvalues.function = GXcopy;
+       gcvalues.foreground = WhitePixel (display, screen);