Sun Jan 5 12:29:33 2014 UTC ()
Update to 1.2.38pre2

* Fix wrong color on NetBSD/evbearmv6hf-el with Yasushi Oshima's patch

Chagnelog:
1.2.38pre2:
	- various bug fixes

1.2.38pre1:
	- xinerama fixes
        - app-group transient window implementation
	- FreeBSD ACPI support - Alexander Motin (amotin)

1.2.37:
	- fix centering of transient windows over parents (Bert Wesarg)
	- check if window is allowed to be moved, before starting movement (Bert Wesarg)
	- fix key handling on buttons

1.2.36:
	- add option TaskBarFullscreenAutoShow (default = 1)

1.2.36pre2: 2008-08-17
	- regrab keyboard bindings when keyboard mapping changes

1.2.36pre1: 2008-08-07
	- fix unresponsive taskbar when PassFirstClickToClient=0
	- add support for sysfs interface (instead of proc) for battery
          status (initial code by Santiago Garcia Mantinan)
	- fix maximized window repositioning on fullscreen toggle
	- bug 1852567 - make searching for icons more consistent (iconPath first,
          search each directory first for all possible types - xpm, png)
	- Italian translation update
	- Korean translation update
	- translation cleanup: converted .po files to UTF-8


(ryoon)
diff -r1.46 -r1.47 pkgsrc/wm/icewm/Makefile
diff -r1.66 -r1.67 pkgsrc/wm/icewm/Makefile.common
diff -r1.24 -r1.25 pkgsrc/wm/icewm/PLIST
diff -r1.38 -r1.39 pkgsrc/wm/icewm/distinfo
diff -r1.11 -r1.12 pkgsrc/wm/icewm/patches/patch-aa
diff -r1.10 -r1.11 pkgsrc/wm/icewm/patches/patch-ad
diff -r0 -r1.1 pkgsrc/wm/icewm/patches/patch-src_ypixbuf.cc

cvs diff -r1.46 -r1.47 pkgsrc/wm/icewm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/icewm/Makefile 2013/06/06 12:55:09 1.46
+++ pkgsrc/wm/icewm/Makefile 2014/01/05 12:29:33 1.47
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.46 2013/06/06 12:55:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.47 2014/01/05 12:29:33 ryoon Exp $
2 2
3PKGREVISION= 6 
4COMMENT= Small, fast and light-weight window manager 3COMMENT= Small, fast and light-weight window manager
5 4
6CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* 5CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]*
7 6
8CONFIGURE_ARGS+= --with-gnome-menus=no 7CONFIGURE_ARGS+= --with-gnome-menus=no
9CONFIGURE_ARGS+= --with-imlib=no 8CONFIGURE_ARGS+= --with-imlib=no
10CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm} 9CONFIGURE_ARGS+= --with-xpm=${BUILDLINK_PREFIX.libXpm}
11 10
12.include "Makefile.common" 11.include "Makefile.common"
13.include "../../x11/libXext/buildlink3.mk" 12.include "../../x11/libXext/buildlink3.mk"
14.include "../../x11/libXinerama/buildlink3.mk" 13.include "../../x11/libXinerama/buildlink3.mk"
15.include "../../x11/libXpm/buildlink3.mk" 14.include "../../x11/libXpm/buildlink3.mk"
16 15

cvs diff -r1.66 -r1.67 pkgsrc/wm/icewm/Makefile.common (expand / switch to unified diff)

