From 2bd3f21b3ad1270fd789239b6eee318099de02b9 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 16 Nov 2012 20:07:48 +0000
Subject: Don't delete static array, delete the elements. Fix template look up.
 Bump revision.

---
 wm/icewm/Makefile                        |  4 ++--
 wm/icewm/distinfo                        |  4 +++-
 wm/icewm/patches/patch-src_apppstatus.cc | 15 +++++++++++++++
 wm/icewm/patches/patch-src_yarray.h      | 13 +++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 wm/icewm/patches/patch-src_apppstatus.cc
 create mode 100644 wm/icewm/patches/patch-src_yarray.h

(limited to 'wm')

diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile
index e46a2ce08d8..c463528e490 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2012/10/23 10:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2012/11/16 20:07:48 joerg Exp $
 
-PKGREVISION=		2
+PKGREVISION=		3
 COMMENT=		Small, fast and light-weight window manager
 
 CONFLICTS+=		icewm-gnome-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index 8c811cb02d8..c92d4ed495c 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2008/06/17 08:32:41 hauke Exp $
+$NetBSD: distinfo,v 1.37 2012/11/16 20:07:48 joerg Exp $
 
 SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210
 RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e
 SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088
 SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2
 SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1
+SHA1 (patch-src_apppstatus.cc) = ea685b05bdcc7169b8f830409c4948c7ee9092a3
+SHA1 (patch-src_yarray.h) = c1e96402396bf6120a286e01c57b7202b4a3b9fb
diff --git a/wm/icewm/patches/patch-src_apppstatus.cc b/wm/icewm/patches/patch-src_apppstatus.cc
new file mode 100644
index 00000000000..267e86ddf17
--- /dev/null
+++ b/wm/icewm/patches/patch-src_apppstatus.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_apppstatus.cc,v 1.1 2012/11/16 20:07:48 joerg Exp $
+
+--- src/apppstatus.cc.orig	2012-11-16 19:21:16.000000000 +0000
++++ src/apppstatus.cc
+@@ -81,7 +81,9 @@ NetStatus::NetStatus(char const * netdev
+ 
+ NetStatus::~NetStatus() {
+     delete[] fNetDev;
+-    delete[] color;
++    delete color[0];
++    delete color[1];
++    delete color[2];
+     delete[] ppp_in;
+     delete[] ppp_out;
+     delete fUpdateTimer;
diff --git a/wm/icewm/patches/patch-src_yarray.h b/wm/icewm/patches/patch-src_yarray.h
new file mode 100644
index 00000000000..e265962e3dc
--- /dev/null
+++ b/wm/icewm/patches/patch-src_yarray.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_yarray.h,v 1.1 2012/11/16 20:07:48 joerg Exp $
+
+--- src/yarray.h.orig	2012-11-16 19:20:22.000000000 +0000
++++ src/yarray.h
+@@ -150,7 +150,7 @@ public:
+     }
+ 
+     virtual void remove(const typename YArray<DataType *>::SizeType index) {
+-        if (index < YArray<DataType *>::getCount()) delete getItem(index);
++        if (index < YArray<DataType *>::getCount()) delete this->getItem(index);
+         YArray<DataType *>::remove(index);
+     }
+     
-- 
cgit v1.2.3