[Libreoffice-commits] .: Branch 'feature/gnumake4' - 354 commits - berkeleydb/db-4.7.25.patch berkeleydb/db-aix.patch berkeleydb/makefile.mk berkeleydb/prj boost/aliasing.patch boost/boost_1_39_0.patch boost/boost_1_44_0.patch boost/boost.4713.warnings.patch boost/boost.gcc47679.patch boost/makefile.mk boost/prj boost/unordered_map-doesnt-support-cp-ctor.patch cairo/cairo cairo/cairo-1.8.0.patch cairo/pixman cairo/pixman-0.12.0.patch cairo/prj curl/curl-7.19.7.patch curl/curl-aix.patch curl/makefile.mk curl/prj dictionaries/af_ZA dictionaries/br_FR dictionaries/ca dictionaries/cs_CZ dictionaries/da_DK dictionaries/de_AT dictionaries/de_CH dictionaries/de_DE dictionaries/en dictionaries/es_ES dictionaries/et_EE dictionaries/fr_FR dictionaries/he_IL dictionaries/hr_HR dictionaries/hu_HU dictionaries/it_IT dictionaries/ku_TR dictionaries/lt_LT dictionaries/ne_NP dictionaries/nl_NL dictionaries/no dictionaries/oc_FR dictionaries/pl_PL dictionaries/prj dictionaries/pt_BR dictionaries/ro dictio naries/ru_RU dictionaries/sk_SK dictionaries/sl_SI dictionaries/source dictionaries/sr dictionaries/sw_TZ dictionaries/th_TH dictionaries/uk_UA dictionaries/util dictionaries/zu_ZA expat/expat-2.0.1.patch expat/makefile.mk expat/prj gdk-pixbuf/gdk-pixbuf-2.23.0.patch gdk-pixbuf/makefile.mk gdk-pixbuf/prj gettext/gettext-0.18.1.1.patch gettext/makefile.mk gettext/prj .gitignore glib/glib-2.28.1.noise.patch glib/glib-2.28.1.patch glib/glib-2.28.1-win32.patch glib/makefile.mk glib/prj graphite/graphite2-0.9.2.patch graphite/graphite-2.3.1.patch graphite/graphite-2.3.1.patch.mingw graphite/graphite_make.patch graphite/makefile.mk graphite/prj hunspell/hunspell-1.2.8-thesfix.patch hunspell/hunspell-android.patch hunspell/hunspell-mingw.patch hunspell/hunspell-solaris.patch hunspell/hunspell-stacksmash.patch hunspell/hunspell-static.patch hunspell/hunspell-wntconfig.patch hunspell/makefile.mk hunspell/prj icu/createmak.cfg icu/icu4c-4_0_1-src.patch icu/icu4c-4_4_2-wchar_t.patch ic u/icu4c.8320.freeserif.crash.patch icu/icu4c-aix.patch icu/icu4c-build.patch icu/icu4c-escapespace.patch icu/icu4c-rpath.patch icu/icu4c-warnings.patch icu/icuversion.mk icu/makefile.mk icu/prj jpeg/prj libcroco/makefile.mk libcroco/prj libgsf/libgsf-1.14.19.patch libgsf/makefile.mk libgsf/prj libpng/libpng-1.5.1.patch libpng/prj librsvg/librsvg-2.32.1.patch librsvg/makefile.mk librsvg/prj libxml2/libxml2-aix.patch libxml2/libxml2-configure.patch libxml2/libxml2-vc10.patch libxml2/makefile.mk libxml2/prj libxslt/dummy libxslt/libxslt-aix.patch libxslt/libxslt-configure.patch libxslt/libxslt-vc10.patch libxslt/makefile.mk libxslt/prj more_fonts/fonts more_fonts/prj moz/extractfiles.mk moz/makefile.mk moz/patches moz/prj moz/seamonkey-source-1.1.14.patch neon/neon.patch neon/prj nss/makefile.mk nss/nss.aix.patch nss/nss_macosx.patch nss/nss.patch nss/prj pango/makefile.mk pango/pango-1.28.3.patch pango/pango-1.28.3-win32.patch pango/prj python/makefile.mk python/prj python/Pyt hon-2.6.1-arch_i386.patch python/Python-2.6.1-arch_ppc.patch python/Python-2.6.1-dylib_dynload.patch python/Python-2.6.1-nohardlink.patch python/Python-2.6.1.patch python/Python-2.6.1-py8067.patch python/Python-2.6.1-urllib.patch python/Python-2.6.1-vc10.patch python/Python-aix.patch python/pyversion.mk saxon/prj stax/prj zlib/prj zlib/zlib-1.1.4.patch zlib/zlib-1.2.3.patch zlib/zlib-valgrind.patch