--- pkgsrc/wm/icewm/Makefile.common 2012/10/08 12:42:20 1.66
+++ pkgsrc/wm/icewm/Makefile.common 2014/01/05 12:29:33 1.67
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile.common,v 1.66 2012/10/08 12:42:20 asau Exp $ 1# $NetBSD: Makefile.common,v 1.67 2014/01/05 12:29:33 ryoon Exp $
2# 2#
3# used by wm/icewm/Makefile 3# used by wm/icewm/Makefile
4# used by wm/icewm-imlib/Makefile 4# used by wm/icewm-imlib/Makefile
5 5
6DISTNAME= icewm-1.2.35 6DISTNAME= icewm-1.2.38pre2
7PKGREVISION= 1 
8CATEGORIES= x11 wm 7CATEGORIES= x11 wm
9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.icewm.org/ 11HOMEPAGE= http://www.icewm.org/
13 12
14GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
15USE_TOOLS+= gmake msgfmt 14USE_TOOLS+= gmake msgfmt
16USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
17 16
18DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo
19FILESDIR= ${.CURDIR}/../../wm/icewm/files 18FILESDIR= ${.CURDIR}/../../wm/icewm/files
20PATCHDIR= ${.CURDIR}/../../wm/icewm/patches 19PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
@@ -67,15 +66,16 @@ INSTALL_TARGET= install-base install-nl @@ -67,15 +66,16 @@ INSTALL_TARGET= install-base install-nl
67post-extract: 66post-extract:
68 cp ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar 67 cp ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
69 68
70post-install: 69post-install:
71 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} 70 ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
72 ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR} 71 ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
73 set -e; \ 72 set -e; \
74 for file in BUGS CHANGES COPYING README README.wm-session TODO; do \ 73 for file in BUGS CHANGES COPYING README README.wm-session TODO; do \
75 ${INSTALL_DATA} ${WRKSRC}/"$${file}" ${DESTDIR}${DOCDIR}; \ 74 ${INSTALL_DATA} ${WRKSRC}/"$${file}" ${DESTDIR}${DOCDIR}; \
76 done 75 done
77 ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${HTMLDIR} 76 ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${HTMLDIR}
78 77
79.include "../../devel/gettext-lib/buildlink3.mk" 78.include "../../devel/gettext-lib/buildlink3.mk"
 79.include "../../fonts/fontconfig/buildlink3.mk"
80.include "../../x11/libXft/buildlink3.mk" 80.include "../../x11/libXft/buildlink3.mk"
81.include "../../x11/libXrandr/buildlink3.mk" 81.include "../../x11/libXrandr/buildlink3.mk"

cvs diff -r1.24 -r1.25 pkgsrc/wm/icewm/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/icewm/PLIST 2009/06/14 18:18:59 1.24
+++ pkgsrc/wm/icewm/PLIST 2014/01/05 12:29:33 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.24 2009/06/14 18:18:59 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.25 2014/01/05 12:29:33 ryoon Exp $
2bin/icehelp 2bin/icehelp
3bin/icesh 3bin/icesh
4bin/icewm 4bin/icewm
5bin/icewm-session 5bin/icewm-session
6bin/icewmbg 6bin/icewmbg
7bin/icewmhint 7bin/icewmhint
8bin/icewmtray 8bin/icewmtray
9share/doc/icewm/BUGS 9share/doc/icewm/BUGS
10share/doc/icewm/CHANGES 10share/doc/icewm/CHANGES
11share/doc/icewm/COPYING 11share/doc/icewm/COPYING
12share/doc/icewm/README 12share/doc/icewm/README
13share/doc/icewm/README.wm-session 13share/doc/icewm/README.wm-session
14share/doc/icewm/TODO 14share/doc/icewm/TODO
@@ -318,15 +318,14 @@ share/locale/mk/LC_MESSAGES/icewm.mo @@ -318,15 +318,14 @@ share/locale/mk/LC_MESSAGES/icewm.mo
318share/locale/nb/LC_MESSAGES/icewm.mo 318share/locale/nb/LC_MESSAGES/icewm.mo
319share/locale/nl/LC_MESSAGES/icewm.mo 319share/locale/nl/LC_MESSAGES/icewm.mo
320share/locale/pl/LC_MESSAGES/icewm.mo 320share/locale/pl/LC_MESSAGES/icewm.mo
321share/locale/pt_BR/LC_MESSAGES/icewm.mo 321share/locale/pt_BR/LC_MESSAGES/icewm.mo
322share/locale/ro/LC_MESSAGES/icewm.mo 322share/locale/ro/LC_MESSAGES/icewm.mo
323share/locale/ru/LC_MESSAGES/icewm.mo 323share/locale/ru/LC_MESSAGES/icewm.mo
324share/locale/sk/LC_MESSAGES/icewm.mo 324share/locale/sk/LC_MESSAGES/icewm.mo
325share/locale/sl/LC_MESSAGES/icewm.mo 325share/locale/sl/LC_MESSAGES/icewm.mo
326share/locale/sv/LC_MESSAGES/icewm.mo 326share/locale/sv/LC_MESSAGES/icewm.mo
327share/locale/tr/LC_MESSAGES/icewm.mo 327share/locale/tr/LC_MESSAGES/icewm.mo
328share/locale/uk/LC_MESSAGES/icewm.mo 328share/locale/uk/LC_MESSAGES/icewm.mo
329share/locale/vi/LC_MESSAGES/icewm.mo 329share/locale/vi/LC_MESSAGES/icewm.mo
330share/locale/zh_CN/LC_MESSAGES/icewm.mo 330share/locale/zh_CN/LC_MESSAGES/icewm.mo
331share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo 
332share/locale/zh_TW/LC_MESSAGES/icewm.mo 331share/locale/zh_TW/LC_MESSAGES/icewm.mo

