summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2004-06-26 23:56:21 +0000
committerxtraeme <xtraeme@pkgsrc.org>2004-06-26 23:56:21 +0000
commit5a29f87e22010026bcac154369d73b637f5e10e3 (patch)
tree1f005c2aabfdd5748c722135ce24a93b994723e9 /wm
parent7d9ee22aaebf548d8ecb112c02695cfa97954620 (diff)
downloadpkgsrc-5a29f87e22010026bcac154369d73b637f5e10e3.tar.gz
Update wm/icewm to 1.2.14, provided by Iain Hibbert via pkgsrc-wip.
Changes: # 1.2.14: 2004-05-22 * minor tweak to alt+tab behavior when selecting from all workspaces # 1.2.14pre16: 2004-05-09 * netwm modal state broken, disabled * make menu/config file parsing behave more like sh (handle both single and double quotes) -- Eduard Bloch * Italian translation update * Czech translation update * fix build with gcc-3.4 # 1.2.14pre15: 2004-05-02 * add new theme yellowmotif (Andreas Leitgeb (avl42)) * fix in window mapping code for Citrix client * bug fixes in xft clipping # 1.2.14pre14: 2004-04-20 * Solaris fixes to configure.in (Damjan Perenic) * implement EWMH "modal" state * show themable preferences in ~/.icewm/preferences * fix order in CPU Status (Hanspeter Roth) # 1.2.14pre13: 2004-04-12 * fix antialiasing of menu icons * fix raising of new window when in fullscreen * Linux Kernel 2.6 iowait,irq,softirq cpu status support (Hanspeter Roth) * improved support for NetWM hints (state: above, below, ...) * fix delayed mouse focus with fast keyboard desktop switches # 1.2.14pre12: 2004-03-21 * fixed icon antialiasing with IMLIB * fix crash with XPM icon loading * Solaris fixes (Damjan Perenic) # 1.2.14pre11: 2004-03-16 * minor bug fixes and build fixes # 1.2.14pre10: 2004-02-29 * fix comile with --enable-lite * CPUStatus fix for FreeBSD 5.2 / gcc 3.3.3 (Hanspeter Roth) * fix crash in CPU status (L10N related, translations need to be updated) * made ShowMenuButtonIcon setting themable again * KeyWinMaximizeHoriz binding (no default key yet) * Italian translation update (Yuri Bongiorno) * Finnish translation update (Taisto Kuikka) * Turkish translation (Coku Erdem) # 1.2.14pre9: 2004-01-19 * improve maximized window position handling on workspace switches # 1.2.14pre8: 2004-01-11 * add Xft font specification for Infadel2 theme * image support for the "show desktop" icon * change startup order in icewm-session (icewm now first, startup last) * minimize all / show desktop should not minimize unminimizable windows * improvements to icehelp * fix winoptions icon override behavior * keep theme history in ~/.icewm/themes (Eduard Bloch) # 1.2.14pre7: 2004-01-03 * fix reaping of children in icewm-session * initial mapping code cleanup # 1.2.14pre6: 2003-12-30 * fix "lost focus when maximizing" in mouse-focus mode * fix "Super+key" bindings again * remove line/string length limits for preferences file # 1.2.14pre5: 2003-12-25 * fix problem with replaying Super+X when not activating menu * build fixes for FreeBSD * build fix for Xrandr \< 1.0 (not tested) * *bsd cpu status support (Hanspeter Roth) # 1.2.14pre4: 2003-12-23 * movesize-fx obsoleted * wm-session obsoleted * header cleanups * fix monitor for linux 2.0 (Miroslav Stibor) * fix focus/click with multiple emacs frames * all font preferences now have a ...Xft variant that can be set to fontconfig pattern specification. example: MenuFontNameXft=sans-serif:size=12:bold * enabled shaped window decorations by default (configure) # 1.2.14pre3: 2003-12-22 * debian fixes (Eduard Bloch) * fixes and cleanups # 1.2.14pre2: 2003-12-20 * compile fixes for egcs-2.91.66 (Miroslav Stibor) * icewm-session explicitly terminates icewm and icewmtray (Hanspeter Roth) * code refactoring and cleanup # 1.2.14pre1: 2003-11-01 * initial support for XRANDR * enable alt+Tab in LITE * only allow a restricted set of prefs to be set in a theme * fix shutdown in logout menu (was a reboot) * fix crash on startup when TaskBarShowWindowListMenu=0 and TaskBarDoubleHeight=1 set (Alexander Portnoy - alexpor) * icesound fixes (some variants need testing) * nested themes menus (Eduard Bloch) * support for rollover titlebar buttons (Rob Costello) * CPU status fixes. New option: TaskBarCPUDelay (Miroslav Stibor) * Net status fixes. New options: TaskBarNetSamples, TaskBarNetDelay (Miroslav Stibor) * fixes to icewm-session * Ctrl+Alt+Numpad moves window (Bert Wesarg)
Diffstat (limited to 'wm')
-rw-r--r--wm/icewm-gnome/Makefile3
-rw-r--r--wm/icewm-imlib/Makefile3
-rw-r--r--wm/icewm/Makefile3
-rw-r--r--wm/icewm/Makefile.common19
-rw-r--r--wm/icewm/PLIST59
-rw-r--r--wm/icewm/distinfo12
-rw-r--r--wm/icewm/patches/patch-ad14
-rw-r--r--wm/icewm/patches/patch-af12
8 files changed, 72 insertions, 53 deletions
diff --git a/wm/icewm-gnome/Makefile b/wm/icewm-gnome/Makefile
index 689146c933e..b754e1e9577 100644
--- a/wm/icewm-gnome/Makefile
+++ b/wm/icewm-gnome/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2004/04/09 10:41:06 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2004/06/26 23:56:21 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-gnome-/}
-PKGREVISION= 2
COMMENT= Small, fast and light-weight window manager (GNOME version)
CONFLICTS+= icewm-[0-9]* icewm-imlib-[0-9]*
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index 14e3ccf45a4..dde88c55556 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/04/09 10:41:07 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/06/26 23:56:22 xtraeme Exp $
PKGNAME= ${DISTNAME:S/-/-imlib-/}
-PKGREVISION= 2
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 2a9f2ade592..e3ce9f677a0 100644
--- a/wm/icewm/Makefile
+++ b/wm/icewm/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2004/04/09 10:41:06 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2004/06/26 23:56:21 xtraeme Exp $
PKGNAME= ${DISTNAME}
-PKGREVISION= 1
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 de6807a001a..a6600a36828 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.32 2004/02/26 09:00:03 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.33 2004/06/26 23:56:21 xtraeme Exp $
-DISTNAME= icewm-1.2.13
+DISTNAME= icewm-1.2.14
CATEGORIES= x11 wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=icewm/}
@@ -15,9 +15,12 @@ USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= # defined
BUILD_USES_MSGFMT= # defined
-DISTINFO_FILE= ${.CURDIR}/../../wm/icewm/distinfo
-FILESDIR= ${.CURDIR}/../../wm/icewm/files
-PATCHDIR= ${.CURDIR}/../../wm/icewm/patches
+DISTINFO_FILE= ${.CURDIR}/../icewm/distinfo
+FILESDIR= ${.CURDIR}/../icewm/files
+PATCHDIR= ${.CURDIR}/../icewm/patches
+
+CONFIGURE_ARGS+= --enable-gradients
+CONFIGURE_ARGS+= --enable-antialiasing
.include "../../mk/bsd.prefs.mk"
@@ -30,18 +33,18 @@ CONFIGURE_ARGS+= --disable-xinerama
PKG_SYSCONFSUBDIR= icewm
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-CPPFLAGS+= -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
+CXXFLAGS+= -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\"
.endif
.if ${OPSYS} == "NetBSD"
CONFIGURE_ARGS+= --with-unicode-set=utf-32
.endif
DOCDIR= ${PREFIX}/share/doc/icewm
-HTMLDIR= ${PREFIX}/share/doc/html/icewm
+HTMLDIR= ${PREFIX}/share/doc/icewm/html
INSTALL_TARGET= install-base install-nls
post-extract:
- ${CP} ${FILES} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+ @${CP} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
post-install:
${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST
index 3a6d3c44a3a..714700a1525 100644
--- a/wm/icewm/PLIST
+++ b/wm/icewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2003/12/28 16:10:04 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/06/26 23:56:21 xtraeme Exp $
bin/icehelp
bin/icesh
bin/icewm
@@ -6,32 +6,32 @@ bin/icewm-session
bin/icewmbg
bin/icewmhint
bin/icewmtray
-share/doc/html/icewm/icewm-1.html
-share/doc/html/icewm/icewm-10.html
-share/doc/html/icewm/icewm-11.html
-share/doc/html/icewm/icewm-12.html
-share/doc/html/icewm/icewm-13.html
-share/doc/html/icewm/icewm-14.html
-share/doc/html/icewm/icewm-15.html
-share/doc/html/icewm/icewm-16.html
-share/doc/html/icewm/icewm-17.html
-share/doc/html/icewm/icewm-18.html
-share/doc/html/icewm/icewm-19.html
-share/doc/html/icewm/icewm-2.html
-share/doc/html/icewm/icewm-3.html
-share/doc/html/icewm/icewm-4.html
-share/doc/html/icewm/icewm-5.html
-share/doc/html/icewm/icewm-6.html
-share/doc/html/icewm/icewm-7.html
-share/doc/html/icewm/icewm-8.html
-share/doc/html/icewm/icewm-9.html
-share/doc/html/icewm/icewm.html
share/doc/icewm/BUGS
share/doc/icewm/CHANGES
share/doc/icewm/COPYING
share/doc/icewm/README
share/doc/icewm/README.wm-session
share/doc/icewm/TODO
+share/doc/icewm/html/icewm-1.html
+share/doc/icewm/html/icewm-10.html
+share/doc/icewm/html/icewm-11.html
+share/doc/icewm/html/icewm-12.html
+share/doc/icewm/html/icewm-13.html
+share/doc/icewm/html/icewm-14.html
+share/doc/icewm/html/icewm-15.html
+share/doc/icewm/html/icewm-16.html
+share/doc/icewm/html/icewm-17.html
+share/doc/icewm/html/icewm-18.html
+share/doc/icewm/html/icewm-19.html
+share/doc/icewm/html/icewm-2.html
+share/doc/icewm/html/icewm-3.html
+share/doc/icewm/html/icewm-4.html
+share/doc/icewm/html/icewm-5.html
+share/doc/icewm/html/icewm-6.html
+share/doc/icewm/html/icewm-7.html
+share/doc/icewm/html/icewm-8.html
+share/doc/icewm/html/icewm-9.html
+share/doc/icewm/html/icewm.html
share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
@@ -107,6 +107,7 @@ share/icewm/menu
share/icewm/preferences
share/icewm/taskbar/bsd-daemon.xpm
share/icewm/taskbar/debian.xpm
+share/icewm/taskbar/desktop.xpm
share/icewm/taskbar/icewm.xpm
share/icewm/taskbar/linux.xpm
share/icewm/taskbar/linux1.xpm
@@ -188,15 +189,20 @@ share/icewm/themes/gtk2/restoreA.xpm
share/icewm/themes/gtk2/restoreI.xpm
share/icewm/themes/icedesert/closeA.xpm
share/icewm/themes/icedesert/closeI.xpm
+share/icewm/themes/icedesert/closeO.xpm
share/icewm/themes/icedesert/default.theme
share/icewm/themes/icedesert/maximizeA.xpm
share/icewm/themes/icedesert/maximizeI.xpm
+share/icewm/themes/icedesert/maximizeO.xpm
share/icewm/themes/icedesert/menuButtonA.xpm
share/icewm/themes/icedesert/menuButtonI.xpm
+share/icewm/themes/icedesert/menuButtonO.xpm
share/icewm/themes/icedesert/minimizeA.xpm
share/icewm/themes/icedesert/minimizeI.xpm
+share/icewm/themes/icedesert/minimizeO.xpm
share/icewm/themes/icedesert/restoreA.xpm
share/icewm/themes/icedesert/restoreI.xpm
+share/icewm/themes/icedesert/restoreO.xpm
share/icewm/themes/icedesert/titleAB.xpm
share/icewm/themes/icedesert/titleAT.xpm
share/icewm/themes/icedesert/titleIB.xpm
@@ -315,6 +321,12 @@ share/icewm/themes/win95/default.theme
share/icewm/themes/win95/maximize.xpm
share/icewm/themes/win95/minimize.xpm
share/icewm/themes/win95/restore.xpm
+share/icewm/themes/yellowmotif/close.xpm
+share/icewm/themes/yellowmotif/default.theme
+share/icewm/themes/yellowmotif/maximize.xpm
+share/icewm/themes/yellowmotif/menu.xpm
+share/icewm/themes/yellowmotif/minimize.xpm
+share/icewm/themes/yellowmotif/restore.xpm
share/icewm/toolbar
share/icewm/winoptions
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/icewm.mo
@@ -322,6 +334,7 @@ ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/de/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/en/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/es/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/icewm.mo
@@ -340,9 +353,11 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/icewm.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/icewm.mo
${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
+@dirrm share/icewm/themes/yellowmotif
@dirrm share/icewm/themes/win95
@dirrm share/icewm/themes/warp4
@dirrm share/icewm/themes/warp3
@@ -363,5 +378,5 @@ ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
@dirrm share/icewm/ledclock
@dirrm share/icewm/icons
@dirrm share/icewm
+@dirrm share/doc/icewm/html
@dirrm share/doc/icewm
-@dirrm share/doc/html/icewm
diff --git a/wm/icewm/distinfo b/wm/icewm/distinfo
index b22b41ba99d..1450d91adf6 100644
--- a/wm/icewm/distinfo
+++ b/wm/icewm/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.17 2004/06/22 20:45:45 xtraeme Exp $
+$NetBSD: distinfo,v 1.18 2004/06/26 23:56:21 xtraeme Exp $
-SHA1 (icewm-1.2.13.tar.gz) = ebfe807cbe3a9d931386833033eb9cb1792ea485
-Size (icewm-1.2.13.tar.gz) = 839636 bytes
+SHA1 (icewm-1.2.14.tar.gz) = 72cf06de5817d7383bd151961c2e24d3490e1826
+Size (icewm-1.2.14.tar.gz) = 932635 bytes
+SHA1 (patch-aa) = 374e3f7aae46c8ac3f0759dd6e72f2defd909fa5
SHA1 (patch-ab) = 791868a4320a62ac81de487667f90cbdaeacd2a7
-SHA1 (patch-ad) = 4b4feeb255a035a77195bf6e6fe5ffda6d428754
+SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6
+SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
SHA1 (patch-ae) = b1db6d35fb2454c132c734b67483d8a9d22ed9df
-SHA1 (patch-af) = 8b074ce39a46873a09978e18904b252dfec0eecf
+SHA1 (patch-af) = c7498dc4f962911bfde25e0f1b37508d5e9ba0c4
diff --git a/wm/icewm/patches/patch-ad b/wm/icewm/patches/patch-ad
index 3f76044da34..745648f719a 100644
--- a/wm/icewm/patches/patch-ad
+++ b/wm/icewm/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.7 2004/04/09 10:41:06 wiz Exp $
+$NetBSD: patch-ad,v 1.8 2004/06/26 23:56:21 xtraeme Exp $
---- src/Makefile.in.orig 2003-08-31 23:09:07.000000000 +0200
-+++ src/Makefile.in 2003-08-31 23:09:55.000000000 +0200
-@@ -29,7 +29,7 @@
- -DICEWMEXE='"icewm$(EXEEXT)"' \
+Make IceWM look in the right place for help files
+
+--- src/Makefile.in.orig Sun May 23 07:18:19 2004
++++ src/Makefile.in Tue Jun 22 22:29:11 2004
+@@ -31,7 +31,7 @@
-DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+ -DICESMEXE='"icewm-session$(EXEEXT)"' \
-DICEHELPEXE='"icehelp$(EXEEXT)"' \
- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+ -DICEHELPIDX='"$(PREFIX)/share/doc/html/icewm/icewm.html"'
++ -DICEHELPIDX='"$(PREFIX)/share/doc/icewm/html/icewm.html"'
CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af
index 67e1bfe635f..c89bd68aea4 100644
--- a/wm/icewm/patches/patch-af
+++ b/wm/icewm/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.8 2004/06/22 20:45:45 xtraeme Exp $
+$NetBSD: patch-af,v 1.9 2004/06/26 23:56:21 xtraeme Exp $
Add some code for NetBSD to
a) check if an interface is up, and
@@ -6,7 +6,7 @@ Add some code for NetBSD to
--- src/apppstatus.cc.orig Sat Sep 27 08:54:45 2003
+++ src/apppstatus.cc Sun Jun 20 20:45:26 2004
-@@ -363,6 +363,26 @@
+@@ -358,6 +358,26 @@
return isUpIsdn();
#endif
@@ -33,15 +33,15 @@ Add some code for NetBSD to
char buffer[32 * sizeof(struct ifreq)];
struct ifconf ifc;
struct ifreq *ifr;
-@@ -395,6 +415,7 @@
+@@ -390,6 +410,7 @@
close(s);
return false;
-+#endif // __NetBSD__
- #endif // if 0
++#endif
}
-@@ -522,6 +543,21 @@
+ void NetStatus::updateStatus() {
+@@ -510,6 +531,21 @@
}
}
#endif //FreeBSD