From 5500d8baf614d46c32b01c8d9461cb060bc212ba Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 5 Nov 2004 11:51:35 +0000 Subject: Changes 0.91.0: * Alt-Tab Window Switching Changes 0.90.0: * NetWM / EWMH Support * Antialiased font support * Global Submenus * UTF-8 Support * Icon Panel for Alt-Tabbing --- wm/windowmaker/Makefile | 32 ++++---- wm/windowmaker/PLIST | 174 ++++++++++++++++++++-------------------- wm/windowmaker/buildlink3.mk | 5 +- wm/windowmaker/distinfo | 20 ++--- wm/windowmaker/patches/patch-aa | 12 +-- wm/windowmaker/patches/patch-ab | 31 +++---- wm/windowmaker/patches/patch-ac | 10 +-- wm/windowmaker/patches/patch-ad | 10 +-- wm/windowmaker/patches/patch-ae | 12 +-- wm/windowmaker/patches/patch-af | 8 +- wm/windowmaker/patches/patch-ah | 18 ++--- 11 files changed, 165 insertions(+), 167 deletions(-) (limited to 'wm') diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 9f19fb7c253..48663d3228b 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,16 +1,15 @@ -# $NetBSD: Makefile,v 1.47 2004/10/03 00:18:23 tv Exp $ +# $NetBSD: Makefile,v 1.48 2004/11/05 11:51:35 adam Exp $ -DISTNAME= WindowMaker-0.80.2 -PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} -PKGREVISION= 4 -CATEGORIES= x11 wm windowmaker -MASTER_SITES= ftp://ftp.windowmaker.org/pub/source/release/ \ - ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/ -EXTRACT_SUFX= .tar.bz2 +DISTNAME= WindowMaker-0.91.0 +PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} +CATEGORIES= x11 wm windowmaker +MASTER_SITES= ftp://ftp.windowmaker.org/pub/source/release/ \ + ftp://ftp.ics.es.osaka-u.ac.jp/mirrors/WindowMaker/source/release/ +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.windowmaker.org/ -COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.windowmaker.org/ +COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone BUILD_USES_MSGFMT= YES @@ -48,10 +47,9 @@ CONF_FILES+= ${EGDIR}/$f ${PKG_SYSCONFDIR}/$f # kde enable support for kde/kwm window manager hints # gnome enable support for GNOME window manager hints # openlook enable support for OPEN LOOK(tm) window manager hints -# lite remove Window Maker redundancies with KDE and GNOME -# (this option is broken in WindowMaker 0.65.x) -# -WINDOWMAKER_OPTIONS?= gnome kde openlook +# vdesktop enable support for virtual desktop. + +WINDOWMAKER_OPTIONS?= gnome kde openlook vdesktop BUILD_DEFS+= WINDOWMAKER_OPTIONS @@ -82,11 +80,11 @@ post-install: ${TOUCH} ${PREFIX}/share/WindowMaker/Sounds/.directory ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/WindowMaker cd ${WRKSRC}; ${INSTALL_DATA} \ - README README.GNOME README.KDE README.definable-cursor \ - FAQ FAQ.I18N \ + README README.definable-cursor FAQ FAQ.I18N \ ${PREFIX}/share/doc/WindowMaker .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../fonts/Xft2/buildlink3.mk" .include "../../graphics/hermes/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST index ae3a4cc0372..86b44c4c589 100644 --- a/wm/windowmaker/PLIST +++ b/wm/windowmaker/PLIST @@ -1,72 +1,72 @@ -@comment $NetBSD: PLIST,v 1.9 2004/09/22 08:09:56 jlam Exp $ -GNUstep/Apps/WPrefs.app/WPrefs -GNUstep/Apps/WPrefs.app/WPrefs.tiff -GNUstep/Apps/WPrefs.app/WPrefs.xpm -GNUstep/Apps/WPrefs.app/tiff/advancetonewworkspace.tiff -GNUstep/Apps/WPrefs.app/tiff/animations.tiff -GNUstep/Apps/WPrefs.app/tiff/appearance.tiff -GNUstep/Apps/WPrefs.app/tiff/clip.tiff -GNUstep/Apps/WPrefs.app/tiff/configs.tiff -GNUstep/Apps/WPrefs.app/tiff/cycleworkspaces.tiff -GNUstep/Apps/WPrefs.app/tiff/dock.tiff -GNUstep/Apps/WPrefs.app/tiff/dontlinkworkspaces.tiff -GNUstep/Apps/WPrefs.app/tiff/ergonomic.tiff -GNUstep/Apps/WPrefs.app/tiff/expert.tiff -GNUstep/Apps/WPrefs.app/tiff/fonts.tiff -GNUstep/Apps/WPrefs.app/tiff/iconprefs.tiff -GNUstep/Apps/WPrefs.app/tiff/keyboard.tiff -GNUstep/Apps/WPrefs.app/tiff/keyboardprefs.tiff -GNUstep/Apps/WPrefs.app/tiff/keyshortcuts.tiff -GNUstep/Apps/WPrefs.app/tiff/menualign1.tiff -GNUstep/Apps/WPrefs.app/tiff/menualign2.tiff -GNUstep/Apps/WPrefs.app/tiff/menuprefs.tiff -GNUstep/Apps/WPrefs.app/tiff/menus.tiff -GNUstep/Apps/WPrefs.app/tiff/moreanim.tiff -GNUstep/Apps/WPrefs.app/tiff/mousesettings.tiff -GNUstep/Apps/WPrefs.app/tiff/mousespeed.tiff -GNUstep/Apps/WPrefs.app/tiff/msty1.tiff -GNUstep/Apps/WPrefs.app/tiff/msty2.tiff -GNUstep/Apps/WPrefs.app/tiff/msty3.tiff -GNUstep/Apps/WPrefs.app/tiff/newstyle.tiff -GNUstep/Apps/WPrefs.app/tiff/nonopaque.tiff -GNUstep/Apps/WPrefs.app/tiff/oldstyle.tiff -GNUstep/Apps/WPrefs.app/tiff/opaque.tiff -GNUstep/Apps/WPrefs.app/tiff/paths.tiff -GNUstep/Apps/WPrefs.app/tiff/smooth.tiff -GNUstep/Apps/WPrefs.app/tiff/sound.tiff -GNUstep/Apps/WPrefs.app/tiff/speed0.tiff -GNUstep/Apps/WPrefs.app/tiff/speed0s.tiff -GNUstep/Apps/WPrefs.app/tiff/speed1.tiff -GNUstep/Apps/WPrefs.app/tiff/speed1s.tiff -GNUstep/Apps/WPrefs.app/tiff/speed2.tiff -GNUstep/Apps/WPrefs.app/tiff/speed2s.tiff -GNUstep/Apps/WPrefs.app/tiff/speed3.tiff -GNUstep/Apps/WPrefs.app/tiff/speed3s.tiff -GNUstep/Apps/WPrefs.app/tiff/speed4.tiff -GNUstep/Apps/WPrefs.app/tiff/speed4s.tiff -GNUstep/Apps/WPrefs.app/tiff/tdel.tiff -GNUstep/Apps/WPrefs.app/tiff/tedit.tiff -GNUstep/Apps/WPrefs.app/tiff/textr.tiff -GNUstep/Apps/WPrefs.app/tiff/theme.tiff -GNUstep/Apps/WPrefs.app/tiff/timer0.tiff -GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff -GNUstep/Apps/WPrefs.app/tiff/timer1.tiff -GNUstep/Apps/WPrefs.app/tiff/timer1s.tiff -GNUstep/Apps/WPrefs.app/tiff/timer2.tiff -GNUstep/Apps/WPrefs.app/tiff/timer2s.tiff -GNUstep/Apps/WPrefs.app/tiff/timer3.tiff -GNUstep/Apps/WPrefs.app/tiff/timer3s.tiff -GNUstep/Apps/WPrefs.app/tiff/timer4.tiff -GNUstep/Apps/WPrefs.app/tiff/timer4s.tiff -GNUstep/Apps/WPrefs.app/tiff/timer5.tiff -GNUstep/Apps/WPrefs.app/tiff/timer5s.tiff -GNUstep/Apps/WPrefs.app/tiff/tnew.tiff -GNUstep/Apps/WPrefs.app/tiff/whandling.tiff -GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff -GNUstep/Apps/WPrefs.app/tiff/workspace.tiff -GNUstep/Apps/WPrefs.app/tiff/workspacename.tiff -GNUstep/Apps/WPrefs.app/tiff/xis.tiff -@exec ${MKDIR} %D/GNUstep/Apps/WPrefs.app/xpm +@comment $NetBSD: PLIST,v 1.10 2004/11/05 11:51:35 adam Exp $ +GNUstep/Applications/WPrefs.app/WPrefs +GNUstep/Applications/WPrefs.app/WPrefs.tiff +GNUstep/Applications/WPrefs.app/WPrefs.xpm +GNUstep/Applications/WPrefs.app/tiff/advancetonewworkspace.tiff +GNUstep/Applications/WPrefs.app/tiff/animations.tiff +GNUstep/Applications/WPrefs.app/tiff/appearance.tiff +GNUstep/Applications/WPrefs.app/tiff/clip.tiff +GNUstep/Applications/WPrefs.app/tiff/configs.tiff +GNUstep/Applications/WPrefs.app/tiff/cycleworkspaces.tiff +GNUstep/Applications/WPrefs.app/tiff/dock.tiff +GNUstep/Applications/WPrefs.app/tiff/dontlinkworkspaces.tiff +GNUstep/Applications/WPrefs.app/tiff/ergonomic.tiff +GNUstep/Applications/WPrefs.app/tiff/expert.tiff +GNUstep/Applications/WPrefs.app/tiff/fonts.tiff +GNUstep/Applications/WPrefs.app/tiff/iconprefs.tiff +GNUstep/Applications/WPrefs.app/tiff/keyboard.tiff +GNUstep/Applications/WPrefs.app/tiff/keyboardprefs.tiff +GNUstep/Applications/WPrefs.app/tiff/keyshortcuts.tiff +GNUstep/Applications/WPrefs.app/tiff/menualign1.tiff +GNUstep/Applications/WPrefs.app/tiff/menualign2.tiff +GNUstep/Applications/WPrefs.app/tiff/menuprefs.tiff +GNUstep/Applications/WPrefs.app/tiff/menus.tiff +GNUstep/Applications/WPrefs.app/tiff/moreanim.tiff +GNUstep/Applications/WPrefs.app/tiff/mousesettings.tiff +GNUstep/Applications/WPrefs.app/tiff/mousespeed.tiff +GNUstep/Applications/WPrefs.app/tiff/msty1.tiff +GNUstep/Applications/WPrefs.app/tiff/msty2.tiff +GNUstep/Applications/WPrefs.app/tiff/msty3.tiff +GNUstep/Applications/WPrefs.app/tiff/newstyle.tiff +GNUstep/Applications/WPrefs.app/tiff/nonopaque.tiff +GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff +GNUstep/Applications/WPrefs.app/tiff/opaque.tiff +GNUstep/Applications/WPrefs.app/tiff/paths.tiff +GNUstep/Applications/WPrefs.app/tiff/smooth.tiff +GNUstep/Applications/WPrefs.app/tiff/sound.tiff +GNUstep/Applications/WPrefs.app/tiff/speed0.tiff +GNUstep/Applications/WPrefs.app/tiff/speed0s.tiff +GNUstep/Applications/WPrefs.app/tiff/speed1.tiff +GNUstep/Applications/WPrefs.app/tiff/speed1s.tiff +GNUstep/Applications/WPrefs.app/tiff/speed2.tiff +GNUstep/Applications/WPrefs.app/tiff/speed2s.tiff +GNUstep/Applications/WPrefs.app/tiff/speed3.tiff +GNUstep/Applications/WPrefs.app/tiff/speed3s.tiff +GNUstep/Applications/WPrefs.app/tiff/speed4.tiff +GNUstep/Applications/WPrefs.app/tiff/speed4s.tiff +GNUstep/Applications/WPrefs.app/tiff/tdel.tiff +GNUstep/Applications/WPrefs.app/tiff/tedit.tiff +GNUstep/Applications/WPrefs.app/tiff/textr.tiff +GNUstep/Applications/WPrefs.app/tiff/theme.tiff +GNUstep/Applications/WPrefs.app/tiff/timer0.tiff +GNUstep/Applications/WPrefs.app/tiff/timer0s.tiff +GNUstep/Applications/WPrefs.app/tiff/timer1.tiff +GNUstep/Applications/WPrefs.app/tiff/timer1s.tiff +GNUstep/Applications/WPrefs.app/tiff/timer2.tiff +GNUstep/Applications/WPrefs.app/tiff/timer2s.tiff +GNUstep/Applications/WPrefs.app/tiff/timer3.tiff +GNUstep/Applications/WPrefs.app/tiff/timer3s.tiff +GNUstep/Applications/WPrefs.app/tiff/timer4.tiff +GNUstep/Applications/WPrefs.app/tiff/timer4s.tiff +GNUstep/Applications/WPrefs.app/tiff/timer5.tiff +GNUstep/Applications/WPrefs.app/tiff/timer5s.tiff +GNUstep/Applications/WPrefs.app/tiff/tnew.tiff +GNUstep/Applications/WPrefs.app/tiff/whandling.tiff +GNUstep/Applications/WPrefs.app/tiff/windowfocus.tiff +GNUstep/Applications/WPrefs.app/tiff/workspace.tiff +GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff +GNUstep/Applications/WPrefs.app/tiff/xis.tiff +bin/convertfonts bin/get-wings-flags bin/get-wraster-flags bin/get-wutil-flags @@ -74,7 +74,6 @@ bin/geticonset bin/getstyle bin/seticons bin/setstyle -bin/wcopy bin/wdread bin/wdwrite bin/wkdemenu.pl @@ -82,11 +81,8 @@ bin/wm-oldmenu2new bin/wmagnify bin/wmaker bin/wmaker.inst -bin/wmchlocale bin/wmsetbg bin/wmsetup -bin/wpaste -bin/wsetfont bin/wxcopy bin/wxpaste include/WINGs/WINGs.h @@ -102,15 +98,16 @@ lib/libWINGs.a lib/libWMaker.a lib/libWUtil.a lib/libwraster.la +lib/pkgconfig/WINGs.pc +lib/pkgconfig/wmlib.pc +lib/pkgconfig/wrlib.pc man/man1/geticonset.1 man/man1/getstyle.1 man/man1/seticons.1 man/man1/setstyle.1 -man/man1/wcopy.1 man/man1/wdwrite.1 man/man1/wmaker.1 man/man1/wmsetbg.1 -man/man1/wsetfont.1 man/man1/wxcopy.1 man/man1/wxpaste.1 man/sk/man1/geticonset.1 @@ -120,7 +117,6 @@ man/sk/man1/setstyle.1 man/sk/man1/wdwrite.1 man/sk/man1/wmaker.1 man/sk/man1/wmsetbg.1 -man/sk/man1/wsetfont.1 man/sk/man1/wxcopy.1 man/sk/man1/wxpaste.1 share/WINGs/Images.tiff @@ -194,6 +190,9 @@ share/WindowMaker/Icons/xdvi.tiff share/WindowMaker/Icons/xdvi.xpm share/WindowMaker/Icons/xv.tiff share/WindowMaker/Icons/xv.xpm +share/WindowMaker/Pixmaps/swback.png +share/WindowMaker/Pixmaps/swback2.png +share/WindowMaker/Pixmaps/swtile.png share/WindowMaker/Pixmaps/tile.tiff share/WindowMaker/Pixmaps/tile.xpm share/WindowMaker/README @@ -269,7 +268,7 @@ share/WindowMaker/menu.sk share/WindowMaker/menu.sl share/WindowMaker/menu.tr share/WindowMaker/menu.zh_CN -share/WindowMaker/menu.zh_TW.Big5 +share/WindowMaker/menu.zh_TW share/WindowMaker/plmenu share/WindowMaker/plmenu.bg share/WindowMaker/plmenu.da @@ -285,22 +284,22 @@ share/WindowMaker/plmenu.pl share/WindowMaker/plmenu.ro share/WindowMaker/plmenu.sk share/WindowMaker/plmenu.zh_CN -share/WindowMaker/plmenu.zh_TW.Big5 +share/WindowMaker/plmenu.zh_TW share/WindowMaker/wmmacros share/WindowMaker/xtree.dat share/doc/WindowMaker/FAQ share/doc/WindowMaker/FAQ.I18N share/doc/WindowMaker/README -share/doc/WindowMaker/README.GNOME -share/doc/WindowMaker/README.KDE share/doc/WindowMaker/README.definable-cursor share/examples/WindowMaker/WMGLOBAL share/examples/WindowMaker/WMRootMenu share/examples/WindowMaker/WMState share/examples/WindowMaker/WMWindowAttributes share/examples/WindowMaker/WindowMaker +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WINGs.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WPrefs.mo ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/WindowMaker.mo +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/WINGs.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WINGs.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WPrefs.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/WindowMaker.mo @@ -311,10 +310,11 @@ ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/WPrefs.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/WindowMaker.mo -${PKGLOCALEDIR}/locale/et/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/WPrefs.mo +${PKGLOCALEDIR}/locale/et/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/WPrefs.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/WindowMaker.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/WINGs.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/WPrefs.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/WindowMaker.mo @@ -344,12 +344,11 @@ ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/WindowMaker.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WPrefs.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo -@dirrm share/examples/WindowMaker @dirrm share/doc/WindowMaker @dirrm share/WindowMaker/Themes @dirrm share/WindowMaker/Styles -@dirrm share/WindowMaker/Sounds @dirrm share/WindowMaker/SoundSets +@dirrm share/WindowMaker/Sounds @dirrm share/WindowMaker/Pixmaps @dirrm share/WindowMaker/Icons @dirrm share/WindowMaker/IconSets @@ -357,10 +356,7 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo @dirrm share/WindowMaker @dirrm share/WINGs @dirrm man/sk/man1 -@dirrm man/sk @dirrm include/WINGs -@dirrm GNUstep/Apps/WPrefs.app/xpm -@dirrm GNUstep/Apps/WPrefs.app/tiff -@dirrm GNUstep/Apps/WPrefs.app -@dirrm GNUstep/Apps -@dirrm GNUstep +@dirrm GNUstep/Applications/WPrefs.app/tiff +@dirrm GNUstep/Applications/WPrefs.app/xpm +@dirrm GNUstep/Applications/WPrefs.app diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk index 759889fe78b..dbe47370f7c 100644 --- a/wm/windowmaker/buildlink3.mk +++ b/wm/windowmaker/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:18:23 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2004/11/05 11:51:35 adam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WINDOWMAKER_BUILDLINK3_MK:= ${WINDOWMAKER_BUILDLINK3_MK}+ @@ -12,10 +12,11 @@ BUILDLINK_PACKAGES+= windowmaker .if !empty(WINDOWMAKER_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.windowmaker+= windowmaker>=0.80.2nb3 -BUILDLINK_RECOMMENDED.windowmaker+= windowmaker>=0.80.2nb4 +BUILDLINK_RECOMMENDED.windowmaker+= windowmaker>=0.91.0 BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker .endif # WINDOWMAKER_BUILDLINK3_MK +.include "../../fonts/Xft2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/hermes/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo index 25ef31cedf4..04140d1c285 100644 --- a/wm/windowmaker/distinfo +++ b/wm/windowmaker/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.18 2003/01/08 19:56:34 jmmv Exp $ +$NetBSD: distinfo,v 1.19 2004/11/05 11:51:35 adam Exp $ -SHA1 (WindowMaker-0.80.2.tar.bz2) = efc8b3e29f738b44cca6257304ae0951cfd33b43 -Size (WindowMaker-0.80.2.tar.bz2) = 2053988 bytes -SHA1 (patch-aa) = fdbb341cf48e3496a51589cbd496ca6869d47b87 -SHA1 (patch-ab) = ef1804477a1908e4a53e29bb43cd40399ea0c870 -SHA1 (patch-ac) = e44933c13b86aa11777d929a71add7fb95118d28 -SHA1 (patch-ad) = 040d603c789987f18c6622e12f6044cfae172e15 -SHA1 (patch-ae) = 92abcb4a013b6df1a89f9884780c3d9611056582 -SHA1 (patch-af) = fd60724503f7bc29788be7e72bbe5898ed282c2c -SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253 +SHA1 (WindowMaker-0.91.0.tar.bz2) = 14fb553943b5cbfaaa867d28405b910e73d3b509 +Size (WindowMaker-0.91.0.tar.bz2) = 2198266 bytes +SHA1 (patch-aa) = c6ac4117995c89803f876f402ae07f0ee3e6e4c6 +SHA1 (patch-ab) = 936ab75d67b932df44d4c41023b588a863e283c9 +SHA1 (patch-ac) = 7dfc20cd0b1e8638afb920bf631b44d918e59ac6 +SHA1 (patch-ad) = 183b529289bbcb8dd7590296e546c166aef8da0a +SHA1 (patch-ae) = 70f21b44a45fad4b2bf48af75820a22ed1e4e857 +SHA1 (patch-af) = dc749bbbea0c0e8d5b42d7d1be76b60b3af794b2 +SHA1 (patch-ah) = b391a48f723c62335448007a89c6958a7d922d86 diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa index ddac6e5d755..a619605a33a 100644 --- a/wm/windowmaker/patches/patch-aa +++ b/wm/windowmaker/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.7 2001/12/25 15:10:50 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2004/11/05 11:51:35 adam Exp $ ---- doc/Makefile.in.orig Tue Dec 18 06:44:16 2001 -+++ doc/Makefile.in -@@ -97,7 +97,7 @@ +--- doc/Makefile.in.orig 2004-10-24 23:02:00.000000000 -0400 ++++ doc/Makefile.in 2004-10-24 23:02:38.000000000 -0400 +@@ -113,7 +113,7 @@ SUBDIRS = sk --man_MANS = geticonset.1x getstyle.1x seticons.1x setstyle.1x wcopy.1x wdwrite.1x wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x -+man_MANS = geticonset.1 getstyle.1 seticons.1 setstyle.1 wcopy.1 wdwrite.1 wmaker.1 wmsetbg.1 wsetfont.1 wxcopy.1 wxpaste.1 +-man_MANS = geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x ++man_MANS = geticonset.1 getstyle.1 seticons.1 setstyle.1 wdwrite.1 wmaker.1 wmsetbg.1 wxcopy.1 wxpaste.1 EXTRA_DIST = $(man_MANS) diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab index d57783e1ae5..b3021f3e0f1 100644 --- a/wm/windowmaker/patches/patch-ab +++ b/wm/windowmaker/patches/patch-ab @@ -1,16 +1,16 @@ -$NetBSD: patch-ab,v 1.11 2002/08/25 21:50:51 mjl Exp $ +$NetBSD: patch-ab,v 1.12 2004/11/05 11:51:35 adam Exp $ ---- configure.orig Tue Jul 2 02:37:46 2002 -+++ configure Sun Aug 25 00:59:32 2002 -@@ -9660,43 +9660,18 @@ +--- configure.orig 2004-10-26 04:10:49.000000000 +0000 ++++ configure +@@ -21590,46 +21590,21 @@ fi --supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5" --supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5" +-supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5" +-supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5" +supported_locales="bg cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN" +supported_wprefs_locales="bg cs de es et fi fr hr hu it ja ko pt ru sk zh_CN" - supported_wings_locales="cs de sk" + supported_wings_locales="bg ca cs de fr sk" -for lang in $LINGUAS; do - ok=0 @@ -46,17 +46,20 @@ $NetBSD: patch-ab,v 1.11 2002/08/25 21:50:51 mjl Exp $ - WINGSMOFILES="$WINGSMOFILES $lang.mo" - fi +for lang in $supported_locales; do -+ MOFILES="$MOFILES $lang.mo" -+done ++ MOFILES="$MOFILES $lang.mo" + done + +for lang in $supported_wprefs_locales; do -+ WPMOFILES="$WPMOFILES $lang.mo" ++ WPMOFILES="$WPMOFILES $lang.mo" +done -+for lang in $supported_wings_locales; do -+ WINGSMOFILES="$WINGSMOFILES $lang.mo" - done ++for lang in $supported_wings_locales; do ++ WINGSMOFILES="$WINGSMOFILES $lang.mo" ++done -@@ -13432,8 +13407,8 @@ + case $host_os in + freebsd*) +@@ -26015,8 +25990,8 @@ _ACEOF fi fi diff --git a/wm/windowmaker/patches/patch-ac b/wm/windowmaker/patches/patch-ac index 1bdd1ecd944..1c432f2f229 100644 --- a/wm/windowmaker/patches/patch-ac +++ b/wm/windowmaker/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.5 2001/12/25 15:10:50 wiz Exp $ +$NetBSD: patch-ac,v 1.6 2004/11/05 11:51:35 adam Exp $ ---- wrlib/Makefile.in.orig Tue Dec 18 06:44:16 2001 +--- wrlib/Makefile.in.orig 2004-10-26 04:10:46.000000000 +0000 +++ wrlib/Makefile.in -@@ -99,7 +99,7 @@ +@@ -115,7 +115,7 @@ AUTOMAKE_OPTIONS = no-dependencies lib_LTLIBRARIES = libwraster.la --libwraster_la_LDFLAGS = -version-info 4:0:2 -+libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info 4:0:2 +-libwraster_la_LDFLAGS = -version-info 4:0:1 ++libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info 4:0:1 bin_SCRIPTS = get-wraster-flags diff --git a/wm/windowmaker/patches/patch-ad b/wm/windowmaker/patches/patch-ad index d4cb04a6aa5..226e3d80caa 100644 --- a/wm/windowmaker/patches/patch-ad +++ b/wm/windowmaker/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.7 2001/10/05 12:18:58 wiz Exp $ +$NetBSD: patch-ad,v 1.8 2004/11/05 11:51:35 adam Exp $ ---- src/main.c.orig Thu Oct 4 13:39:18 2001 -+++ src/main.c Fri Oct 5 14:02:59 2001 +--- src/main.c.orig 2004-10-25 01:32:51.000000000 +0000 ++++ src/main.c @@ -28,6 +28,7 @@ #include #include @@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.7 2001/10/05 12:18:58 wiz Exp $ #include #include -@@ -235,6 +236,12 @@ +@@ -233,6 +234,12 @@ SetupEnvironment(WScreen *scr) { char *tmp, *ptr; char buf[16]; @@ -22,4 +22,4 @@ $NetBSD: patch-ad,v 1.7 2001/10/05 12:18:58 wiz Exp $ + sigaction(SIGPIPE, &sa, NULL); if (multiHead) { - int len = strlen(DisplayName)+64; + int len = strlen(DisplayName)+64; diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae index 9fccd5fb11e..49e226b249c 100644 --- a/wm/windowmaker/patches/patch-ae +++ b/wm/windowmaker/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.4 2001/12/25 15:10:51 wiz Exp $ +$NetBSD: patch-ae,v 1.5 2004/11/05 11:51:35 adam Exp $ ---- doc/sk/Makefile.in.orig Tue Dec 18 06:44:16 2001 -+++ doc/sk/Makefile.in -@@ -96,7 +96,7 @@ +--- doc/sk/Makefile.in.orig 2004-10-24 23:05:06.000000000 -0400 ++++ doc/sk/Makefile.in 2004-10-24 23:05:39.000000000 -0400 +@@ -112,7 +112,7 @@ mandir = @mandir@/sk --man_MANS = geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x wmsetbg.1x wsetfont.1x seticons.1x wmaker.1x wxcopy.1x -+man_MANS = geticonset.1 setstyle.1 wxpaste.1 getstyle.1 wdwrite.1 wmsetbg.1 wsetfont.1 seticons.1 wmaker.1 wxcopy.1 +-man_MANS = geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x ++man_MANS = geticonset.1 setstyle.1 wxpaste.1 getstyle.1 wdwrite.1 wmsetbg.1 seticons.1 wmaker.1 wxcopy.1 EXTRA_DIST = $(man_MANS) diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-af index e0ccdfcf6f5..ec4362423eb 100644 --- a/wm/windowmaker/patches/patch-af +++ b/wm/windowmaker/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.3 2003/01/08 19:56:34 jmmv Exp $ +$NetBSD: patch-af,v 1.4 2004/11/05 11:51:35 adam Exp $ ---- WindowMaker/Defaults/Makefile.in.orig Tue Jul 2 02:37:45 2002 -+++ WindowMaker/Defaults/Makefile.in -@@ -95,7 +95,7 @@ X_LIBRARY_PATH = @X_LIBRARY_PATH@ +--- WindowMaker/Defaults/Makefile.in.orig 2004-10-26 14:10:46.000000000 +1000 ++++ WindowMaker/Defaults/Makefile.in 2004-10-27 18:25:53.000000000 +1000 +@@ -111,7 +111,7 @@ supported_locales = @supported_locales@ wprefsdir = @wprefsdir@ diff --git a/wm/windowmaker/patches/patch-ah b/wm/windowmaker/patches/patch-ah index 27cbc4a928a..091fe1522ee 100644 --- a/wm/windowmaker/patches/patch-ah +++ b/wm/windowmaker/patches/patch-ah @@ -1,15 +1,15 @@ -$NetBSD: patch-ah,v 1.1 2001/07/23 18:56:19 wiz Exp $ +$NetBSD: patch-ah,v 1.2 2004/11/05 11:51:35 adam Exp $ ---- src/properties.c.orig Tue Oct 31 15:57:25 2000 -+++ src/properties.c +--- src/properties.c.orig 2004-10-27 17:41:34.000000000 +1000 ++++ src/properties.c 2004-10-27 17:42:09.000000000 +1000 @@ -81,8 +81,8 @@ class_hint = XAllocClassHint(); if (XGetClassHint(dpy,window,class_hint) == 0) { -- *wm_class = NULL; -- *wm_instance = NULL; -+ *wm_class = strdup("default"); -+ *wm_instance = strdup("default"); - XFree(class_hint); - return False; +- *wm_class = NULL; +- *wm_instance = NULL; ++ *wm_class = strdup("default"); ++ *wm_instance = strdup("default"); + XFree(class_hint); + return False; } -- cgit v1.2.3