pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/Coin Fixed a g++ error message from PR 35947....
details: https://anonhg.NetBSD.org/pkgsrc/rev/6f9425c3d7bc
branches: trunk
changeset: 526340:6f9425c3d7bc
user: rillig <rillig%pkgsrc.org@localhost>
date: Thu Mar 08 13:39:20 2007 +0000
description:
Fixed a g++ error message from PR 35947. Patch provided by Gilles
Dauphin.
While here, fixed all pkglint warnings and modernized the buildlink3.mk
file.
diffstat:
graphics/Coin/Makefile | 3 ++-
graphics/Coin/buildlink3.mk | 19 ++++++++-----------
graphics/Coin/distinfo | 3 ++-
graphics/Coin/patches/patch-ab | 26 ++++++++++++++++++++++++++
4 files changed, 38 insertions(+), 13 deletions(-)
diffs (93 lines):
diff -r 17115f4cbab9 -r 6f9425c3d7bc graphics/Coin/Makefile
--- a/graphics/Coin/Makefile Thu Mar 08 09:07:41 2007 +0000
+++ b/graphics/Coin/Makefile Thu Mar 08 13:39:20 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/02/15 14:33:43 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2007/03/08 13:39:20 rillig Exp $
DISTNAME= Coin-2.4.4
PKGREVISION= 3
@@ -10,6 +10,7 @@
COMMENT= Free, portable, Open Inventor API implementation
USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-3ds-import
CONFIGURE_ARGS+= --disable-debug
diff -r 17115f4cbab9 -r 6f9425c3d7bc graphics/Coin/buildlink3.mk
--- a/graphics/Coin/buildlink3.mk Thu Mar 08 09:07:41 2007 +0000
+++ b/graphics/Coin/buildlink3.mk Thu Mar 08 13:39:20 2007 +0000
@@ -1,22 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/02/15 14:33:44 joerg Exp $
-#
-# This Makefile fragment is included by packages that use Coin.
-#
-# This file was created automatically using createbuildlink-3.1.
-#
+# $NetBSD: buildlink3.mk,v 1.11 2007/03/08 13:39:20 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
COIN_BUILDLINK3_MK:= ${COIN_BUILDLINK3_MK}+
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
BUILDLINK_DEPENDS+= Coin
.endif
-.if !empty(COIN_BUILDLINK3_MK:M+)
-BUILDLINK_PACKAGES+= Coin
-BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Coin
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NCoin}
+BUILDLINK_PACKAGES+= Coin
+BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}Coin
+
+.if ${COIN_BUILDLINK3_MK} == "+"
BUILDLINK_API_DEPENDS.Coin+= Coin>=2.2.1
-BUILDLINK_ABI_DEPENDS.Coin?= Coin>=2.4.4nb3
+BUILDLINK_ABI_DEPENDS.Coin+= Coin>=2.4.4nb3
BUILDLINK_PKGSRCDIR.Coin?= ../../graphics/Coin
.include "../../graphics/simage/buildlink3.mk"
diff -r 17115f4cbab9 -r 6f9425c3d7bc graphics/Coin/distinfo
--- a/graphics/Coin/distinfo Thu Mar 08 09:07:41 2007 +0000
+++ b/graphics/Coin/distinfo Thu Mar 08 13:39:20 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/05/14 16:50:53 wiz Exp $
+$NetBSD: distinfo,v 1.4 2007/03/08 13:39:21 rillig Exp $
SHA1 (Coin-2.4.4.tar.gz) = 5482b8ad371484ab3194b2bef828297a1b059c33
RMD160 (Coin-2.4.4.tar.gz) = 6bdeabf38809c2cf0873c85f030fe3392dec89f3
Size (Coin-2.4.4.tar.gz) = 3784368 bytes
SHA1 (patch-aa) = 1da1a55e083d330cd21e41686a248b7d0ea552c7
+SHA1 (patch-ab) = c09e209fdece24b844e0e747ab8051bce31cdd27
diff -r 17115f4cbab9 -r 6f9425c3d7bc graphics/Coin/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/Coin/patches/patch-ab Thu Mar 08 13:39:20 2007 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-ab,v 1.1 2007/03/08 13:39:21 rillig Exp $
+
+g++ 4.1.2 says:
+SoExtSelection.cpp:351: error: extra qualification
+ 'SoExtSelectionP::SelectionState::' on member 'SelectionState'
+
+--- src/nodes/SoExtSelection.cpp.orig 2005-06-09 13:35:44.000000000 +0200
++++ src/nodes/SoExtSelection.cpp 2007-03-08 14:36:41.000000000 +0100
+@@ -348,7 +348,7 @@ public:
+ SbList<SbVec2s> coords;
+ SoTimerSensor * updatetimer;
+
+- SelectionState::SelectionState(SoExtSelection * t)
++ SelectionState(SoExtSelection * t)
+ {
+ this->updatetimer = new SoTimerSensor(&SoExtSelectionP::timercallback, t);
+ this->updatetimer->setBaseTime(SbTime::zero());
+@@ -356,7 +356,7 @@ public:
+ this->reset();
+ }
+
+- SelectionState::~SelectionState()
++ ~SelectionState()
+ {
+ delete this->updatetimer;
+ }
Home |
Main Index |
Thread Index |
Old Index