- Fix build with gcc42

- Add patch-gcc4

PR:		ports/115566
Submitted by:	David Yeske <dyeske@gmail.com> (maintainer)
Approved by:	sat (mentor)
Obtained from:	Gentoo Portage
This commit is contained in:
Beech Rintoul 2007-08-18 19:50:29 +00:00
parent cd9e9c467b
commit a604bb3428
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=197883
2 changed files with 40 additions and 6 deletions

View file

@ -8,8 +8,7 @@ PORTNAME= evolvotron
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MASTER_SITES= SF
MAINTAINER= dyeske@gmail.com
COMMENT= Generative software that evolves images/textures/patterns
@ -20,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_QT_VER= 3
USE_PYTHON= yes
USE_X_PREFIX= yes
USE_XORG= x11
GNU_CONFIGURE= yes
MAKE_ENV= QTDIR=${QT_PREFIX} MOC=${MOC}
@ -32,9 +31,11 @@ post-patch:
${WRKSRC}/common.pro
do-configure:
cd ${WRKSRC} && ./text_to_markup.py -html < USAGE > evolvotron.html
cd ${WRKSRC} && ./text_to_markup.py -qml -s < USAGE > libevolvotron/usage_text.h
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake -spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ VERSION_NUMBER=${PORTVERSION} main.pro
@cd ${WRKSRC} && ./text_to_markup.py -html < USAGE > evolvotron.html
@cd ${WRKSRC} && ./text_to_markup.py -qml -s < USAGE > libevolvotron/usage_text.h
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake -spec \
${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
VERSION_NUMBER=${PORTVERSION} main.pro
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/evolvotron/evolvotron ${PREFIX}/bin

View file

@ -0,0 +1,33 @@
diff -Nru evolvotron.vanilla/libevolvotron/function_node.h evolvotron/libevolvotron/function_node.h
--- libevolvotron/function_node.h 2006-09-03 17:42:30.000000000 +0200
+++ libevolvotron/function_node.h 2006-09-03 17:46:11.000000000 +0200
@@ -133,7 +133,7 @@
static const std::vector<FunctionNode*> stubargs(const MutationParameters& parameters,uint n,bool exciting=false);
//! Return a suitable starting value for a node's iteration count (assuming it's iterative).
- static const uint FunctionNode::stubiterations(const MutationParameters& parameters);
+ static const uint stubiterations(const MutationParameters& parameters);
//! Constructor given an array of params and args and an iteration count.
/*! These MUST be provided; there are no alterative constructors.
diff -Nru evolvotron.vanilla/libevolvotron/mutation_parameters.h evolvotron/libevolvotron/mutation_parameters.h
--- libevolvotron/mutation_parameters.h 2006-09-03 17:42:30.000000000 +0200
+++ libevolvotron/mutation_parameters.h 2006-09-03 17:43:19.000000000 +0200
@@ -266,7 +266,7 @@
//! This returns a new random bit of tree.
/*! Setting the "exciting" flag avoids the most basic node types, but only at the top level of the stub tree.
*/
- FunctionNode*const MutationParameters::random_function_stub(bool exciting) const;
+ FunctionNode*const random_function_stub(bool exciting) const;
void change_function_weighting(const FunctionRegistration* fn,float w);
@@ -277,7 +277,7 @@
protected:
//! Return a random function appropriately biased by current settings
- FunctionNode*const MutationParameters::random_function() const;
+ FunctionNode*const random_function() const;
//! Return a random function registration, appropriately biased by current settings
const FunctionRegistration*const random_weighted_function_registration() const;