[pkgsrc/trunk]: pkgsrc/audio/wsoundprefs Fixed compiling with windowmaker-0.9x

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea45d714d9ed
branches:  trunk
changeset: 484111:ea45d714d9ed
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Nov 25 13:14:01 2004 +0000

description:
Fixed compiling with windowmaker-0.9x

diffstat:

 audio/wsoundprefs/Makefile         |   3 ++-
 audio/wsoundprefs/distinfo         |   4 +++-
 audio/wsoundprefs/patches/patch-af |  13 +++++++++++++
 audio/wsoundprefs/patches/patch-ag |  13 +++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r b8741d9e4258 -r ea45d714d9ed audio/wsoundprefs/Makefile
--- a/audio/wsoundprefs/Makefile        Thu Nov 25 13:12:52 2004 +0000
+++ b/audio/wsoundprefs/Makefile        Thu Nov 25 13:14:01 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/10/03 00:13:10 tv Exp $
+# $NetBSD: Makefile,v 1.22 2004/11/25 13:14:01 adam Exp $
 #
 
 DISTNAME=      WSoundPrefs-1.1.1
@@ -13,6 +13,7 @@
 
 USE_BUILDLINK3=        YES
 USE_IMAKE=     YES
+LIBS+=         -lXft
 
 .include "../../audio/wsoundserver/buildlink3.mk"
 .include "../../wm/windowmaker/buildlink3.mk"
diff -r b8741d9e4258 -r ea45d714d9ed audio/wsoundprefs/distinfo
--- a/audio/wsoundprefs/distinfo        Thu Nov 25 13:12:52 2004 +0000
+++ b/audio/wsoundprefs/distinfo        Thu Nov 25 13:14:01 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/31 03:08:59 wiz Exp $
+$NetBSD: distinfo,v 1.6 2004/11/25 13:14:02 adam Exp $
 
 SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
 Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
@@ -7,3 +7,5 @@
 SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
 SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
 SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
+SHA1 (patch-af) = 9b60b779af703075058f8a88669cae70a5eecddb
+SHA1 (patch-ag) = ec0c1a3c2223b9728fa69f85547cce6b12177c06
diff -r b8741d9e4258 -r ea45d714d9ed audio/wsoundprefs/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/wsoundprefs/patches/patch-af        Thu Nov 25 13:14:01 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2004/11/25 13:14:02 adam Exp $
+
+--- src/main.c.orig    2004-11-25 13:43:01.000000000 +0000
++++ src/main.c
+@@ -109,7 +109,7 @@ main(int argc, char **argv)
+                       wwarning(_("could not load image file %s:%s"), path, RMessageForError(RErrorCode));
+               else {
+                       icon = WMCreatePixmapFromRImage(scr, tmp, 0);
+-                      RDestroyImage(tmp);
++                      RReleaseImage(tmp);
+                       if (icon) {
+                               WMSetApplicationIconImage(scr, icon);
+                               WMReleasePixmap(icon);
diff -r b8741d9e4258 -r ea45d714d9ed audio/wsoundprefs/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/wsoundprefs/patches/patch-ag        Thu Nov 25 13:14:01 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2004/11/25 13:14:02 adam Exp $
+
+--- src/WSoundPrefs.c.orig     2004-11-25 13:48:33.000000000 +0000
++++ src/WSoundPrefs.c
+@@ -407,7 +407,7 @@ Initialize(WMScreen *scr)
+               WMResizeWidget(panel->copyrightL, 448, 20);
+               WMMoveWidget(panel->copyrightL, 8, 178);
+               WMSetLabelTextAlignment(panel->copyrightL, WACenter);
+-              font = WMCreateNormalFont(scr, "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*");
++              font = WMCreateFont(scr, "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*");
+               if (font)
+                       WMSetLabelText(panel->copyrightL, "Copyright \xa9 1999 The Az\xe5rg-r\xfbh");
+               else {