From cc303a228901ba4d52b1d5273d59b25da638be5d Mon Sep 17 00:00:00 2001 From: ghen Date: Thu, 9 Feb 2006 21:36:40 +0000 Subject: Update to IceWM 1.2.25. Changes: 1.2.25: 2006-02-03 - fix resize of maximized windows when taskbar set to AutoHide - fix support for screens 0.1 and up 1.2.25pre1: 2006-01-31 - fix format in window size/position display (Bert Wesarg) - fix configure to use pkg-config for xft (Marius Feraru) - fix build with Sun Forte C++ (Grant McDorman) - icewmtray crash fixes (Grant McDorman) 1.2.24: 2006-01-22 - option to --replace an extisting window manager - change menu scroll wheel direction (Thomas Holder) - paint desktop tray background (Thomas Holder) - gcc 4.1 build fixes (Hanno Boeck) - fix gcc strict aliasing errors (Pavel Nemec) 1.2.24pre1: 2005-12-04 - restore Dutch translation from Ton Kersten - zh_TW translation from Wei-Lun Chao - fix TaskBarKeepBelow=1 preference - fix problems in horizontal maximization - implemented support for --replace option - Make shaped decorations work in 21 bit graphics cards (like those common in sparcs) -- Bernhard R. Link Ok with wiz. --- wm/icewm-imlib/Makefile | 3 +-- wm/icewm/Makefile | 3 +-- wm/icewm/Makefile.common | 4 ++-- wm/icewm/PLIST | 5 +++-- wm/icewm/distinfo | 15 +++++++-------- wm/icewm/patches/patch-ac | 8 ++++---- wm/icewm/patches/patch-af | 24 ------------------------ wm/icewm/patches/patch-ag | 24 ------------------------ wm/icewm/patches/patch-ah | 23 ----------------------- 9 files changed, 18 insertions(+), 91 deletions(-) delete mode 100644 wm/icewm/patches/patch-af delete mode 100644 wm/icewm/patches/patch-ag delete mode 100644 wm/icewm/patches/patch-ah (limited to 'wm') diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile index ed35437ccfe..8579fcb3665 100644 --- a/wm/icewm-imlib/Makefile +++ b/wm/icewm-imlib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/02/09 21:36:41 ghen Exp $ PKGNAME= ${DISTNAME:S/-/-imlib-/} -PKGREVISION= 3 COMMENT= Small, fast and light-weight window manager (imlib version) CONFLICTS+= icewm-[0-9]* icewm-gnome-[0-9]* diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index dc155219e68..3165d8f422e 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2006/02/05 23:11:13 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2006/02/09 21:36:40 ghen Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 3 COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index d38f8f2a4d4..b8aded89bab 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.48 2006/01/06 20:49:20 rillig Exp $ +# $NetBSD: Makefile.common,v 1.49 2006/02/09 21:36:40 ghen Exp $ -DISTNAME= icewm-1.2.23 +DISTNAME= icewm-1.2.25 CATEGORIES= x11 wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/} diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST index 0a089c4fa71..4e22080cd6e 100644 --- a/wm/icewm/PLIST +++ b/wm/icewm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2006/01/23 11:12:50 ghen Exp $ +@comment $NetBSD: PLIST,v 1.18 2006/02/09 21:36:40 ghen Exp $ bin/icehelp bin/icesh bin/icewm @@ -350,8 +350,8 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/icewm.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/icewm.mo -${PKGLOCALEDIR}/locale/no/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/icewm.mo @@ -364,6 +364,7 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/icewm.mo ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/icewm.mo @dirrm share/icewm/themes/yellowmotif @dirrm share/icewm/themes/win95 @dirrm share/icewm/themes/warp4 diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo index d91a8e85f93..eebd4e55ffa 100644 --- a/wm/icewm/distinfo +++ b/wm/icewm/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.25 2006/01/06 20:49:20 rillig Exp $ +$NetBSD: distinfo,v 1.26 2006/02/09 21:36:40 ghen Exp $ -SHA1 (icewm-1.2.23.tar.gz) = 122baeaaaa9fee90abfe50c66636df6d78d22deb -RMD160 (icewm-1.2.23.tar.gz) = 0b82deca8750b2dd82502e2911656d9204b84ea4 -Size (icewm-1.2.23.tar.gz) = 1017090 bytes -SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6 +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-ac) = 456dab76f0726b474aa7bd7a2843b634b0b572b1 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424 -SHA1 (patch-af) = dbba18656c0f49a17ee2744d43c84b6a43bdd7a6 -SHA1 (patch-ag) = 101306de4d144a8ad470c39f80ecac9103264cf5 -SHA1 (patch-ah) = 5e0fd7643010132917c1fbc92cd22b4cc1d925d0 +SHA1 (patch-af) = 628870f89d67a7d0f6173d4183dd79e52c29690f +SHA1 (patch-ah) = f1a6da758c45ab058bc716891086c35c94bae693 diff --git a/wm/icewm/patches/patch-ac b/wm/icewm/patches/patch-ac index 9ff2943eb6c..fb52a0fdf26 100644 --- a/wm/icewm/patches/patch-ac +++ b/wm/icewm/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.5 2004/06/26 23:58:02 xtraeme Exp $ +$NetBSD: patch-ac,v 1.6 2006/02/09 21:36:41 ghen 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 @@ +--- src/wmtaskbar.cc.orig 2006-02-09 17:15:58.000000000 +0100 ++++ src/wmtaskbar.cc +@@ -90,7 +90,8 @@ static void initPixmaps() { YResourcePaths subdirs(paths, base); if ((icewmImage = themedirs.loadImage(base, ICEWM_PIXMAP)) == null && diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af deleted file mode 100644 index 9acdcf830cb..00000000000 --- a/wm/icewm/patches/patch-af +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-af,v 1.13 2005/05/31 14:05:57 rillig Exp $ - ---- src/ylocale.cc.orig Sun Jan 9 22:48:23 2005 -+++ src/ylocale.cc Tue May 31 13:11:58 2005 -@@ -15,6 +15,7 @@ - - #include "intl.h" - #include -+#include /* __NetBSD_Version__ */ - - #ifdef CONFIG_I18N - #include -@@ -152,7 +153,11 @@ YUChar *YLocale::unicodeString(const YLC - char * inbuf((char *) lStr), * outbuf((char *) uStr); - size_t inlen(lLen), outlen(4 * lLen); - -+#if (__NetBSD_Version__ >= 200000000) || defined(__sun) -+ if (0 > (int) iconv(instance->toUnicode, (const char **)&inbuf, &inlen, &outbuf, &outlen)) -+#else - if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) -+#endif - warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); - - *((YUChar *) outbuf) = 0; diff --git a/wm/icewm/patches/patch-ag b/wm/icewm/patches/patch-ag deleted file mode 100644 index a975538577a..00000000000 --- a/wm/icewm/patches/patch-ag +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ag,v 1.8 2005/05/31 14:05:57 rillig Exp $ - -Needed for Sun C++ 5.6 on Solaris. - ---- src/wmclient.cc.orig Tue May 31 13:07:11 2005 -+++ src/wmclient.cc Tue May 31 13:07:29 2005 -@@ -599,7 +599,7 @@ void YFrameClient::setWindowTitle(const - int count; - char ** strings(NULL); - -- if (XmbTextPropertyToTextList(xapp->display(), &title, -+ if (XmbTextPropertyToTextList(xapp->display(), const_cast(&title), - &strings, &count) >= 0 && - count > 0 && strings[0]) - setWindowTitle((const char *)strings[0]); -@@ -617,7 +617,7 @@ void YFrameClient::setIconTitle(const XT - int count; - char ** strings(NULL); - -- if (XmbTextPropertyToTextList(xapp->display(), &title, -+ if (XmbTextPropertyToTextList(xapp->display(), const_cast(&title), - &strings, &count) >= 0 && - count > 0 && strings[0]) - setIconTitle((const char *)strings[0]); diff --git a/wm/icewm/patches/patch-ah b/wm/icewm/patches/patch-ah deleted file mode 100644 index 721ff81e8d7..00000000000 --- a/wm/icewm/patches/patch-ah +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2005/05/31 14:05:57 rillig Exp $ - -Needed for Sun C++ 5.6 without patch 117549-02. - ---- src/icesh.cc.orig Sun Jan 9 22:48:23 2005 -+++ src/icesh.cc Tue May 31 13:56:02 2005 -@@ -91,6 +91,7 @@ public: - - template - T data(unsigned index) const { return ((T *) fData)[index]; } -+ long long_data(unsigned index) const { return ((long *) fData)[index]; } - - operator int() const { return fStatus; } - -@@ -385,7 +386,7 @@ struct WorkspaceInfo { - }; - - unsigned WorkspaceInfo::count() { -- return (Success == fCount ? fCount.data(0) : 0); -+ return (Success == fCount ? fCount.long_data(0) : 0); - } - - int WorkspaceInfo::parseWorkspaceName(char const * name) { -- cgit v1.2.3