Commit 4b9bd973 authored by Frederic Bassaler's avatar Frederic Bassaler Committed by Peter Korsgaard
Browse files

package: add Fluxbox 1.3.1 window manager 



[Peter: fix build without iconv, whitespace fixes]
Signed-off-by: default avatarFrederic Bassaler <frederic.bassaler@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7b1cf6c6

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ comment "X Window managers" 
source "package/matchbox/Config.in"

source "package/metacity/Config.in"

source "package/blackbox/Config.in"

source "package/fluxbox/Config.in"



comment "X applications"

source "package/alsamixergui/Config.in"

package/fluxbox/Config.in

0 → 100644
+12 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_FLUXBOX

	bool "fluxbox"

	depends on BR2_PACKAGE_XORG7

	depends on BR2_INSTALL_LIBSTDCPP

	select BR2_PACKAGE_XLIB_LIBX11

	help

	  The Fluxbox lightweight window manager for X



	  http://fluxbox.org



comment "fluxbox requires a toolchain with C++ support enabled"

	depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP

package/fluxbox/fluxbox-1.3.1-iconv.patch

0 → 100644
+37 −0
Original line number Diff line number Diff line 
From 3ed2d03446cdf53fd10c8ad056d9f86db9923666 Mon Sep 17 00:00:00 2001

From: Peter Korsgaard <jacmet@sunsite.dk>

Date: Fri, 9 Sep 2011 20:35:49 +0200

Subject: [PATCH] FbString: fix build without iconv



Commit 690d926 (introduced FbTk::BidiString) broke building without

HAVE_ICONV, because of wrong variable name and use of iconv_t type.



Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 src/FbTk/FbString.cc |    3 ++-

 1 files changed, 2 insertions(+), 1 deletions(-)



diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc

index fd34693..5295a66 100644

--- a/src/FbTk/FbString.cc

+++ b/src/FbTk/FbString.cc

@@ -150,6 +150,7 @@ enum ConvType { FB2X = 0, X2FB, LOCALE2FB, FB2LOCALE, CONVSIZE };

 #ifdef HAVE_ICONV

 static iconv_t *iconv_convs = 0;

 #else

+typedef int iconv_t;

 static int iconv_convs[CONVSIZE];

 #endif // HAVE_ICONV

 

@@ -292,7 +293,7 @@ string recode(iconv_t cd, const string &in) {

 

     return ret;

 #else

-    return str;

+    return in;

 #endif // HAVE_ICONV

 }

 

-- 

1.7.5.4

package/fluxbox/fluxbox.mk

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#############################################################

#

# FLUXBOX

#

#############################################################



FLUXBOX_VERSION = 1.3.1

FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.bz2

FLUXBOX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fluxbox/



FLUXBOX_CONF_OPT = --x-includes=$(STAGING_DIR)/usr/include/X11 \

		   --x-libraries=$(STAGING_DIR)/usr/lib



FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv)



$(eval $(call AUTOTARGETS,package,fluxbox))