pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/wm/fluxbox Fixed the package so that it builds with su...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7cb645385b18
branches: trunk
changeset: 534822:7cb645385b18
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu Nov 01 13:08:05 2007 +0000
description:
Fixed the package so that it builds with sunpro, a very strict compiler.
diffstat:
wm/fluxbox/Makefile | 14 ++++--------
wm/fluxbox/distinfo | 15 +++++++++++-
wm/fluxbox/patches/patch-ac | 27 +++++++++++++++++++++---
wm/fluxbox/patches/patch-ba | 24 ++++++++++++++++++++++
wm/fluxbox/patches/patch-bb | 24 ++++++++++++++++++++++
wm/fluxbox/patches/patch-bc | 16 ++++++++++++++
wm/fluxbox/patches/patch-bd | 49 +++++++++++++++++++++++++++++++++++++++++++++
wm/fluxbox/patches/patch-be | 25 ++++++++++++++++++++++
wm/fluxbox/patches/patch-bf | 42 ++++++++++++++++++++++++++++++++++++++
wm/fluxbox/patches/patch-bg | 15 +++++++++++++
wm/fluxbox/patches/patch-bh | 12 +++++++++++
wm/fluxbox/patches/patch-bi | 12 +++++++++++
wm/fluxbox/patches/patch-bj | 16 ++++++++++++++
wm/fluxbox/patches/patch-bk | 22 ++++++++++++++++++++
14 files changed, 298 insertions(+), 15 deletions(-)
diffs (truncated from 393 to 300 lines):
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/Makefile
--- a/wm/fluxbox/Makefile Thu Nov 01 13:00:14 2007 +0000
+++ b/wm/fluxbox/Makefile Thu Nov 01 13:08:05 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2007/10/15 09:17:31 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2007/11/01 13:08:05 rillig Exp $
#
DISTNAME= fluxbox-1.0.0
@@ -28,14 +28,10 @@
.include "options.mk"
-SUBST_CLASSES+= cmds
-SUBST_STAGE.cmds= post-build
-SUBST_MESSAGE.cmds= Fixing command names in data files.
-SUBST_SED.cmds= -e 's|bsetroot|fbsetroot|g'
-SUBST_FILES.cmds= data/README.style data/styles/Artwiz\
- data/styles/MerleyKay data/styles/Outcomes\
- data/styles/Rampage data/styles/Results\
- data/styles/Spiff
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Msunpro)
+CXXFLAGS+= -template=no%extdef
+.endif
BUILDLINK_DEPMETHOD.libXt?= build
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/distinfo
--- a/wm/fluxbox/distinfo Thu Nov 01 13:00:14 2007 +0000
+++ b/wm/fluxbox/distinfo Thu Nov 01 13:08:05 2007 +0000
@@ -1,8 +1,19 @@
-$NetBSD: distinfo,v 1.25 2007/10/15 09:17:31 rillig Exp $
+$NetBSD: distinfo,v 1.26 2007/11/01 13:08:05 rillig Exp $
SHA1 (fluxbox-1.0.0.tar.bz2) = 7985e35fbb170fda24b9e04610690cd04c7a8748
RMD160 (fluxbox-1.0.0.tar.bz2) = 320b11a1cf96a757da079886cd6496b9d84ab202
Size (fluxbox-1.0.0.tar.bz2) = 767586 bytes
SHA1 (patch-aa) = 7b0b4a08a2c66902c38dc573da77b7917a2e859a
-SHA1 (patch-ac) = 2e77766bc2490b65e214d04ac6102f4e9e882930
+SHA1 (patch-ac) = 467154bd1f43e68997bb368883016c65e1afd7b2
SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa
+SHA1 (patch-ba) = 27ecea84bfe459656f4ff5a09b4f24abf1519097
+SHA1 (patch-bb) = fc698dcb8c8592bbc46aa9d02dbbf8f9e870f700
+SHA1 (patch-bc) = f6cfcd5ef3db3a69504152cf9329110e63778693
+SHA1 (patch-bd) = 6f57ed17a0d7330d3a3c0f246b1d69e2f61d8984
+SHA1 (patch-be) = 6dc8547ef5b5144e61fba02ccfb683853280d15e
+SHA1 (patch-bf) = b7c44cfbb1c3e5997bb5c499ae8a15f239f1bce7
+SHA1 (patch-bg) = c6a1c79adb48c78a6ac6e5c57e1211d807eff2ce
+SHA1 (patch-bh) = f5c98c6eab9f5fd6de35b991a67273985e949648
+SHA1 (patch-bi) = 17c9f36b3beb12903dcdb4ab2ea98b2be0c72c46
+SHA1 (patch-bj) = 24eb486f2414bd82bcb85e2ee86f87a061faaa16
+SHA1 (patch-bk) = 6e1319418c3f30dc06a9cdaa57086f90859859e7
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-ac
--- a/wm/fluxbox/patches/patch-ac Thu Nov 01 13:00:14 2007 +0000
+++ b/wm/fluxbox/patches/patch-ac Thu Nov 01 13:08:05 2007 +0000
@@ -1,8 +1,18 @@
-$NetBSD: patch-ac,v 1.8 2007/10/09 20:17:32 xtraeme Exp $
+$NetBSD: patch-ac,v 1.9 2007/11/01 13:08:05 rillig Exp $
---- src/fluxbox.cc.orig 2007-10-09 03:40:08.000000000 +0200
-+++ src/fluxbox.cc 2007-10-09 03:41:21.000000000 +0200
-@@ -589,11 +589,11 @@
+--- src/fluxbox.cc.orig 2007-03-19 20:57:09.000000000 +0100
++++ src/fluxbox.cc 2007-10-31 00:54:40.610976000 +0100
+@@ -94,7 +94,8 @@ class Toolbar { };
+ #ifdef SHAPE
+ #include <X11/extensions/shape.h>
+ #endif // SHAPE
+-#ifdef HAVE_RANDR
++#undef HAVE_RANDR
++#if defined(HAVE_RANDR) && !defined(__sun)
+ #include <X11/extensions/Xrandr.h>
+ #endif // HAVE_RANDR
+
+@@ -596,11 +597,11 @@ void Fluxbox::setupConfigFiles() {
bool create_init = false, create_keys = false, create_menu = false;
@@ -18,3 +28,12 @@
struct stat buf;
+@@ -1349,7 +1350,7 @@ void Fluxbox::saveWindowSearchGroup(Wind
+ }
+
+ void Fluxbox::saveGroupSearch(Window window, WinClient *data) {
+- m_group_search.insert(pair<Window, WinClient *>(window, data));
++ m_group_search.insert(std::multimap<Window, WinClient *>::value_type(window, data));
+ }
+
+
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-ba
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-ba Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-ba,v 1.1 2007/11/01 13:08:05 rillig Exp $
+
+The array size of a local variable must be a constant expression, says
+sunpro.
+
+--- src/Ewmh.cc.orig 2007-03-19 20:57:09.000000000 +0100
++++ src/Ewmh.cc 2007-10-31 01:07:03.044178000 +0100
+@@ -454,7 +454,7 @@ void Ewmh::updateWorkspaceNames(BScreen
+ const BScreen::WorkspaceNames &workspacenames = screen.getWorkspaceNames();
+ const size_t number_of_desks = workspacenames.size();
+
+- char *names[number_of_desks];
++ char **names = new char *[number_of_desks];
+
+ for (size_t i = 0; i < number_of_desks; i++) {
+ names[i] = new char[workspacenames[i].size() + 1]; // +1 for \0
+@@ -483,6 +483,7 @@ void Ewmh::updateWorkspaceNames(BScreen
+
+ for (size_t i = 0; i < number_of_desks; i++)
+ delete [] names[i];
++ delete[] names;
+
+ }
+
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-bb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-bb Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-bb,v 1.1 2007/11/01 13:08:05 rillig Exp $
+
+Do not include files inside namespaces.
+
+--- src/FbTk/Font.cc.orig 2007-03-19 20:57:07.000000000 +0100
++++ src/FbTk/Font.cc 2007-10-30 16:53:50.021147000 +0100
+@@ -76,7 +76,7 @@ using std::string;
+ using std::map;
+ using std::list;
+
+-namespace {
++//namespace {
+
+ #ifdef HAVE_SETLOCALE
+ #include <locale.h>
+@@ -102,7 +102,7 @@ void resetEffects(FbTk::Font& font) {
+ font.setShadowOffX(2);
+ }
+
+-}; // end nameless namespace
++//}; // end nameless namespace
+
+
+
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-bc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-bc Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-bc,v 1.1 2007/11/01 13:08:05 rillig Exp $
+
+sunpro doesn't know whether it should call abs(int) or abs(long), so we
+need to make it explicit.
+
+--- src/FbTk/TextBox.cc.orig 2007-03-19 20:57:07.000000000 +0100
++++ src/FbTk/TextBox.cc 2007-10-30 16:57:31.306492000 +0100
+@@ -193,7 +193,7 @@ void TextBox::buttonPressEvent(XButtonEv
+ int delta = width();
+ int tmp = 0;
+ for(i = m_start_pos; i <= m_end_pos; i++) {
+- tmp = abs(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos));
++ tmp = abs((int)(event.x - font().textWidth(m_text.c_str() + m_start_pos, i - m_start_pos)));
+
+ if (tmp < delta) {
+ delta = tmp;
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-bd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-bd Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,49 @@
+$NetBSD: patch-bd,v 1.1 2007/11/01 13:08:06 rillig Exp $
+
+See patch-be and patch-bf.
+
+--- src/Screen.cc.orig 2007-03-19 20:57:09.000000000 +0100
++++ src/Screen.cc 2007-11-01 12:50:05.233133000 +0100
+@@ -1032,7 +1032,7 @@ void BScreen::addIcon(FluxboxWindow *w)
+ return;
+
+ // make sure we have a unique list
+- if (find(iconList().begin(), iconList().end(), w) != iconList().end())
++ if (std::find(iconList().begin(), iconList().end(), w) != iconList().end())
+ return;
+
+ m_icon_list.push_back(w);
+@@ -2013,21 +2013,21 @@ void BScreen::setLayer(FbTk::XLayerItem
+ /**
+ Goes to the workspace "right" of the current
+ */
+-void BScreen::nextWorkspace(const int delta) {
++void BScreen::nextWorkspace(int delta) {
+ changeWorkspaceID( (currentWorkspaceID() + delta) % numberOfWorkspaces());
+ }
+
+ /**
+ Goes to the workspace "left" of the current
+ */
+-void BScreen::prevWorkspace(const int delta) {
++void BScreen::prevWorkspace(int delta) {
+ changeWorkspaceID( (static_cast<signed>(numberOfWorkspaces()) + currentWorkspaceID() - (delta % numberOfWorkspaces())) % numberOfWorkspaces());
+ }
+
+ /**
+ Goes to the workspace "right" of the current
+ */
+-void BScreen::rightWorkspace(const int delta) {
++void BScreen::rightWorkspace(int delta) {
+ if (currentWorkspaceID()+delta < numberOfWorkspaces())
+ changeWorkspaceID(currentWorkspaceID()+delta);
+ }
+@@ -2035,7 +2035,7 @@ void BScreen::rightWorkspace(const int d
+ /**
+ Goes to the workspace "left" of the current
+ */
+-void BScreen::leftWorkspace(const int delta) {
++void BScreen::leftWorkspace(int delta) {
+ if (currentWorkspaceID() >= static_cast<unsigned int>(delta))
+ changeWorkspaceID(currentWorkspaceID()-delta);
+ }
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-be
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-be Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-be,v 1.1 2007/11/01 13:08:06 rillig Exp $
+
+sunpro couldn't resolve "find" without the prefix. Maybe there is some
+method of that name?
+
+--- src/Workspace.cc.orig 2007-03-19 20:57:09.000000000 +0100
++++ src/Workspace.cc 2007-10-31 01:05:46.195938000 +0100
+@@ -167,7 +167,7 @@ Workspace::~Workspace() {
+
+ void Workspace::addWindow(FluxboxWindow &w, bool place) {
+ // we don't need to add a window that already exist in our list
+- if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
++ if (std::find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
+ return;
+
+ w.setWorkspace(m_id);
+@@ -207,7 +207,7 @@ int Workspace::removeWindow(FluxboxWindo
+ FocusControl::unfocusWindow(w->winClient(), true, true);
+
+ // we don't remove it from the layermanager, as it may be being moved
+- Windows::iterator erase_it = remove(m_windowlist.begin(),
++ Windows::iterator erase_it = std::remove(m_windowlist.begin(),
+ m_windowlist.end(), w);
+ if (erase_it != m_windowlist.end())
+ m_windowlist.erase(erase_it);
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-bf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-bf Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,42 @@
+$NetBSD: patch-bf,v 1.1 2007/11/01 13:08:06 rillig Exp $
+
+Adding "const" to a primitive type is useless. Sunpro doesn't like it.
+
+--- src/CurrentWindowCmd.cc.orig 2007-03-19 20:57:09.000000000 +0100
++++ src/CurrentWindowCmd.cc 2007-11-01 13:05:58.247018000 +0100
+@@ -111,7 +111,7 @@ FluxboxWindow &WindowHelperCmd::fbwindow
+ return *FocusControl::focusedFbWindow();
+ }
+
+-MoveCmd::MoveCmd(const int step_size_x, const int step_size_y) :
++MoveCmd::MoveCmd(int step_size_x, int step_size_y) :
+ m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
+
+ void MoveCmd::real_execute() {
+@@ -120,7 +120,7 @@ void MoveCmd::real_execute() {
+ fbwindow().y() + m_step_size_y);
+ }
+
+-ResizeCmd::ResizeCmd(const int step_size_x, const int step_size_y) :
++ResizeCmd::ResizeCmd(int step_size_x, int step_size_y) :
+ m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
+
+ void ResizeCmd::real_execute() {
+@@ -134,7 +134,7 @@ void ResizeCmd::real_execute() {
+ fbwindow().resize(w, h);
+ }
+
+-MoveToCmd::MoveToCmd(const int step_size_x, const int step_size_y, const unsigned int refc) :
++MoveToCmd::MoveToCmd(int step_size_x, int step_size_y, unsigned int refc) :
+ m_step_size_x(step_size_x), m_step_size_y(step_size_y), m_refc(refc) { }
+
+ void MoveToCmd::real_execute() {
+@@ -161,7 +161,7 @@ void MoveToCmd::real_execute() {
+ }
+
+
+-ResizeToCmd::ResizeToCmd(const int step_size_x, const int step_size_y) :
++ResizeToCmd::ResizeToCmd(int step_size_x, int step_size_y) :
+ m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
+
+ void ResizeToCmd::real_execute() {
diff -r 28bd3ef32bd9 -r 7cb645385b18 wm/fluxbox/patches/patch-bg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/fluxbox/patches/patch-bg Thu Nov 01 13:08:05 2007 +0000
@@ -0,0 +1,15 @@
Home |
Main Index |
Thread Index |
Old Index