cvs diff -r1.38 -r1.39 pkgsrc/wm/icewm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/icewm/distinfo 2013/08/18 21:29:37 1.38
+++ pkgsrc/wm/icewm/distinfo 2014/01/05 12:29:33 1.39
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.38 2013/08/18 21:29:37 wiz Exp $ 1$NetBSD: distinfo,v 1.39 2014/01/05 12:29:33 ryoon Exp $
2 2
3SHA1 (icewm-1.2.35.tar.gz) = a0174901ca89aa091a58efedfec1536c5e477210 3SHA1 (icewm-1.2.38pre2.tar.gz) = e0fa0ac454c8a7bbe850f114e9a0a82082516da3
4RMD160 (icewm-1.2.35.tar.gz) = 19b044d9f88f860d3e25a3f419404e106162f40b 4RMD160 (icewm-1.2.38pre2.tar.gz) = e2b3fefdae7e1d368920e84d175058e3fe7c8d93
5Size (icewm-1.2.35.tar.gz) = 831087 bytes 5Size (icewm-1.2.38pre2.tar.gz) = 854190 bytes
6SHA1 (patch-aa) = 54ee3fe3ecf520977b208472d99a218e590537ce 6SHA1 (patch-aa) = f8293eb29bffc657e6ae322a944c9c7416ce6687
7SHA1 (patch-ad) = e2f1e92b95f43bb2efdd5a5a4eab44d43f61a91b 7SHA1 (patch-ad) = 04dbb91c1486d6aa493fffa2661f330347153fe5
8SHA1 (patch-aj) = aa357c56d3165f36a347133cf11cc299438617e9 8SHA1 (patch-aj) = aa357c56d3165f36a347133cf11cc299438617e9
9SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1 9SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1
10SHA1 (patch-src_apppstatus.cc) = ea685b05bdcc7169b8f830409c4948c7ee9092a3 10SHA1 (patch-src_apppstatus.cc) = ea685b05bdcc7169b8f830409c4948c7ee9092a3
11SHA1 (patch-src_base.h) = cd869fd68b2d169fcded97662212e7eccee9c83c 11SHA1 (patch-src_base.h) = cd869fd68b2d169fcded97662212e7eccee9c83c
12SHA1 (patch-src_yarray.h) = c1e96402396bf6120a286e01c57b7202b4a3b9fb 12SHA1 (patch-src_yarray.h) = c1e96402396bf6120a286e01c57b7202b4a3b9fb
 13SHA1 (patch-src_ypixbuf.cc) = 6ecc2f9b76a2bf0589ae9ea98733f61a49f9afd1

cvs diff -r1.11 -r1.12 pkgsrc/wm/icewm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-aa 2013/08/18 21:29:08 1.11
+++ pkgsrc/wm/icewm/patches/patch-aa 2014/01/05 12:29:33 1.12
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.11 2013/08/18 21:29:08 wiz Exp $ 1$NetBSD: patch-aa,v 1.12 2014/01/05 12:29:33 ryoon Exp $
 2
 3* Support NetBSD's iconv(3)
2 4
3--- src/ylocale.cc.orig 2008-01-05 07:34:25.000000000 +0000 5--- src/ylocale.cc.orig 2008-01-05 07:34:25.000000000 +0000
4+++ src/ylocale.cc 6+++ src/ylocale.cc
5@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC 7@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC
6 char * inbuf((char *) lStr), * outbuf((char *) uStr); 8 char * inbuf((char *) lStr), * outbuf((char *) uStr);
7 size_t inlen(lLen), outlen(4 * lLen); 9 size_t inlen(lLen), outlen(4 * lLen);
8  10
9+#if defined(__NetBSD__) || defined(__sun) 11+#if defined(__NetBSD__) || defined(__sun)
10+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen)) 12+ if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
11+#else 13+#else
12 if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) 14 if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
13+#endif 15+#endif
14 warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); 16 warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno));

