diff options
author | 2002-08-07 03:02:59 +0000 | |
---|---|---|
committer | 2002-08-07 03:02:59 +0000 | |
commit | 5fea44712c0f5280cdae8835243900c65a871375 (patch) | |
tree | 8d54ba4e2406f5fa53e16e91f387b9789e04c29b | |
parent | Emergency fix - the target dir gets lost in 5.6.1 (installs, just not to (diff) | |
download | historical-5fea44712c0f5280cdae8835243900c65a871375.tar.gz historical-5fea44712c0f5280cdae8835243900c65a871375.tar.bz2 historical-5fea44712c0f5280cdae8835243900c65a871375.zip |
Updated the wmfpo patch for 0.80.1. Added to the gentoo patch to
address bug #5975. Cleaned up xpm comment. Deleted unneeded ebuilds
and files.
-rw-r--r-- | x11-wm/WindowMaker/ChangeLog | 11 | ||||
-rw-r--r-- | x11-wm/WindowMaker/WindowMaker-0.80.0-r3.ebuild | 121 | ||||
-rw-r--r-- | x11-wm/WindowMaker/WindowMaker-0.80.1-r1.ebuild | 147 | ||||
-rw-r--r-- | x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild | 17 | ||||
-rw-r--r-- | x11-wm/WindowMaker/WindowMaker-0.80.1.ebuild | 140 | ||||
-rw-r--r-- | x11-wm/WindowMaker/files/25gnustep | 1 | ||||
-rw-r--r-- | x11-wm/WindowMaker/files/WindowMaker-0.80.1-gentoo.patch (renamed from x11-wm/WindowMaker/files/WindowMaker-0.81-gentoo.patch) | 24 | ||||
-rw-r--r-- | x11-wm/WindowMaker/files/digest-WindowMaker-0.80.0-r3 | 2 | ||||
-rw-r--r-- | x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1 | 2 | ||||
-rw-r--r-- | x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1-r1 | 2 | ||||
-rw-r--r-- | x11-wm/WindowMaker/files/wmfpo-80.patch | 261 |
11 files changed, 38 insertions, 690 deletions
diff --git a/x11-wm/WindowMaker/ChangeLog b/x11-wm/WindowMaker/ChangeLog index bf6fd242d479..6ac30b0e4c7f 100644 --- a/x11-wm/WindowMaker/ChangeLog +++ b/x11-wm/WindowMaker/ChangeLog @@ -1,12 +1,17 @@ # ChangeLog for x11-wm/WindowMaker # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/ChangeLog,v 1.12 2002/07/17 21:48:53 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/ChangeLog,v 1.13 2002/08/07 03:02:59 raker Exp $ *WindowMaker-0.80.1-r2 (17 Jul 2002) - 17 Jul 2002; Nick Hadaway <raker@gentoo.org> - WindowMaker-0.80.1-r2.ebuild + 06 Aug 2002; Nick Hadaway <raker@gentoo.org> WindowMaker-0.80.1-r2.ebuild, + files/wmfpo-81.patch, files/WindowMaker-0.80.1-gentoo.patch : + Updated the wmfpo patch for 0.80.1. Added to the gentoo patch to + address bug #5975. Cleaned up xpm comment. Deleted unneeded ebuilds + and files. + 17 Jul 2002; Nick Hadaway <raker@gentoo.org> + WindowMaker-0.80.1-r2.ebuild : Uncommented the wmfpo-80.patch as it still works with this latest version. Closes bug #5139. diff --git a/x11-wm/WindowMaker/WindowMaker-0.80.0-r3.ebuild b/x11-wm/WindowMaker/WindowMaker-0.80.0-r3.ebuild deleted file mode 100644 index 2d88d36b4d9e..000000000000 --- a/x11-wm/WindowMaker/WindowMaker-0.80.0-r3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/WindowMaker-0.80.0-r3.ebuild,v 1.7 2002/07/11 06:31:00 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Window Maker" -SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P}.tar.gz - ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" -HOMEPAGE="http://www.windowmaker.org/" -SLOT="0" -DEPEND="virtual/x11 - >=media-libs/tiff-3.5.5 - x11-wm/gnustep-env - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b-r2 ) - gif? ( >=media-libs/giflib-4.1.0-r3 - >=media-libs/libungif-4.1.0 )" - -RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )" -LICENSE="GPL-2" -KEYWORDS="x86" - -#NOTE: the default menu has the wrong path for the WMPrefs utility. -# Needs fixing. - -src_compile() { - - patch -p1 < ${FILESDIR}/wmfpo-80.patch - - local myconf - - use gnome \ - && myconf="${myconf} --enable-gnome" \ - || myconf="${myconf} --disable-gnome" - - use kde \ - && myconf="${myconf} --enable-kde" \ - && export KDEDIR=/usr/kde/2 \ - || myconf="${myconf} --disable-kde" - - if [ "$WITH_MODELOCK" ] ; then - myconf="${myconf} --enable-modelock" - else - myconf="${myconf} --disable-modelock" - fi - - use nls \ - && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \ - || myconf="${myconf} --disable-nls --disable-locale" - - use gif \ - || myconf="${myconf} --disable-gif" - - use jpeg \ - || myconf="${myconf} --disable-jpeg" - - use png \ - || myconf="${myconf} --disable-png" - - - use esd || use alsa || use oss \ - && myconf="${myconf} --enable-sound" \ - || myconf="${myconf} --disable-sound" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --sysconfdir=/etc/X11 \ - --with-x \ - --enable-newstyle \ - --enable-superfluous \ - --enable-usermenu \ - ${myconf} || die - - emake || die - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - ./configure --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info || die - - make || die -} - -src_install() { - - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - sysconfdir=${D}/etc/X11 \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - install || die - - cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu - - dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* INSTALL* FAQ* \ - MIRRORS README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - install || die - - newdoc README README.extra -} - -pkg_postinst() { - - echo - echo '######################################################################' - echo '# If do you want trans globes and other trans elements do you need #' - echo '# the libxpm (media-libs/xpm). #' - echo '######################################################################' - } - diff --git a/x11-wm/WindowMaker/WindowMaker-0.80.1-r1.ebuild b/x11-wm/WindowMaker/WindowMaker-0.80.1-r1.ebuild deleted file mode 100644 index c9ae6dd599e9..000000000000 --- a/x11-wm/WindowMaker/WindowMaker-0.80.1-r1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/WindowMaker-0.80.1-r1.ebuild,v 1.2 2002/07/08 13:47:11 aliz Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Window Maker" -SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P}.tar.gz - ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" -HOMEPAGE="http://www.windowmaker.org/" - -DEPEND="virtual/x11 - >=media-libs/tiff-3.5.5 - x11-wm/gnustep-env - gif? ( >=media-libs/giflib-4.1.0-r3 - >=media-libs/libungif-4.1.0 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b-r2 )" - -RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86" - -#NOTE: the default menu has the wrong path for the WMPrefs utility. -# Needs fixing. - -src_unpack() { - - unpack ${A} - cd ${WORKDIR} - patch -p0 < ${FILESDIR}/${P}-gentoo.patch -} - -src_compile() { - - patch -p1 < ${FILESDIR}/wmfpo-80.patch - - local myconf - - use gnome \ - && myconf="${myconf} --enable-gnome" \ - || myconf="${myconf} --disable-gnome" - - use kde \ - && myconf="${myconf} --enable-kde" \ - && export KDEDIR=/usr/kde/2 \ - || myconf="${myconf} --disable-kde" - - if [ "$WITH_MODELOCK" ] ; then - myconf="${myconf} --enable-modelock" - else - myconf="${myconf} --disable-modelock" - fi - - use nls \ - && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \ - || myconf="${myconf} --disable-nls --disable-locale" - - use gif \ - || myconf="${myconf} --disable-gif" - - use jpeg \ - || myconf="${myconf} --disable-jpeg" - - use png \ - || myconf="${myconf} --disable-png" - - - use esd || use alsa || use oss \ - && myconf="${myconf} --enable-sound" \ - || myconf="${myconf} --disable-sound" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --sysconfdir=/etc/X11 \ - --with-x \ - --enable-newstyle \ - --enable-superfluous \ - --enable-usermenu \ - ${myconf} || die - - cd ${S}/po - cp Makefile Makefile.orig - sed 's:zh_TW.*::' \ - Makefile.orig > Makefile - - cd ${S}/WPrefs.app/po - cp Makefile Makefile.orig - sed 's:zh_TW.*::' \ - Makefile.orig > Makefile - - cd ${S} - emake || die - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - ./configure --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info || die - - make || die -} - -src_install() { - - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - sysconfdir=${D}/etc/X11 \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - install || die - - cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu - - dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* INSTALL* FAQ* \ - MIRRORS README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - install || die - - newdoc README README.extra - - echo "#!/bin/bash" > wmaker - echo "/usr/bin/wmaker" >> wmaker - - exeino /etc/X11/Sessions/ - doexe wmaker -} - -pkg_postinst() { - - echo - echo '######################################################################' - echo '# If do you want trans globes and other trans elements do you need #' - echo '# the libxpm (media-libs/xpm). #' - echo '######################################################################' - } - diff --git a/x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild b/x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild index 1258a4a7a5d8..43a6cfdba2fe 100644 --- a/x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild +++ b/x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild,v 1.5 2002/07/17 21:48:53 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/WindowMaker-0.80.1-r2.ebuild,v 1.6 2002/08/07 03:02:59 raker Exp $ S=${WORKDIR}/${P} DESCRIPTION="Window Maker" @@ -21,9 +21,16 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86" -src_compile() { +src_unpack() { + + unpack ${A} + cd ${WORKDIR} + patch -p0 < ${FILESDIR}/${P}-gentoo.patch + patch -p0 < ${FILESDIR}/wmfpo-81.patch - patch -p1 < ${FILESDIR}/wmfpo-80.patch +} + +src_compile() { local myconf @@ -133,8 +140,8 @@ pkg_postinst() { echo echo '######################################################################' - echo '# If do you want trans globes and other trans elements do you need #' - echo '# the libxpm (media-libs/xpm). #' + echo '# If do you want trans globes and other trans elements you need #' + echo '# libxpm (media-libs/xpm). #' echo '######################################################################' } diff --git a/x11-wm/WindowMaker/WindowMaker-0.80.1.ebuild b/x11-wm/WindowMaker/WindowMaker-0.80.1.ebuild deleted file mode 100644 index b092f6d2f475..000000000000 --- a/x11-wm/WindowMaker/WindowMaker-0.80.1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/WindowMaker/WindowMaker-0.80.1.ebuild,v 1.4 2002/07/08 13:47:11 aliz Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="Window Maker" -SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P}.tar.gz - ftp://ftp.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" -HOMEPAGE="http://www.windowmaker.org/" - -DEPEND="virtual/x11 - >=media-libs/tiff-3.5.5 - x11-wm/gnustep-env - gif? ( >=media-libs/giflib-4.1.0-r3 - >=media-libs/libungif-4.1.0 ) - png? ( >=media-libs/libpng-1.2.1 ) - jpeg? ( >=media-libs/jpeg-6b-r2 )" - -RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86" - -#NOTE: the default menu has the wrong path for the WMPrefs utility. -# Needs fixing. - -src_compile() { - - patch -p1 < ${FILESDIR}/wmfpo-80.patch - - local myconf - - use gnome \ - && myconf="${myconf} --enable-gnome" \ - || myconf="${myconf} --disable-gnome" - - use kde \ - && myconf="${myconf} --enable-kde" \ - && export KDEDIR=/usr/kde/2 \ - || myconf="${myconf} --disable-kde" - - if [ "$WITH_MODELOCK" ] ; then - myconf="${myconf} --enable-modelock" - else - myconf="${myconf} --disable-modelock" - fi - - use nls \ - && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \ - || myconf="${myconf} --disable-nls --disable-locale" - - use gif \ - || myconf="${myconf} --disable-gif" - - use jpeg \ - || myconf="${myconf} --disable-jpeg" - - use png \ - || myconf="${myconf} --disable-png" - - - use esd || use alsa || use oss \ - && myconf="${myconf} --enable-sound" \ - || myconf="${myconf} --disable-sound" - - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --sysconfdir=/etc/X11 \ - --with-x \ - --enable-newstyle \ - --enable-superfluous \ - --enable-usermenu \ - ${myconf} || die - - cd ${S}/po - cp Makefile Makefile.orig - sed 's:zh_TW.*::' \ - Makefile.orig > Makefile - - cd ${S}/WPrefs.app/po - cp Makefile Makefile.orig - sed 's:zh_TW.*::' \ - Makefile.orig > Makefile - - cd ${S} - emake || die - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - ./configure --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info || die - - make || die -} - -src_install() { - - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - sysconfdir=${D}/etc/X11 \ - GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \ - install || die - - cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu - - dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* INSTALL* FAQ* \ - MIRRORS README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - make prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - install || die - - newdoc README README.extra - - echo "#!/bin/bash" > wmaker - echo "/usr/bin/wmaker" >> wmaker - - exeino /etc/X11/Sessions/ - doexe wmaker -} - -pkg_postinst() { - - echo - echo '######################################################################' - echo '# If do you want trans globes and other trans elements do you need #' - echo '# the libxpm (media-libs/xpm). #' - echo '######################################################################' - } - diff --git a/x11-wm/WindowMaker/files/25gnustep b/x11-wm/WindowMaker/files/25gnustep deleted file mode 100644 index 5c59167706f4..000000000000 --- a/x11-wm/WindowMaker/files/25gnustep +++ /dev/null @@ -1 +0,0 @@ -GNUSTEP_LOCAL_ROOT=/usr/lib/GNUstep diff --git a/x11-wm/WindowMaker/files/WindowMaker-0.81-gentoo.patch b/x11-wm/WindowMaker/files/WindowMaker-0.80.1-gentoo.patch index 7db52d4a0a47..435540d00d1a 100644 --- a/x11-wm/WindowMaker/files/WindowMaker-0.81-gentoo.patch +++ b/x11-wm/WindowMaker/files/WindowMaker-0.80.1-gentoo.patch @@ -1,6 +1,6 @@ -diff -urN WindowMaker-0.80.1.old/WPrefs.app/po/zh_TW.Big5.po WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po ---- WindowMaker-0.80.1.old/WPrefs.app/po/zh_TW.Big5.po Tue Jan 8 05:44:42 2002 -+++ WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po Wed Jul 3 07:58:09 2002 +diff -urN WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po WindowMaker-0.80.1-modified/WPrefs.app/po/zh_TW.Big5.po +--- WindowMaker-0.80.1/WPrefs.app/po/zh_TW.Big5.po Tue Jan 8 07:44:42 2002 ++++ WindowMaker-0.80.1-modified/WPrefs.app/po/zh_TW.Big5.po Tue Aug 6 21:40:32 2002 @@ -1887,11 +1887,11 @@ #: ../../WPrefs.app/WindowHandling.c:366 @@ -20,9 +20,21 @@ diff -urN WindowMaker-0.80.1.old/WPrefs.app/po/zh_TW.Big5.po WindowMaker-0.80.1/ msgid "could not initialize application" msgstr "�L�k�ҩl���ε{��" + -diff -urN WindowMaker-0.80.1.old/po/zh_TW.Big5.po WindowMaker-0.80.1/po/zh_TW.Big5.po ---- WindowMaker-0.80.1.old/po/zh_TW.Big5.po Tue Jan 8 05:45:06 2002 -+++ WindowMaker-0.80.1/po/zh_TW.Big5.po Wed Jul 3 07:58:04 2002 +diff -urN WindowMaker-0.80.1/WindowMaker/plmenu WindowMaker-0.80.1-modified/WindowMaker/plmenu +--- WindowMaker-0.80.1/WindowMaker/plmenu Mon Jul 1 19:30:25 2002 ++++ WindowMaker-0.80.1-modified/WindowMaker/plmenu Tue Aug 6 21:41:19 2002 +@@ -95,7 +95,7 @@ + ), + ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""), + ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""), +- ("Preferences Utility", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs") ++ ("Preferences Utility", EXEC, "/usr/share/GNUstep/Apps/WPrefs.app/WPrefs") + ), + ("Exit", + ("Restart", RESTART), +diff -urN WindowMaker-0.80.1/po/zh_TW.Big5.po WindowMaker-0.80.1-modified/po/zh_TW.Big5.po +--- WindowMaker-0.80.1/po/zh_TW.Big5.po Tue Jan 8 07:45:06 2002 ++++ WindowMaker-0.80.1-modified/po/zh_TW.Big5.po Tue Aug 6 21:40:32 2002 @@ -519,8 +519,8 @@ "is docked in the same positions on the other workspaces and the Clip is not " "full in some workspace." diff --git a/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.0-r3 b/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.0-r3 deleted file mode 100644 index 706819e1fda2..000000000000 --- a/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.0-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 0768a12edff35cba82e769fcbc8de430 WindowMaker-0.80.0.tar.gz 2452207 -MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018 diff --git a/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1 b/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1 deleted file mode 100644 index c05f660bc310..000000000000 --- a/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b1c88c8ecb8f4484d0ae953b9a730418 WindowMaker-0.80.1.tar.gz 2503965 -MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018 diff --git a/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1-r1 b/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1-r1 deleted file mode 100644 index c05f660bc310..000000000000 --- a/x11-wm/WindowMaker/files/digest-WindowMaker-0.80.1-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 b1c88c8ecb8f4484d0ae953b9a730418 WindowMaker-0.80.1.tar.gz 2503965 -MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018 diff --git a/x11-wm/WindowMaker/files/wmfpo-80.patch b/x11-wm/WindowMaker/files/wmfpo-80.patch deleted file mode 100644 index 1ec26e791e94..000000000000 --- a/x11-wm/WindowMaker/files/wmfpo-80.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff -ur WindowMaker-0.80.0/WPrefs.app/Expert.c WindowMaker-0.80.0fpo1/WPrefs.app/Expert.c ---- WindowMaker-0.80.0/WPrefs.app/Expert.c Mon May 21 18:11:17 2001 -+++ WindowMaker-0.80.0fpo1/WPrefs.app/Expert.c Sat Jan 5 03:08:10 2002 -@@ -33,7 +33,7 @@ - - WMWidget *parent; - -- WMButton *swi[8]; -+ WMButton *swi[10]; - - } _Panel; - -@@ -54,6 +54,8 @@ - WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling")); - WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill")); - WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); -+ WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize")); -+ WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch")); - } - - -@@ -66,10 +68,10 @@ - panel->box = WMCreateBox(panel->parent); - WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); - -- for (i=0; i<7; i++) { -+ for (i=0; i<9; i++) { - panel->swi[i] = WMCreateSwitchButton(panel->box); - WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); -- WMMoveWidget(panel->swi[i], 20, 20+i*25); -+ WMMoveWidget(panel->swi[i], 20, 20+i*23); - } - - WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME.")); -@@ -79,6 +81,8 @@ - WMSetButtonText(panel->swi[4], _("Use Windoze style cycling.")); - WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command.")); - WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons.")); -+ WMSetButtonText(panel->swi[7], _("Double click on title bar maximize")); -+ WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click")); - - WMRealizeWidget(panel->box); - WMMapSubwidgets(panel->box); -@@ -101,6 +105,8 @@ - SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling"); - SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill"); - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize"); -+ SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch"); - } - - -diff -ur WindowMaker-0.80.0/src/WindowMaker.h WindowMaker-0.80.0fpo1/src/WindowMaker.h ---- WindowMaker-0.80.0/src/WindowMaker.h Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/WindowMaker.h Sat Jan 5 14:12:14 2002 -@@ -463,6 +463,12 @@ - /* shading animation */ - signed char shade_speed; - -+ /* double click on title bar maximize */ -+ char dc_maximize; -+ -+ /* single click to lauch applications */ -+ char single_click; -+ - int edge_resistance; - char attract; - -diff -ur WindowMaker-0.80.0/src/appicon.c WindowMaker-0.80.0fpo1/src/appicon.c ---- WindowMaker-0.80.0/src/appicon.c Tue Dec 18 03:43:48 2001 -+++ WindowMaker-0.80.0fpo1/src/appicon.c Sat Jan 5 14:12:14 2002 -@@ -596,6 +596,7 @@ - int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0; - int ix, iy; - int clickButton = event->xbutton.button; -+ Bool hasMoved = False; - Pixmap ghost = None; - Window wins[2]; - Bool movingSingle = False; -@@ -676,6 +677,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -812,6 +814,8 @@ - - if (wPreferences.auto_arrange_icons) - wArrangeIcons(scr, True); -+ if (!hasMoved && wPreferences.single_click) -+ iconDblClick(desc, event); - - done = 1; - break; -diff -ur WindowMaker-0.80.0/src/def_pixmaps.h WindowMaker-0.80.0fpo1/src/def_pixmaps.h ---- WindowMaker-0.80.0/src/def_pixmaps.h Wed May 26 20:18:34 1999 -+++ WindowMaker-0.80.0fpo1/src/def_pixmaps.h Sat Jan 5 14:12:14 2002 -@@ -86,15 +86,15 @@ - ". c #000000", - "# c None", - "..........", --"..........", --"..........", --".########.", --".########.", --".########.", --".########.", --".########.", --".########.", --".........." -+".........#", -+"........##", -+".......###", -+"......####", -+".....#####", -+"....######", -+"...#######", -+"..########", -+".#########" - }; - - #ifdef XKB_BUTTON_HINT -diff -ur WindowMaker-0.80.0/src/defaults.c WindowMaker-0.80.0fpo1/src/defaults.c ---- WindowMaker-0.80.0/src/defaults.c Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/defaults.c Sat Jan 5 14:12:14 2002 -@@ -548,6 +548,12 @@ - {"DisableBlinking", "NO", NULL, - &wPreferences.dont_blink, getBool, NULL - }, -+ {"DCMaximize", "NO", NULL, -+ &wPreferences.dc_maximize, getBool, NULL -+ }, -+ {"SingleClickLaunch", "NO", NULL, -+ &wPreferences.single_click, getBool, NULL -+ }, - /* style options */ - {"MenuStyle", "normal", seMenuStyles, - &wPreferences.menu_style, getEnum, setMenuStyle -diff -ur WindowMaker-0.80.0/src/dock.c WindowMaker-0.80.0fpo1/src/dock.c ---- WindowMaker-0.80.0/src/dock.c Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/dock.c Sat Jan 5 14:12:14 2002 -@@ -3772,7 +3772,7 @@ - - - --static void -+static Bool - handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) - { - WScreen *scr = dock->screen_ptr; -@@ -3788,6 +3788,7 @@ - int tmp; - Pixmap ghost = None; - Bool docked; -+ Bool hasMoved = False; - int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ - int omnipresent = aicon->omnipresent; /* this must be cached!!! */ - -@@ -3842,6 +3843,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -3991,7 +3993,7 @@ - #ifdef DEBUG - puts("End icon move"); - #endif -- return; -+ return hasMoved; - } - } - } -@@ -4130,8 +4132,11 @@ - handleClipChangeWorkspace(scr, event); - else - handleDockMove(dock, aicon, event); -- } else -- handleIconMove(dock, aicon, event); -+ } else { -+ Bool hasMoved = handleIconMove(dock, aicon, event); -+ if (!hasMoved && wPreferences.single_click) -+ iconDblClick(desc, event); -+ } - - } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && - aicon==scr->clip_icon) { -diff -ur WindowMaker-0.80.0/src/icon.c WindowMaker-0.80.0fpo1/src/icon.c ---- WindowMaker-0.80.0/src/icon.c Tue Jul 24 06:51:05 2001 -+++ WindowMaker-0.80.0fpo1/src/icon.c Sat Jan 5 14:16:16 2002 -@@ -877,6 +877,7 @@ - int dx=event->xbutton.x, dy=event->xbutton.y; - int grabbed=0; - int clickButton=event->xbutton.button; -+ Bool hasMoved = False; - - if (WCHECK_STATE(WSTATE_MODAL)) - return; -@@ -928,6 +929,7 @@ - break; - - case MotionNotify: -+ hasMoved = True; - if (!grabbed) { - if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD - || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { -@@ -965,6 +967,9 @@ - - if (wPreferences.auto_arrange_icons) - wArrangeIcons(wwin->screen_ptr, True); -+ if (!hasMoved && wPreferences.single_click) -+ miniwindowDblClick(desc, event); -+ - return; - - } -diff -ur WindowMaker-0.80.0/src/window.c WindowMaker-0.80.0fpo1/src/window.c ---- WindowMaker-0.80.0/src/window.c Fri Dec 21 21:38:08 2001 -+++ WindowMaker-0.80.0fpo1/src/window.c Sat Jan 5 14:18:07 2002 -@@ -2984,14 +2984,29 @@ - - if (event->xbutton.button==Button1) { - if (event->xbutton.state == 0) { -- if (!WFLAGP(wwin, no_shadeable)) { -- /* shade window */ -- if (wwin->flags.shaded) -- wUnshadeWindow(wwin); -- else -- wShadeWindow(wwin); -- } -- } else { -+ /* check preferences, maximize or shade */ -+ if (wPreferences.dc_maximize) { -+ if (!WFLAGP(wwin, no_resizable)) { -+ /* maximize window */ -+ if (wwin->flags.maximized != 0) { -+ wUnmaximizeWindow(wwin); -+ wwin->flags.maximized = 0; -+ } -+ else { -+ wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL); -+ wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL; -+ } -+ } -+ } else { -+ if (!WFLAGP(wwin, no_shadeable)) { -+ /* shade window */ -+ if (wwin->flags.shaded) -+ wUnshadeWindow(wwin); -+ else -+ wShadeWindow(wwin); -+ } -+ } -+ } else { - int dir = 0; - - if (event->xbutton.state & ControlMask) |