Revision
90172
Author
cal@macports.org
Date
2012-02-24 15:21:05 -0800 (Fri, 24 Feb 2012)

Log Message

grantlee: Fix build (with Xcode 4.3 (?))

Modified Paths

Added Paths

Diff

Modified: trunk/dports/devel/grantlee/Portfile (90171 => 90172)


--- trunk/dports/devel/grantlee/Portfile	2012-02-24 23:15:00 UTC (rev 90171)
+++ trunk/dports/devel/grantlee/Portfile	2012-02-24 23:21:05 UTC (rev 90172)
@@ -19,7 +19,10 @@
                     sha256  43a6256b46a14cc12a2a6bdbe300f1c5ab52abd0cb6ba357db4580148bddd474
 
 patch.pre_args      -p1
-patchfiles          0001-Test-for-working-tr1-unordered_map.diff
+patchfiles          0001-Test-for-working-tr1-unordered_map.diff \
+                    util-path.patch \
+                    templates-i18n-with_locale.cpp.patch \
+                    templates-tests-testfilters.cpp.patch
 
 livecheck.url       http://downloads.grantlee.org/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/devel/grantlee/files/templates-i18n-with_locale.cpp.patch (0 => 90172)


--- trunk/dports/devel/grantlee/files/templates-i18n-with_locale.cpp.patch	                        (rev 0)
+++ trunk/dports/devel/grantlee/files/templates-i18n-with_locale.cpp.patch	2012-02-24 23:21:05 UTC (rev 90172)
@@ -0,0 +1,10 @@
+--- ./templates/i18n/with_locale.cpp.orig	2012-02-25 00:03:46.000000000 +0100
++++ ./templates/i18n/with_locale.cpp	2012-02-25 00:03:56.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include "with_locale.h"
+ 
+ #include "../lib/exception.h"
++#include "../lib/util.h"
+ #include "parser.h"
+ #include <util.h>
+

Added: trunk/dports/devel/grantlee/files/templates-tests-testfilters.cpp.patch (0 => 90172)


--- trunk/dports/devel/grantlee/files/templates-tests-testfilters.cpp.patch	                        (rev 0)
+++ trunk/dports/devel/grantlee/files/templates-tests-testfilters.cpp.patch	2012-02-24 23:21:05 UTC (rev 90172)
@@ -0,0 +1,11 @@
+--- ./templates/tests/testfilters.cpp.orig	2012-02-25 00:13:55.000000000 +0100
++++ ./templates/tests/testfilters.cpp	2012-02-25 00:14:10.000000000 +0100
+@@ -27,7 +27,7 @@
+ #include "template.h"
+ #include "engine.h"
+ #include "context.h"
+-#include <util.h>
++#include "../lib/util.h"
+ #include "grantlee_paths.h"
+ #include "coverageobject.h"
+

Added: trunk/dports/devel/grantlee/files/util-path.patch (0 => 90172)


