summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorreed <reed@pkgsrc.org>2008-04-05 18:33:32 +0000
committerreed <reed@pkgsrc.org>2008-04-05 18:33:32 +0000
commit76a9bb94b12bb56efb1cdd9d8009100c6fdf0676 (patch)
treece83cdc24b425df9e0f4cea8ded846a98e3ed1c6 /wm
parentf8e473bb63baea4af4894cce84bd0da897e66957 (diff)
downloadpkgsrc-76a9bb94b12bb56efb1cdd9d8009100c6fdf0676.tar.gz
Add patch to stop seg fault when lucidasans-10 font is not available.
(Also sent patch to developer.)
Diffstat (limited to 'wm')
-rw-r--r--wm/novawm/Makefile4
-rw-r--r--wm/novawm/distinfo3
-rw-r--r--wm/novawm/patches/patch-ab23
3 files changed, 27 insertions, 3 deletions
diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile
index 0faac0f97f9..3117184969a 100644
--- a/wm/novawm/Makefile
+++ b/wm/novawm/Makefile
@@ -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 --git a/wm/novawm/distinfo b/wm/novawm/distinfo
index c5495bcc887..a9c56f13909 100644
--- a/wm/novawm/distinfo
+++ b/wm/novawm/distinfo
@@ -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 --git a/wm/novawm/patches/patch-ab b/wm/novawm/patches/patch-ab
new file mode 100644
index 00000000000..6f3a9f4d307
--- /dev/null
+++ b/wm/novawm/patches/patch-ab
@@ -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);