[100537] trunk/dports/devel/grantlee

[ryandesign at macports.org]

Revision: 100537
          https://trac.macports.org/changeset/100537
Author:   ryandesign at macports.org
Date:     2012-12-14 17:29:05 -0800 (Fri, 14 Dec 2012)
Log Message:
-----------
grantlee: update to 0.3.0

Modified Paths:
--------------
    trunk/dports/devel/grantlee/Portfile
    trunk/dports/devel/grantlee/files/util-path.patch

Removed Paths:
-------------
    trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff

Modified: trunk/dports/devel/grantlee/Portfile
===================================================================
--- trunk/dports/devel/grantlee/Portfile	2012-12-15 01:27:27 UTC (rev 100536)
+++ trunk/dports/devel/grantlee/Portfile	2012-12-15 01:29:05 UTC (rev 100537)
@@ -5,7 +5,7 @@
 PortGroup           kde4 1.1
 
 name                grantlee
-version             0.2.0
+version             0.3.0
 categories          devel kde kde4
 maintainers         nomaintainer
 description         string template engine based on the Django template system
@@ -15,12 +15,11 @@
 homepage            http://www.grantlee.org/
 master_sites        http://downloads.grantlee.org/
 
-checksums           rmd160  14ac226fcfff07cef7bc43ef971f1a819284a7ec \
-                    sha256  43a6256b46a14cc12a2a6bdbe300f1c5ab52abd0cb6ba357db4580148bddd474
+checksums           rmd160  ac66592b4ecae569e60fc2aee1cda754eb624e3d \
+                    sha256  fb7ebcc9beb5f74077a5e2fb4e9893d280dd3346e7f5f58155f0dcc9a2e25f30
 
 patch.pre_args      -p1
-patchfiles          0001-Test-for-working-tr1-unordered_map.diff \
-                    util-path.patch \
+patchfiles          util-path.patch \
                     templates-i18n-with_locale.cpp.patch \
                     templates-tests-testfilters.cpp.patch
 

Deleted: trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff
===================================================================
--- trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff	2012-12-15 01:27:27 UTC (rev 100536)
+++ trunk/dports/devel/grantlee/files/0001-Test-for-working-tr1-unordered_map.diff	2012-12-15 01:29:05 UTC (rev 100537)
@@ -1,42 +0,0 @@
-From 41a771b7470bb61ca8fa98f1428b43b5e06592ba Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <steveire at gmail.com>
-Date: Sun, 6 Nov 2011 17:49:37 +0100
-Subject: [PATCH] Test for working tr1/unordered_map.
-
-On Apple Leopard, the assignment operator and copy constructor don't work
-for that class.
----
- templates/tests/CMakeLists.txt |   17 ++++++++++++++++-
- 1 files changed, 16 insertions(+), 1 deletions(-)
-
-diff --git a/templates/tests/CMakeLists.txt b/templates/tests/CMakeLists.txt
-index caab003..d2e37d2 100644
---- a/templates/tests/CMakeLists.txt
-+++ b/templates/tests/CMakeLists.txt
-@@ -12,7 +12,22 @@ check_include_file_cxx("tr1/unordered_map" HAVE_TR1_UNORDERED_MAP)
- check_include_file_cxx("tr1/array" HAVE_TR1_ARRAY)
- check_include_file_cxx("tr1/memory" HAVE_TR1_MEMORY)
- 
--if(NOT HAVE_TR1_UNORDERED_MAP OR NOT HAVE_TR1_ARRAY OR NOT HAVE_TR1_MEMORY)
-+check_cxx_source_compiles("
-+
-+#include <tr1/unordered_map>
-+
-+typedef std::tr1::unordered_map<int, int> std_unordered_mapintint;
-+
-+int main(int, char **)
-+{
-+  std_unordered_mapintint m1;
-+  std_unordered_mapintint m2(m1);
-+  return 0;
-+}
-+
-+" HAVE_WORKING_TR1_UNORDERED_MAP)
-+
-+if(NOT HAVE_TR1_UNORDERED_MAP OR NOT HAVE_TR1_ARRAY OR NOT HAVE_TR1_MEMORY OR NOT HAVE_WORKING_TR1_UNORDERED_MAP)
-   message(STATUS "Not enabling TR1 container tests")
-   set(GRANTLEE_NO_TR1 True)
- else()
--- 
-1.7.5.4
-

Modified: trunk/dports/devel/grantlee/files/util-path.patch
===================================================================
--- trunk/dports/devel/grantlee/files/util-path.patch	2012-12-15 01:27:27 UTC (rev 100536)
+++ trunk/dports/devel/grantlee/files/util-path.patch	2012-12-15 01:29:05 UTC (rev 100537)
@@ -20,17 +20,17 @@
  
  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
+--- ./templates/defaultfilters/lists.cpp.orig	2012-12-14 14:28:14.000000000 -0600
++++ ./templates/defaultfilters/lists.cpp	2012-12-14 14:28:56.000000000 -0600
 @@ -21,7 +21,7 @@
  #include "lists.h"
  
  #include "metatype.h"
 -#include "util.h"
 +#include "../lib/util.h"
+ #include "variable.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 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121214/6a7f3ad8/attachment-0001.html>