[SCM] qtxmlpatterns packaging branch, experimental, updated. debian/5.3.2-2-4-g5b01f23

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtxmlpatterns.git;a=commitdiff;h=5b01f23

The following commit has been merged in the experimental branch:
commit 5b01f23277cfa77a24724b92fda29a60a893e380
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 16 13:16:34 2014 +0300

    Drop iterator_stack_overflow_fix.diff, applied upstream.
---
 debian/changelog                                |  1 +
 debian/patches/iterator_stack_overflow_fix.diff | 60 -------------------------
 debian/patches/series                           |  1 -
 3 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6754c73..11c6a89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtxmlpatterns-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop iterator_stack_overflow_fix.diff, applied upstream.
   * Build-depend on qtbase 5.4.0.
   * Update debian/copyright to reflect LGPLv3 addition.
 
diff --git a/debian/patches/iterator_stack_overflow_fix.diff b/debian/patches/iterator_stack_overflow_fix.diff
deleted file mode 100644
index 23de84b..0000000
--- a/debian/patches/iterator_stack_overflow_fix.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-commit d1b17740ed4d9b1e3c3ad5898bb8259969dc77df
-Author: Kamil Rojewski <kamil.rojewski at gmail.com>
-Date:   Wed Aug 13 10:38:38 2014 +0200
-
-    fix for stack overflow
-    
-    Recursion in item mapping iterator caused a stack
-    overflow for large datasets.
-    
-    Task-number: QTBUG-40153
-    Change-Id: I693798de0ecfd3a920a3dd270172ce7ec3c13d8d
-    Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki at digia.com>
-
-diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
-index 9dc3b45..3167bd7 100644
---- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
-+++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
-@@ -115,24 +115,28 @@ namespace QPatternist
-          */
-         virtual TResult next()
-         {
--            const TSource sourceItem(m_it->next());
--
--            if(qIsForwardIteratorEnd(sourceItem))
--            {
--                m_current = TResult();
--                m_position = -1;
--                return TResult();
--            }
--            else
-+            while (true)
-             {
--                m_current = m_mapper->mapToItem(sourceItem, m_context);
--                if(qIsForwardIteratorEnd(m_current))
--                    return next(); /* The mapper returned null, so continue with the next in the source. */
--                else
-+                const TSource &sourceItem = m_it->next();
-+                if (qIsForwardIteratorEnd(sourceItem))
-                 {
--                    ++m_position;
-+                    m_current = TResult();
-+                    m_position = -1;
-                     return m_current;
-                 }
-+                else
-+                {
-+                    m_current = m_mapper->mapToItem(sourceItem, m_context);
-+                    if (qIsForwardIteratorEnd(m_current))
-+                    {
-+                        continue; /* The mapper returned null, so continue with the next in the source. */
-+                    }
-+                    else
-+                    {
-+                        ++m_position;
-+                        return m_current;
-+                    }
-+                }
-             }
-         }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 75a71f3..86215b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable_network_tests.patch
-iterator_stack_overflow_fix.diff

-- 
qtxmlpatterns packaging