diff options
author | Tavis Ormandy <taviso@gentoo.org> | 2004-03-30 10:19:49 +0000 |
---|---|---|
committer | Tavis Ormandy <taviso@gentoo.org> | 2004-03-30 10:19:49 +0000 |
commit | b9d79c86453d23acd5e6a47f4e3e145cc2981c8b (patch) | |
tree | 1a47a8f7b0b97cf6abe48df15823f5ce3167e332 /x11-wm | |
parent | Fixing #45599 (diff) | |
download | historical-b9d79c86453d23acd5e6a47f4e3e145cc2981c8b.tar.gz historical-b9d79c86453d23acd5e6a47f4e3e145cc2981c8b.tar.bz2 historical-b9d79c86453d23acd5e6a47f4e3e145cc2981c8b.zip |
new FvwmTabs release, bugfixes from cvs
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/fvwm/ChangeLog | 12 | ||||
-rw-r--r-- | x11-wm/fvwm/Manifest | 5 | ||||
-rw-r--r-- | x11-wm/fvwm/files/digest-fvwm-2.5.10-r1 | 2 | ||||
-rw-r--r-- | x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff | 88 | ||||
-rw-r--r-- | x11-wm/fvwm/fvwm-2.5.10-r1.ebuild | 295 |
5 files changed, 400 insertions, 2 deletions
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog index 1b7cd8a6d14d..2e1444de075a 100644 --- a/x11-wm/fvwm/ChangeLog +++ b/x11-wm/fvwm/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-wm/fvwm # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.64 2004/03/20 10:59:48 taviso Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.65 2004/03/30 10:19:49 taviso Exp $ + +*fvwm-2.5.10-r1 (30 Mar 2004) + + 30 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r1.ebuild, + files/fvwm-2.5.10-post-release.diff: + new release of FvwmTabs, which fixes the tmp file handling problem. + extracted some patches from cvs which fix issues reported since the + release, including a problem with FvwmTaskBar and multiple rows + , inconsistencies in variable names in the FvwmButtons man page, + and a problem with the BackingStore style. *fvwm-2.5.8-r6 (20 Mar 2004) diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest index 1f817e40d12a..f4f69f4a2c9b 100644 --- a/x11-wm/fvwm/Manifest +++ b/x11-wm/fvwm/Manifest @@ -2,8 +2,9 @@ MD5 b83bf23f1c96084b79765739613430ac fvwm-2.5.7-r5.ebuild 8757 MD5 76fde55c6ffece27a13fd976d5fb51b6 fvwm-2.5.8-r4.ebuild 10169 MD5 2fe250da04e9678631ac0d7f282de875 fvwm-2.5.8-r6.ebuild 10691 MD5 babbec50812f1dd2af1b76b9afa837af fvwm-2.4.17.ebuild 3961 +MD5 eab7687e1b4ebb2b542f00c7aebceffe fvwm-2.5.10-r1.ebuild 9117 MD5 60dad7fdef9011540156e68d2ed1f8c4 fvwm-2.5.9.ebuild 9409 -MD5 3533175531d7bdce1c1a9c4511c4fd39 ChangeLog 12142 +MD5 cc3115771fffff184c1c5e20280addcc ChangeLog 12603 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527 MD5 12ef1ce8551fa2c8f989f2b529e29e82 fvwm-2.5.10.ebuild 9433 MD5 c515838ed1efd6d1f9a60db5b2ff0a5c fvwm-2.4.18.ebuild 3964 @@ -21,6 +22,7 @@ MD5 0fcb3587e80a443304b2e6878b6eab0a files/fvwmtabs-2.8-insecure-tmp-handling.di MD5 d15c4e05878e8e2b8a9d5edcf30abdc2 files/fvwm-2.5.9-translucent-menus.diff.gz 58529 MD5 977c11b7ca7c17cff7a14d1d4a0136f4 files/fvwm-2.5.8-perllib-disconnect.diff 1179 MD5 5dc401c9f6a50da0bfa85a025749652a files/fvwm-2.5.8-fvwm-menu-directory-security.diff 382 +MD5 083ba66d9e23778a70fe140caf99cb8a files/digest-fvwm-2.5.10-r1 128 MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425 MD5 2bdb17132f9d7f352002a1fbace7fca1 files/acinclude.m4 61423 MD5 4f044a8a47c9f8ea61d54dfa4bd79b70 files/fvwm-2.5.8-fvwm-bug-security.diff 327 @@ -31,3 +33,4 @@ MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r4 127 MD5 c3ea3b9a8c5d7700913a795096e0b51a files/digest-fvwm-2.5.8-r6 127 MD5 97373a30210df0b93c59e2aac76d17e0 files/fvwm-2.5.8-undermouse.diff 2534 MD5 933ebc841a6eafebaf9d57b7a99c3b10 files/fvwm-2.5.8-flickeringmoveworkaround.diff 726 +MD5 b20e3c8c23286531b549852ecbed4b74 files/fvwm-2.5.10-post-release.diff 2923 diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.10-r1 b/x11-wm/fvwm/files/digest-fvwm-2.5.10-r1 new file mode 100644 index 000000000000..a7085e17b163 --- /dev/null +++ b/x11-wm/fvwm/files/digest-fvwm-2.5.10-r1 @@ -0,0 +1,2 @@ +MD5 b3c86e2af2a4eabe692c9c849ff4b243 fvwm-2.5.10.tar.bz2 1788873 +MD5 53f46d80ce55cf58892d80877f0641b1 FvwmTabs-2.9.tar.gz 25327 diff --git a/x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff b/x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff new file mode 100644 index 000000000000..b6036a5e2681 --- /dev/null +++ b/x11-wm/fvwm/files/fvwm-2.5.10-post-release.diff @@ -0,0 +1,88 @@ +--- fvwm-2.5.10/fvwm/add_window.c 2004-03-17 14:42:53.000000000 +0000 ++++ fvwm/fvwm/add_window.c 2004-03-30 10:05:08.000000000 +0100 +@@ -937,9 +937,10 @@ + size_borders b; + + XSetWindowAttributes attributes; +- int valuemask = CWBackingStore | CWBackPixmap | CWCursor | CWEventMask | +- CWSaveUnder; ++ int valuemask; + ++ valuemask = CWBackingStore | CWBackPixmap | CWCursor | CWEventMask | ++ CWSaveUnder; + attributes.backing_store = NotUseful; + attributes.background_pixmap = None; + attributes.cursor = Scr.FvwmCursors[CRS_DEFAULT]; +@@ -1829,7 +1830,6 @@ + void setup_frame_attributes( + FvwmWindow *fw, window_style *pstyle) + { +- int i; + XSetWindowAttributes xswa; + + /* Backing_store is controlled on the client, borders, title & buttons +@@ -1847,36 +1847,18 @@ + xswa.backing_store = NotUseful; + break; + } +- XChangeWindowAttributes(dpy, FW_W(fw), CWBackingStore, &xswa); +- if (pstyle->flags.use_backing_store == BACKINGSTORE_OFF) +- { +- xswa.backing_store = NotUseful; +- } +- if (HAS_TITLE(fw)) +- { +- XChangeWindowAttributes( +- dpy, FW_W_TITLE(fw), CWBackingStore, &xswa); +- for (i = 0; i < NUMBER_OF_BUTTONS; i++) +- { +- if (FW_W_BUTTON(fw, i)) +- { +- XChangeWindowAttributes( +- dpy, FW_W_BUTTON(fw, i), +- CWBackingStore, &xswa); +- } +- } +- } +- + /* parent_relative is applied to the frame and the parent */ + xswa.background_pixmap = pstyle->flags.use_parent_relative + ? ParentRelative : None; +- XChangeWindowAttributes(dpy, FW_W_FRAME(fw), CWBackPixmap, &xswa); +- XChangeWindowAttributes(dpy, FW_W_PARENT(fw), CWBackPixmap, &xswa); +- + /* Save_under is only useful on the frame */ + xswa.save_under = pstyle->flags.do_save_under + ? Scr.flags.do_save_under : NotUseful; +- XChangeWindowAttributes(dpy, FW_W_FRAME(fw), CWSaveUnder, &xswa); ++ XChangeWindowAttributes(dpy, FW_W(fw), CWBackingStore, &xswa); ++ XChangeWindowAttributes( ++ dpy, FW_W_PARENT(fw), CWBackPixmap | CWBackingStore, &xswa); ++ XChangeWindowAttributes( ++ dpy, FW_W_FRAME(fw), ++ CWBackPixmap | CWBackingStore | CWSaveUnder, &xswa); + + return; + } +--- fvwm-2.5.10/modules/FvwmTaskBar/FvwmTaskBar.c 2004-03-15 13:48:52.000000000 +0000 ++++ fvwm/modules/FvwmTaskBar/FvwmTaskBar.c 2004-03-30 10:05:09.000000000 +0100 +@@ -532,7 +532,6 @@ + + win_border = nb; + win_width = nw; +- win_height = nh; + win_has_title = nht; + win_title_dir = ntd; + win_title_height = nth; +--- fvwm-2.5.10/modules/FvwmButtons/FvwmButtons.1 2002-11-09 15:18:52.000000000 +0000 ++++ fvwm/modules/FvwmButtons/FvwmButtons.1 2004-03-30 10:05:08.000000000 +0100 +@@ -1127,7 +1127,8 @@ + + # Pop up a module menu directly above the button. + *FvwmButtons: (9x1+3+0, Padding 0, Title "Modules", \\ +- Action `Menu Modulepopup rectangle $wx$h+$l+$t o+50 -100m`) ++ Action `Menu Modulepopup rectangle \\ ++ $widthx$height+$lleft+$top o+50 -100m`) + + # first row of buttons from left to right: + *FvwmButtons: (3x2+0+1, Icon my_lock.xpm, Action `Exec xlock`) diff --git a/x11-wm/fvwm/fvwm-2.5.10-r1.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r1.ebuild new file mode 100644 index 000000000000..566c80296a0e --- /dev/null +++ b/x11-wm/fvwm/fvwm-2.5.10-r1.ebuild @@ -0,0 +1,295 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r1.ebuild,v 1.1 2004/03/30 10:19:49 taviso Exp $ + +inherit eutils flag-o-matic + +IUSE="readline truetype ncurses gtk stroke gnome rplay xinerama perl nls png bidi imlib tcltk debug gtk2" + +DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager" +SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 + perl? ( mirror://gentoo/FvwmTabs-2.9.tar.gz )" +HOMEPAGE="http://www.fvwm.org/" + +SLOT="0" +KEYWORDS="~x86 ~alpha ~sparc" +LICENSE="GPL-2 FVWM" + +RDEPEND="readline? ( >=sys-libs/readline-4.1 + ncurses? ( >=sys-libs/ncurses-5.3-r1 ) + !ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) ) + gtk? ( =x11-libs/gtk+-1.2* + imlib? ( >=media-libs/gdk-pixbuf-0.21.0 + >=media-libs/imlib-1.9.14-r1 ) + gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) ) + rplay? ( >=media-sound/rplay-3.3.2 ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + png? ( >=media-libs/libpng-1.0.12-r2 ) + stroke? ( >=dev-libs/libstroke-0.4 ) + perl? ( tcltk? ( >=dev-lang/tk-8.3.4 + >=dev-perl/perl-tk-800.024-r2 + >=dev-perl/X11-Protocol-0.52 ) ) + truetype? ( virtual/xft + >=media-libs/fontconfig-2.1-r1 + >=dev-libs/expat-1.95.6-r1 ) + >=dev-lang/perl-5.6.1-r10 + >=sys-libs/zlib-1.1.4-r1 + sys-apps/debianutils + virtual/x11" +# XXX: gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency? +# XXX: gtk perl bindings require dev-perl/gtk-perl, worth a dependency? +# XXX: netpbm is used by FvwmScript-ScreenDump, worth a dependency? +DEPEND="${RDEPEND} + >=sys-apps/sed-4 + dev-util/pkgconfig" + +S=${WORKDIR}/${P} + +src_unpack() { + unpack ${A} + + # this patch enables fast translucent menus in fvwm..yummy! this is a + # minor tweak of a patch posted to fvwm-user mailing list by Olivier + # Chapuis in <20030827135125.GA6370@snoopy.folie>. + cd ${S}; epatch ${FILESDIR}/fvwm-2.5.9-translucent-menus.diff.gz + + # according to a post to fvwm-workers mailing list, Mikhael Goikhman + # planned on disabling these debug statements before the release, but + # never got around to it. + cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff + + if use perl; then + # I'll supply a default icon for FvwmTabs, this removes the need for + # installing an iconset, this one comes from the fvwm_icons package. + cd ${WORKDIR} + ebegin " Setting default icon for FvwmTabs" + sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \ + FvwmTabs FvwmTabs.1 fvwmtabrc + eend $? + fi + + # this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan. + cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff + + # fix some issues reported since the 2.5.10 release. + cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-post-release.diff + + # build fails on alpha with certain options without this. + use alpha && append-flags -fPIC +} + +src_compile() { + local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs" + + # ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons) + # + # Another iconset for fvwm, wm-icons, includes configurations and user + # configuration utilities to make them easy to use with fvwm, no need + # to put them in the default ImagePath. + + # use readline in FvwmConsole. + if ! use readline; then + myconf="${myconf} --without-readline-library" + else + myconf="${myconf} --with-readline-library" + + # choose ncurses or termcap. + if use ncurses; then + myconf="${myconf} --without-termcap-library" + else + myconf="${myconf} --without-ncurses-library" + fi + fi + + # since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously + # we had to hide the includes/libs during configure. this is still the case + # for GDK image suport _with_ gtk, unfortunately. + # FvwmGtk can be built as a gnome application, or a Gtk+ application. + if ! use gtk; then + myconf="${myconf} --disable-gtk --without-gnome" + else + if ! use imlib; then + einfo "ATTN: You can safely ignore any imlib related configure errors." + myconf="${myconf} --with-imlib-prefix=${T}" + fi + if ! use gnome; then + myconf="${myconf} --without-gnome" + else + myconf="${myconf} --with-gnome" + fi + fi + + # rplay is a cool, but little used way of playing sounds over a network + # Fvwm support is pretty good. + if ! use rplay; then + myconf="${myconf} --without-rplay-library" + fi + + # Install perl bindings. + if use perl; then + myconf="${myconf} --enable-perllib" + else + myconf="${myconf} --disable-perllib" + fi + + # xinerama support for those who have multi-headed machines. + if use xinerama; then + myconf="${myconf} --enable-xinerama" + else + myconf="${myconf} --disable-xinerama" + fi + + # bidirectional writing support, eg hebrew + if use bidi; then + myconf="${myconf} --enable-bidi" + else + myconf="${myconf} --disable-bidi" + fi + + # png image support (very nice in fvwm) + if ! use png; then + myconf="${myconf} --without-png-library" + fi + + # native language support + if use nls; then + myconf="${myconf} --enable-nls --enable-iconv" + else + myconf="${myconf} --disable-nls --disable-iconv" + fi + + # support for mouse gestures using libstroke (very very cool) + if ! use stroke; then + myconf="${myconf} --without-stroke-library" + fi + + # more verbosity for module developers/hackers/etc. + if use debug; then + myconf="${myconf} --enable-debug-msgs --enable-command-log" + append-flags -DCR_DETECT_MOTION_METHOD_DEBUG + fi + + # Xft Anti Aliased text support (yummy eye candy) + if use truetype; then + myconf="${myconf} --enable-xft" + else + myconf="${myconf} --disable-xft" + fi + + # disable xsm protocol (session management) support? + if use nosm; then + myconf="${myconf} --disable-sm" + else + myconf="${myconf} --enable-sm" + fi + + # disable xpm support? (maybe you only use png in your themes, or just solid colour?) + if use noxpm; then + myconf="${myconf} --without-xpm-library" + fi + + # set the local maintainer for fvwm-bug. + export FVWM_BUGADDR="taviso@gentoo.org" + + econf ${myconf} || die + emake || die +} + +src_install() { + + make DESTDIR=${D} install || die + + if use perl; then + + local toolkits="gtk2 gtk tcltk" + + if use tcltk; then + # Install the very cool FvwmTabs module + # http://users.tpg.com.au/users/scottie7/FvwmTabs + einfo "Installing FvwmTabs module..." + + exeinto /usr/lib/fvwm/${PV}/ + doexe ${WORKDIR}/FvwmTabs + dodoc ${WORKDIR}/fvwmtabrc ${WORKDIR}/README.fvwmtabs + doman ${WORKDIR}/FvwmTabs.1 + + # install default drag and drop icon. + insinto /usr/share/fvwm + newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm + else + # Remove the Tk bindings (requires perl-tk) + rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm + toolkits=${toolkits/tcltk/} + fi + if ! use gtk; then + # Remove gtk bindings (requires gtk-perl/gtk2-perl) + rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \ + ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm + toolkits=${toolkits/gtk2/} + toolkits=${toolkits/gtk/} + else + if ! use gtk2; then + # Just remove the gtk2 bindings (requires gtk2-perl) + rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm + toolkits=${toolkits/gtk2/} + fi + fi + toolkits=${toolkits// /} + if ! test "${toolkits}"; then + # No perl toolkit bindings wanted, remove the unneeded files + # and empty directories. + rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm + find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null + fi + else + # Remove useless script if perllib isnt required. + rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1 + fi + + # neat utility for testing fvwm behaviour on applications setting various + # hints, creates a simple black window with configurable hints set. + if use debug; then + dobin ${S}/tests/hints/hints_test + newdoc ${S}/tests/hints/README README.hints + fi + + # fvwm-convert-2.6 is just a stub, contains no code - remove it for now. + # fvwm-convert-2.2 has a man page, but the script is no longer distributed. + rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1 + rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1 + + # ive included `exec` to save a few bytes of memory. + echo "#!/bin/bash" > fvwm2 + echo "exec /usr/bin/fvwm2" >> fvwm2 + + exeinto /etc/X11/Sessions + doexe fvwm2 + + dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \ + docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \ + docs/fvwm.lsm + + dodoc utils/fvwm_make_directory_menu.sh utils/fvwm_make_browse_menu.sh \ + utils/quantize_pixmaps utils/xselection.c + + dodoc ${FILESDIR}/README.transluceny.gz + + # make sure FvwmGtk man page is installed + use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1 + + # fix a couple of symlinks. + prepallman +} + +pkg_postinst() { + if use perl; then + if use tcltk; then + einfo "By setting the perl and tcltk USE flags, you have elected to" + einfo "install the FvwmTabs module, a configurable tabbing system" + einfo "for FVWM. You can read more about FvwmTabs here:" + einfo + einfo " http://users.tpg.com.au/users/scottie7/fvwmtabs.html" + einfo + fi + fi +} |