diff options
| author | pav <pav@FreeBSD.org> | 2003-11-15 20:28:57 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2003-11-15 20:28:57 +0800 |
| commit | 70f25d5cd594551f55bd74c3d3279ec581dac9ab (patch) | |
| tree | 1ece70b2e8c4e419617eadcc85e652236a5678e7 /x11-wm/fluxbox | |
| parent | 5b6264cc5e021302934ee794f6998119eee720af (diff) | |
| download | freebsd-ports-graphics-70f25d5cd594551f55bd74c3d3279ec581dac9ab.tar.gz freebsd-ports-graphics-70f25d5cd594551f55bd74c3d3279ec581dac9ab.tar.zst freebsd-ports-graphics-70f25d5cd594551f55bd74c3d3279ec581dac9ab.zip | |
Unbreak build on -CURRENT.
PR: ports/58672
Submitted by: Yonas <yonas_@yahoo.com>
Approved by: adamw (mentor)
Diffstat (limited to 'x11-wm/fluxbox')
| -rw-r--r-- | x11-wm/fluxbox/files/patch-src-Toolbar.cc | 49 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/patch-src-fluxbox.hh | 12 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh | 11 |
3 files changed, 72 insertions, 0 deletions
diff --git a/x11-wm/fluxbox/files/patch-src-Toolbar.cc b/x11-wm/fluxbox/files/patch-src-Toolbar.cc new file mode 100644 index 00000000000..780c866619e --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src-Toolbar.cc @@ -0,0 +1,49 @@ +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,7 @@ + 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 --git a/x11-wm/fluxbox/files/patch-src-fluxbox.hh b/x11-wm/fluxbox/files/patch-src-fluxbox.hh new file mode 100644 index 00000000000..ad39792bf22 --- /dev/null +++ b/x11-wm/fluxbox/files/patch-src-fluxbox.hh @@ -0,0 +1,12 @@ +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 --git a/x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh b/x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh new file mode 100644 index 00000000000..721c2bb88a3 --- /dev/null +++ b/x11-wm/fluxbox/files/patch-util-fbrun-FbRun.hh @@ -0,0 +1,11 @@ +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 |