On Wed, Jul 09, 2008 at 12:11:20AM +0100, Edd Barrett wrote:
> Hi,
>
> Have a diff for fluxbox 1.0.0.
>
> Fixes keybinding sticky icon bug for me.
Iirc david@ (maintainer) had a pending update for it, but it had issues
with malloc.conf flags set. Maybe you can work with him to coordinate the
bugfix/update ?
Landry
> ? w-fluxbox-1.0.0
Hint: use WRKOBJDIR on mfs :)
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/fluxbox/Makefile,v
> retrieving revision 1.43
> diff -u -a -r1.43 Makefile
> --- Makefile 1 Feb 2008 21:38:27 -0000 1.43
> +++ Makefile 8 Jul 2008 23:09:24 -0000
> @@ -1,10 +1,9 @@
> # $OpenBSD: Makefile,v 1.43 2008/02/01 21:38:27 steven Exp $
>
> -COMMENT= window manager based on the original Blackbox code
> +COMMENT= window manager based on the Blackbox code
>
> -VERSION= 0.9.15.1
> +VERSION= 1.0.0
> DISTNAME= fluxbox-${VERSION}
> -PKGNAME= ${DISTNAME}p1
> CATEGORIES= x11
>
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
> @@ -21,19 +20,13 @@
> WANTLIB= ICE SM X11 Xext Xft Xinerama Xpm Xrandr Xrender \
> Xau Xdmcp expat fontconfig freetype stdc++ m c z
>
> -CONFIGURE_STYLE= autoconf
> -AUTOCONF_VERSION= 2.59
> +CONFIGURE_STYLE= gnu
> CONFIGURE_ARGS= --enable-xinerama --enable-imlib2
>
> USE_X11= Yes
> -USE_LIBTOOL= Yes
>
> NO_REGRESS= Yes
>
> -SEPARATE_BUILD= simple
> -
> LIB_DEPENDS= Imlib2.>=2::graphics/imlib2
> -
> -CONFIGURE_ENV= PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/fluxbox/distinfo,v
> retrieving revision 1.23
> diff -u -a -r1.23 distinfo
> --- distinfo 5 Apr 2007 17:36:19 -0000 1.23
> +++ distinfo 8 Jul 2008 23:09:24 -0000
> @@ -1,5 +1,5 @@
> -MD5 (fluxbox-0.9.15.1.tar.gz) = hq+mVwqH1oRQKoIKPxdeNw==
> -RMD160 (fluxbox-0.9.15.1.tar.gz) = usCPchNn38HX2kkfKGvRnfzYES4=
> -SHA1 (fluxbox-0.9.15.1.tar.gz) = oiuKZ5f69O2wO2Y4L+FNgiEqGhE=
> -SHA256 (fluxbox-0.9.15.1.tar.gz) =
> qQiYo5W7MEs+9vhlo1qhFKnIgyvST2nNsGNKImQd384=
> -SIZE (fluxbox-0.9.15.1.tar.gz) = 944863
> +MD5 (fluxbox-1.0.0.tar.gz) = HziRd+F80ejb7QfICBKWHw==
> +RMD160 (fluxbox-1.0.0.tar.gz) = uLofWPfDl1bDKCkdIeZVcmjgWAs=
> +SHA1 (fluxbox-1.0.0.tar.gz) = uTSSOQ4hw9pfV12ZPnpS5PmVOjI=
> +SHA256 (fluxbox-1.0.0.tar.gz) = mK/KrknNPLHKX6MrN51jDsiKdeZMuEcqECPbHRw1wSo=
> +SIZE (fluxbox-1.0.0.tar.gz) = 975940
> Index: patches/patch-data_README_style
> ===================================================================
> RCS file: patches/patch-data_README_style
> diff -N patches/patch-data_README_style
> --- patches/patch-data_README_style 25 Jan 2006 03:57:44 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-data_README_style,v 1.1 2006/01/25 03:57:44 david Exp $
> ---- data/README.style.orig Mon Nov 15 14:40:53 2004
> -+++ data/README.style Mon Jan 23 03:19:26 2006
> -@@ -315,7 +315,7 @@ handleWidth: 4
> - menuFont: lucidasans-10
> - titleFont: lucidasans-bold-10
> -
> --rootCommand: bsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
> -+rootCommand: fbsetroot -mod 4 4 -fg rgb:6/6/5c -bg grey20
> - ...
> -
> - Alright! Our style is finished. Let's see how the sucker looks. First we
> Index: patches/patch-util_fluxbox-generate_menu_in
> ===================================================================
> RCS file: patches/patch-util_fluxbox-generate_menu_in
> diff -N patches/patch-util_fluxbox-generate_menu_in
> --- patches/patch-util_fluxbox-generate_menu_in 25 Jan 2006 03:57:44
> -0000 1.6
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-util_fluxbox-generate_menu_in,v 1.6 2006/01/25 03:57:44
> david Exp $
> ---- util/fluxbox-generate_menu.in.orig Thu Aug 25 11:52:50 2005
> -+++ util/fluxbox-generate_menu.in Mon Jan 23 03:36:56 2006
> -@@ -343,7 +343,7 @@ searchForIcon(){
> - # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>"
> - if [ -f "$entry_icon" ]; then
> - # if icon exists and entry does not already exists, add it
> -- if ! grep -q -m 1
> "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2>
> /dev/null; then
> -+ if ! grep -q "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>"
> $ICONMAPPING 2> /dev/null; then
> - echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
> - else
> - : echo "# mapping already exists for ${entry_exec}" >>
> $ICONMAPPING
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/fluxbox/pkg/PLIST,v
> retrieving revision 1.15
> diff -u -a -r1.15 PLIST
> --- pkg/PLIST 25 Jan 2006 03:57:44 -0000 1.15
> +++ pkg/PLIST 8 Jul 2008 23:09:24 -0000
> @@ -1,9 +1,11 @@
> @comment $OpenBSD: PLIST,v 1.15 2006/01/25 03:57:44 david Exp $
> -bin/fbrun
> [EMAIL PROTECTED] bin/fbrun
> bin/fbsetbg
> -bin/fbsetroot
> -bin/fluxbox
> [EMAIL PROTECTED] bin/fbsetroot
> [EMAIL PROTECTED] bin/fluxbox
> bin/fluxbox-generate_menu
> [EMAIL PROTECTED] bin/fluxbox-remote
> [EMAIL PROTECTED] bin/fluxbox-update_configs
> bin/startfluxbox
> @man man/man1/fbrun.1
> @man man/man1/fbsetbg.1
> @@ -42,9 +44,6 @@
> share/fluxbox/styles/BlueFlux/pixmaps/toolbar_label.xpm
> share/fluxbox/styles/BlueFlux/theme.cfg
> share/fluxbox/styles/BlueNight
> -share/fluxbox/styles/Carbondioxide
> -share/fluxbox/styles/Clean
> -share/fluxbox/styles/Cthulhain
> share/fluxbox/styles/Emerge/
> share/fluxbox/styles/Emerge/pixmaps/
> share/fluxbox/styles/Emerge/pixmaps/bullet.xpm
> @@ -71,13 +70,95 @@
> share/fluxbox/styles/Makro
> share/fluxbox/styles/MerleyKay
> share/fluxbox/styles/Meta
> -share/fluxbox/styles/Minimal
> share/fluxbox/styles/Nyz
> share/fluxbox/styles/Operation
> share/fluxbox/styles/Outcomes
> -share/fluxbox/styles/Rampage
> share/fluxbox/styles/Results
> share/fluxbox/styles/Shade
> -share/fluxbox/styles/Spiff
> share/fluxbox/styles/Twice
> +share/fluxbox/styles/arch/
> +share/fluxbox/styles/arch/pixmaps/
> +share/fluxbox/styles/arch/pixmaps/bullet.xpm
> +share/fluxbox/styles/arch/pixmaps/closefcs.xpm
> +share/fluxbox/styles/arch/pixmaps/closepr.xpm
> +share/fluxbox/styles/arch/pixmaps/closeufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/frame.xpm
> +share/fluxbox/styles/arch/pixmaps/gripfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/maxfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/maxpr.xpm
> +share/fluxbox/styles/arch/pixmaps/maxufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/menuiconfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/menuiconpr.xpm
> +share/fluxbox/styles/arch/pixmaps/menuiconufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/minfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/minpr.xpm
> +share/fluxbox/styles/arch/pixmaps/minufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/selected.xpm
> +share/fluxbox/styles/arch/pixmaps/shadefcs.xpm
> +share/fluxbox/styles/arch/pixmaps/shadepr.xpm
> +share/fluxbox/styles/arch/pixmaps/shadeufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/stickfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/stickpr.xpm
> +share/fluxbox/styles/arch/pixmaps/stickufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/stuckfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/stuckufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/tbarfcs.xpm
> +share/fluxbox/styles/arch/pixmaps/tbarufcs.xpm
> +share/fluxbox/styles/arch/pixmaps/unselected.xpm
> +share/fluxbox/styles/arch/pixmaps/unshadefcs.xpm
> +share/fluxbox/styles/arch/pixmaps/unshadepr.xpm
> +share/fluxbox/styles/arch/pixmaps/unshadeufcs.xpm
> +share/fluxbox/styles/arch/theme.cfg
> +share/fluxbox/styles/bloe/
> +share/fluxbox/styles/bloe/pixmaps/
> +share/fluxbox/styles/bloe/pixmaps/bullet.xpm
> +share/fluxbox/styles/bloe/pixmaps/closefcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/closepr.xpm
> +share/fluxbox/styles/bloe/pixmaps/closeufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/frame.xpm
> +share/fluxbox/styles/bloe/pixmaps/maxfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/maxpr.xpm
> +share/fluxbox/styles/bloe/pixmaps/maxufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/menuiconfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/menuiconpr.xpm
> +share/fluxbox/styles/bloe/pixmaps/menuiconufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/minfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/minpr.xpm
> +share/fluxbox/styles/bloe/pixmaps/minufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/selected.xpm
> +share/fluxbox/styles/bloe/pixmaps/shadefcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/shadepr.xpm
> +share/fluxbox/styles/bloe/pixmaps/shadeufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/stickfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/stickpr.xpm
> +share/fluxbox/styles/bloe/pixmaps/stickufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/stuckfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/stuckufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/tbarfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/tbarufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/unselected.xpm
> +share/fluxbox/styles/bloe/pixmaps/unshadefcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/unshadepr.xpm
> +share/fluxbox/styles/bloe/pixmaps/unshadeufcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/windowlabelfcs.xpm
> +share/fluxbox/styles/bloe/pixmaps/windowlabelufcs.xpm
> +share/fluxbox/styles/bloe/theme.cfg
> +share/fluxbox/styles/bora_black/
> +share/fluxbox/styles/bora_black/theme.cfg
> +share/fluxbox/styles/bora_blue/
> +share/fluxbox/styles/bora_blue/theme.cfg
> +share/fluxbox/styles/bora_green/
> +share/fluxbox/styles/bora_green/theme.cfg
> +share/fluxbox/styles/carp/
> +share/fluxbox/styles/carp/theme.cfg
> +share/fluxbox/styles/green_tea/
> +share/fluxbox/styles/green_tea/theme.cfg
> +share/fluxbox/styles/ostrich/
> +share/fluxbox/styles/ostrich/theme.cfg
> share/fluxbox/styles/qnx-photon
> +share/fluxbox/styles/zimek_bisque/
> +share/fluxbox/styles/zimek_bisque/theme.cfg
> +share/fluxbox/styles/zimek_darkblue/
> +share/fluxbox/styles/zimek_darkblue/theme.cfg
> +share/fluxbox/styles/zimek_green/
> +share/fluxbox/styles/zimek_green/theme.cfg
