[SCM] Grantlee template engine packaging branch, master, updated. debian/0.3.0-5-5-gad9e77b

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/grantlee.git;a=commitdiff;h=3360188

The following commit has been merged in the master branch:
commit 336018801376585b7257593a055cbece991766dd
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 8 10:15:27 2013 +0100

    variantIsTrue-float-fix.diff: remove applied parts
---
 debian/changelog                            |  2 ++
 debian/patches/variantIsTrue-float-fix.diff | 21 +--------------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cb3c20..be6a61b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ grantlee (0.4.0-0r1) UNRELEASED; urgency=low
     - the provided jQuery (for an example) has been updated and it is provided
       in uncompressed form (Closes: #710215)
   * Bump the cmake build dependency to 2.8.9.
+  * Update the patches:
+    - variantIsTrue-float-fix.diff: remove applied parts
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 Dec 2013 09:56:01 +0100
 
diff --git a/debian/patches/variantIsTrue-float-fix.diff b/debian/patches/variantIsTrue-float-fix.diff
index 5f288ea..649ccbe 100644
--- a/debian/patches/variantIsTrue-float-fix.diff
+++ b/debian/patches/variantIsTrue-float-fix.diff
@@ -1,30 +1,11 @@
 Author: Pino Toscano <toscano.pino at tiscali.it>
 Description: Fix variantIsTrue for float variants
- Grantlee::variantIsTrue() was not properly checking whether a QVariant
- containing a float (for example a qreal on arm and sh platforms)
- is a true value, simply because its type was not be handled in the type
- switch, and thus it was handled as string.
- Adding the QMetaType::Float case and extracting the float as such from
- the variant fixes the issue.
- .
  The test data for TestDefaultTags::testIfTag() has been expaded to
  include if-truthiness data explicitly for double and float values,
  so the they can be both tested no matter what qreal is.
-Last-Update: 2013-05-14
+Last-Update: 2013-12-08
 Forwarded: https://www.gitorious.org/grantlee/grantlee/merge_requests/10
 
---- a/templates/lib/util.cpp
-+++ b/templates/lib/util.cpp
-@@ -49,6 +49,9 @@ bool Grantlee::variantIsTrue( const QVar
-   case QVariant::Double: {
-     return ( variant.toDouble() > 0 );
-   }
-+  case QMetaType::Float: {
-+    return ( variant.toFloat() > 0 );
-+  }
-   case QMetaType::QObjectStar: {
-     QObject *obj = variant.value<QObject *>();
-     if ( !obj )
 --- a/templates/tests/testdefaulttags.cpp
 +++ b/templates/tests/testdefaulttags.cpp
 @@ -617,6 +617,20 @@ void TestDefaultTags::testIfTag_data()

-- 
Grantlee template engine packaging