• Previous message: [Libreoffice-commits] .: Branch 'feature/gnumake4' - 189 commits - apache-commons/java apache-commons/prj ct2n/ConvertTextToNumber-1.3.2-no-license.patch ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch ct2n/delzip ct2n/makefile.mk ct2n/prj .gitignore jfreereport/java jfreereport/patches jfreereport/prj languagetool/JLanguageTool-1.0.0.patch languagetool/makefile.mk languagetool/prj migrationanalysis/src mysqlc/prj mysqlc/source nlpsolver/locale nlpsolver/makefile.mk nlpsolver/nlpsolver-0.9.patch nlpsolver/prj reportbuilder/java reportbuilder/prj reportbuilder/registry reportbuilder/util sdext/inc sdext/prj sdext/source swext/mediawiki swext/prj tomcat/makefile.mk tomcat/prj xpdf/prj
• Next message: [Libreoffice-commits] .: Branch 'feature/gnumake4' - 122 commits - .gitignore packimages/pack packimages/prj postprocess/checkdeliver postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/rebase
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

 .gitignore                                                                       |   20 
 berkeleydb/db-4.7.25.patch                                                       |   11 
 berkeleydb/db-aix.patch                                                          |  205 
 berkeleydb/makefile.mk                                                           |   31 
 berkeleydb/prj/build.lst                                                         |    2 
 berkeleydb/prj/d.lst                                                             |   19 
 boost/aliasing.patch                                                             |   10 
 boost/boost.4713.warnings.patch                                                  |  881 
 boost/boost.gcc47679.patch                                                       |   61 
 boost/boost_1_39_0.patch                                                         |  287 
 boost/boost_1_44_0.patch                                                         |   25 
 boost/makefile.mk                                                                |   38 
 boost/prj/build.lst                                                              |    2 
 boost/prj/d.lst                                                                  | 1517 
 boost/unordered_map-doesnt-support-cp-ctor.patch                                 |   92 
 cairo/cairo-1.8.0.patch                                                          |   34 
 cairo/cairo/makefile.mk                                                          |   38 
 cairo/pixman-0.12.0.patch                                                        |   22 
 cairo/pixman/makefile.mk                                                         |   24 
 cairo/prj/build.lst                                                              |    2 
 cairo/prj/d.lst                                                                  |   28 
 curl/curl-7.19.7.patch                                                           |   22 
 curl/curl-aix.patch                                                              |   21 
 curl/makefile.mk                                                                 |   50 
 curl/prj/d.lst                                                                   |   24 
 dev/null                                                                         |binary
 dictionaries/br_FR/LICENSES-en.txt                                               |    2 
 dictionaries/br_FR/br_FR.aff                                                     |   76 
 dictionaries/br_FR/br_FR.dic                                                     |463628 ++++++++++
 dictionaries/br_FR/description.xml                                               |   20 
 dictionaries/br_FR/dictionaries.xcu                                              |   21 
 dictionaries/br_FR/makefile.mk                                                   |   75 
 dictionaries/br_FR/manifest.xml                                                  |    6 
 dictionaries/br_FR/package-description.txt                                       |    4 
 dictionaries/ca/makefile.mk                                                      |   11 
 dictionaries/ca/th_ca_ES_v3.idx                                                  | 8158 
 dictionaries/cs_CZ/makefile.mk                                                   |   17 
 dictionaries/cs_CZ/th_cs_CZ_v2.dat                                               |27699 
 dictionaries/da_DK/README_th_da_DK.txt                                           |   20 
 dictionaries/da_DK/desc_da_DK.txt                                                |    3 
 dictionaries/da_DK/desc_en_US.txt                                                |    3 
 dictionaries/da_DK/description.xml                                               |   10 
 dictionaries/da_DK/dictionaries.xcu                                              |    1 
 dictionaries/da_DK/help/da/help.tree                                             |    8 
 dictionaries/da_DK/help/da/org.openoffice.da.hunspell.dictionaries/Trold.png     |binary
 dictionaries/da_DK/help/da/org.openoffice.da.hunspell.dictionaries/page1.xhp     |   62 
 dictionaries/da_DK/makefile.mk                                                   |   24 
 dictionaries/da_DK/manifest.xml                                                  |    4 
 dictionaries/da_DK/th_da_DK.dat                                                  |    1 
 dictionaries/de_AT/COPYING_GPLv3                                                 |  674 
 dictionaries/de_AT/README_extension_owner.txt                                    |   17 
 dictionaries/de_AT/README_hyph_de_AT.txt                                         |   47 
 dictionaries/de_AT/README_th_de_AT_v2.txt                                        |    4 
 dictionaries/de_AT/de_AT_frami.aff                                               |   10 
 dictionaries/de_AT/de_AT_frami.dic                                               |14355 
 dictionaries/de_AT/description.xml                                               |    2 
 dictionaries/de_AT/makefile.mk                                                   |   14 
 dictionaries/de_AT/th_de_AT_v2.dat                                               |32970 
 dictionaries/de_AT/th_de_AT_v2.idx                                               |59160 -
 dictionaries/de_CH/COPYING_GPLv3                                                 |  674 
 dictionaries/de_CH/README_extension_owner.txt                                    |   76 
 dictionaries/de_CH/README_hyph_de_CH.txt                                         |   45 
 dictionaries/de_CH/README_th_de_CH_v2.txt                                        |    2 
 dictionaries/de_CH/de_CH_frami.aff                                               |   10 
 dictionaries/de_CH/de_CH_frami.dic                                               |14338 
 dictionaries/de_CH/description.xml                                               |    2 
 dictionaries/de_CH/makefile.mk                                                   |   13 
 dictionaries/de_CH/th_de_CH_v2.dat                                               |18391 
 dictionaries/de_CH/th_de_CH_v2.idx                                               |59204 -
 dictionaries/de_DE/COPYING_GPLv2                                                 |  340 
 dictionaries/de_DE/COPYING_GPLv2.txt                                             |  340 
 dictionaries/de_DE/COPYING_GPLv3                                                 |  674 
 dictionaries/de_DE/README_extension_owner.txt                                    |   75 
 dictionaries/de_DE/README_hyph_de_DE.txt                                         |   47 
 dictionaries/de_DE/README_th_de_DE_v2.txt                                        |    4 
 dictionaries/de_DE/de_DE_frami.aff                                               |   10 
 dictionaries/de_DE/de_DE_frami.dic                                               |14330 
 dictionaries/de_DE/description.xml                                               |    2 
 dictionaries/de_DE/makefile.mk                                                   |   19 
 dictionaries/de_DE/th_de_DE_v2.dat                                               |18498 
 dictionaries/de_DE/th_de_DE_v2.idx                                               |59160 -
 dictionaries/en/README_en_AU.txt                                                 |    6 
 dictionaries/en/changelog.txt                                                    |   95 
 dictionaries/en/dictionaries.xcu                                                 |   10 
 dictionaries/en/makefile.mk                                                      |   14 
 dictionaries/en/th_en_US_v2.idx                                                  |145868 ---
 dictionaries/fr_FR/description.xml                                               |    4 
 dictionaries/fr_FR/makefile.mk                                                   |   14 
 dictionaries/fr_FR/thes_fr.idx                                                   |36207 
 dictionaries/hr_HR/README_hr_HR.txt                                              |    6 
 dictionaries/hr_HR/README_hyph_hr_HR.txt                                         |   82 
 dictionaries/hr_HR/description.xml                                               |   13 
 dictionaries/hr_HR/dictionaries.xcu                                              |   29 
 dictionaries/hr_HR/hr_HR.aff                                                     |  106 
 dictionaries/hr_HR/hr_HR.dic                                                     |215957 ++++
 dictionaries/hr_HR/hyph_hr_HR.dic                                                | 1597 
 dictionaries/hr_HR/makefile.mk                                                   |   75 
 dictionaries/hr_HR/manifest.xml                                                  |    6 
 dictionaries/hu_HU/description.xml                                               |    2 
 dictionaries/hu_HU/help/hu/help.tree                                             |    8 
 dictionaries/hu_HU/help/hu/org.openoffice.hu.hunspell.dictionaries/fsfhu.png     |binary
 dictionaries/hu_HU/help/hu/org.openoffice.hu.hunspell.dictionaries/page1.xhp     |   42 
 dictionaries/hu_HU/help/hu/org.openoffice.hu.hunspell.dictionaries/szinonima.png |binary
 dictionaries/hu_HU/hu_HU.dic                                                     |    3 
 dictionaries/hu_HU/makefile.mk                                                   |   15 
 dictionaries/hu_HU/manifest.xml                                                  |    4 
 dictionaries/hu_HU/th_hu_HU_v2.dat                                               |    2 
 dictionaries/hu_HU/th_hu_HU_v2.idx                                               |21692 
 dictionaries/it_IT/description.xml                                               |    4 
 dictionaries/it_IT/makefile.mk                                                   |   14 
 dictionaries/it_IT/th_it_IT_v2.idx                                               |25853 
 dictionaries/ku_TR/makefile.mk                                                   |    4 
 dictionaries/ne_NP/makefile.mk                                                   |   16 
 dictionaries/ne_NP/th_ne_NP_v2.dat                                               |11858 
 dictionaries/nl_NL/desc_nl_NL.txt                                                |    2 
 dictionaries/no/makefile.mk                                                      |   17 
 dictionaries/no/th_nb_NO_v2.idx                                                  |13033 
 dictionaries/no/th_nn_NO_v2.idx                                                  |   36 
 dictionaries/oc_FR/LICENCES-fr.txt                                               |   20 
 dictionaries/oc_FR/LICENSES-en.txt                                               |   19 
 dictionaries/oc_FR/README_oc_FR.txt                                              |   47 
 dictionaries/oc_FR/description.xml                                               |   16 
 dictionaries/oc_FR/dictionaries.xcu                                              |   20 
 dictionaries/oc_FR/makefile.mk                                                   |   75 
 dictionaries/oc_FR/manifest.xml                                                  |    6 
 dictionaries/oc_FR/oc_FR.aff                                                     |  763 
 dictionaries/oc_FR/oc_FR.dic                                                     |56579 +
 dictionaries/pl_PL/description.xml                                               |    5 
 dictionaries/pl_PL/makefile.mk                                                   |   14 
 dictionaries/pl_PL/th_pl_PL_v2.idx                                               |33849 
 dictionaries/prj/build.lst                                                       |   71 
 dictionaries/prj/d.lst                                                           |    4 
 dictionaries/prj/tests.mk                                                        |   28 
 dictionaries/pt_BR/README_en.TXT                                                 |   59 
 dictionaries/pt_BR/README_en.txt                                                 |   59 
 dictionaries/pt_BR/README_hyph_pt_BR.TXT                                         |  720 
 dictionaries/pt_BR/README_hyph_pt_BR.txt                                         |  743 
 dictionaries/pt_BR/README_pt_BR.txt                                              |   82 
 dictionaries/pt_BR/description.xml                                               |    2 
 dictionaries/pt_BR/hyph_pt_BR.dic                                                |   17 
 dictionaries/pt_BR/makefile.mk                                                   |    4 
 dictionaries/pt_BR/pt_BR.aff                                                     |   16 
 dictionaries/pt_BR/pt_BR.dic                                                     | 1177 
 dictionaries/ro/makefile.mk                                                      |   13 
 dictionaries/ro/th_ro_RO_v2.idx                                                  |45417 
 dictionaries/ru_RU/README_ru_RU.txt                                              |   28 
 dictionaries/ru_RU/description.xml                                               |    5 
 dictionaries/ru_RU/dictionaries.xcu                                              |   11 
 dictionaries/ru_RU/makefile.mk                                                   |   21 
 dictionaries/ru_RU/ru_RU.aff                                                     | 1632 
 dictionaries/ru_RU/ru_RU.dic                                                     |146270 +++
 dictionaries/ru_RU/th_ru_RU_v2.dat                                               |21639 
 dictionaries/sk_SK/description.xml                                               |    4 
 dictionaries/sk_SK/makefile.mk                                                   |   14 
 dictionaries/sk_SK/th_sk_SK_v2.idx                                               |12523 
 dictionaries/sl_SI/README_th_sl_SI.txt                                           |    4 
 dictionaries/sl_SI/description.xml                                               |    6 
 dictionaries/sl_SI/makefile.mk                                                   |   11 
 dictionaries/sl_SI/th_sl_SI_v2.dat                                               | 3117 
 dictionaries/sl_SI/th_sl_SI_v2.idx                                               |14046 
 dictionaries/source/idxdict.cpp                                                  |  104 
 dictionaries/source/makefile.mk                                                  |   16 
 dictionaries/uk_UA/README_hyph_uk_UA.txt                                         |   21 
 dictionaries/uk_UA/README_th_uk_UA.txt                                           |   10 
 dictionaries/uk_UA/README_uk_UA.txt                                              |   27 
 dictionaries/uk_UA/description.xml                                               |   15 
 dictionaries/uk_UA/dictionaries.xcu                                              |   40 
 dictionaries/uk_UA/hyph_uk_UA.dic                                                | 1654 
 dictionaries/uk_UA/makefile.mk                                                   |   83 
 dictionaries/uk_UA/manifest.xml                                                  |    5 
 dictionaries/uk_UA/th_uk_UA.dat                                                  |24966 
 dictionaries/uk_UA/uk_UA.aff                                                     | 4495 
 dictionaries/uk_UA/uk_UA.dic                                                     |111403 ++
 dictionaries/util/th_check.pl                                                    |  105 
 expat/expat-2.0.1.patch                                                          |   11 
 expat/makefile.mk                                                                |    4 
 expat/prj/d.lst                                                                  |   28 
 gdk-pixbuf/gdk-pixbuf-2.23.0.patch                                               |  153 
 gdk-pixbuf/makefile.mk                                                           |   82 
 gdk-pixbuf/prj/d.lst                                                             |   37 
 gettext/gettext-0.18.1.1.patch                                                   | 1309 
 gettext/makefile.mk                                                              |   87 
 gettext/prj/d.lst                                                                |   61 
 glib/glib-2.28.1-win32.patch                                                     |   90 
 glib/glib-2.28.1.noise.patch                                                     |   12 
 glib/glib-2.28.1.patch                                                           |  112 
 glib/makefile.mk                                                                 |  296 
 glib/prj/d.lst                                                                   |  465 
 graphite/graphite-2.3.1.patch                                                    | 2396 
 graphite/graphite-2.3.1.patch.mingw                                              |  159 
 graphite/graphite2-0.9.2.patch                                                   |  463 
 graphite/graphite_make.patch                                                     |   59 
 graphite/makefile.mk                                                             |  136 
 graphite/prj/build.lst                                                           |    2 
 graphite/prj/d.lst                                                               |   23 
 hunspell/hunspell-1.2.8-thesfix.patch                                            |   28 
 hunspell/hunspell-android.patch                                                  |   33 
 hunspell/hunspell-mingw.patch                                                    |    4 
 hunspell/hunspell-solaris.patch                                                  |    4 
 hunspell/hunspell-stacksmash.patch                                               |   28 
 hunspell/hunspell-static.patch                                                   |   11 
 hunspell/hunspell-wntconfig.patch                                                |    4 
 hunspell/makefile.mk                                                             |   26 
 hunspell/prj/d.lst                                                               |    9 
 icu/createmak.cfg                                                                |   14 
 icu/icu4c-4_0_1-src.patch                                                        |  247 
 icu/icu4c-4_4_2-wchar_t.patch                                                    | 2553 
 icu/icu4c-aix.patch                                                              |  113 
 icu/icu4c-build.patch                                                            |  212 
 icu/icu4c-escapespace.patch                                                      |   11 
 icu/icu4c-rpath.patch                                                            |   21 
 icu/icu4c-warnings.patch                                                         |   21 
 icu/icu4c.8320.freeserif.crash.patch                                             |   62 
 icu/icuversion.mk                                                                |    4 
 icu/makefile.mk                                                                  |   97 
 icu/prj/d.lst                                                                    |   57 
 jpeg/prj/d.lst                                                                   |   20 
 libcroco/makefile.mk                                                             |   81 
 libcroco/prj/build.lst                                                           |    2 
 libcroco/prj/d.lst                                                               |   72 
 libgsf/libgsf-1.14.19.patch                                                      |   20 
 libgsf/makefile.mk                                                               |  124 
 libgsf/prj/d.lst                                                                 |  110 
 libpng/libpng-1.5.1.patch                                                        |   14 
 libpng/prj/d.lst                                                                 |   16 
 librsvg/librsvg-2.32.1.patch                                                     |   21 
 librsvg/makefile.mk                                                              |   29 
 librsvg/prj/build.lst                                                            |    2 
 librsvg/prj/d.lst                                                                |   22 
 libxml2/libxml2-aix.patch                                                        |   21 
 libxml2/libxml2-configure.patch                                                  |   25 
 libxml2/libxml2-vc10.patch                                                       |   15 
 libxml2/makefile.mk                                                              |   25 
 libxml2/prj/d.lst                                                                |   19 
 libxslt/dummy/bin/xml2-config                                                    |   17 
 libxslt/libxslt-aix.patch                                                        |   21 
 libxslt/libxslt-configure.patch                                                  |   11 
 libxslt/libxslt-vc10.patch                                                       |   15 
 libxslt/makefile.mk                                                              |   30 
 libxslt/prj/d.lst                                                                |   23 
 more_fonts/fonts/ttf_amt/makefile.mk                                             |   59 
 more_fonts/fonts/ttf_linlibertineg/makefile.mk                                   |   60 
 more_fonts/prj/build.lst                                                         |    3 
 more_fonts/prj/d.lst                                                             |   20 
 moz/extractfiles.mk                                                              |    2 
 moz/makefile.mk                                                                  |   24 
 moz/patches/aix_build_fix.patch                                                  |  203 
 moz/patches/libpr0n_build_fix.patch                                              |   14 
 moz/prj/build.lst                                                                |    2 
 moz/prj/d.lst                                                                    |  506 
 moz/seamonkey-source-1.1.14.patch                                                |    8 
 neon/neon.patch                                                                  |   10 
 neon/prj/build.lst                                                               |    2 
 neon/prj/d.lst                                                                   |    8 
 nss/makefile.mk                                                                  |   11 
 nss/nss.aix.patch                                                                |  143 
 nss/nss.patch                                                                    |   36 
 nss/nss_macosx.patch                                                             |    4 
 nss/prj/build.lst                                                                |    2 
 nss/prj/d.lst                                                                    |   52 
 pango/makefile.mk                                                                |   30 
 pango/pango-1.28.3-win32.patch                                                   |   19 
 pango/pango-1.28.3.patch                                                         |   34 
 pango/prj/d.lst                                                                  |   80 
 python/Python-2.6.1-arch_i386.patch                                              |   11 
 python/Python-2.6.1-arch_ppc.patch                                               |   11 
 python/Python-2.6.1-dylib_dynload.patch                                          |   14 
 python/Python-2.6.1-nohardlink.patch                                             |    6 
 python/Python-2.6.1-py8067.patch                                                 |   12 
 python/Python-2.6.1-urllib.patch                                                 |   93 
 python/Python-2.6.1-vc10.patch                                                   | 6367 
 python/Python-2.6.1.patch                                                        |  521 
 python/Python-aix.patch                                                          |  151 
 python/makefile.mk                                                               |  136 
 python/prj/build.lst                                                             |    2 
 python/prj/d.lst                                                                 |  250 
 python/pyversion.mk                                                              |    9 
 saxon/prj/d.lst                                                                  |    2 
 stax/prj/d.lst                                                                   |    2 
 zlib/prj/d.lst                                                                   |   22 
 zlib/zlib-1.1.4.patch                                                            | 3244 
 zlib/zlib-1.2.3.patch                                                            |  103 
 zlib/zlib-valgrind.patch                                                         |   78 
 283 files changed, 1185061 insertions(+), 589224 deletions(-)

New commits:
commit ffb3d670f43ae49b956a7bfc406d40bb0a117b28
Merge: 2d511b9... a97482c...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sun Jun 19 12:03:35 2011 +0200

    Merge branch 'master' into feature/gnumake4
    
    Conflicts:
    	cairo/cairo-1.8.0.patch
    	cairo/prj/build.lst
    	gdk-pixbuf/makefile.mk
    	libcroco/makefile.mk

diff --cc cairo/prj/build.lst
index c59a5c4,5827e76..a4d0da4
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@@ -1,4 -1,4 +1,4 @@@
- lcairo	cairo	: ZLIB:zlib soltools stlport NULL
 -lcairo	cairo	: ZLIB:zlib libpng soltools NULL
++lcairo	cairo	: ZLIB:zlib libpng soltools stlport NULL
  lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
  lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
  lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL
diff --cc expat/expat-2.0.1.patch
index 3ff1e2d,6c09d34..f168297
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@@ -1,6 -1,17 +1,17 @@@
+ --- misc/expat-2.0.1/conftools/config.sub
+ +++ misc/build/expat-2.0.1/conftools/config.sub
+ @@ -1272,7 +1272,7 @@
+  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ -	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ +	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+  	      | -chorusos* | -chorusrdb* \
+  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  --- misc/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
  +++ misc/build/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 -@@ -1 +1,89 @@
 +@@ -1 +1,90 @@
  -dummy
  +#*************************************************************************
  +#
diff --cc gdk-pixbuf/makefile.mk
index d44f1a0,aa58133..74f3201
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@@ -52,15 -52,21 +52,23 @@@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b
  PATCH_FILES=gdk-pixbuf-2.23.0.patch
  CONFIGURE_DIR=
  CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
+                 BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                  BASE_DEPENDENCIES_LIBS=" " \
 +		GDK_PIXBUF_XLIB_DEP_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
 +		GDK_PIXBUF_XLIB_DEP_LIBS=" " \
-                  .$/configure \
-                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \
-                  LDFLAGS="-L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0 -lintl" \
-                  --disable-glibtest --without-libtiff --without-libjpeg
+                  ./configure --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
+                  CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/libpng -I$(SOLARINCDIR)/external/jpeg" \
+                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
+                  LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
+                  --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+                  --disable-nls \
+                  --disable-modules \
+                  --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
+                  --disable-glibtest --without-libtiff --without-libjasper
+ 
+ .IF "$(CROSS_COMPILING)"=="YES"
+ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+ .ENDIF
  
  BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
  BUILD_DIR=$(CONFIGURE_DIR)
diff --cc libcroco/makefile.mk
index 8f80daf,4789c07..d405f95
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@@ -51,18 -51,18 +51,19 @@@ PATCH_FILES
  CONFIGURE_DIR=
  
  .IF "$(OS)"=="MACOSX"
- CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                  .$/configure \
-                  --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
-                  LDFLAGS="-L$(SOLARLIBDIR)" \
-                  GLIB2_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+ CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+                  CPPFLAGS="$(EXTRA_CDEFS)" \
+                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
+                  LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file, at loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \
+                  GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                   GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
 -                 LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"
 +                 LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \
 +                 LIBXML2_LIBS="$(LIBXML_LIBS)"
  
- CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-                 
+ .IF "$(CROSS_COMPILING)"=="YES"
+ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+ .ENDIF
+ 
  BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
               $(GNUMAKE)
  BUILD_DIR=$(CONFIGURE_DIR)
commit a97482c6505524d1d1ef00ada8f59ca3ab35081e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 15:44:11 2011 +0200

    remove noise from configure on Mac, use --disable-dependency-tracking

diff --git a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
index 726ca89..fccd992 100644
--- a/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+++ b/gdk-pixbuf/gdk-pixbuf-2.23.0.patch
@@ -1,5 +1,5 @@
 --- misc/gdk-pixbuf-2.23.0/configure	2010-12-23 15:18:11.000000000 +0100
-+++ misc/build/gdk-pixbuf-2.23.0/configure	2011-02-28 18:49:26.000000000 +0100
++++ misc/build/gdk-pixbuf-2.23.0/configure	2011-06-14 15:20:05.000000000 +0200
 @@ -16839,7 +16839,7 @@
  
  
@@ -9,7 +9,7 @@
  
  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  	if test -n "$ac_tool_prefix"; then
-@@ -17158,7 +17158,11 @@
+@@ -17158,14 +17158,18 @@
  
  
    rm -f conf.glibtest
@@ -21,7 +21,58 @@
 +fi
  
  # See if it's safe to turn G_DISABLE_DEPRECATED on.
- GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
+-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
++#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
++#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
++#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+   CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
+-fi
++#fi
+ 
+ CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
+ 
+@@ -17801,7 +17805,7 @@
+     for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $l" >&5
+ $as_echo_n "checking for $l... " >&6; }
+-      if $PKG_CONFIG --exists $l ; then
++      if false ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+         PNG='png'
+@@ -18206,8 +18210,8 @@
+ $as_echo_n "checking if gio can sniff png... " >&6; }
+   gtk_save_LIBS="$LIBS"
+   gtk_save_CFLAGS="$CFLAGS"
+-  LIBS="`$PKG_CONFIG --libs gio-2.0`"
+-  CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
++  #LIBS="`$PKG_CONFIG --libs gio-2.0`"
++  #CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
+   if test "$cross_compiling" = yes; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+@@ -18622,8 +18626,8 @@
+ GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
+ GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
+ GDK_PIXBUF_EXTRA_CFLAGS=
+-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
+-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
++GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS"
++GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS"
+ 
+ 
+ 
+@@ -18640,7 +18644,7 @@
+ GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
+ GDK_PIXBUF_XLIB_EXTRA_LIBS=
+ 
+-if $PKG_CONFIG --exists x11; then
++if false; then
+    if true; then
+   USE_X11_TRUE=
+   USE_X11_FALSE='#'
 --- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
 +++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
 @@ -23,7 +23,9 @@
@@ -34,7 +85,7 @@
  
  #include "gdk-pixbuf-transform.h"
  #include "gdk-pixbuf-private.h"
-@@ -336,15 +336,19 @@
+@@ -336,15 +338,19 @@
  const gchar *
  gdk_pixbuf_gettext (const gchar *msgid)
  {
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 201495d..aa58133 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -52,13 +52,13 @@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043
 PATCH_FILES=gdk-pixbuf-2.23.0.patch
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \
+                BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                 BASE_DEPENDENCIES_LIBS=" " \
-                 .$/configure \
-                 CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \
+                 ./configure --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
+                 CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/libpng -I$(SOLARINCDIR)/external/jpeg" \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \
                  LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \
-                 --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
+                 --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
                  --disable-nls \
                  --disable-modules \
                  --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
@@ -95,21 +95,21 @@ CONFIGURE_ACTION=
 BUILD_DIR=./gdk-pixbuf
 BUILD_ACTION=nmake -f makefile.msc
 
-OUT2LIB+=gdk-pixbuf$/gdk_pixbuf-2.0.lib
-
-OUT2BIN+=gdk-pixbuf$/libgdk_pixbuf-2.0-0.dll
-
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-animation.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-features.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-marshal.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-core.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-io.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-simple-anim.h
-OUT2INC+=gdk-pixbuf$/gdk-pixdata.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-enum-types.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-loader.h
-OUT2INC+=gdk-pixbuf$/gdk-pixbuf-transform.h
+OUT2LIB+=gdk-pixbuf/gdk_pixbuf-2.0.lib
+
+OUT2BIN+=gdk-pixbuf/libgdk_pixbuf-2.0-0.dll
+
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-animation.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-features.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-marshal.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-core.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-io.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-simple-anim.h
+OUT2INC+=gdk-pixbuf/gdk-pixdata.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-enum-types.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-loader.h
+OUT2INC+=gdk-pixbuf/gdk-pixbuf-transform.h
 
 .ELSE
 
commit b4c63a9e190d29fa05f6d7afd7d79e76ad81530c
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 15:04:04 2011 +0200

    remove noise from configure on Mac, use --disable-dependency-tracking

diff --git a/librsvg/librsvg-2.32.1.patch b/librsvg/librsvg-2.32.1.patch
index 0b7534d..2d9fc0f 100644
--- a/librsvg/librsvg-2.32.1.patch
+++ b/librsvg/librsvg-2.32.1.patch
@@ -40,4 +40,21 @@
  LIBCROCOPKG=""
  
  test_croco=true
-
+@@ -13376,13 +13380,13 @@
+ 
+ 
+ 
+-GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0)
++#GLIB_PREFIX=$($PKG_CONFIG --variable=prefix glib-2.0)
+ 
+-GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
++#GDK_PIXBUF_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
+ 
+-GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
++#GTK_PREFIX=$($PKG_CONFIG --variable=prefix gdk-pixbuf-2.0)
+ 
+-CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo)
++#CAIRO_PREFIX=$($PKG_CONFIG --variable=prefix cairo)
+ 
+ 
+ 
diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 664baf6..63f45e3 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -62,7 +62,7 @@ CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \
                  --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC)
 CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
-                 --disable-pixbuf-loader \
+                 --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
                  LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \
                  LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \
                  GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
@@ -71,7 +71,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
                  GTHREAD_LIBS=-lgthread-2.0 \
                  LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \
                  LIBCROCO_LIBS=-lcroco-0.6 \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \
                  LDFLAGS="$(CONFIGURE_LDFLAGS)"
 
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
commit 73bd399f5b14c184775f9a4a9e9026f4e0f53869
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 03:21:00 2011 +0200

    silence pango, get rid of $/ escapes, pass verbosity switches

diff --git a/pango/makefile.mk b/pango/makefile.mk
index 44fd080..66bf866 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -36,8 +36,8 @@ TARGET=so_pango
 
 .IF "$(SYSTEM_PANGO)" == "YES"
 all:
-    @echo "An already available installation of pango should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
+	@echo "An already available installation of pango should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -56,15 +56,15 @@ PATCH_FILES=pango-1.28.3.patch
 CONFIGURE_LDFLAGS="-L$(SOLARLIBDIR)"
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 .$/configure --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
-                 CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 ./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) --disable-dependency-tracking --disable-doc-cross-references \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
+                 CXXFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(EXTRA_CDEFS) -I$(SOLARINCDIR) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                  LDFLAGS="$(CONFIGURE_LDFLAGS)" \
-                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)$/cairo" \
+                 CAIRO_CFLAGS="-I$(SOLARINCDIR) -I$(SOLARINCDIR)/cairo" \
                  CAIRO_LIBS="-lcairo" \
-                 GLIB_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 GLIB_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                  GLIB_LIBS="-lgthread-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 -lintl"
-CONFIGURE_FLAGS=--with-included-modules=yes
+CONFIGURE_FLAGS=--with-included-modules=yes $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules)
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 CONFIGURE_ACTION+="--without-x"
 
diff --git a/pango/pango-1.28.3.patch b/pango/pango-1.28.3.patch
index 7da953f..45ce441 100644
--- a/pango/pango-1.28.3.patch
+++ b/pango/pango-1.28.3.patch
@@ -1,6 +1,15 @@
 --- misc/pango-1.28.3/configure	2010-09-29 13:02:33.000000000 +0200
 +++ misc/build/pango-1.28.3/configure	2011-03-01 17:56:26.000000000 +0100
-@@ -18596,16 +18596,16 @@
+@@ -17980,8 +17980,6 @@
+ 
+ 
+   if test x$no_x = xyes ; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: X development libraries not found" >&5
+-$as_echo "$as_me: WARNING: X development libraries not found" >&2;}
+     have_x=false
+   else
+     X_LIBS="$X_LIBS -lX11"
+@@ -18596,16 +18594,16 @@
    fi
  
    if $have_atsui; then
@@ -26,12 +35,31 @@
    fi
    if $have_cairo_atsui; then
  
-@@ -18859,7 +18859,7 @@
+@@ -18858,20 +18856,20 @@
+ fi
  
  # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled.
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 -
++#GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 +GLIB_MKENUMS=glib-mkenums
  
  
  # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any
+ # necesary defines for thread-safety.
+-GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
++#GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0`
+ 
+ # See if it's safe to turn G_DISABLE_DEPRECATED on.
+-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
+-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
++#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
++#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo $GLIB_REQUIRED_VERSION | sed "s/\.[^.]*\$//"`
++#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+   GLIB_CFLAGS="-DG_DISABLE_DEPRECATED $GLIB_CFLAGS"
+-fi
++#fi
+ 
+ #
+ # Checks for LibThai
commit 977ec60930311da0b1b46a9ae601d909f2cb7379
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue Jun 14 02:20:17 2011 +0200

    silence warnings from configure, get rid of $/ escapes

diff --git a/libgsf/libgsf-1.14.19.patch b/libgsf/libgsf-1.14.19.patch
index 12d20c6..e8acba5 100644
--- a/libgsf/libgsf-1.14.19.patch
+++ b/libgsf/libgsf-1.14.19.patch
@@ -5,7 +5,7 @@
  
  
 -
-+if 0; then
++if false; then
  case "$am__api_version" in
      1.01234)
  	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
@@ -27,3 +27,12 @@
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
  $as_echo_n "checking for XML::Parser... " >&6; }
     if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+@@ -12846,7 +12846,7 @@
+ fi
+ 
+ fi
+-if test -n "$PKG_CONFIG"; then
++if test "$PKG_CONFIG" != "no" ; then
+ 	_pkg_min_version=0.9.0
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index eadbe10..6a481a2 100644
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -57,17 +57,17 @@ BUILD_DIR=gsf
 BUILD_ACTION=dmake
 
 ADDITIONAL_FILES=\
-    gsf$/makefile.mk \
-    gsf$/gsf-config.h
+    gsf/makefile.mk \
+    gsf/gsf-config.h
 
 .ELSE
 PATCH_FILES=libgsf-1.14.19.patch
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 .$/configure \
-                 --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \
-                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 ./configure \
+                 --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+                 CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) $(LIBXML_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
                  LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \
                  --without-python \
                  --without-bonobo \
@@ -76,11 +76,11 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  --with-gdk_pixbuf \
                  --without-gnome-vfs \
                  --disable-nls \
-                 LIBGSF_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 LIBGSF_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                  LIBGSF_LIBS="-lxml2 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
-                 LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)$/external$/glib-2.0" \
+                 LIBGSF_GIO_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                  LIBGSF_GIO_LIBS="-lgio-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
-                 GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)$/external$/gdk-pixbuf-2.0" \
+                 GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
                  GDK_PIXBUF_LIBS="-lgdk_pixbuf-2.0"
                  
                  
commit 8a0f5cf8bf873ab7cf70f7dc03c45875880b3a2b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 13 01:04:28 2011 +0300

    Use dummy xml2-config script for iOS

diff --git a/libxslt/dummy/bin/xml2-config b/libxslt/dummy/bin/xml2-config
new file mode 100755
index 0000000..4ee8dd0
--- /dev/null
+++ b/libxslt/dummy/bin/xml2-config
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Use flags found out by configure when we *don't* want
+# to use the "system" xml2-config in $PATH
+
+case $1 in
+--cflags)
+  echo $LIBXML_CFLAGS
+  ;;
+--libs)
+  echo $LIBXML_LIBS
+  ;;
+--version)
+  # Assume it's close enough to the system version...
+  xml2-config --version
+  ;;
+esac
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index dff4068..576dede 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -115,17 +115,25 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l
 .IF "$(COMNAME)"=="sunpro5"
 CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
 .ENDIF                  # "$(COMNAME)"=="sunpro5"
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
+
 .IF "$(OS)"=="IOS"
-CONFIGURE_FLAGS=--disable-shared
+# --with-libxml-prefix actually gives the prefix where bin/xml2-config is looked for,
+# and we want it to find our dummy one that prints the LIBXML_CFLAGS and LIBXML_LIBS that
+# the configure script found out.
+CONFIGURE_FLAGS=--disable-shared --with-libxml-prefix=$(SRC_ROOT)/$(PRJNAME)/dummy
 .ELSE
 CONFIGURE_FLAGS=--disable-static
 .ENDIF
+
 CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes
+
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
+
 BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
