Mon Jun 16 14:55:03 2008 UTC ()
Minor update to IceWM 1.2.35:

1.2.35: 2008-01-05
        - Application tray bug fixes
        - Add encoding/language to about dialog

While we're here, re-instate Beastie - the way icewm selects the start menu
icon changed with 1.2.28.

It's the little things that count. :)


(hauke)
diff -r1.61 -r1.62 pkgsrc/wm/icewm/Makefile.common
diff -r1.34 -r1.35 pkgsrc/wm/icewm/distinfo
diff -r0 -r1.3 pkgsrc/wm/icewm/patches/patch-ak
cvs diff -r1.61 -r1.62 pkgsrc/wm/icewm/Makefile.common (expand / switch to unified diff)

--- pkgsrc/wm/icewm/Makefile.common 2008/06/16 10:17:56 1.61
+++ pkgsrc/wm/icewm/Makefile.common 2008/06/16 14:55:03 1.62
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.common,v 1.61 2008/06/16 10:17:56 hauke Exp $ 1# $NetBSD: Makefile.common,v 1.62 2008/06/16 14:55:03 hauke Exp $
2 2
3DISTNAME= icewm-1.2.34 3DISTNAME= icewm-1.2.35
4CATEGORIES= x11 wm 4CATEGORIES= x11 wm
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.icewm.org/ 8HOMEPAGE= http://www.icewm.org/
9 9
10GNU_CONFIGURE= yes 10GNU_CONFIGURE= yes
11USE_TOOLS+= gmake msgfmt 11USE_TOOLS+= gmake msgfmt
12USE_PKGLOCALEDIR= yes 12USE_PKGLOCALEDIR= yes
13 13
14DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo 14DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo
15FILESDIR= ${.CURDIR}/../../wm/icewm/files 15FILESDIR= ${.CURDIR}/../../wm/icewm/files
16PATCHDIR= ${.CURDIR}/../../wm/icewm/patches 16PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
cvs diff -r1.34 -r1.35 pkgsrc/wm/icewm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/icewm/distinfo 2008/06/16 10:17:56 1.34
+++ pkgsrc/wm/icewm/distinfo 2008/06/16 14:55:03 1.35
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.34 2008/06/16 10:17:56 hauke Exp $ 1$NetBSD: distinfo,v 1.35 2008/06/16 14:55:03 hauke Exp $
2 2
3SHA1 (icewm-1.2.34.tar.gz) = 9cc7c47e47767eccf957561f1a166ffe631c3d42 3SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210
4RMD160 (icewm-1.2.34.tar.gz) = f85a9332312134d22db19e806d9e7122ece76f07 4RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b
5Size (icewm-1.2.34.tar.gz) = 830558 bytes 5Size (icewm-1.2.35.tar.gz) = 831087 bytes
6SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e 6SHA1 (patch-aa) = 28202bab4996d320843f811629301df1abd2608e
7SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088 7SHA1 (patch-ad) = 371c8939bcdcdb6c49cc8db2246370c95c9ff088
8SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2 8SHA1 (patch-aj) = a6cf8c8daeb54b1e75642dc846c3e6ce4a619fa2
 9SHA1 (patch-ak) = 20917a172f8e2b05966109cd7fae62fed29688b6
File Added: pkgsrc/wm/icewm/patches/patch-ak
$NetBSD: patch-ak,v 1.3 2008/06/16 14:55:03 hauke Exp $

--- src/wmtaskbar.cc.orig	2008-01-05 08:34:24.000000000 +0100
+++ src/wmtaskbar.cc
@@ -81,7 +81,10 @@ static void initPixmaps() {
      * filename. This will be unified and be a forced standard in
      * icewm-2
      */
-    startImage = themedirs.loadImage(base, "start.xpm");
+    /* pkgsrc *BSD: Try Beastie first */
+    startImage = subdirs.loadImage(base, START_PIXMAP);
+    if (startImage == null || !startImage->valid())
+        startImage = themedirs.loadImage(base, "start.xpm");
     if (startImage == null || !startImage->valid())
         startImage = themedirs.loadImage(base, "linux.xpm");
     if (startImage == null || !startImage->valid())