Killed 0.9.12, added a 0.9.12-r1 which hopefully doesn't have nasty vanishing window bugs. Patches: vanishing window on untab fix (upstream), 64-bit fixes (upstream), fix menu backups (upstream), menu locations (Gentoo), icon locations (Gentoo), extra menu contents (Gentoo).

Package-Manager: portage-2.0.51-r14

12 files changed, 182 insertions, 8 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index ed6976e5e0bc..adff71a43b0e 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.140 2005/01/19 10:06:12 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.141 2005/01/24 18:50:37 ciaranm Exp $
+
+*fluxbox-0.9.12-r1 (24 Jan 2005)
+
+  24 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+  +files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch,
+  +files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch,
+  +files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch,
+  +files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch,
+  +files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch,
+  +files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch,
+  +files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch,
+  +files/0.9.12/fluxbox-0.9.12-you-got-mail.patch,
+  +fluxbox-0.9.12-r1.ebuild, -fluxbox-0.9.12.ebuild:
+  Killed 0.9.12, added a 0.9.12-r1 which hopefully doesn't have nasty
+  vanishing window bugs. Patches: vanishing window on untab fix (upstream),
+  64-bit fixes (upstream), fix menu backups (upstream), menu locations
+  (Gentoo), icon locations (Gentoo), extra menu contents (Gentoo).
 
   19 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.12.ebuild:
   Fix imlib2 option
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 6c817b78282c..5e817ba8ee88 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -2,22 +2,30 @@
 Hash: SHA1
 
 MD5 b62d5034f15682de4655c74b91279659 fluxbox-0.9.11.ebuild 4804
-MD5 c797c850c4a536376b560872d4813832 ChangeLog 26481
+MD5 1f353e0232b7ca1b6b828ad9a93d373c fluxbox-0.9.12-r1.ebuild 5143
+MD5 0648bbdabc5829b342c73a7fddb534ce ChangeLog 27368
 MD5 ba3c40b11884514f9fa692fd8e9788b4 fluxbox-0.9.9.ebuild 1700
 MD5 6a4a11dad3a188c67e636430c3f00511 fluxbox-0.9.10-r4.ebuild 5131
 MD5 6f6575a94ad05a93e167e9c685f18748 fluxbox-0.9.8-r1.ebuild 1626
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
-MD5 447303f3a1efcd460e187c9db53aa63f fluxbox-0.9.12.ebuild 4649
 MD5 2e419bd3131910844f1b2d56b2ee4dc6 fluxbox-0.9.10-r3.ebuild 4098
 MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67
-MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12 67
 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65
 MD5 8371840822662e7d40019b5f5ee7888f files/digest-fluxbox-0.9.10-r4 150
 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
+MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r1 67
 MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r3 67
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
+MD5 b73dd2d75c728d03e9ab973946a6c7fd files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch 394
+MD5 08670463836eec1499fd48f6cad6a6c9 files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch 432
+MD5 7a34186b1b83746dbc71f0415d5f5a52 files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch 650
+MD5 7e577aae2f600bf4ae3ff8d85f044a58 files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch 623
+MD5 c5dd91e4b4519e3c7363dc76f2cc5f61 files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch 1893
 MD5 59bfbdb0d951c09db8897948a9796cb9 files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch 741
+MD5 6e4f5d9486b1919b3c0fb7356b737966 files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch 647
+MD5 7b8327fc8b73757e8fb506b565d989ea files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch 1008
+MD5 e56d5d9ab0af15229ed139b1e1f5b3be files/0.9.12/fluxbox-0.9.12-you-got-mail.patch 516
 MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
 MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93
 MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968
