head 1.3; access; symbols pkgsrc-2018Q3:1.2.0.46 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.44 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.42 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.40 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.38 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.34 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.32 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.30 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.28 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.26 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.24 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.22 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.20 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.18 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.16 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.14 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.12 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.10 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.8 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.6 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.4 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.2 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.1.0.46 pkgsrc-2013Q1-base:1.1 pkgsrc-2012Q4:1.1.0.44 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.42 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.40 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.38 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.36 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.34 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.32 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.30 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.28 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.26 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.24 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.22 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.20 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.18 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.16 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.14 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.12 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.10 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.8 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.6 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.4 pkgsrc-2008Q1:1.1.0.2 pkgsrc-2008Q1-base:1.1; locks; strict; comment @# @; 1.3 date 2018.10.12.18.00.55; author he; state dead; branches; next 1.2; commitid R8howq6sLiS9jHVA; 1.2 date 2013.04.29.21.27.15; author joerg; state Exp; branches; next 1.1; 1.1 date 2008.01.14.02.04.41; author rillig; state Exp; branches; next ; desc @@ 1.3 log @Switch upstream for blackbox70, and upgrade to version 0.72. The old upstream last had a release in November 2005, and the new upstream in May this year. In recent rebuilds, the old version has developed "focus issues" when run with "sloppy focus", as is my preference. The new upstream is a fork of blackbox but where this among other issues have been fixed. The patches have also been re-done and partly renamed, and some of the old patches to build with SunPro have not been carried forward, as I don't have a suitable system to verify that these are still required. @ text @$NetBSD: patch-ab,v 1.2 2013/04/29 21:27:15 joerg Exp $ Sunpro has problems with a non-const const_reverse_iterator. --- lib/Menu.cc.orig 2005-01-27 17:08:22.000000000 +0000 +++ lib/Menu.cc @@@@ -33,9 +33,9 @@@@ #include #include -#include #include - +#include +#include bt::MenuStyle **bt::MenuStyle::styles = 0; @@@@ -363,7 +363,7 @@@@ unsigned int bt::Menu::insertItem(const } else { index = std::min(static_cast(index), _items.size()); it = _items.begin(); - std::advance(it, index); + std::advance(it, index); } it = _items.insert(it, item); @@@@ -514,7 +514,7 @@@@ void bt::Menu::removeItem(unsigned int i void bt::Menu::removeIndex(unsigned int index) { ItemList::iterator it = _items.begin(); - std::advance(it, index); + std::advance(it, index); if (it == _items.end()) return; // item not found removeItemByIterator(it); @@@@ -1035,7 +1035,7 @@@@ void bt::Menu::keyPressEvent(const XKeyE const ItemList::const_iterator &end = _items.end(); ItemList::const_iterator anchor = _items.begin(); if (_active_index != ~0u) { - std::advance(anchor, _active_index); + std::advance(anchor, _active_index); // go one paste the current active index if (anchor != end && !anchor->separator) @@@@ -1052,11 +1052,10 @@@@ void bt::Menu::keyPressEvent(const XKeyE } case XK_Up: { - ItemList::const_reverse_iterator anchor = _items.rbegin(); - const ItemList::const_reverse_iterator &end = _items.rend(); + ItemList::reverse_iterator anchor = _items.rbegin(); + const ItemList::reverse_iterator &end = _items.rend(); if (_active_index != ~0u) { - std::advance - (anchor, _items.size() - _active_index - 1); + std::advance(anchor, _items.size() - _active_index - 1); // go one item past the current active index if (anchor != end && !anchor->separator) @@@@ -1065,7 +1064,7 @@@@ void bt::Menu::keyPressEvent(const XKeyE if (anchor == end) anchor = _items.rbegin(); - ItemList::const_reverse_iterator it = + ItemList::reverse_iterator it = std::find_if(anchor, end, InteractMatch()); if (it != end) activateIndex(it->indx); @@@@ -1073,8 +1072,8 @@@@ void bt::Menu::keyPressEvent(const XKeyE } case XK_Home: { - const ItemList::const_iterator &end = _items.end(); - ItemList::const_iterator it = _items.begin(); + const ItemList::iterator &end = _items.end(); + ItemList::iterator it = _items.begin(); it = std::find_if(it, end, InteractMatch()); if (it != end) activateIndex(it->indx); @@@@ -1082,8 +1081,8 @@@@ void bt::Menu::keyPressEvent(const XKeyE } case XK_End: { - const ItemList::const_reverse_iterator &end = _items.rend(); - ItemList::const_reverse_iterator it = _items.rbegin(); + const ItemList::reverse_iterator &end = _items.rend(); + ItemList::reverse_iterator it = _items.rbegin(); it = std::find_if(it, end, InteractMatch()); if (it != end) activateIndex(it->indx); @ 1.2 log @Add missing includes from libstdc++'s namespace pollution. Let the compiler figure out which types std::advance is used with. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2008/01/14 02:04:41 rillig Exp $ @ 1.1 log @Fixed build failures with sunpro. @ text @d1 1 a1 1 $NetBSD$ d5 42 a46 3 --- lib/Menu.cc.orig 2005-01-27 18:08:22.000000000 +0100 +++ lib/Menu.cc 2007-12-05 16:08:11.094236000 +0100 @@@@ -1052,10 +1052,10 @@@@ void bt::Menu::keyPressEvent(const XKeyE d56 2 a57 2 + std::advance (anchor, _items.size() - _active_index - 1); d60 2 a61 1 @@@@ -1065,7 +1065,7 @@@@ void bt::Menu::keyPressEvent(const XKeyE d70 1 a70 1 @@@@ -1073,8 +1073,8 @@@@ void bt::Menu::keyPressEvent(const XKeyE d81 1 a81 1 @@@@ -1082,8 +1082,8 @@@@ void bt::Menu::keyPressEvent(const XKeyE @