debuglevels: pulled and merged DEV300.m102

graphite/graphite-2.3.1_debug.patch

+--- 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];
+ }

graphite/makefile.mk

@@ -47,7 +47,7 @@ all:
 .IF "$(ENABLE_GRAPHITE)"=="TRUE"
 TARFILE_NAME=silgraphite-2.3.1
 TARFILE_MD5=d35724900f6a4105550293686688bbb3
-PATCH_FILES=graphite-2.3.1.patch
+PATCH_FILES=graphite-2.3.1.patch graphite-2.3.1_debug.patch
 
 # convert line-endings to avoid problems when patching
 CONVERTFILES=\

moz/prj/d.lst

@@ -236,5 +236,22 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
 ..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet
 ..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib
 ..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete
-..\%__SRC%\lib\* %_DEST%\lib%_EXT%
+
+..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.a   %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT%
+
+mkdir: %_DEST%\lib%_EXT%\sqlite
+..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite
+
 ..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT%