gcc33 fixes

5 files changed, 222 insertions, 3 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 18d10691ac4c..3b1134eeba34 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.67 2003/09/14 16:58:07 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.68 2003/09/14 17:43:27 tseng Exp $
+
+*fluxbox-0.1.14-r2 (14 Sep 2003)
+
+  14 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.1.14-r2.ebuild:
+  Add gcc33 fixes.
 
 *fluxbox-0.9.6_pre7 (14 Sep 2003)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index a4bc644dbf14..184e85f1ab36 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -5,11 +5,11 @@ MD5 143110b2a988e0a383142062b0fa41b6 fluxbox-0.9.3.ebuild 2718
 MD5 584949bdc5b17f5f5219e820d739c815 fluxbox-0.9.4.ebuild 2718
 MD5 05b1b1b37d0da0bcbe5f826a04430791 fluxbox-0.9.5.ebuild 2718
 MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
-MD5 7cb11e60ac7c8052baf637946c9853f9 ChangeLog 14807
+MD5 2226f26e9bf45dbfecf69dc4db5254da ChangeLog 14934
 MD5 8d50756bc51e5476cc57811d42d27e3b fluxbox-0.9.6_pre5.ebuild 2742
 MD5 1efc373cf7a63af4c1ee7d93f96f8a51 fluxbox-0.9.6_pre6.ebuild 2742
 MD5 aea9e41bcc3efdd4682fa0628bacf49d fluxbox-0.9.6_pre7.ebuild 2742