@@ -38,7 +46,7 @@ MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setloc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB7jehLLFUmVNQ7rkRAgfpAKDHkctwQPrYmIgcxKs/nnkLOJl+iACgn4kV
-l5kNLQIqzf2CWo8KKfGPbWA=
-=281C
+iD8DBQFB9UOWLLFUmVNQ7rkRAhQ2AJ4koh6lnmmfucgc7qHhZ138LK9j5ACcCQ3s
+SK8yRE+kPAvXjRAmmwcKH6g=
+=Oecn
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch
new file mode 100644
index 000000000000..22733ebe3272
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch
@@ -0,0 +1,16 @@
+--- /trunk/src/FbCommands.cc	2005/01/18 19:06:04	3852
++++ trunk/src/FbCommands.cc	2005/01/20 12:30:35	3853
+@@ -131,11 +131,11 @@
+         displaystring += intbuff;
+         setsid();
+         putenv(const_cast<char *>(displaystring.c_str()));
+-        execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), 0);
++        execl("/bin/sh", "/bin/sh", "-c", m_cmd.c_str(), static_cast<void*>(NULL));
+         exit(0);
+     }
+ #else //   __EMX__
+-    spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_cmd.c_str(), 0);
++    spawnlp(P_NOWAIT, "cmd.exe", "cmd.exe", "/c", m_cmd.c_str(), static_cast<void*>(NULL));
+ #endif // !__EMX__
+ 
+ }
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch
new file mode 100644
index 000000000000..1a54f1e65824
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch
@@ -0,0 +1,11 @@
+--- /trunk/util/fbrun/FbRun.cc	2005/01/18 19:06:04	3852
++++ trunk/util/fbrun/FbRun.cc	2005/01/20 12:30:35	3853
+@@ -117,7 +117,7 @@
+     // fork and execute program
+     if (!fork()) {
+         setsid();
+-        execl("/bin/sh", "/bin/sh", "-c", command.c_str(), 0);
++        execl("/bin/sh", "/bin/sh", "-c", command.c_str(), static_cast<void*>(NULL));
+         exit(0); //exit child
+     }
+ 
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch
new file mode 100644
index 000000000000..b208f1a40f60
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch
@@ -0,0 +1,15 @@
+--- trunk/src/Window.cc	2005/01/20 12:40:02	3855
++++ trunk/src/Window.cc	2005/01/20 22:41:34	3856
+@@ -3483,9 +3483,10 @@
+             detachClient(*old_attached);
+             // move window by relative amount of mouse movement
+             // since just detached, move relative to old location
+-            if (client.m_win != 0)
++            if (client.m_win != 0) {
+                 client.m_win->move(frame().x() - m_last_resize_x + x, frame().y() - m_last_resize_y + y);
+-
++                client.m_win->show();
++                }
+         }
+ 	else if(attach_to_win==this && attach_to_win->isTabable()) {
+ 		//reording of tabs within a frame
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch
new file mode 100644
index 000000000000..c772ae83e3e6
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch
@@ -0,0 +1,13 @@
+--- /trunk/util/fluxbox-generate_menu.in	2005/01/24 16:27:06	3859
++++ trunk/util/fluxbox-generate_menu.in	2005/01/24 16:32:57	3860
+@@ -949,8 +949,8 @@
+     if [ -f ${MENUFILENAME}.firstbak ]; then
+         cp ${MENUFILENAME} ${MENUFILENAME}.firstbak
+     fi
+-    if [ -s "${MENUFILE}" ]; then
+-       mv ${MENUFILE} ${MENUFILE}.bak
++    if [ -s "${MENUFILENAME}" ]; then
++       mv ${MENUFILENAME} ${MENUFILENAME}.bak
+     fi
+ fi
+ 
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch
new file mode 100644
index 000000000000..ab9980b70f86
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch
@@ -0,0 +1,43 @@
+--- util/fluxbox-generate_menu.in.orig	2005-01-24 14:53:07.125141280 +0000
++++ util/fluxbox-generate_menu.in	2005-01-24 15:07:09.921016832 +0000
+@@ -153,21 +153,25 @@
+     if [ -z "${INSTALL}" ]; then
+         echo -n "      $*" >> ${MENUFILENAME}
+         execname="`echo $*|cut -d\( -f2|cut -d\) -f1`"
+-        if [ "${PNG_ICONS}" = "no" ]; then
+-            if [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
+-                echo "<${HOME}/.fluxbox/icons/$execname.xpm>"  >> ${MENUFILENAME}
+-            else
+-                echo >> ${MENUFILENAME}
+-            fi
+-        else
+-            if [ -r "${HOME}/.fluxbox/icons/$execname.png" ]; then
+-                echo "<${HOME}/.fluxbox/icons/$execname.png>"  >> ${MENUFILENAME}
+-            elif [ -r "${HOME}/.fluxbox/icons/$execname.xpm" ]; then
+-                echo "<${HOME}/.fluxbox/icons/$execname.xpm>"  >> ${MENUFILENAME}
+-            else
+-                echo >> ${MENUFILENAME}
+-            fi
+-        fi
++        for P in {${HOME}/.fluxbox,/usr/share,/usr/local/share}/{icons,pixmaps} ; do
++            for S in "" "-icon" ; do
++                if [ "${PNG_ICONS}" = "no" ]; then
++                    if [ -r "${P}/$execname${S}.xpm" ]; then
++                        echo -n "<${P}/$execname${S}.xpm>"  >> ${MENUFILENAME}
++                        break
++                    fi
++                else
++                    if [ -r "${P}/$execname${S}.png" ]; then
++                        echo -n "<${P}/$execname${S}.png>"  >> ${MENUFILENAME}
++                        break
++                    elif [ -r "${P}/$execname${S}.xpm" ]; then
++                        echo -n "<${P}/$execname${S}.xpm>"  >> ${MENUFILENAME}
++                        break
++                    fi
++                fi
++            done
++        done
++        echo >> ${MENUFILENAME}
+     else
+         echo "      $*" >> ${MENUFILENAME}
+     fi
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch
new file mode 100644
index 000000000000..0e26fee346fb
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch
@@ -0,0 +1,11 @@
+--- util/fluxbox-generate_menu.in.orig	2005-01-24 14:53:07.125141280 +0000
++++ util/fluxbox-generate_menu.in	2005-01-24 15:07:09.921016832 +0000
+@@ -1165,6 +1169,8 @@
+                find_it cdcd        append "[exec] (cdcd) {${DEFAULT_TERM} -e cdcd}"
+                find_it cplay       append "[exec] (cplay) {${DEFAULT_TERM} -e cplay}"
+                find_it alsamixer   append "[exec] (AlsaMixer) {${DEFAULT_TERM} -e alsamixer}"
++               find_it orpheus     append "[exec] (orpheus) {${DEFAULT_TERM} -e orpheus}"
++               find_it mp3blaster  append "[exec] (mp3blaster) {${DEFAULT_TERM} -e mp3blaster}"
+        append_menu_end
+ 
+ 
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch
new file mode 100644
index 000000000000..61cdf4be4871
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch
@@ -0,0 +1,16 @@
+--- util/fluxbox-generate_menu.in.orig	2005-01-24 14:53:07.125141280 +0000
++++ util/fluxbox-generate_menu.in	2005-01-24 15:07:09.921016832 +0000
+@@ -1131,10 +1135,10 @@
+ 
+ append_submenu "${EDITORMENU}"
+     normal_find gvim bluefish nedit gedit xedit kword kwrite kate anjuta \
+-        wings xemacs emacs kvim cream
++        wings xemacs emacs kvim cream evim
+     find_it     nano   append "[exec]   (nano)     {${DEFAULT_TERM} -e nano}"
+-    find_it     vi     append "[exec]   (vi)       {${DEFAULT_TERM} -e vi}" ||\
+-        find_it     vim    append "[exec]   (vim)      {${DEFAULT_TERM} -e vim}"
++    find_it     vim     append "[exec]   (vim)       {${DEFAULT_TERM} -e vim}" ||\
++        find_it     vi    append "[exec]   (vi)      {${DEFAULT_TERM} -e vi}"
+     find_it     zile   append "[exec]   (zile)     {${DEFAULT_TERM} -e zile}"
+     find_it     jed    append "[exec]   (jed)      {${DEFAULT_TERM} -e jed}"
+     find_it     emacs  append "[exec]   (emacs-nw) {${DEFAULT_TERM} -e emacs -nw}"
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch
new file mode 100644
index 000000000000..a440ea67c677
--- /dev/null
+++ b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-you-got-mail.patch
@@ -0,0 +1,12 @@
+--- util/fluxbox-generate_menu.in.orig	2005-01-24 14:43:03.503905656 +0000
++++ util/fluxbox-generate_menu.in	2005-01-24 14:44:17.793611904 +0000
+@@ -1089,7 +1089,9 @@
+ 
+     append_submenu Mail
+         normal_find sylpheed kmail evolution thunderbird mozilla-thunderbird
++        normal_find sylpheed-claws
+         find_it mutt        append "[exec]   (mutt) {${DEFAULT_TERM} -e mutt}"
++        find_it pine        append "[exec]   (pine) {${DEFAULT_TERM} -e pine}"
+     append_menu_end
+ 
+     append_submenu News
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r1
index 9f51ea28b9fd..9f51ea28b9fd 100644
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r1
diff --git a/x11-wm/fluxbox/fluxbox-0.9.12.ebuild b/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
index b9f5f15f9b44..dc2ec80f34ed 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.12.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12.ebuild,v 1.3 2005/01/19 10:33:43 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild,v 1.1 2005/01/24 18:50:37 ciaranm Exp $
 
 inherit eutils
 
@@ -39,6 +39,18 @@ src_unpack() {
 	# things with style ebuilds.
 	epatch ${FILESDIR}/${PV}/${P}-our-styles-go-over-here.patch
 
+	# menu generator things
+	epatch ${FILESDIR}/${PV}/${P}-you-got-mail.patch
+	epatch ${FILESDIR}/${PV}/${P}-sweet-sweet-music.patch
+	epatch ${FILESDIR}/${PV}/${P}-vi-sucks-use-vim.patch
+	epatch ${FILESDIR}/${PV}/${P}-pretty-eye-candy.patch
+
+	# fixes
+	epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-not-null.patch
+	epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-still-not-null.patch
+	epatch ${FILESDIR}/${PV}/${P}-3856-hide-and-seek-is-bad.patch
+	epatch ${FILESDIR}/${PV}/${P}-3860-menu-backups.patch
+
 	# Add in the Gentoo -r number to fluxbox -version output.
 	if [[ "${PR}" == "r0" ]] ; then
 		suffix="gentoo"