commit 25c47d85186822dc490c5ebd528c983f12b6b3f1
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun Jun 12 21:00:47 2011 +0200

    tell the linker how to resolve @loader_path on Mac
    
    also cleanup useless double checking for MACOSX
    and remove unneeded AUGMENT_LIBRARY_PATH

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index 9e26dde..4789c07 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -51,17 +51,14 @@ PATCH_FILES=
 CONFIGURE_DIR=
 
 .IF "$(OS)"=="MACOSX"
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
-                 ./configure \
-                 --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \
+                 CPPFLAGS="$(EXTRA_CDEFS)" \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0" \
-                 LDFLAGS="-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))" \
+                 LDFLAGS="-L$(SOLARLIBDIR) $(EXTRA_LINKFLAGS) -Wl,-dylib_file, at loader_path/libgmodule-2.0.0.dylib:$(SOLARLIBDIR)/libgmodule-2.0.0.dylib" \
                  GLIB2_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0" \
                  GLIB2_LIBS="-lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lintl" \
                  LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" LIBXML2_LIBS="$(LIBXML_LIBS)"
 
-CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
-
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
commit 1db9076f189f103eceafa0611c336a0da8d8b8b0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jun 11 21:23:00 2011 +0300

    Add Android patch

diff --git a/hunspell/hunspell-android.patch b/hunspell/hunspell-android.patch
new file mode 100644
index 0000000..6713e40
--- /dev/null
+++ b/hunspell/hunspell-android.patch
@@ -0,0 +1,33 @@
+--- misc/hunspell-1.3.1/config.sub
++++ misc/build/hunspell-1.3.1/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+--- misc/hunspell-1.3.1/src/tools/munch.c
++++ misc/build/hunspell-1.3.1/src/tools/munch.c
+@@ -8,7 +8,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-#ifdef __linux__
++#if defined(__linux__) && !defined(__ANDROID__)
+ #include <error.h>
+ #include <errno.h>
+ #include <sys/mman.h>
+--- misc/hunspell-1.3.1/src/tools/unmunch.c
++++ misc/build/hunspell-1.3.1/src/tools/unmunch.c
+@@ -8,7 +8,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-#ifdef __linux__
++#if defined(__linux__) && !defined(__ANDROID__)
+ #include <error.h>
+ #include <errno.h>
+ #include <sys/mman.h>
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 5a6ea0c..a682ba0 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -43,7 +43,8 @@ ADDITIONAL_FILES+=config.h
 PATCH_FILES=\
     hunspell-static.patch \
     hunspell-wntconfig.patch \
-    hunspell-solaris.patch
+    hunspell-solaris.patch \
+    hunspell-android.patch
 
 .IF "$(GUI)"=="UNX"
 
commit 357c09cd289525992297ffa28093a1268b192b6e
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sat Jun 11 20:19:03 2011 +0200

    add dylib to the list of native python modules for Mac (for pyuno.dylib)

diff --git a/python/Python-2.6.1-dylib_dynload.patch b/python/Python-2.6.1-dylib_dynload.patch
new file mode 100644
index 0000000..3e44502
--- /dev/null
+++ b/python/Python-2.6.1-dylib_dynload.patch
@@ -0,0 +1,14 @@
+add dylib to the extensions, to be able to load pyuno.dylib via "import pyuno"
+--- misc/Python-2.6.1/Python/dynload_shlib.c	2006-01-04 02:30:17.000000000 +0100
++++ misc/build/Python-2.6.1/Python/dynload_shlib.c	2011-06-11 19:42:09.000000000 +0200
+@@ -46,6 +46,10 @@
+         {"module.exe", "rb", C_EXTENSION},
+         {"MODULE.EXE", "rb", C_EXTENSION},
+ #else
++#ifdef __APPLE__
++	{".dylib", "rb", C_EXTENSION},
++	{"module.dylib", "rb", C_EXTENSION},
++#endif
+ 	{".so", "rb", C_EXTENSION},
+ 	{"module.so", "rb", C_EXTENSION},
+ #endif
diff --git a/python/makefile.mk b/python/makefile.mk
index b43147d..d91660a 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -88,7 +88,7 @@ CONFIGURE_ACTION += --disable-ipv6
 .ENDIF
 
 .IF "$(OS)" == "MACOSX"
-PATCH_FILES+=Python-2.6.1-py8067.patch
+PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch
 # don't build dual-arch version as OOo itself is not universal binary either
 PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch
 
@@ -235,7 +235,6 @@ $(MISC)/OOoPython.framework.zip: $(PACKAGE_DIR)/fixinstallnames $(PACKAGE_DIR)/f
 
 $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
 	@-rm -f $@
-	@echo process $@
-	$(COMMAND_ECHO)sed 's#%%replaceme%%#$(MYCWD)/python-inst#g' < pyversion.mk > $@
+	$(COMMAND_ECHO)$(COPY) pyversion.mk $@
 
 .ENDIF # DISABLE_PYTHON != TRUE
diff --git a/python/pyversion.mk b/python/pyversion.mk
index baba538..97c904f 100644
--- a/python/pyversion.mk
+++ b/python/pyversion.mk
@@ -10,8 +10,6 @@ PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).a
 PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython
 CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR)
-# needed to fix install_name in pyuno
-PYTHON_MAKEINSTALLDIR=%%replaceme%%
 .ELSE
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
commit 81cc31ebfe017a0e5f1a4c65388db999f6569f08
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jun 11 17:44:45 2011 +0300

    Initial attempt at Android cross-compilation support
    
    Recognize the arm-linux-androideabi "triplet". (Actually I doubt that
    is a well-formed triplet at all, what are the Google people smoking?)
    
    Allow longer lines in pkgdata.cpp as the compiler command line gets
    quite long for cross-compilation to Android.
    
    Add the proper assembly source file format for Android to pkg_genc.c
    and use that.
    
    Probably a good idea to use --disable-dyload on Android (and iOS).
    
    Tweak gcc flags used for Android a bit to work around some Android C
    header weirdness related to strictness and 64-bit types.

diff --git a/icu/icu4c-build.patch b/icu/icu4c-build.patch
index e5e4bd9..3a09610 100644
--- a/icu/icu4c-build.patch
+++ b/icu/icu4c-build.patch
@@ -1,3 +1,88 @@
+--- misc/icu/source/config.sub
++++ misc/build/icu/source/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/icu/source/configure
++++ misc/build/icu/source/configure
+@@ -5438,7 +5438,7 @@
+ 	else
+ 		icu_cv_host_frag=mh-linux-va
+ 	fi ;;
+-*-*-linux*|*-pc-gnu) icu_cv_host_frag=mh-linux ;;
++*-*-linux*|*-pc-gnu|*-*-androideabi*) icu_cv_host_frag=mh-linux ;;
+ *-*-cygwin|*-*-mingw32)
+ 	if test "$GCC" = yes; then
+ 		cat >conftest.$ac_ext <<_ACEOF
+@@ -7429,6 +7429,9 @@
+ # Check to see if genccode can generate simple assembly.
+ GENCCODE_ASSEMBLY=
+ case "${host}" in
++*-linux-androideabi)
++    GENCCODE_ASSEMBLY="-a gcc-android"
++    ;;
+ *-linux*|i*86-*-*bsd*|i*86-pc-gnu)
+     if test "$GCC" = yes; then
+         # We're using gcc, and the simple -a gcc command line works for genccode
+@@ -11115,6 +1115,10 @@
+     # wchar_t can be used
+     CHECK_UTF16_STRING_RESULT="available"
+     ;;
++*-*-androideabi*)
++    # no UTF-16 strings thanks, I think, this is to avoid the -std=c++0x which causes trouble with uint64_t
++    CHECK_UTF16_STRING_RESULT="nope"
++    ;;
+ *)
+     ;;
+ esac
+--- misc/icu/source/tools/toolutil/pkg_genc.c
++++ misc/build/icu/source/tools/toolutil/pkg_genc.c
+@@ -145,6 +145,28 @@
+ 
+         ".long ","",HEX_0X
+     },
++    {"gcc-android",
++	"\t.arch armv5te\n"
++	"\t.fpu softvfp\n"
++	"\t.eabi_attribute 20, 1\n"
++	"\t.eabi_attribute 21, 1\n"
++	"\t.eabi_attribute 23, 3\n"
++	"\t.eabi_attribute 24, 1\n"
++	"\t.eabi_attribute 25, 1\n"
++	"\t.eabi_attribute 26, 2\n"
++	"\t.eabi_attribute 30, 6\n"
++	"\t.eabi_attribute 18, 4\n"
++	"\t.file \"%s.s\"\n"
++	"\t.global %s\n"
++	"\t.section .rodata\n"
++	"\t.align 2\n"
++	"\t.type %s, %%object\n"
++	"%s:\n",
++
++	"\t.word ",
++	"\t.section .note.GNU-stack,\"\",%%progbits\n",
++	HEX_0X
++    },
+     {"sun",
+         "\t.section \".rodata\"\n"
+         "\t.align   8\n"
+--- misc/icu/source/tools/pkgdata/pkgdata.cpp
++++ misc/build/icu/source/tools/pkgdata/pkgdata.cpp
+@@ -97,7 +97,7 @@
+ #endif
+ 
+ #define LARGE_BUFFER_MAX_SIZE 2048
+-#define SMALL_BUFFER_MAX_SIZE 512
++#define SMALL_BUFFER_MAX_SIZE 2048
+ 
+ static void loadLists(UPKGOptions *o, UErrorCode *status);
+ 
 --- misc/icu/source/common/putil.c	2010-09-29 20:37:22.000000000 +0200
 +++ misc/build/icu/source/common/putil.c	2011-03-15 10:58:44.054592942 +0100
 @@ -52,7 +52,7 @@
diff --git a/icu/makefile.mk b/icu/makefile.mk
index fca782f..42ca838 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -98,6 +98,16 @@ LDFLAGSADD += -Wl,--hash-style=both
 icu_CFLAGS+=-DUCONFIG_NO_FILE_IO
 .ENDIF
 
+.IF "$(OS)"=="ANDROID"
+# Problems with uint64_t on Android unless disabling strictness
+DISABLE_STRICT=--disable-strict
+.ENDIF
+
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
+# Problems with uint64_t on Android unless disabling strictness
+DISABLE_DYLOAD=--disable-dyload
+.ENDIF
+
 .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"
 LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo
 .ENDIF
@@ -116,7 +126,7 @@ BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-cross-bu
 .ENDIF
 
 CONFIGURE_ACTION+=sh -c 'CPPFLAGS="$(EXTRA_CDEFS)" CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" \
-./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT)'
+./configure --enable-layout $(STATIC_OR_SHARED) $(BUILD_AND_HOST) $(DISABLE_64BIT) $(DISABLE_STRICT) $(DISABLE_DYLOAD) '
 
 CONFIGURE_FLAGS=
 
commit a577f934f2b4a8979d80495c1659d8337146905f
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Fri Jun 10 16:50:35 2011 +0200

    get rid of some noise in the buildlog due to missing msgfmt
    
    o test.mo ./de.po; \
    ../.././install-sh -c -d de/LC_MESSAGES; \
    cp -f test.mo de/LC_MESSAGES
    /bin/sh: line 1: o: command not found
    cp: test.mo: No such file or directory
    make[5]: [test.mo] Error 1 (ignored)

diff --git a/glib/glib-2.28.1.noise.patch b/glib/glib-2.28.1.noise.patch
new file mode 100644
index 0000000..f42b08a
--- /dev/null
+++ b/glib/glib-2.28.1.noise.patch
@@ -0,0 +1,12 @@
+--- misc/glib-2.28.1/gio/tests/Makefile.in	2011-02-18 16:22:00.000000000 +0100
++++ misc/build/glib-2.28.1/gio/tests/Makefile.in	2011-06-10 16:37:05.000000000 +0200
+@@ -1020,7 +1020,9 @@
+ proxy_LDADD = $(progs_ldadd) \
+ 	$(top_builddir)/gthread/libgthread-2.0.la
+ 
++ifneq ($(MSGFMT),)
+ MISC_STUFF = test.mo
++endif
+ DISTCLEANFILES = \
+ 	applications/mimeinfo.cache	\
+ 	org.gtk.test.enums.xml		\
diff --git a/glib/makefile.mk b/glib/makefile.mk
index c1bb069..1b31d39 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -49,7 +49,7 @@ TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e
 
 
 .IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
-PATCH_FILES=glib-2.28.1.patch
+PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch
 
 .IF "$(OS)"=="IOS"
 CONFIGURE_FLAGS= \
commit 887d94aceec501722a775abc517c00b34ee7665f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:07:14 2011 +0300

    Fix configury for Android, but won't build

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index d18396c..f2ce5b6 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -55,6 +55,17 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.features misc/build/cai
 -CAIRO_HAS_SVG_SURFACE=1
 +CAIRO_HAS_SVG_SURFACE=0
  CAIRO_HAS_TEST_SURFACES=0
+--- misc/build/cairo-1.8.0.org/build/config.sub
++++ misc/build/cairo-1.8.0/build/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 diff -ur misc/build/cairo-1.8.0.org/configure misc/build/cairo-1.8.0/configure
 --- misc/build/cairo-1.8.0.org/configure	2008-09-26 01:57:30.000000000 +0300
 +++ misc/build/cairo-1.8.0/configure	2008-11-04 22:21:26.000000000 +0200
@@ -258,3 +269,17 @@ diff -ur misc/build/cairo-1.8.0.org/src/cairo-ps-surface.c misc/build/cairo-1.8.
  #include <errno.h>
  
  #define DEBUG_PS 0
+--- misc/build/cairo-1.8.0.org/src/cairo-output-stream.c
++++ misc/build/cairo-1.8.0/src/cairo-output-stream.c
+@@ -281,7 +281,11 @@
+ 	d = 0.0;
+ 
+     locale_data = localeconv ();
++#ifdef __ANDROID__
++    decimal_point = ".";
++#else
+     decimal_point = locale_data->decimal_point;
++#endif
+     decimal_point_len = strlen (decimal_point);
+ 
+     assert (decimal_point_len != 0);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 754ceba..4059504 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -147,16 +147,32 @@ cairo_CFLAGS+=-march=i486
 .ENDIF
 
 CONFIGURE_DIR=
+
+.IF "$(OS)"=="ANDROID"
+# No pkg-config in the Android NDK
+CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
+.ELSE
 CONFIGURE_ACTION=.$/configure
+.ENDIF
+
 .IF "$(OS)"=="IOS"
 CONFIGURE_FLAGS=--disable-shared
 .ELSE
 CONFIGURE_FLAGS=--disable-static --enable-xlib
 .ENDIF
-CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+
+.IF "$(OS)"=="ANDROID"
+CONFIGURE_FLAGS+=--disable-ft
+.ELSE
+CONFIGURE_FLAGS+=--enable-ft
+.ENDIF
+
+CONFIGURE_FLAGS+=--disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+
 .IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
+
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -212,7 +228,7 @@ OUT2BIN+=src$/.libs$/*.dll
 OUT2LIB+=src$/release$/*.lib
 OUT2BIN+=src$/release$/*.dll
 .ENDIF
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=src$/.libs$/libcairo-1.a
 .ELSE
 OUT2LIB+=src$/.libs$/libcairo.so*
diff --git a/cairo/pixman-0.12.0.patch b/cairo/pixman-0.12.0.patch
index c3d2145..8694a87 100644
--- a/cairo/pixman-0.12.0.patch
+++ b/cairo/pixman-0.12.0.patch
@@ -1,3 +1,14 @@
+--- misc/build/pixman-0.12.0/config.sub
++++ misc/build/pixman-0.12.0/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/build/pixman-0.12.0/configure.orig	2008-09-17 20:14:40.000000000 +0300
 +++ misc/build/pixman-0.12.0/configure	2008-11-08 21:17:00.000000000 +0200
 @@ -19740,6 +19740,13 @@
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 0a1d443..d212407 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -152,7 +152,7 @@ OUT2LIB+=pixman$/.libs$/*.a
 .ELSE
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=pixman$/.libs$/libpixman-1.a
 .ELSE
 OUT2LIB+=pixman$/.libs$/libpixman-1.so*
commit f70978cc3f5e2ef51cefa33b5cfd92946ec58954
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:05:57 2011 +0300

    Use system zlib on Android, too

diff --git a/libpng/libpng-1.5.1.patch b/libpng/libpng-1.5.1.patch
index b69735e..ebae94a 100644
--- a/libpng/libpng-1.5.1.patch
+++ b/libpng/libpng-1.5.1.patch
@@ -238,10 +238,10 @@
   * data in PNG files.
   */
 +/* WTF, surely this should depend explicitly on whether using the system or
-+ * internal zlib, not on OS... But yeah, so maybe MacOSX (and iOS) are the only OSes for which
++ * internal zlib, not on OS... But yeah, so maybe MacOSX, iOS and Android are the only OSes for which
 + * we use a system zlib but internal libpng, at least by default.
 + */
-+#if defined MACOSX || defined IOS
++#if defined MACOSX || defined IOS || defined ANDROID
  #include "zlib.h"
 +#else
 +#include <external/zlib/zlib.h>
@@ -255,7 +255,7 @@
   * of files at once by typing "pngtest -m file1.png file2.png ..."
   */
 
-+#if defined MACOSX || defined IOS
++#if defined MACOSX || defined IOS || defined ANDROID
  #include "zlib.h"
 +#else
 +#include <external/zlib/zlib.h>
@@ -271,7 +271,7 @@
  #endif
 
 -#include "zlib.h"   /* For crc32 */
-+#if defined MACOSX || defined IOS
++#if defined MACOSX || defined IOS || defined ANDROID
 +#include "zlib.h"
 +#else
 +#include <external/zlib/zlib.h>
commit 0ded1dce18a341b562ec7bb5bd2c9a65640e3098
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 21:51:30 2011 +0300

    First attempt at Android support

diff --git a/expat/expat-2.0.1.patch b/expat/expat-2.0.1.patch
index bea3d01..6c09d34 100644
--- a/expat/expat-2.0.1.patch
+++ b/expat/expat-2.0.1.patch
@@ -1,3 +1,14 @@
+--- misc/expat-2.0.1/conftools/config.sub
++++ misc/build/expat-2.0.1/conftools/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:33:55 2008
 +++ misc/build/expat-2.0.1/lib/makefile.mk	Wed Aug 20 14:26:42 2008
 @@ -1 +1,89 @@
commit b0bfc72db9186d3cc3ba901f6deb97e3c91e9d8e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 19:40:37 2011 +0300

    Cross-compilation support for Android

diff --git a/berkeleydb/db-4.7.25.patch b/berkeleydb/db-4.7.25.patch
index 8cf412d..6077e66 100644
--- a/berkeleydb/db-4.7.25.patch
+++ b/berkeleydb/db-4.7.25.patch
@@ -398,6 +398,17 @@
  	$(RM) -f $(libdb)
  	$(LN) -s .libs/$(libdb_version) $(libdb)
 
+--- misc/db-4.7.25.NC/dist/config.sub
++++ misc/build/db-4.7.25.NC/dist/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/db-4.7.25.NC/dist/configure	2008-05-15 23:12:41.000000000 +0200
 +++ misc/build/db-4.7.25.NC/dist/configure	2009-07-21 11:39:25.000000000 +0200
 @@ -3757,8 +3757,10 @@
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 20c5340..376b1d9 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -116,7 +116,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
-.IF "$(OS)"=="IOS"
+.IF "$(OS)"=="IOS" || "$(OS)" == "ANDROID"
 OUT2LIB=$(BUILD_DIR)$/libdb*.a
 .ELSE
 OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST)
