diff options
| -rw-r--r-- | graphite/graphite-2.3.1_debug.patch | 13 | ||||
| -rw-r--r-- | libxml2/libxml2-long-path.patch | 34 | ||||
| -rwxr-xr-x[-rw-r--r--] | libxml2/makefile.mk | 4 | ||||
| -rw-r--r-- | moz/prj/d.lst | 19 | ||||
| -rw-r--r-- | python/prj/d.lst | 6 |
5 files changed, 69 insertions, 7 deletions
diff --git a/graphite/graphite-2.3.1_debug.patch b/graphite/graphite-2.3.1_debug.patch new file mode 100644 index 000000000000..583fac711e2b --- /dev/null +++ b/graphite/graphite-2.3.1_debug.patch @@ -0,0 +1,13 @@ +--- 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/libxml2/libxml2-long-path.patch b/libxml2/libxml2-long-path.patch new file mode 100644 index 000000000000..bd888d99e183 --- /dev/null +++ b/libxml2/libxml2-long-path.patch @@ -0,0 +1,34 @@ +--- misc/libxml2-2.7.6/uri.c 2009-10-02 17:28:55.000000000 +0200 ++++ misc/build/libxml2-2.7.6/uri.c 2011-02-24 13:47:19.349299000 +0100 +@@ -2479,7 +2479,16 @@ + if (path == NULL) + return(NULL); + +- /* sanitize filename starting with // so it can be used as URI */ ++#if defined(_WIN32) ++ //We must not change the backslashes to slashes if the the path starts with ++ // \\?\ ++ //Those pathes can be up to 32k characters long. ++ len = xmlStrlen(path); ++ if ((len > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) ++ return xmlStrdup((const xmlChar *) path); ++#endif ++ ++ /* sanitize filename starting with // so it can be used as URI */ + if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/')) + path++; + +--- misc/libxml2-2.7.6/xmlIO.c 2009-09-24 17:32:00.000000000 +0200 ++++ misc/build/libxml2-2.7.6/xmlIO.c 2011-02-24 13:47:26.163762000 +0100 +@@ -772,6 +772,11 @@ + + #ifdef HAVE_STAT + #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) ++ //On Windows stat and wstat do not work with long pathname, ++ //which start with '\\?\' ++ if ((xmlStrlen(path) > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) ++ return 1; ++ + if (xmlWrapStat(path, &stat_buffer) == -1) + return 0; + #else diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 3cf7988080df..9e69e67f67e2 100644..100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -56,6 +56,10 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-aix.patch \ libxml2-vc10.patch +.IF "$(OS)" == "WNT" +PATCH_FILES+= libxml2-long-path.patch +.ENDIF + # This is only for UNX environment now .IF "$(OS)"=="WNT" diff --git a/moz/prj/d.lst b/moz/prj/d.lst index dda8503f5f9d..67bd28bb164b 100644 --- a/moz/prj/d.lst +++ b/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% diff --git a/python/prj/d.lst b/python/prj/d.lst index 8ad3dd5700b0..7df9cfe62af6 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -3,9 +3,6 @@ mkdir: %_DEST%\lib%_EXT%\python\lib-old mkdir: %_DEST%\lib%_EXT%\python\lib-tk mkdir: %_DEST%\lib%_EXT%\python\site-packages mkdir: %_DEST%\lib%_EXT%\python\encodings -mkdir: %_DEST%\lib%_EXT%\python\test -mkdir: %_DEST%\lib%_EXT%\python\test\output -mkdir: %_DEST%\lib%_EXT%\python\test\data mkdir: %_DEST%\lib%_EXT%\python\email mkdir: %_DEST%\lib%_EXT%\python\email\mime mkdir: %_DEST%\lib%_EXT%\python\compiler @@ -41,9 +38,6 @@ mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib ..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\test\* %_DEST%\lib%_EXT%\python\test\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\test\output\* %_DEST%\lib%_EXT%\python\test\output\* -..\%__SRC%\misc\build\Python-2.6.1\Lib\test\data\* %_DEST%\lib%_EXT%\python\test\data\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib%_EXT%\python\email\* ..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\* |