From 5f5bfdb99283eccc26d73313483602ba7722c632 Mon Sep 17 00:00:00 2001
From: ghen <ghen@pkgsrc.org>
Date: Sat, 13 May 2006 09:24:21 +0000
Subject: Update to IceWM 1.2.26.  Changes:

1.2.26: 2006-04-16
	- fix icesh workspace switching (Thomas Holder)
	- Polish translation fix (Pawel Chwalowski)
	- fix focus after closing fullscreen window
	- new option: TaskBarShowTransientWindows (default = 1, for now)
---
 wm/icewm-imlib/Makefile   |  9 ++++-----
 wm/icewm/Makefile.common  |  4 ++--
 wm/icewm/distinfo         | 10 +++++-----
 wm/icewm/patches/patch-aa |  7 ++++---
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'wm')

diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index b958235b478..852aa686118 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2006/04/17 13:46:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/05/13 09:24:21 ghen Exp $
 
-PKGNAME=	${DISTNAME:S/-/-imlib-/}
-PKGREVISION=	1
-COMMENT=	Small, fast and light-weight window manager (imlib version)
+PKGNAME=		${DISTNAME:S/-/-imlib-/}
+COMMENT=		Small, fast and light-weight window manager (imlib version)
 
-CONFLICTS+=	icewm-[0-9]* icewm-gnome-[0-9]*
+CONFLICTS+=		icewm-[0-9]* icewm-gnome-[0-9]*
 
 .include "../../wm/icewm/Makefile.common"
 
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 5b4540337e1..2b9e5b9e46a 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.52 2006/05/10 21:37:15 rillig Exp $
+# $NetBSD: Makefile.common,v 1.53 2006/05/13 09:24:21 ghen Exp $
 
-DISTNAME=		icewm-1.2.25
+DISTNAME=		icewm-1.2.26
 CATEGORIES=		x11 wm
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=icewm/}
 
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index 3e57dfac53b..202d58c9e15 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2006/03/06 21:53:04 joerg Exp $
+$NetBSD: distinfo,v 1.29 2006/05/13 09:24:21 ghen Exp $
 
-SHA1 (icewm-1.2.25.tar.gz) = 04d3555ec0c2e0fc4e782893f6b1ca8d5dfdcacd
-RMD160 (icewm-1.2.25.tar.gz) = 58bab630875aea02c64c2ca9bcbe80cf2338cdb3
-Size (icewm-1.2.25.tar.gz) = 1042790 bytes
-SHA1 (patch-aa) = 4a7a1f2efe756ab187219176a587f8fc3ae5b236
+SHA1 (icewm-1.2.26.tar.gz) = 8cd941ae0d70a8175bfd8e1e1c4f6658c6caf1fa
+RMD160 (icewm-1.2.26.tar.gz) = fca3e3e9c11da971aff132a34cfbf0c8f3a15599
+Size (icewm-1.2.26.tar.gz) = 1042824 bytes
+SHA1 (patch-aa) = 01d6f2b212fefcce51075d339f1a633b6f9740ed
 SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
diff --git a/wm/icewm/patches/patch-aa b/wm/icewm/patches/patch-aa
index 8aa3f7d4bc4..310b995d2c3 100644
--- a/wm/icewm/patches/patch-aa
+++ b/wm/icewm/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.6 2006/03/06 21:53:04 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2006/05/13 09:24:21 ghen Exp $
 
---- src/ylocale.cc.orig	2006-02-03 06:24:27.000000000 +0000
+--- src/ylocale.cc.orig	2006-05-13 11:05:31.000000000 +0200
 +++ src/ylocale.cc
 @@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC
      char * inbuf((char *) lStr), * outbuf((char *) uStr);
      size_t inlen(lLen), outlen(4 * lLen);
  
+-    if (0 > (int) iconv(instance->toUnicode, const_cast<char **>(&inbuf), &inlen, &outbuf, &outlen))
 +#if defined(__NetBSD__)
-     if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
++    if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
 +#else
 +    if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
 +#endif
-- 
cgit v1.2.3