diff options
| -rw-r--r-- | graphite/graphite-2.3.1_debug.patch | 13 | ||||
| -rw-r--r-- | graphite/graphite2.placementnew.patch | 10 |
2 files changed, 0 insertions, 23 deletions
diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch deleted file mode 100644 index 583fac711e2b..000000000000 --- a/graphite/graphite-2.3.1_debug.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- misc/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2008-08-21 16:24:32.000000000 +0200 -+++ misc/build/silgraphite-2.3.1/engine/src/segment/SegmentAux.cpp 2011-02-21 13:22:23.159834368 +0100 -@@ -247,7 +247,9 @@ - GlyphSetIterator::reference GlyphSetIterator::operator*() const - { - assert(m_pseg != 0); -- assert(m_vit != std::vector<int>::const_iterator()); -+ // #i116227# the check below is well meant but breaks itself when using stlport with debug facilities -+ // a valid iterator cannot be compared to an empty one in that case -+ // assert(m_vit != std::vector<int>::const_iterator()); - // in the case of a non-contiguous list - return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0]; - } diff --git a/graphite/graphite2.placementnew.patch b/graphite/graphite2.placementnew.patch deleted file mode 100644 index 47b50a24fdf9..000000000000 --- a/graphite/graphite2.placementnew.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- misc/graphite2-1.0.2/src/GlyphFace.cpp 2011-08-23 11:37:11.971472000 +0100 -+++ misc/build/graphite2-1.0.2/src/GlyphFace.cpp 2011-08-23 11:38:13.979750400 +0100 -@@ -25,6 +25,7 @@ - of the License or (at your option) any later version. - */ - #include <iterator> -+#include <new> - #include "GlyphFace.h" - #include "XmlTraceLog.h" - #include "GlyphFaceCache.h" |