commit 1c3fac55a78df12dd79e363ca1165d1a4007f31c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 19:29:05 2011 +0300

    Cross-compilation support for Android

diff --git a/curl/curl-7.19.7.patch b/curl/curl-7.19.7.patch
index 0e39cb7..ca25c23 100644
--- a/curl/curl-7.19.7.patch
+++ b/curl/curl-7.19.7.patch
@@ -1,3 +1,14 @@
+--- misc/curl-7.19.7/config.sub
++++ misc/build/curl-7.19.7/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/curl-7.19.7/configure	2009-11-04 13:26:02.000000000 +0100
 +++ misc/build/curl-7.19.7/configure	2009-11-18 14:17:25.453125000 +0100
 @@ -2735,8 +2735,8 @@
@@ -42,6 +53,17 @@
    fi
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+--- misc/curl-7.19.7/include/curl/curl.h
++++ misc/build/curl-7.19.7/include/curl/curl.h
+@@ -74,7 +74,7 @@
+    require it! */
+ #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
+     defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
+-    defined(ANDROID)
++    defined(__ANDROID__)
+ #include <sys/select.h>
+ #endif
+ 
 --- misc/curl-7.19.7/lib/setup.h	2009-10-28 21:21:58.000000000 +0100
 +++ misc/build/curl-7.19.7/lib/setup.h	2009-11-18 13:30:42.375000000 +0100
 @@ -193,6 +193,7 @@
diff --git a/curl/makefile.mk b/curl/makefile.mk
index dc9d74d..dfc5720 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -94,7 +94,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 
-.IF "$(OS)"=="IOS"
+.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
 .ELSE
 OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4
commit bf24af351ea2fb44119c1d038ac40f2e368db046
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 18:38:45 2011 +0300

    Cross-compilation support for Android

diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index bfa0b51..3ec9de5 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -1,3 +1,14 @@
+--- misc/libxslt-1.1.26/config.sub
++++ misc/build/libxslt-1.1.26/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/libxslt-1.1.26/ltmain.sh	Wed Aug 29 14:28:46 2007
 +++ misc/build/libxslt-1.1.26/ltmain.sh	Wed Jun 25 13:06:05 2008
 @@ -6195,9 +6195,9 @@
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 7167adf..dff4068 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -138,7 +138,7 @@ OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
 OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
 OUT2BIN+=xsltproc$/.libs$/xsltproc
 OUT2BIN+=xslt-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" 
 OUT2LIB+=libxslt$/.libs$/libxslt.a
 OUT2LIB+=libexslt$/.libs$/libexslt.a
 OUT2BIN+=xslt-config
commit 3ed1101c2eddcb96436b713bac7c806bade05550
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 9 18:31:01 2011 +0300

    Cross-compilation support for Android

diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index 4158c38..8694b6a 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -1,3 +1,28 @@
+--- misc/libxml2-2.7.6/config.sub
++++ misc/build/libxml2-2.7.6/config.sub
+@@ -1272,7 +1272,7 @@
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -udi* | -androideabi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+--- misc/libxml2-2.7.6/Makefile.in
++++ misc/build/libxml2-2.7.6/Makefile.in
+@@ -41,9 +41,9 @@
+ 	testSAX$(EXEEXT) testHTML$(EXEEXT) testXPath$(EXEEXT) \
+ 	testURI$(EXEEXT) testThreads$(EXEEXT) testC14N$(EXEEXT) \
+ 	testAutomata$(EXEEXT) testRegexp$(EXEEXT) testReader$(EXEEXT) \
+-	testapi$(EXEEXT) testModule$(EXEEXT) runtest$(EXEEXT) \
++	testapi$(EXEEXT) testModule$(EXEEXT) \
+ 	runsuite$(EXEEXT) testchar$(EXEEXT) testdict$(EXEEXT) \
+-	runxmlconf$(EXEEXT) testrecurse$(EXEEXT)
++	runxmlconf$(EXEEXT)
+ bin_PROGRAMS = xmllint$(EXEEXT) xmlcatalog$(EXEEXT)
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 --- misc/libxml2-2.7.6/ltmain.sh	2009-10-06 17:39:54.000000000 +0100
 +++ misc/build/libxml2-2.7.6/ltmain.sh	2009-12-17 11:43:56.000000000 +0000
 @@ -6271,8 +6271,8 @@
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 5091360..0eb0801 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -123,7 +123,7 @@ EXTRPATH=URELIB
 OUT2LIB+=.libs$/libxml2.*.dylib
 OUT2BIN+=.libs$/xmllint
 OUT2BIN+=xml2-config
-.ELIF "$(OS)"=="IOS"
+.ELIF "$(OS)"=="IOS" || "$(OS)"=="ANDROID"
 OUT2LIB+=.libs$/libxml2.a
 OUT2BIN+=xml2-config
 .ELIF "$(OS)"=="WNT"
diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst
index 9b5d736..e28c52e 100644
--- a/libxml2/prj/d.lst
+++ b/libxml2/prj/d.lst
@@ -3,7 +3,8 @@ mkdir: %_DEST%\inc\external\libxml
 ..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2
 symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so
 ..\%__SRC%\lib\*.lib %_DEST%\lib
-..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.a
+..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a
+..\%__SRC%\lib\libxml2.a %_DEST%\lib\libxml2.a
 ..\%__SRC%\bin\*.dll %_DEST%\bin
 ..\%__SRC%\bin\xmllint* %_DEST%\bin
 ..\%__SRC%\bin\xml2-config* %_DEST%\bin
commit e6065f3a1aa985fa9daead03c8082fc7ed0ebf6a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:06:36 2011 +0300

    Run the build platform's ixdict exectuable

diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index ede892c..7bdb47b 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -93,5 +93,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ca_ES_v3.idx : "$(EXTENSIONDIR)$/th_ca_ES_v3.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
 
diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk
index 09371e5..427234a 100644
--- a/dictionaries/cs_CZ/makefile.mk
+++ b/dictionaries/cs_CZ/makefile.mk
@@ -77,4 +77,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_cs_CZ_v2.idx : "$(EXTENSIONDIR)$/th_cs_CZ_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx <$(EXTENSIONDIR)$/th_cs_CZ_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx <$(EXTENSIONDIR)$/th_cs_CZ_v2.dat
diff --git a/dictionaries/da_DK/makefile.mk b/dictionaries/da_DK/makefile.mk
index 9f1d7c6..f2e2f4d 100644
--- a/dictionaries/da_DK/makefile.mk
+++ b/dictionaries/da_DK/makefile.mk
@@ -88,5 +88,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_da_DK.idx : "$(EXTENSIONDIR)$/th_da_DK.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx <$(EXTENSIONDIR)$/th_da_DK.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx <$(EXTENSIONDIR)$/th_da_DK.dat
 
diff --git a/dictionaries/de_AT/makefile.mk b/dictionaries/de_AT/makefile.mk
index 4e1aa61..d3a7c6f 100644
--- a/dictionaries/de_AT/makefile.mk
+++ b/dictionaries/de_AT/makefile.mk
@@ -91,4 +91,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_de_AT_v2.idx : "$(EXTENSIONDIR)$/th_de_AT_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_AT_v2.idx <$(EXTENSIONDIR)$/th_de_AT_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_AT_v2.idx <$(EXTENSIONDIR)$/th_de_AT_v2.dat
diff --git a/dictionaries/de_CH/makefile.mk b/dictionaries/de_CH/makefile.mk
index dc2580d..2c653b8 100644
--- a/dictionaries/de_CH/makefile.mk
+++ b/dictionaries/de_CH/makefile.mk
@@ -92,4 +92,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_de_CH_v2.idx : "$(EXTENSIONDIR)$/th_de_CH_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_CH_v2.idx <$(EXTENSIONDIR)$/th_de_CH_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_CH_v2.idx <$(EXTENSIONDIR)$/th_de_CH_v2.dat
diff --git a/dictionaries/de_DE/makefile.mk b/dictionaries/de_DE/makefile.mk
index 465bc05..731da2c 100644
--- a/dictionaries/de_DE/makefile.mk
+++ b/dictionaries/de_DE/makefile.mk
@@ -90,4 +90,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_de_DE_v2.idx : "$(EXTENSIONDIR)$/th_de_DE_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_DE_v2.idx <$(EXTENSIONDIR)$/th_de_DE_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_DE_v2.idx <$(EXTENSIONDIR)$/th_de_DE_v2.dat
diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk
index d276dc7..7640185 100644
--- a/dictionaries/en/makefile.mk
+++ b/dictionaries/en/makefile.mk
@@ -101,4 +101,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_en_US_v2.idx : "$(EXTENSIONDIR)$/th_en_US_v2.dat"
-        $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_en_US_v2.idx <$(EXTENSIONDIR)$/th_en_US_v2.dat
+        $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_en_US_v2.idx <$(EXTENSIONDIR)$/th_en_US_v2.dat
diff --git a/dictionaries/fr_FR/makefile.mk b/dictionaries/fr_FR/makefile.mk
index 56dafab..1b3eb46 100644
--- a/dictionaries/fr_FR/makefile.mk
+++ b/dictionaries/fr_FR/makefile.mk
@@ -84,4 +84,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/thes_fr.idx : "$(EXTENSIONDIR)$/thes_fr.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk
index 26650da..dca137d 100644
--- a/dictionaries/hu_HU/makefile.mk
+++ b/dictionaries/hu_HU/makefile.mk
@@ -86,4 +86,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_hu_HU_v2.idx : "$(EXTENSIONDIR)$/th_hu_HU_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx <$(EXTENSIONDIR)$/th_hu_HU_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx <$(EXTENSIONDIR)$/th_hu_HU_v2.dat
diff --git a/dictionaries/it_IT/makefile.mk b/dictionaries/it_IT/makefile.mk
index 1262e75..d8b2fe1 100644
--- a/dictionaries/it_IT/makefile.mk
+++ b/dictionaries/it_IT/makefile.mk
@@ -84,5 +84,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_it_IT_v2.idx : "$(EXTENSIONDIR)$/th_it_IT_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
 
diff --git a/dictionaries/ne_NP/makefile.mk b/dictionaries/ne_NP/makefile.mk
index 37aaebd..e673a17 100644
--- a/dictionaries/ne_NP/makefile.mk
+++ b/dictionaries/ne_NP/makefile.mk
@@ -80,4 +80,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ne_NP_v2.idx : "$(EXTENSIONDIR)$/th_ne_NP_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
diff --git a/dictionaries/no/makefile.mk b/dictionaries/no/makefile.mk
index 4befca1..57c5e2d 100644
--- a/dictionaries/no/makefile.mk
+++ b/dictionaries/no/makefile.mk
@@ -86,7 +86,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_nb_NO_v2.idx : "$(EXTENSIONDIR)$/th_nb_NO_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nb_NO_v2.idx <$(EXTENSIONDIR)$/th_nb_NO_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nb_NO_v2.idx <$(EXTENSIONDIR)$/th_nb_NO_v2.dat
 
 $(EXTENSIONDIR)$/th_nn_NO_v2.idx : "$(EXTENSIONDIR)$/th_nn_NO_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nn_NO_v2.idx <$(EXTENSIONDIR)$/th_nn_NO_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nn_NO_v2.idx <$(EXTENSIONDIR)$/th_nn_NO_v2.dat
diff --git a/dictionaries/pl_PL/makefile.mk b/dictionaries/pl_PL/makefile.mk
index 60eac32..e85e45e 100644
--- a/dictionaries/pl_PL/makefile.mk
+++ b/dictionaries/pl_PL/makefile.mk
@@ -82,5 +82,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_pl_PL_v2.idx : "$(EXTENSIONDIR)$/th_pl_PL_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
 
diff --git a/dictionaries/ro/makefile.mk b/dictionaries/ro/makefile.mk
index cd5416a..73830ca 100644
--- a/dictionaries/ro/makefile.mk
+++ b/dictionaries/ro/makefile.mk
@@ -84,5 +84,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ro_RO_v2.idx : "$(EXTENSIONDIR)$/th_ro_RO_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
 
diff --git a/dictionaries/ru_RU/makefile.mk b/dictionaries/ru_RU/makefile.mk
index 726ab8e..d245219 100644
--- a/dictionaries/ru_RU/makefile.mk
+++ b/dictionaries/ru_RU/makefile.mk
@@ -81,4 +81,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
diff --git a/dictionaries/sk_SK/makefile.mk b/dictionaries/sk_SK/makefile.mk
index 4acf9f3..d7ec90e 100644
--- a/dictionaries/sk_SK/makefile.mk
+++ b/dictionaries/sk_SK/makefile.mk
@@ -86,4 +86,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_sk_SK_v2.idx : "$(EXTENSIONDIR)$/th_sk_SK_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sk_SK_v2.idx <$(EXTENSIONDIR)$/th_sk_SK_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sk_SK_v2.idx <$(EXTENSIONDIR)$/th_sk_SK_v2.dat
diff --git a/dictionaries/sl_SI/makefile.mk b/dictionaries/sl_SI/makefile.mk
index b31bca9..2c5cb7d 100644
--- a/dictionaries/sl_SI/makefile.mk
+++ b/dictionaries/sl_SI/makefile.mk
@@ -84,5 +84,5 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_sl_SI_v2.idx : "$(EXTENSIONDIR)$/th_sl_SI_v2.dat"
-         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
+         $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
 
diff --git a/dictionaries/uk_UA/makefile.mk b/dictionaries/uk_UA/makefile.mk
index bcdf035..b98c619 100644
--- a/dictionaries/uk_UA/makefile.mk
+++ b/dictionaries/uk_UA/makefile.mk
@@ -80,4 +80,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE : extension_post.mk
 
 $(EXTENSIONDIR)$/th_uk_UA.idx : "$(EXTENSIONDIR)$/th_uk_UA.dat"
-        $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_uk_UA.idx <$(EXTENSIONDIR)$/th_uk_UA.dat
+        $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_uk_UA.idx <$(EXTENSIONDIR)$/th_uk_UA.dat
commit 1e4f5844c8aa8201a07b9ca64cbc1e00c57a740b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:05:57 2011 +0300

    Add cross-compilation support

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index 4888bfa..9e26dde 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -62,6 +62,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
 
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
              $(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
commit 625198305023b4f73f0a8e1820c20011ce83036e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:05:47 2011 +0300

    Add cross-compilation support

diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 9ddc809..664baf6 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -76,6 +76,10 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
 
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
              $(GNUMAKE) $(!eq,$(VERBOSE),$(NULL) V=1) -j$(MAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
commit ecb6aa79e6e30716b629f45753e037d976f25bd4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:05:37 2011 +0300

    Add cross-compilation support

diff --git a/pango/makefile.mk b/pango/makefile.mk
index a5c2854..44fd080 100644
--- a/pango/makefile.mk
+++ b/pango/makefile.mk
@@ -68,6 +68,10 @@ CONFIGURE_FLAGS=--with-included-modules=yes
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 CONFIGURE_ACTION+="--without-x"
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 .IF "$(VERBOSE)"!=""
 VFLAG=V=1
 .ENDIF
commit 163aa598c71282c2de5ffeccb258934e87e4fede
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 6 16:40:31 2011 +0300

    Cross-compilation support for MacOSX

diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk
index 1e89deb..201495d 100644
--- a/gdk-pixbuf/makefile.mk
+++ b/gdk-pixbuf/makefile.mk
@@ -64,6 +64,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \
                  --disable-glibtest --without-libtiff --without-libjasper
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+.ENDIF
+
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
                 
commit ee8eee6a57b710211046a62e716287291a4b944b
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 6 10:50:49 2011 +0300

    chmod -x

diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
old mode 100755
new mode 100644
commit 5bab8f941c2341dc2abf3894fb5bcb3759e86e86
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 6 10:50:30 2011 +0300

    Pass --build and --host options when cross-compiling

diff --git a/libgsf/makefile.mk b/libgsf/makefile.mk
index 7e4613f..eadbe10 100755
--- a/libgsf/makefile.mk
+++ b/libgsf/makefile.mk
@@ -86,6 +86,10 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \
                  
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
                 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) \
              $(GNUMAKE)
 BUILD_DIR=$(CONFIGURE_DIR)
commit 75638c07880e9f01033349a9892f88c531d09260
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jun 6 18:21:14 2011 +0200

    allow building internal Python on Mac (needs to be built as framework)
    
    fixes #i111496# (meta), #i111498# & #i111500#
    (along with the similar commits to the other repos)

diff --git a/python/Python-2.6.1-arch_i386.patch b/python/Python-2.6.1-arch_i386.patch
new file mode 100644
index 0000000..6dca2c3
--- /dev/null
+++ b/python/Python-2.6.1-arch_i386.patch
@@ -0,0 +1,11 @@
+--- misc/Python-2.6.1/configure	2010-05-06 20:24:36.000000000 +0200
++++ misc/build/Python-2.6.1/configure	2010-05-06 20:25:17.000000000 +0200
+@@ -4653,7 +4653,7 @@
+ 	    if test "${enable_universalsdk}"; then
+ 		UNIVERSAL_ARCH_FLAGS=""
+ 	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
+-		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   UNIVERSAL_ARCH_FLAGS="-arch i386"
+ 		   ARCH_RUN_32BIT=""
+ 
+ 	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
diff --git a/python/Python-2.6.1-arch_ppc.patch b/python/Python-2.6.1-arch_ppc.patch
new file mode 100644
index 0000000..d4073ac
--- /dev/null
+++ b/python/Python-2.6.1-arch_ppc.patch
@@ -0,0 +1,11 @@
+--- misc/Python-2.6.1/configure	2010-05-06 20:24:36.000000000 +0200
++++ misc/build/Python-2.6.1/configure	2010-05-06 20:25:17.000000000 +0200
+@@ -4653,7 +4653,7 @@
+ 	    if test "${enable_universalsdk}"; then
+ 		UNIVERSAL_ARCH_FLAGS=""
+ 	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
+-		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc"
+ 		   ARCH_RUN_32BIT=""
+ 
+ 	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
diff --git a/python/Python-2.6.1-py8067.patch b/python/Python-2.6.1-py8067.patch
new file mode 100644
index 0000000..7a88a93
--- /dev/null
+++ b/python/Python-2.6.1-py8067.patch
@@ -0,0 +1,12 @@
+http://bugs.python.org/issue8067 - needed for building on Mac OSX >= 10.6
+--- misc/Python-2.6.1/configure	2010-05-06 20:59:52.000000000 +0200
++++ misc/build/Python-2.6.1/configure	2010-05-06 20:59:46.000000000 +0200
+@@ -2120,6 +2120,8 @@
+   # has no effect, don't bother defining them
+   Darwin/[6789].*)
+     define_xopen_source=no;;
++  Darwin/1[0-9].*)
++    define_xopen_source=no;;
+   # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
+   # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
+   # or has another value. By not (re)defining it, the defaults come in place.
diff --git a/python/makefile.mk b/python/makefile.mk
index f51e7e8..b43147d 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -40,8 +40,8 @@ TARGET=so_python
 
 .IF "$(SYSTEM_PYTHON)" == "YES"
 all:
-    @echo "An already available installation of python should exist on your system."
-    @echo "Therefore the version provided here does not need to be built in addition."
+	@echo "An already available installation of python should exist on your system."
+	@echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
 # --- Files --------------------------------------------------------
@@ -81,14 +81,27 @@ python_LDFLAGS+=$(ARCH_FLAGS)
 python_CFLAGS=-g0
 .ENDIF
 
-CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
+CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure --prefix=/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)"
+
 .IF "$(OS)$(CPU)" == "SOLARISI"
 CONFIGURE_ACTION += --disable-ipv6
 .ENDIF
+
+.IF "$(OS)" == "MACOSX"
+PATCH_FILES+=Python-2.6.1-py8067.patch
+# don't build dual-arch version as OOo itself is not universal binary either
+PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch
+
+MACDEVSDK*=/Developer/SDKs/MacOSX10.4u.sdk
+CONFIGURE_ACTION+=--enable-universalsdk=$(MACDEVSDK) --with-universal-archs=32-bit --enable-framework=/python-inst --with-framework-name=OOoPython
+ALLTAR: $(MISC)/OOoPython.framework.zip
+
+.ENDIF
+
 .IF "$(OS)"=="AIX"
 CONFIGURE_ACTION += --disable-ipv6 --with-threads
 .ENDIF
-BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include
+BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) && $(GNUMAKE) install DESTDIR=$(MYCWD) && chmod -R ug+w $(MYCWD)/python-inst && chmod g+w Include
 .ELSE
 # ----------------------------------
 # WINDOWS
@@ -182,9 +195,47 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h
 ALLTAR : $(PYVERSIONFILE)
 .ENDIF          # "$(L10N_framework)"==""
 
