pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/wm/bsetroot Explicitly add base class, G++ 3.4 on Drag...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b9b35a8d1d6a
branches:  trunk
changeset: 499501:b9b35a8d1d6a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Sep 26 10:15:30 2005 +0000

description:
Explicitly add base class, G++ 3.4 on DragonFly doesn't like it
otherwise.

OKed by maintainer.

diffstat:

 wm/bsetroot/distinfo         |   3 ++-
 wm/bsetroot/patches/patch-ad |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (34 lines):

diff -r b000f377b014 -r b9b35a8d1d6a wm/bsetroot/distinfo
--- a/wm/bsetroot/distinfo      Mon Sep 26 08:09:38 2005 +0000
+++ b/wm/bsetroot/distinfo      Mon Sep 26 10:15:30 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 18:43:53 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/09/26 10:15:30 joerg Exp $
 
 SHA1 (blackbox-0.65.0.tar.gz) = 903a35526b1c29912ca500b7f8c205368e60fc38
 RMD160 (blackbox-0.65.0.tar.gz) = d88d9c5d9375274da149c77d3c63bb9c92470f26
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 134f628eef5cec1e9d7ce4b95a57c7e35a2307d9
 SHA1 (patch-ab) = 0654be7d1465d0adc331714377f17e6e6bd459da
 SHA1 (patch-ac) = 5f249a2e6d75e5d88605d6d8a1675d003b1cb52f
+SHA1 (patch-ad) = a39dee423ea041f8c72c0c9144ffda06c20242eb
diff -r b000f377b014 -r b9b35a8d1d6a wm/bsetroot/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/bsetroot/patches/patch-ad      Mon Sep 26 10:15:30 2005 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2005/09/26 10:15:30 joerg Exp $
+
+--- src/Timer.hh.orig  2005-07-07 14:15:48.000000000 +0000
++++ src/Timer.hh
+@@ -98,9 +98,9 @@ public:
+   ~_timer_queue(void) {}
+ 
+   void release(const _Tp& value) {
+-    c.erase(std::remove(c.begin(), c.end(), value), c.end());
++    _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value), _Base::c.end());
+     // after removing the item we need to make the heap again
+-    std::make_heap(c.begin(), c.end(), comp);
++    std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
+   }
+   bool empty(void) const { return _Base::empty(); }
+   size_t size(void) const { return _Base::size(); }



Home | Main Index | Thread Index | Old Index