cvs diff -r1.10 -r1.11 pkgsrc/wm/icewm/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/wm/icewm/patches/patch-ad 2013/08/18 21:29:08 1.10
+++ pkgsrc/wm/icewm/patches/patch-ad 2014/01/05 12:29:33 1.11
@@ -1,13 +1,23 @@ @@ -1,13 +1,23 @@
1$NetBSD: patch-ad,v 1.10 2013/08/18 21:29:08 wiz Exp $ 1$NetBSD: patch-ad,v 1.11 2014/01/05 12:29:33 ryoon Exp $
2 2
3--- src/Makefile.in.orig 2008-01-05 07:34:24.000000000 +0000 3* -lfontconfig part: Fix link on NetBSD/evbearmv6-hf-el
 4
 5--- src/Makefile.in.orig 2009-11-08 18:59:46.000000000 +0000
4+++ src/Makefile.in 6+++ src/Makefile.in
5@@ -33,7 +33,7 @@ DEFS = @DEFS@ \ 7@@ -33,14 +33,14 @@ DEFS = @DEFS@ \
6 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \ 8 -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
7 -DICESMEXE='"icewm-session$(EXEEXT)"' \ 9 -DICESMEXE='"icewm-session$(EXEEXT)"' \
8 -DICEHELPEXE='"icehelp$(EXEEXT)"' \ 10 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
9- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' 11- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
10+ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"' 12+ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"'
11  13
12 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \ 14 CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
13 @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags` 15 @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
 16 LFLAGS = @LDFLAGS@
 17 LIBS = @LIBS@
 18
 19-CORE_LIBS = @CORE_LIBS@ # `fc-config --libs`
 20+CORE_LIBS = @CORE_LIBS@ -lfontconfig # `fc-config --libs`
 21 IMAGE_LIBS = @IMAGE_LIBS@
 22 AUDIO_LIBS = @AUDIO_LIBS@
 23 GNOME1_LIBS = @GNOME1_LIBS@

File Added: pkgsrc/wm/icewm/patches/patch-src_ypixbuf.cc
$NetBSD: patch-src_ypixbuf.cc,v 1.1 2014/01/05 12:29:33 ryoon Exp $

From http://www.yagoto-urayama.jp/~oshimaya/netbsd/files/icewm-1.2.35.diff
Fix color

--- src/ypixbuf.cc.orig	2009-11-08 18:59:46.000000000 +0000
+++ src/ypixbuf.cc
@@ -570,6 +570,23 @@ static void copyPixbufToRGB32(unsigned c
 }
 
 template <int Channels>
+static void copyPixbufToBGR32(unsigned char const * src, unsigned const sStep,
+                              char * dst, unsigned const dStep,
+                              unsigned const width, unsigned const height) {
+    MSG(("copyPixbufToRGB32"));
+
+    for (unsigned y(height); y > 0; --y, src+= sStep, dst+= dStep) {
+        unsigned char const * s(src); char * d(dst);
+        for (unsigned x(width); x-- > 0; s+= Channels, d+= 4)
+        {
+                d[0] = s[0];
+                d[1] = s[1];
+                d[2] = s[2];
+        }
+    }
+}
+
+template <int Channels>
 static void copyPixbufToRGB565(unsigned char const * src, unsigned const sStep,
                                char * dst, unsigned const dStep,
                                unsigned const width, unsigned const height) {
@@ -651,10 +668,12 @@ static void copyPixbufToImage(YPixbuf::P
     unsigned const width(image.width), height(image.height);
 
     if (image.depth > 16) {
-        if (CHANNEL_MASK(image, 0xff0000, 0x00ff00, 0x0000ff) ||
-            CHANNEL_MASK(image, 0x0000ff, 0x00ff00, 0xff0000))
+        if (CHANNEL_MASK(image, 0xff0000, 0x00ff00, 0x0000ff))
             copyPixbufToRGB32<Channels> (pixels, rowstride,
                      image.data, image.bytes_per_line, width, height);
+        else if (CHANNEL_MASK(image, 0x0000ff, 0x00ff00, 0xff0000))
+            copyPixbufToBGR32<Channels> (pixels, rowstride,
+                     image.data, image.bytes_per_line, width, height);
         else
             copyPixbufToRGBAny<yuint32, Channels> (pixels, rowstride,
                 image.data, image.bytes_per_line, width, height,