+# rule to allow relocating the whole framework, removing reference to buildinstallation directory
+$(PACKAGE_DIR)/fixscripts: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+	@echo remove build installdir from scripts
+	$(COMMAND_ECHO)for file in \
+	        $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/2to3 \
+	        $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/idle$(PYMAJOR).$(PYMINOR) \
+	        $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/pydoc$(PYMAJOR).$(PYMINOR) \
+	        $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/python$(PYMAJOR).$(PYMINOR)-config \
+	        $(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/bin/smtpd$(PYMAJOR).$(PYMINOR).py ; do \
+	{{ rm "$$file" && awk '\
+		BEGIN {{print "\
+#!/bin/bash\n\
+origpath=$$(pwd)\n\
+bindir=$$(cd $$(dirname \"$$0\") ; pwd)\n\
+cd \"$$origpath\"\n\
+\"$$bindir/../Resources/Python.app/Contents/MacOS/OOoPython\" - $$@ <<EOF"}} \
+		FNR==1{{next}} \
+		      {{print}} \
+		END   {{print "EOF"}}' > "$$file" ; }} < "$$file" ; chmod +x "$$file" ; done
+	@touch $@
+
+$(PACKAGE_DIR)/fixinstallnames: $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+	@echo remove build installdir from OOoPython
+	$(COMMAND_ECHO)install_name_tool -change \
+		/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/OOoPython \
+		@executable_path/../../../../OOoPython \
+		$(MYCWD)/python-inst/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/Resources/Python.app/Contents/MacOS/OOoPython
+	@touch $@
+
+$(MISC)/OOoPython.framework.zip: $(PACKAGE_DIR)/fixinstallnames $(PACKAGE_DIR)/fixscripts
+	@-rm -f $@
+	@echo creating $@
+	$(COMMAND_ECHO)cd $(MISC)/build/python-inst && find OOoPython.framework \
+		-not -type l -not -name Info.plist.in \
+		-not -name pythonw$(PYMAJOR).$(PYMINOR) \
+		-not -name python$(PYMAJOR).$(PYMINOR) -print0 | \
+		xargs -0 zip $(ZIP_VERBOSITY) ../../$(@:f)
 
 $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
-    -rm -f $@
-    cat $? > $@
+	@-rm -f $@
+	@echo process $@
+	$(COMMAND_ECHO)sed 's#%%replaceme%%#$(MYCWD)/python-inst#g' < pyversion.mk > $@
 
 .ENDIF # DISABLE_PYTHON != TRUE
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 245ddb4..7495150 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -1,3 +1,14 @@
+# MACOSX - start
+mkdir: %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6
+
+..\%__SRC%\misc\build\python-inst\OOoPython.framework\OOoPython %_DEST%\lib\OOoPython.framework\OOoPython
+..\%__SRC%\misc\build\python-inst\OOoPython.framework\Versions\2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\*
+..\%__SRC%\misc\build\python-inst\OOoPython.framework\Versions\2.6\include\python2.6\* %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6\*
+..\%__SRC%\misc\OOoPython.framework.zip %_DEST%\bin\OOoPython.framework.zip
+# MACOSX - end
+
+..\%__SRC%\misc\pyversion.mk %_DEST%\inc\pyversion.mk
+
 mkdir: %_DEST%\lib\python
 mkdir: %_DEST%\lib\python\lib-old
 mkdir: %_DEST%\lib\python\lib-tk
@@ -69,8 +80,6 @@ mkdir: %_DEST%\lib\python\ctypes\macholib
 ..\%__SRC%\misc\build\Python-2.6.1\Lib\ctypes\macholib\* %_DEST%\lib\python\ctypes\macholib\*
 ..\%__SRC%\misc\build\Python-2.6.1\Lib\xml\etree\* %_DEST%\lib\python\xml\etree
 
-..\pyversion.mk %_DEST%\inc\pyversion.mk
-
 ..\%__SRC%\misc\build\Python-2.6.1\Include\* %_DEST%\inc\python\*
 
 #unix ONLY !
@@ -81,9 +90,6 @@ mkdir: %_DEST%\lib\python\ctypes\macholib
 ..\%__SRC%\misc\build\python-inst\lib\libpython2.6.so.1.0 %_DEST%\lib\libpython2.6.so.1.0
 symlink: %_DEST%\lib\libpython2.6.so.1.0 %_DEST%\lib\libpython2.6.so
 
-# MacOS X
-..\%__SRC%\misc\build\python-inst\lib\libpython2.6.dylib %_DEST%\lib\libpython2.6.dylib
-
 #MingW ONLY !
 ..\%__SRC%\misc\build\python-inst\bin\python.exe %_DEST%\bin\python.exe
 ..\%__SRC%\misc\build\Python-2.6.1\libpython2.6.dll %_DEST%\bin\libpython2.6.dll
diff --git a/python/pyversion.mk b/python/pyversion.mk
index 71b5acf..baba538 100644
--- a/python/pyversion.mk
+++ b/python/pyversion.mk
@@ -7,11 +7,15 @@ PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
 
 .IF "$(GUI)" == "UNX"
 .IF "$(OS)" == "MACOSX"
-PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib
+PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).a
+PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython
+CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR)
+# needed to fix install_name in pyuno
+PYTHON_MAKEINSTALLDIR=%%replaceme%%
 .ELSE
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
-.ENDIF
 PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
+.ENDIF
 .ELSE
 .IF "$(COM)" == "GCC"
 PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll
commit 5bb7155cd9c7f305a3378ed95b53460af1900176
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jun 6 18:10:24 2011 +0200

    don't limit the _POSIX_SEMAPHORES+0 to FreeBSD (Mac needs it as well), rediff
    
    please guys'n'gals:
    Use dmake create_patch when updating/creating new patches. And when
    replacing patches instead of adding ones, use solenv/bin/patch_sanitizer.pl

diff --git a/python/Python-2.6.1.patch b/python/Python-2.6.1.patch
index 0e045c4..ac70bab 100644
--- a/python/Python-2.6.1.patch
+++ b/python/Python-2.6.1.patch
@@ -1,5 +1,5 @@
---- misc/build/Python-2.6.1/Include/pyport.h	Wed Jun 11 09:41:16 2008
-+++ misc/build/Python-2.6.1/Include/pyport.h	Fri Apr 17 09:02:52 2009
+--- misc/Python-2.6.1/Include/pyport.h	2008-06-11 09:41:16.000000000 +0200
++++ misc/build/Python-2.6.1/Include/pyport.h	2011-06-06 17:31:17.000000000 +0200
 @@ -449,11 +449,6 @@
  in platform-specific #ifdefs.
  **************************************************************************/
@@ -12,8 +12,8 @@
  #ifdef __BEOS__
  /* Unchecked */
  /* It's in the libs, but not the headers... - [cjh] */
---- misc/build/Python-2.6.1/PCbuild/pcbuild.sln	2008-06-27 04:30:34.000000000 +0200
-+++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln	2009-03-09 22:48:14.546329900 +0100
+--- misc/Python-2.6.1/PCbuild/pcbuild.sln	2008-06-27 04:30:34.000000000 +0200
++++ misc/build/Python-2.6.1/PCbuild/pcbuild.sln	2011-06-06 17:31:17.000000000 +0200
 @@ -15,16 +15,6 @@
  		{C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD}
  	EndProjectSection
@@ -31,7 +31,7 @@
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
  EndProject
  Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}"
-@@ -38,12 +38,6 @@
+@@ -38,12 +28,6 @@
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  	EndProjectSection
  EndProject
@@ -44,7 +44,7 @@
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
  	ProjectSection(ProjectDependencies) = postProject
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -69,34 +69,18 @@
+@@ -69,12 +53,6 @@
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  	EndProjectSection
  EndProject
@@ -57,12 +57,7 @@
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}"
  	ProjectSection(ProjectDependencies) = postProject
  		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}
- 		{86937F53-C189-40EF-8CE8-8759D8E7D480} = {86937F53-C189-40EF-8CE8-8759D8E7D480}
- 		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
- 	EndProjectSection
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
- 	ProjectSection(ProjectDependencies) = postProject
+@@ -87,16 +65,6 @@
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  	EndProjectSection
  EndProject
@@ -79,7 +74,7 @@
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}"
  	ProjectSection(ProjectDependencies) = postProject
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -114,19 +114,6 @@
+@@ -112,19 +80,6 @@
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
  	EndProjectSection
  EndProject