--- trunk/dports/devel/grantlee/files/util-path.patch	                        (rev 0)
+++ trunk/dports/devel/grantlee/files/util-path.patch	2012-02-24 23:21:05 UTC (rev 90172)
@@ -0,0 +1,253 @@
+--- ./templates/defaultfilters/datetime.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaultfilters/datetime.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include "datetime.h"
+ 
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QDateTime>
+ 
+--- ./templates/defaultfilters/integers.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaultfilters/integers.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include "integers.h"
+ 
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ QVariant AddFilter::doFilter( const QVariant& input, const QVariant &argument, bool autoescape ) const
+ {
+--- ./templates/defaultfilters/lists.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaultfilters/lists.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "lists.h"
+ 
+ #include "metatype.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QDateTime>
+ 
+--- ./templates/defaultfilters/logic.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaultfilters/logic.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include "logic.h"
+ 
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ QVariant DefaultFilter::doFilter( const QVariant& input, const QVariant &argument, bool autoescape ) const
+ {
+--- ./templates/defaultfilters/stringfilters.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaultfilters/stringfilters.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ #include "stringfilters.h"
+ 
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QVariant>
+ 
+--- ./templates/defaulttags/autoescape.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/autoescape.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "exception.h"
+ #include "parser.h"
+ #include "template.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QFile>
+ 
+--- ./templates/defaulttags/cycle.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/cycle.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "../lib/exception.h"
+ #include "parser.h"
+ #include "rendercontext.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ static const char _namedCycleNodes[] = "_namedCycleNodes";
+ 
+--- ./templates/defaulttags/filtertag.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/filtertag.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "filterexpression.h"
+ #include "../lib/exception.h"
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ FilterNodeFactory::FilterNodeFactory()
+ {
+--- ./templates/defaulttags/firstof.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/firstof.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include "../lib/exception.h"
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ 
+ FirstOfNodeFactory::FirstOfNodeFactory()
+--- ./templates/defaulttags/ifequal.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/ifequal.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include "../lib/exception.h"
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ 
+ IfEqualNodeFactory::IfEqualNodeFactory()
+--- ./templates/defaulttags/mediafinder.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/mediafinder.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "engine.h"
+ #include "exception.h"
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QUrl>
+ 
+--- ./templates/defaulttags/range.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/range.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include "engine.h"
+ #include "exception.h"
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ 
+ RangeNodeFactory::RangeNodeFactory()
+--- ./templates/defaulttags/regroup.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/regroup.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include "../lib/exception.h"
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ RegroupNodeFactory::RegroupNodeFactory()
+ {
+--- ./templates/defaulttags/spaceless.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/defaulttags/spaceless.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "spaceless.h"
+ 
+ #include "parser.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ SpacelessNodeFactory::SpacelessNodeFactory()
+ {
+--- ./templates/i18n/l10n_money.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/i18n/l10n_money.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include "template.h"
+ #include "engine.h"
+ #include "exception.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ L10nMoneyNodeFactory::L10nMoneyNodeFactory()
+ {
+--- ./templates/loadertags/block.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/loadertags/block.cpp	2012-02-24 23:55:15.000000000 +0100
+@@ -25,7 +25,7 @@
+ #include "parser.h"
+ #include "rendercontext.h"
+ #include "template.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ const char * __loadedBlocks = "__loadedBlocks";
+ 
+--- ./templates/loadertags/extends.cpp.orig	2012-02-24 23:55:15.000000000 +0100
++++ ./templates/loadertags/extends.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -28,7 +28,7 @@
+ #include "parser.h"
+ #include "rendercontext.h"
+ #include "template.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QListIterator>
+ 
+--- ./templates/loadertags/include.cpp.orig	2012-02-24 23:55:16.000000000 +0100
++++ ./templates/loadertags/include.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include "exception.h"
+ #include "parser.h"
+ #include "template.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QtPlugin>
+ 
+--- ./templates/scriptabletags/scriptablefilter.cpp.orig	2012-02-24 23:55:16.000000000 +0100
++++ ./templates/scriptabletags/scriptablefilter.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -21,7 +21,7 @@
+ #include "scriptablefilter.h"
+ #include "scriptablesafestring.h"
+ 
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtScript/QScriptEngine>
+ 
+--- ./templates/scriptabletags/scriptablefilterexpression.cpp.orig	2012-02-24 23:55:16.000000000 +0100
++++ ./templates/scriptabletags/scriptablefilterexpression.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ #include "parser.h"
+ #include "scriptablecontext.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ using namespace Grantlee;
+ 
+--- ./templates/scriptabletags/scriptablesafestring.cpp.orig	2012-02-24 23:55:16.000000000 +0100
++++ ./templates/scriptabletags/scriptablesafestring.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include <QtScript/QScriptEngine>
+ 
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ QScriptValue markSafeFunction( QScriptContext *context,
+                                QScriptEngine *engine )
+--- ./templates/tests/testdefaulttags.cpp.orig	2012-02-24 23:55:16.000000000 +0100
++++ ./templates/tests/testdefaulttags.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -27,7 +27,7 @@
+ #include "template.h"
+ #include "engine.h"
+ #include "context.h"
+-#include "util.h"
++#include "../lib/util.h"
+ #include "grantlee_paths.h"
+ #include "metatype.h"
+ #include "coverageobject.h"
+--- ./templates/tests/testinternationalization.cpp.orig	2012-02-24 23:55:16.000000000 +0100
++++ ./templates/tests/testinternationalization.cpp	2012-02-24 23:55:16.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include "nulllocalizer_p.h"
+ #include "engine.h"
+ #include "grantlee_paths.h"
+-#include "util.h"
++#include "../lib/util.h"
+ 
+ #include <QtCore/QScopedPointer>
+ #include <QtTest/QtTest>