-MD5 ac6d14a195e306ef27310661da5b57e5 fluxbox-0.1.14-r2.ebuild 1481
+MD5 63eb87e2e5804012e8bfb11b5e607421 fluxbox-0.1.14-r2.ebuild 1480
 MD5 3661fa0f4811d5de5119163ee43ac690 files/digest-fluxbox-0.1.12-r1 132
 MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r1 67
 MD5 224efa97a7e52718fb828c036c6d91d9 files/digest-fluxbox-0.9.0 65
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.1.14-r2 b/x11-wm/fluxbox/files/digest-fluxbox-0.1.14-r2
new file mode 100644
index 000000000000..05ff01a8d2ea
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-0.1.14-r2
@@ -0,0 +1 @@
+MD5 66b72e10fc595e8531547046ad22f5a1 fluxbox-0.1.14.tar.bz2 375499
diff --git a/x11-wm/fluxbox/files/fluxbox-0.1.14-gcc33.patch b/x11-wm/fluxbox/files/fluxbox-0.1.14-gcc33.patch
new file mode 100644
index 000000000000..f66f30a1ca85
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-0.1.14-gcc33.patch
@@ -0,0 +1,147 @@
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox-0.1.14.orig/configure fluxbox-0.1.14/configure
+--- fluxbox-0.1.14.orig/configure	2002-12-08 12:39:59.000000000 +1100
++++ fluxbox-0.1.14/configure	2003-09-11 00:45:43.000000000 +1000
+@@ -8322,7 +8322,7 @@
+ 
+ 
+ 
+-for ac_func in getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose
++for ac_func in getpid setlocale sigaction strcasestr snprintf vsnprintf catopen catgets catclose
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_func" >&5
+@@ -8397,6 +8397,61 @@
+ fi
+ done
+ 
++echo "$as_me:$LINENO: checking for strftime" >&5
++echo $ECHO_N "checking for strftime... $ECHO_C" >&6
++
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <time.h>
++int
++main ()
++{
++
++char * s;
++time_t t = time(NULL);
++size_t x = strftime(s, 5, "%a", localtime(&t));
++
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_STRFTIME 1
++_ACEOF
++
++	echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++rm -f conftest.$ac_objext conftest.$ac_ext
++
++
+ echo "$as_me:$LINENO: checking for t_open in -lnsl" >&5
+ echo $ECHO_N "checking for t_open in -lnsl... $ECHO_C" >&6
+ if test "${ac_cv_lib_nsl_t_open+set}" = set; then
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox-0.1.14.orig/configure.in fluxbox-0.1.14/configure.in
+--- fluxbox-0.1.14.orig/src/Toolbar.cc	2002-12-08 14:41:57.000000000 +1100
++++ fluxbox-0.1.14/src/Toolbar.cc	2003-09-11 00:32:52.000000000 +1000
+@@ -65,6 +65,7 @@
+ #include <iostream>
+ 
+ using namespace std;
++using namespace FBNLS;
+ 
+ Toolbar::Toolbar(BScreen *scrn):
+ on_top(scrn->isToolbarOnTop()),
+@@ -204,6 +205,7 @@
+ }
+ 		
+ void Toolbar::reconfigure() {
++	I18n *i18n = I18n::instance();
+ 	int head_x = 0,
+ 			head_y = 0,
+ 			head_w,
+@@ -519,6 +521,7 @@
+ 
+ 
+ void Toolbar::checkClock(bool redraw, bool date) {
++	I18n *i18n = I18n::instance();
+ 	time_t tmp = 0;
+ 	struct tm *tt = 0;
+ 
+@@ -547,7 +550,7 @@
+ 		char t[9];
+ 		if (date) {
+ 			// format the date... with special consideration for y2k ;)
+-			if (screen()->getDateFormat() == Blackbox::B_EuropeanDate) {
++			if (screen()->getDateFormat() == Fluxbox::B_EUROPEANDATE) {
+ 				sprintf(t,
+ 					i18n->getMessage(
+ 				 		ToolbarSet, ToolbarNoStrftimeDateFormatEu,
+diff -I'^// \$Id' -Naur --exclude-from diff-exclude fluxbox-0.1.14.orig/src/fluxbox.cc fluxbox-0.1.14/src/fluxbox.cc
+--- fluxbox-0.1.14.orig/src/fluxbox.cc	2002-12-09 02:55:32.000000000 +1100
++++ fluxbox-0.1.14/src/fluxbox.cc	2003-09-11 00:28:35.000000000 +1000
+@@ -1973,7 +1973,7 @@
+ 		XrmPutLineResource(&new_blackboxrc, rc_string);
+ #else // !HAVE_STRFTIME
+ 		sprintf(rc_string, "session.screen%d.dateFormat:	%s", screen_number,
+-			((screen->getDateFormat() == B_EuropeanDate) ?
++			((screen->getDateFormat() == B_EUROPEANDATE) ?
+ 				"European" : "American"));
+ 		XrmPutLineResource(&new_blackboxrc, rc_string);
+ 
+@@ -2321,11 +2321,11 @@
+ 	if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
+ 			&value)) {
+ 		if (strncasecmp(value.addr, "european", value.size))
+-			screen->saveDateFormat(B_AmericanDate);
++			screen->saveDateFormat(B_AMERICANDATE);
+ 		else
+-			screen->saveDateFormat(B_EuropeanDate);
++			screen->saveDateFormat(B_EUROPEANDATE);
+ 	} else
+-		screen->saveDateFormat(B_AmericanDate);
++		screen->saveDateFormat(B_AMERICANDATE);
+ 
+ 	sprintf(name_lookup, "session.screen%d.clockFormat", screen_number);
+ 	sprintf(class_lookup, "Session.Screen%d.ClockFormat", screen_number);
+--- fluxbox-0.1.14.orig/util/fbrun/FbRun.cc	2002-12-08 01:15:27.000000000 +1100
++++ fluxbox-0.1.14/util/fbrun/FbRun.cc	2003-09-11 01:07:42.000000000 +1000
+@@ -34,6 +34,7 @@
+ 
+ #include <iostream>
+ #include <fstream>
++#include <cassert>
+ 
+ using namespace std;
+ FbRun::FbRun(int x, int y, size_t width):
diff --git a/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
new file mode 100644
index 000000000000..4c94f150fb03
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild,v 1.1 2003/09/14 17:43:28 tseng Exp $
+
+IUSE="kde gnome nls xinerama truetype cjk"
+
+inherit commonbox flag-o-matic eutils gnuconfig
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Window manager based on Blackbox -- has tabs."
+SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://fluxbox.sf.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc hppa ~mips"
+
+mydoc="ChangeLog COPYING NEWS"
+if pkg-config xft
+then
+	CXXFLAGS="${CXXFLAGS} -I/usr/include/freetype2"
+fi
+filter-flags -fno-exceptions
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Patch to fix toggledecor for terms
+	epatch ${FILESDIR}/${P}-toggledecor.patch
+	# Remember patch
+	#epatch ${FILESDIR}/${P}-remember.patch
+	# Menukey patch
+	epatch ${FILESDIR}/${P}-menukey.patch
+	# Vano menu destroy patch
+	epatch ${FILESDIR}/${PN}-vano-gentoo.patch
+	# gcc 3.3 fixes
+	epatch ${FILESDIR}/${P}-gcc33.patch
+
+	if [ `use cjk` ]; then
+		epatch ${FILESDIR}/${P}-ja.patch
+	fi
+}
+
+src_compile() {
+
+	# Allow configure to detect mipslinux systems
+	use mips && gnuconfig_update
+
+	commonbox_src_compile
+
+	cd data
+	make \
+		pkgdatadir=/usr/share/commonbox init
+}
+
+
+src_install() {
+
+	commonbox_src_install
+	cd data
+	insinto /usr/share/commonbox
+	doins init keys
+	rmdir ${D}/usr/share/commonbox/fluxbox
+	rm -f ${D}/usr/bin/fluxbox-generate_menu
+}