@@ -99,7 +94,7 @@
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
  	ProjectSection(ProjectDependencies) = postProject
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -162,20 +162,20 @@
+@@ -162,20 +117,20 @@
  		{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64
  		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
  		{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
@@ -128,7 +123,7 @@
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32
  		{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64
-@@ -226,20 +226,20 @@
+@@ -226,20 +181,20 @@
  		{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
  		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
  		{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
@@ -157,7 +152,7 @@
  		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32
  		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32
  		{28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64
-@@ -448,7 +448,7 @@
+@@ -481,7 +436,7 @@
  		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.ActiveCfg = Release|x64
  		{D06B6426-4762-44CC-8BAD-D79052507F2F}.Release|x64.Build.0 = Release|x64
  		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.Debug|Win32.ActiveCfg = Release|Win32
@@ -166,8 +161,8 @@
  		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|Win32.ActiveCfg = Release|Win32
  		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGInstrument|x64.ActiveCfg = Release|x64
  		{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}.PGUpdate|Win32.ActiveCfg = Release|Win32
---- misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj
-+++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj
+--- misc/Python-2.6.1/PCbuild/make_versioninfo.vcproj	2008-06-12 23:58:20.000000000 +0200
++++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj	2011-06-06 17:31:17.000000000 +0200
 @@ -124,6 +124,8 @@
  				InlineFunctionExpansion="1"
  				EnableIntrinsicFunctions="true"
@@ -177,7 +172,7 @@
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
-@@ -140,6 +140,8 @@
+@@ -137,6 +139,8 @@
  			<Tool
  				Name="VCLinkerTool"
  				OutputFile="$(SolutionDir)make_versioninfo.exe"
@@ -186,7 +181,43 @@
  			/>
  			<Tool
  				Name="VCALinkTool"
-@@ -268,6 +268,8 @@
+@@ -175,7 +179,7 @@
+ 			<Tool
+ 				Name="VCCustomBuildTool"
+ 				Description="Build PC/pythonnt_rc(_d).h"
+-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
++				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
+ 				Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+ 			/>
+ 			<Tool
+@@ -210,7 +214,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCLinkerTool"
+-				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
++				OutputFile="$(SolutionDir)make_versioninfo.exe"
+ 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+ 				SubSystem="1"
+ 				BaseAddress="0x1d000000"
+@@ -235,7 +239,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"
+-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
++				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
+ 			/>
+ 		</Configuration>
+ 		<Configuration
+@@ -249,7 +253,7 @@
+ 			<Tool
+ 				Name="VCCustomBuildTool"
+ 				Description="Build PC/pythonnt_rc(_d).h"
+-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
++				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
+ 				Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
+ 			/>
+ 			<Tool
+@@ -268,6 +272,8 @@
  				InlineFunctionExpansion="1"
  				EnableIntrinsicFunctions="false"
  				PreprocessorDefinitions="_CONSOLE"
@@ -195,18 +226,29 @@
  			/>
  			<Tool
  				Name="VCManagedResourceCompilerTool"
-@@ -285,7 +285,8 @@
+@@ -280,8 +286,9 @@
+ 			/>
  			<Tool
  				Name="VCLinkerTool"
- 				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
+-				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
+-				TargetMachine="17"
++				OutputFile="$(SolutionDir)make_versioninfo.exe"
 +				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 +				SubSystem="1"
--				TargetMachine="17"
  			/>
  			<Tool
  				Name="VCALinkTool"
---- misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcproj
-+++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcproj
+@@ -303,7 +310,7 @@
+ 			/>
+ 			<Tool
+ 				Name="VCPostBuildEventTool"
+-				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
++				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
+ 			/>
+ 		</Configuration>
+ 	</Configurations>
+--- misc/Python-2.6.1/PCbuild/make_buildinfo.vcproj	2007-11-30 20:18:08.000000000 +0100
++++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.vcproj	2011-06-06 17:31:17.000000000 +0200
 @@ -119,6 +119,9 @@
  			/>
  			<Tool
@@ -217,9 +259,9 @@
  			/>
  			<Tool
  				Name="VCALinkTool"
---- misc/build/Python-2.6.1/PCbuild/x64.vsprops
-+++ misc/build/Python-2.6.1/PCbuild/x64.vsprops
-@@ -10,7 +10,7 @@
+--- misc/Python-2.6.1/PCbuild/x64.vsprops	2008-02-29 19:54:45.000000000 +0100
++++ misc/build/Python-2.6.1/PCbuild/x64.vsprops	2011-06-06 17:31:17.000000000 +0200
+@@ -3,7 +3,7 @@
  	ProjectType="Visual C++"
  	Version="8.00"
  	Name="amd64"
@@ -228,7 +270,7 @@
  	IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\"
  	>
  	<Tool
-@@ -23,8 +23,4 @@
+@@ -15,8 +15,4 @@
  		Name="VCLinkerTool"
  		TargetMachine="17"
  	/>
@@ -237,8 +279,8 @@
 -		Value="$(HOST_PYTHON)"
 -	/>
  </VisualStudioPropertySheet>
---- misc/build/Python-2.6.1/PCbuild/debug.vsprops
-+++ misc/build/Python-2.6.1/PCbuild/debug.vsprops
+--- misc/Python-2.6.1/PCbuild/debug.vsprops	2008-04-03 20:27:06.000000000 +0200
++++ misc/build/Python-2.6.1/PCbuild/debug.vsprops	2011-06-06 17:31:17.000000000 +0200
 @@ -10,6 +10,6 @@
  	/>
  	<UserMacro
@@ -247,8 +289,8 @@
 +		Value="$(OutDir)\kill_python.exe"
  	/>
  </VisualStudioPropertySheet>
---- misc/build/Python-2.6.1/PCbuild/kill_python.vcproj
-+++ misc/build/Python-2.6.1/PCbuild/kill_python.vcproj
+--- misc/Python-2.6.1/PCbuild/kill_python.vcproj	2008-06-14 00:38:33.000000000 +0200
++++ misc/build/Python-2.6.1/PCbuild/kill_python.vcproj	2011-06-06 17:31:17.000000000 +0200
 @@ -54,7 +54,7 @@
  			/>
  			<Tool
@@ -267,65 +309,9 @@
  				SubSystem="1"
  			/>
  			<Tool
---- misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj
-+++ misc/build/Python-2.6.1/PCbuild/make_versioninfo.vcproj
-@@ -179,7 +179,7 @@
- 			<Tool
- 				Name="VCCustomBuildTool"
- 				Description="Build PC/pythonnt_rc(_d).h"
--				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
- 				Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
- 			/>
- 			<Tool
-@@ -214,7 +214,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
-+				OutputFile="$(SolutionDir)make_versioninfo.exe"
- 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- 				SubSystem="1"
- 				BaseAddress="0x1d000000"
-@@ -239,7 +239,7 @@
- 			/>
- 			<Tool
- 				Name="VCPostBuildEventTool"
--				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
-+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
- 			/>
- 		</Configuration>
- 		<Configuration
-@@ -253,7 +253,7 @@
- 			<Tool
- 				Name="VCCustomBuildTool"
- 				Description="Build PC/pythonnt_rc(_d).h"
--				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
- 				Outputs="$(SolutionDir)..\PC\pythonnt_rc_d.h"
- 			/>
- 			<Tool
-@@ -286,7 +286,7 @@
- 			/>
- 			<Tool
- 				Name="VCLinkerTool"
--				OutputFile="$(SolutionDir)make_versioninfo_d.exe"
-+				OutputFile="$(SolutionDir)make_versioninfo.exe"
- 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
- 				SubSystem="1"
- 			/>
-@@ -310,7 +310,7 @@
- 			/>
- 			<Tool
- 				Name="VCPostBuildEventTool"
--				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo_d.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
-+				CommandLine="cd $(SolutionDir)&#x0D;&#x0A;make_versioninfo.exe &gt; ..\PC\python_nt_d.h&#x0D;&#x0A;"
- 			/>
- 		</Configuration>
- 	</Configurations>
---- misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops
-+++ misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops
-@@ -15,13 +15,13 @@
+--- misc/Python-2.6.1/PCbuild/pyd_d.vsprops	2008-11-06 18:29:54.000000000 +0100
++++ misc/build/Python-2.6.1/PCbuild/pyd_d.vsprops	2011-06-06 17:31:17.000000000 +0200
+@@ -11,13 +11,13 @@
  		InlineFunctionExpansion="0"
  		EnableIntrinsicFunctions="false"
  		PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
@@ -350,8 +336,8 @@
 +		Value="$(SolutionDir)python.exe"
  	/>
  </VisualStudioPropertySheet>
---- misc/build/Python-2.6.1/PCbuild/python.vcproj
-+++ misc/build/Python-2.6.1/PCbuild/python.vcproj
+--- misc/Python-2.6.1/PCbuild/python.vcproj	2008-06-12 23:58:20.000000000 +0200
++++ misc/build/Python-2.6.1/PCbuild/python.vcproj	2011-06-06 17:31:17.000000000 +0200
 @@ -191,7 +191,7 @@
  				EnableIntrinsicFunctions="false"
  				AdditionalIncludeDirectories=""
@@ -391,8 +377,8 @@
  				BaseAddress="0x1d000000"
  			/>
  			<Tool
---- misc/build/Python-2.6.1/PCbuild/pythoncore.vcproj
-+++ misc/build/Python-2.6.1/PCbuild/pythoncore.vcproj
+--- misc/Python-2.6.1/PCbuild/pythoncore.vcproj	2008-06-10 23:23:22.000000000 +0200
++++ misc/build/Python-2.6.1/PCbuild/pythoncore.vcproj	2011-06-06 17:31:17.000000000 +0200
 @@ -198,7 +198,7 @@
  				EnableIntrinsicFunctions="false"
  				AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
@@ -441,8 +427,8 @@
  			/>
  			<Tool
  				Name="VCALinkTool"
---- misc/build/Python-2.6.1/PCbuild/make_buildinfo.c
-+++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.c
+--- misc/Python-2.6.1/PCbuild/make_buildinfo.c	2007-12-06 22:13:06.000000000 +0100
++++ misc/build/Python-2.6.1/PCbuild/make_buildinfo.c	2011-06-06 17:31:17.000000000 +0200
 @@ -65,7 +65,7 @@
  		strcat_s(command, CMD_SIZE, "-MD ");
  	}
@@ -452,9 +438,9 @@
  	}
  	else if (strcmp(argv[1], "ReleaseItanium") == 0) {
  		strcat_s(command, CMD_SIZE, "-MD /USECL:MS_ITANIUM ");
---- misc/build/Python-2.6.1/Objects/exceptions.c
-+++ misc/build/Python-2.6.1/Objects/exceptions.c
-@@ -2158,8 +2158,6 @@
+--- misc/Python-2.6.1/Objects/exceptions.c	2008-07-30 19:45:10.000000000 +0200
++++ misc/build/Python-2.6.1/Objects/exceptions.c	2011-06-06 17:31:17.000000000 +0200
+@@ -2157,8 +2157,6 @@
  #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__)
      /* Set CRT argument error handler */
      prevCrtHandler = _set_invalid_parameter_handler(InvalidParameterHandler);
@@ -463,15 +449,15 @@
  #endif
  }
  
-@@ -2170,6 +2170,5 @@
+@@ -2170,6 +2168,5 @@
  #if defined _MSC_VER && _MSC_VER >= 1400 && defined(__STDC_SECURE_LIB__)
      /* reset CRT error handling */
      _set_invalid_parameter_handler(prevCrtHandler);
 -    _CrtSetReportMode(_CRT_ASSERT, prevCrtReportMode);
  #endif
  }
---- misc/build/Python-2.6.1/Lib/test/test_threading.py.bak	2009-03-12 07:59:17.000000000 +0000
-+++ misc/build/Python-2.6.1/Lib/test/test_threading.py	2009-03-12 10:48:04.000000000 +0000
+--- misc/Python-2.6.1/Lib/test/test_threading.py	2008-09-30 22:41:13.000000000 +0200
++++ misc/build/Python-2.6.1/Lib/test/test_threading.py	2011-06-06 17:31:17.000000000 +0200
 @@ -382,7 +382,7 @@
              return
          # Skip platforms with known problems forking from a worker thread.
@@ -481,10 +467,9 @@
              print >>sys.stderr, ('Skipping test_3_join_in_forked_from_thread'
                                   ' due to known OS bugs on'), sys.platform
              return
-
---- misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure.orig	2008-05-24 00:06:50.000000000 +0900
-+++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure	2008-10-09 20:24:02.000000000 +0900
-@@ -4725,6 +4725,6 @@
+--- misc/Python-2.6.1/Modules/_ctypes/libffi/configure	2008-05-23 17:06:50.000000000 +0200
++++ misc/build/Python-2.6.1/Modules/_ctypes/libffi/configure	2011-06-06 17:31:17.000000000 +0200
+@@ -4725,7 +4725,7 @@
    rm -rf conftest*
    ;;
  
@@ -492,10 +477,10 @@
 +amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
  s390*-*linux*|sparc*-*linux*)
    # Find out which ABI we are using.
-
---- misc/build/Python-2.6.1/Python/thread_pthread.h.orig	2006-06-13 16:04:24.000000000 +0100
-+++ misc/build/Python-2.6.1/Python/thread_pthread.h	2009-03-12 10:55:49.000000000 +0000
-@@ -26,13 +26,18 @@
+   echo 'int i;' > conftest.$ac_ext
+--- misc/Python-2.6.1/Python/thread_pthread.h	2006-06-13 17:04:24.000000000 +0200
++++ misc/build/Python-2.6.1/Python/thread_pthread.h	2011-06-06 17:33:34.000000000 +0200
+@@ -26,6 +26,10 @@
  #endif
  #endif
  
@@ -506,16 +491,7 @@
  /* The POSIX spec says that implementations supporting the sem_*
     family of functions must indicate this by defining
     _POSIX_SEMAPHORES. */   
- #ifdef _POSIX_SEMAPHORES
- /* On FreeBSD 4.x, _POSIX_SEMAPHORES is defined empty, so 
-    we need to add 0 to make it work there as well. */
--#if (_POSIX_SEMAPHORES+0) == -1
-+#if defined(__FreeBSD__) && __FreeBSD_version < 701104 && \
-+    (_POSIX_SEMAPHORES+0) == -1
- #define HAVE_BROKEN_POSIX_SEMAPHORES
- #else
- #include <semaphore.h>
-@@ -44,7 +49,6 @@
+@@ -44,7 +48,6 @@
     in default setting.  So the process scope is preferred to get
     enough number of threads to work. */
  #ifdef __FreeBSD__
@@ -523,7 +499,7 @@
  #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101
  #undef PTHREAD_SYSTEM_SCHED_SUPPORTED
  #endif
-@@ -149,6 +153,9 @@
+@@ -149,6 +152,9 @@
  {
  	pthread_t th;
  	int status;
@@ -533,7 +509,7 @@
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
  	pthread_attr_t attrs;
  #endif
-@@ -177,7 +184,10 @@
+@@ -177,7 +183,10 @@
  #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
          pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM);
  #endif
@@ -545,7 +521,7 @@
  	status = pthread_create(&th, 
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
  				 &attrs,
-@@ -188,6 +198,9 @@
+@@ -188,6 +197,9 @@
  				 (void *)arg
  				 );
  
@@ -555,8 +531,17 @@
  #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED)
  	pthread_attr_destroy(&attrs);
  #endif
---- misc/build/Python-2.6.1/configure	2008-11-17 02:57:10.000000000 +0900
-+++ misc/build/Python-2.6.1/configure	2009-03-23 21:18:42.000000000 +0900
+--- misc/Python-2.6.1/configure	2008-11-16 18:57:10.000000000 +0100
++++ misc/build/Python-2.6.1/configure	2011-06-06 17:31:17.000000000 +0200
+@@ -4102,7 +4102,7 @@
+           ;;
+     SunOS*)
+ 	  LDLIBRARY='libpython$(VERSION).so'
+-	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
++	  BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
+ 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+           ;;
 @@ -4110,11 +4110,6 @@
  	  LDLIBRARY='libpython$(VERSION).so'
  	  BLDLIBRARY='-L. -lpython$(VERSION)'
@@ -569,19 +554,8 @@
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
      hp*|HP*)
---- misc/build/Python-2.6.1/configure	Sun Nov 16 18:57:10 2008
-+++ misc/build/Python-2.6.1/configure	Thu Apr 16 15:16:03 2009
-@@ -4102,7 +4102,7 @@
-           ;;
-     SunOS*)
- 	  LDLIBRARY='libpython$(VERSION).so'
--	  BLDLIBRARY='-Wl,-R,$(LIBDIR) -L. -lpython$(VERSION)'
-+	  BLDLIBRARY=-R\'\$\$ORIGIN\'' -L. -lpython$(VERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
-           ;;
---- misc/build/Python-2.6.1/PC/pyconfig.h
-+++ misc/build/Python-2.6.1/PC/pyconfig.h
+--- misc/Python-2.6.1/PC/pyconfig.h	2008-06-13 02:42:22.000000000 +0200
++++ misc/build/Python-2.6.1/PC/pyconfig.h	2011-06-06 17:31:17.000000000 +0200
 @@ -322,11 +322,7 @@
  			/* So MSVC users need not specify the .lib file in
  			their Makefile (other compilers are generally
commit cfcaaf6f1330de7a372cce0b51bdacd1f96968fa
Merge: 39ff0c2... d525686...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Mon Jun 6 12:53:10 2011 +0200

    Merge remote-tracking branch 'origin/libreoffice-3-4'

commit 39ff0c2d9bd90e727da86833de7b4345da2218ac
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 6 09:07:30 2011 +0300

    Always compare CROSS_COMPILING explicitly to "YES"

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index f755075..20c5340 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -103,7 +103,7 @@ CONFIGURE_FLAGS+= --enable-shared
 .IF "$(OS)"=="MACOSX"
 CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 .ENDIF
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index abe850d..754ceba 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -109,7 +109,7 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
 CONFIGURE_DIR=
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
 CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 cairo_CPPFLAGS+=$(EXTRA_CDEFS)
@@ -154,7 +154,7 @@ CONFIGURE_FLAGS=--disable-shared
 CONFIGURE_FLAGS=--disable-static --enable-xlib
 .ENDIF
 CONFIGURE_FLAGS+=--enable-ft --disable-svg --enable-gtk-doc=no --enable-test-surfaces=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
-.IF "$(CROSS_COMPILING)"!=""
+.IF "$(CROSS_COMPILING)"=="YES"
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
 .ENDIF
 BUILD_ACTION=$(GNUMAKE)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b344520..0a1d443 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -85,7 +85,7 @@ CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
 CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
 .ENDIF # "$(EXTRA_CDEFS)"!=""
 .ENDIF # "$(SYSBASE)"!=""
-.IF "$(CROSS_COMPILING)"!=""

... etc. - the rest is truncated

• Previous message: [Libreoffice-commits] .: Branch 'feature/gnumake4' - 189 commits - apache-commons/java apache-commons/prj ct2n/ConvertTextToNumber-1.3.2-no-license.patch ct2n/ConvertTextToNumber-1.3.2-no-visible-by-default.patch ct2n/delzip ct2n/makefile.mk ct2n/prj .gitignore jfreereport/java jfreereport/patches jfreereport/prj languagetool/JLanguageTool-1.0.0.patch languagetool/makefile.mk languagetool/prj migrationanalysis/src mysqlc/prj mysqlc/source nlpsolver/locale nlpsolver/makefile.mk nlpsolver/nlpsolver-0.9.patch nlpsolver/prj reportbuilder/java reportbuilder/prj reportbuilder/registry reportbuilder/util sdext/inc sdext/prj sdext/source swext/mediawiki swext/prj tomcat/makefile.mk tomcat/prj xpdf/prj
• Next message: [Libreoffice-commits] .: Branch 'feature/gnumake4' - 122 commits - .gitignore packimages/pack packimages/prj postprocess/checkdeliver postprocess/packcomponents postprocess/packregistry postprocess/prj postprocess/rebase
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]