From 20678783f5b262528137663691ed247357bba3f3 Mon Sep 17 00:00:00 2001
From: xtraeme <xtraeme>
Date: Sat, 26 Jun 2004 23:58:02 +0000
Subject: Finish update to 1.2.14.

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

(limited to 'wm/icewm')

diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa
new file mode 100644
index 00000000000..9f83739c502
--- /dev/null
+++ b/wm/icewm/patches/patch-aa
@@ -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 --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac
new file mode 100644
index 00000000000..9ff2943eb6c
--- /dev/null
+++ b/wm/icewm/patches/patch-ac
@@ -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");
-- 
cgit v1.2.3