[pkgsrc/trunk]: pkgsrc/wm/icewm/patches Finish update to 1.2.14.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fa60fceb0a00
branches:  trunk
changeset: 477132:fa60fceb0a00
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jun 26 23:58:02 2004 +0000

description:
Finish update to 1.2.14.

diffstat:

 wm/icewm/patches/patch-aa |  13 +++++++++++++
 wm/icewm/patches/patch-ac |  16 ++++++++++++++++
 2 files changed, 29 insertions(+), 0 deletions(-)

diffs (37 lines):

diff -r 40a2a402d2c1 -r fa60fceb0a00 wm/icewm/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/icewm/patches/patch-aa Sat Jun 26 23:58:02 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2004/06/26 23:58:02 xtraeme Exp $
+
+allow CONFIG_APPLET_APM to stay defined for NetBSD
+
+--- src/aapm.h.orig    Sat Apr 17 20:56:20 2004
++++ src/aapm.h Sat Apr 17 20:55:27 2004
+@@ -1,5 +1,5 @@
+ 
+-#ifndef linux
++#if !defined(linux) && !defined(__NetBSD__)
+ #undef CONFIG_APPLET_APM
+ #elif CONFIG_APPLET_APM
+ 
diff -r 40a2a402d2c1 -r fa60fceb0a00 wm/icewm/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/icewm/patches/patch-ac Sat Jun 26 23:58:02 2004 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.5 2004/06/26 23:58:02 xtraeme Exp $
+
+Get icewm to look in the right place for START_PIXMAP
+
+--- src/wmtaskbar.cc.orig      Sun May 23 07:18:19 2004
++++ src/wmtaskbar.cc   Tue Jun 22 23:03:48 2004
+@@ -86,7 +86,8 @@
+     YResourcePaths subdirs(paths, base);
+ 
+     if ((icewmImage = themedirs.loadImage(base, ICEWM_PIXMAP)) == null &&
+-        (icewmImage = themedirs.loadImage(base, START_PIXMAP)) == null)
++        (icewmImage = themedirs.loadImage(base, START_PIXMAP)) == null &&
++        (icewmImage = subdirs.loadImage(base, START_PIXMAP)) == null)
+         icewmImage = subdirs.loadImage(base, ICEWM_PIXMAP);
+ 
+     windowsImage = subdirs.loadImage(base, "windows.xpm");