ports/58671: patches to allow x11-wm/fluxbox compile on 5.1-CURRENT
Yonas
yonas at rn-re142b10.uwaterloo.ca
Wed Oct 29 03:40:22 UTC 2003
>Number: 58671
>Category: ports
>Synopsis: patches to allow x11-wm/fluxbox compile on 5.1-CURRENT
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 28 19:40:18 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Yonas
>Release: FreeBSD 5.1-CURRENT-20031010-JPSNAP i386
>Organization:
>Environment:
System: FreeBSD rn-re142b10 5.1-CURRENT-20031010-JPSNAP FreeBSD 5.1-CURRENT-20031010-JPSNAP #1: Sat Oct 25 18:59:20 EDT 2003 yonas at rn-re142b10:/usr/src/sys/i386/compile/LAPTOP i386
>Description:
x11-wm/fluxbox needs to be patched to compile on 5.1-CURRENT
>How-To-Repeat:
apply patch
>Fix:
diff -u -r src/Toolbar.cc.orig src/Toolbar.cc
--- src/Toolbar.cc.orig Sat Dec 7 22:41:57 2002
+++ src/Toolbar.cc Tue Oct 28 01:03:30 2003
@@ -204,6 +204,7 @@
}
void Toolbar::reconfigure() {
+ I18n *i18n = I18n::instance();
int head_x = 0,
head_y = 0,
head_w,
@@ -318,6 +319,7 @@
frame.clock_w = 0;
#else // !HAVE_STRFTIME
+ using namespace FBNLS;
frame.clock_w = screen()->getToolbarStyle()->font.textWidth(
i18n->getMessage(
ToolbarSet, ToolbarNoStrftimeLength,
@@ -521,6 +523,8 @@
void Toolbar::checkClock(bool redraw, bool date) {
time_t tmp = 0;
struct tm *tt = 0;
+ I18n *i18n = I18n::instance();
+
if ((tmp = time(NULL)) != -1) {
if (! (tt = localtime(&tmp))) {
@@ -545,9 +549,11 @@
return;
#else // !HAVE_STRFTIME
char t[9];
+ using namespace FBNLS;
+
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,
@@ -1101,6 +1107,8 @@
CommonSet, CommonAutoHide,
"Auto hide"),
2);
+
+ using namespace FBNLS;
insert(i18n->getMessage(
ToolbarSet, ToolbarEditWkspcName,
"Edit current workspace name"),
diff -u -r src/Toolbar.hh.orig src/Toolbar.hh
--- src/Toolbar.hh.orig Sat Dec 7 09:15:25 2002
+++ src/Toolbar.hh Tue Oct 28 00:31:00 2003
@@ -159,6 +159,7 @@
bool do_auto_hide; ///< do we auto hide
Display *display; ///< display connection
+
struct frame {
unsigned long button_pixel, pbutton_pixel;
Pixmap base, label, wlabel, clk, button, pbutton;
diff -u -r src/fluxbox.hh.orig src/fluxbox.hh
--- src/fluxbox.hh.orig Sat Dec 7 09:15:26 2002
+++ src/fluxbox.hh Mon Oct 27 23:34:49 2003
@@ -184,7 +184,7 @@
#ifndef HAVE_STRFTIME
- enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
+ enum { B_AmericanDate = 1, B_EuropeanDate };
#endif // HAVE_STRFTIME
typedef std::vector<Fluxbox::Titlebar> TitlebarList;
diff -u -r util/fbrun/FbRun.hh.orig util/fbrun/FbRun.hh
--- util/fbrun/FbRun.hh.orig Sat Dec 7 09:15:27 2002
+++ util/fbrun/FbRun.hh Mon Oct 27 23:57:51 2003
@@ -29,6 +29,7 @@
#include <string>
#include <vector>
+#include <cassert>
/**
Creates and managed a run window
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list