[ooo-build-commit] .: 328 commits - AUTHORS autogen.sh berkeleydb/db-4.2.52-mingw.patch berkeleydb/db-4.2.52.patch berkeleydb/db-4.7.25-mingw.patch berkeleydb/db-4.7.25.patch berkeleydb/download berkeleydb/makefile.mk berkeleydb/prj bitstream_vera_fonts/download bitstream_vera_fonts/fonts bitstream_vera_fonts/prj boost/boost-1.30.2.patch boost/boost_1_34_1.patch boost/boost_1_39_0.patch boost/download boost/makefile.mk boost/prj boost/spirit boost/spirit-1.6.1.patch buildenv.in build/prj build/src build/stamp cairo/cairo cairo/download cairo/pixman cairo/prj ChangeLog configure.in COPYING curl/curl-7.12.2.patch curl/curl-7.19.7_mingw.patch curl/curl-7.19.7.patch curl/curl-7.19.7_win.patch curl/download curl/makefile.mk curl/prj dictionaries/af_ZA dictionaries/ca dictionaries/cs_CZ dictionaries/da_DK dictionaries/de_AT dictionaries/de_CH dictionaries/de_DE dictionaries/diclst dictionaries/en dictionaries/en_AU dictionaries/en_CA dictionaries/en_GB dictionaries/en_US dictionaries/en_ZA d ictionaries/es_ES dictionaries/et_EE dictionaries/fr_FR dictionaries/gl dictionaries/he_IL dictionaries/hu_HU dictionaries/it_IT dictionaries/ku_TR dictionaries/lt_LT dictionaries/ne_NP dictionaries/nl_NL dictionaries/no dictionaries/pl_PL dictionaries/prj dictionaries/pt_BR dictionaries/ro dictionaries/ru_RU dictionaries/sk_SK dictionaries/sl_SI dictionaries/sr dictionaries/sv_SE dictionaries/sw_TZ dictionaries/th_TH dictionaries/util dictionaries/vi dictionaries/zu_ZA expat/download expat/expat-2.0.1.patch expat/expat.patch expat/expat-winapi.patch expat/makefile.mk expat/prj .gitignore graphite/graphite-2.3.1.patch graphite/graphite-2.3.1.patch.mingw graphite/makefile.mk graphite/prj hunspell/download hunspell/hunspell-1.2.8.patch hunspell/hunspell-1.2.8-thesfix.patch hunspell/hunspell-consts-1.2.8.patch hunspell/hunspell-mingw.patch hunspell/hunspell-solaris.patch hunspell/hunspell-stacksmash.patch hunspell/hunspell-wntconfig.patch hunspell/makefile.mk hunspell/prj icu/c reatemak.cfg icu/createmak.pl icu/download icu/icu-4.0.patch icu/icu4c-4_0_1-src.patch icu/icuversion.mk icu/makefile.mk icu/prj INSTALL jpeg/download jpeg/jpeg-6b.patch jpeg/makefile.mk libxml2/download libxml2/libxml2-2.6.31.patch libxml2/libxml2-configure.patch libxml2/libxml2-global-symbols.patch libxml2/libxml2-gnome599717.patch libxml2/libxml2-mingw.patch libxml2/makefile.mk libxml2/prj libxslt/download libxslt/libxslt-1.1.24.patch libxslt/libxslt-1.1.24_win_manifest.patch libxslt/libxslt-configure.patch libxslt/libxslt-internal-symbols.patch libxslt/libxslt-mingw.patch libxslt/libxsltversion.mk libxslt/libxslt-win_manifest.patch libxslt/makefile.mk Makefile.am more_fonts/fonts more_fonts/prj moz/download moz/extractfiles.mk moz/makefile.mk moz/mozilla-source-1.0.patch moz/mozilla-source-1.7.5.patch moz/mozilla-source-1.7b.patch moz/patches moz/prj moz/README moz/seamonkey-source-1.1.14.patch moz/zipped neon/download neon/makefile.mk neon/neon_exports_unix.patch neon/n eon_exports_win.patch neon/neon.patch neon/prj neon/version.mk NEWS nss/makefile.mk nss/nss_macosx.patch nss/nss.patch nss/nss.patch.mingw nss/prj nss/readme.txt python/download python/makefile.mk python/prj python/Python-2.6.1-mingw.patch python/Python-2.6.1.patch python/Python-ssl.patch README saxon/download saxon/makefile.mk saxon/prj stax/download stax/makefile.mk stax/prj zlib/download zlib/makefile.mk zlib/make_patched_header.pl zlib/prj zlib/zlib-1.1.4.patch
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Aug 18 10:44:31 PDT 2010
.gitignore | 21
AUTHORS | 1
COPYING | 165
ChangeLog | 1
INSTALL | 237
Makefile.am | 34
README | 12
autogen.sh | 11
berkeleydb/db-4.2.52-mingw.patch | 233
berkeleydb/db-4.2.52.patch | 1981
berkeleydb/db-4.7.25-mingw.patch | 348
berkeleydb/db-4.7.25.patch | 1048
berkeleydb/download/README | 2
berkeleydb/makefile.mk | 86
berkeleydb/prj/build.lst | 2
berkeleydb/prj/d.lst | 14
bitstream_vera_fonts/fonts/ttf_dejavu/makefile.mk | 64
bitstream_vera_fonts/fonts/ttf_liberation/makefile.mk | 66
bitstream_vera_fonts/prj/build.lst | 4
bitstream_vera_fonts/prj/d.lst | 7
boost/boost-1.30.2.patch | 736
boost/boost_1_34_1.patch | 260
boost/boost_1_39_0.patch | 287
boost/makefile.mk | 60
boost/prj/build.lst | 3
boost/prj/d.lst | 504
boost/spirit-1.6.1.patch | 1748
boost/spirit/makefile.mk | 81
build/prj/build.lst | 1
build/src/.gitignore | 1
build/src/OpenOffice.org-libs-extern-sys.pc.in | 7
build/stamp/.gitignore | 3
build/stamp/README.txt | 1
buildenv.in | 10
cairo/cairo/makefile.mk | 30
cairo/pixman/makefile.mk | 23
cairo/prj/build.lst | 2
configure.in | 19
curl/curl-7.12.2.patch | 1085
curl/curl-7.19.7.patch | 83
curl/curl-7.19.7_mingw.patch | 24
curl/curl-7.19.7_win.patch | 19
curl/makefile.mk | 48
curl/prj/build.lst | 2
curl/prj/d.lst | 2
dev/null |binary
dictionaries/af_ZA/dictionary.lst | 4
dictionaries/af_ZA/makefile.mk | 8
dictionaries/ca/LICENSES-en.txt | 674
dictionaries/ca/LLICENCIES-ca.txt | 12
dictionaries/ca/README_th_ca_ES_v3.txt | 50
dictionaries/ca/ca.aff | 1346
dictionaries/ca/ca.dic |95054 ++
dictionaries/ca/description.xml | 69
dictionaries/ca/dict_LICENSES-en.txt | 2
dictionaries/ca/dict_LLICENCIES-ca.txt | 2
dictionaries/ca/dictionaries.xcu | 41
dictionaries/ca/hyph_LICENSES-en.txt | 674
dictionaries/ca/hyph_LLICENCIES-ca.txt | 12
dictionaries/ca/hyph_ca.dic | 1022
dictionaries/ca/hyph_release-note_ca.txt | 8
dictionaries/ca/hyph_release-note_en.txt | 8
dictionaries/ca/makefile.mk | 90
dictionaries/ca/manifest.xml | 6
dictionaries/ca/th_LICENCES-fr.txt | 4
dictionaries/ca/th_LICENCIAS-es.txt | 4
dictionaries/ca/th_LICENSES-en.txt | 4
dictionaries/ca/th_LLICENCIES-ca.txt | 4
dictionaries/ca/th_ca_ES_v3.dat |22251
dictionaries/ca/th_ca_ES_v3.idx | 8158
dictionaries/ca/th_release_note-ca.txt | 8
dictionaries/cs_CZ/dictionary.lst | 1
dictionaries/cs_CZ/makefile.mk | 11
dictionaries/da_DK/README_da_DK.txt | 5
dictionaries/da_DK/da_DK.aff | 108
dictionaries/da_DK/da_DK.dic |284042 ++++----
dictionaries/da_DK/desc_da_DK.txt | 3
dictionaries/da_DK/desc_en_US.txt | 4
dictionaries/da_DK/description.xml | 14
dictionaries/da_DK/dictionary.lst | 2
dictionaries/da_DK/makefile.mk | 13
dictionaries/da_DK/manifest.xml | 1
dictionaries/da_DK/path2516.png |binary
dictionaries/de_AT/Copyright | 20
dictionaries/de_AT/INSTALL_de.txt | 21
dictionaries/de_AT/README_de_AT.txt | 7
dictionaries/de_AT/README_de_AT_frami.txt | 17
dictionaries/de_AT/README_de_AT_thes.txt | 1
dictionaries/de_AT/README_extension_owner.txt | 37
dictionaries/de_AT/README_hyph_de_AT.txt | 37
dictionaries/de_AT/README_th_de_AT_v2.txt | 558
dictionaries/de_AT/VERSION | 1
dictionaries/de_AT/de_AT.aff | 723
dictionaries/de_AT/de_AT.dic |71312 --
dictionaries/de_AT/de_AT_frami.aff | 717
dictionaries/de_AT/de_AT_frami.dic |163454 ++++
dictionaries/de_AT/description.xml | 13
dictionaries/de_AT/dictionaries.xcu | 42
dictionaries/de_AT/hyph_de_AT.dic | 7519
dictionaries/de_AT/makefile.mk | 40
dictionaries/de_AT/manifest.xml | 3
dictionaries/de_AT/th_de_AT_v2.dat |128064 +++
dictionaries/de_AT/th_de_AT_v2.idx |56613 +
dictionaries/de_CH/Copyright | 20
dictionaries/de_CH/INSTALL_de.txt | 21
dictionaries/de_CH/README_de_CH.txt | 7
dictionaries/de_CH/README_de_CH_frami.txt | 17
dictionaries/de_CH/README_extension_owner.txt | 38
dictionaries/de_CH/README_hyph_de_CH.txt | 37
dictionaries/de_CH/README_th_de_CH_v2.txt | 558
dictionaries/de_CH/VERSION | 1
dictionaries/de_CH/de_CH.aff | 723
dictionaries/de_CH/de_CH.dic |72557 --
dictionaries/de_CH/de_CH_frami.aff | 717
dictionaries/de_CH/de_CH_frami.dic |163265 ++++
dictionaries/de_CH/description.xml | 13
dictionaries/de_CH/dictionaries.xcu | 42
dictionaries/de_CH/hyph_de_CH.dic | 7519
dictionaries/de_CH/makefile.mk | 50
dictionaries/de_CH/manifest.xml | 3
dictionaries/de_CH/th_de_CH_v2.dat |128064 +++
dictionaries/de_CH/th_de_CH_v2.idx |56613 +
dictionaries/de_DE/Copyright | 20
dictionaries/de_DE/INSTALL_de.txt | 21
dictionaries/de_DE/README_de_DE.txt | 7
dictionaries/de_DE/README_de_DE_frami.txt | 17
dictionaries/de_DE/README_extension_owner.txt | 37
dictionaries/de_DE/README_hyph_de_DE.txt | 15
dictionaries/de_DE/README_th_de_DE_v2.txt | 558
dictionaries/de_DE/VERSION | 1
dictionaries/de_DE/de_DE.aff | 723
dictionaries/de_DE/de_DE.dic |71038 --
dictionaries/de_DE/de_DE_frami.aff | 717
dictionaries/de_DE/de_DE_frami.dic |163217 ++++
dictionaries/de_DE/description.xml | 8
dictionaries/de_DE/dictionaries.xcu | 51
dictionaries/de_DE/downloadplaces.txt | 3
dictionaries/de_DE/hyph_de_DE.dic | 19
dictionaries/de_DE/makefile.mk | 46
dictionaries/de_DE/manifest.xml | 3
dictionaries/de_DE/th_de_DE_v2.dat |128064 +++
dictionaries/de_DE/th_de_DE_v2.idx |56613 +
dictionaries/diclst/dictionary.lst | 15
dictionaries/diclst/makefile.mk | 10
dictionaries/en/README.txt | 76
dictionaries/en/README_en_AU.txt | 49
dictionaries/en/README_en_CA.txt | 276
dictionaries/en/README_en_GB.txt | 56
dictionaries/en/README_en_GB_thes.txt | 1
dictionaries/en/README_en_US.txt | 276
dictionaries/en/README_en_ZA.txt | 709
dictionaries/en/README_hyph_en_GB.txt | 194
dictionaries/en/README_hyph_en_US.txt | 55
dictionaries/en/WordNet_license.txt | 31
dictionaries/en/affDescription.txt | 149
dictionaries/en/changelog.txt | 95
dictionaries/en/description.xml | 13
dictionaries/en/dictionaries.xcu | 86
dictionaries/en/en_AU.aff | 1551
dictionaries/en/en_AU.dic |49845 +
dictionaries/en/en_CA.aff | 3120
dictionaries/en/en_CA.dic |52992 +
dictionaries/en/en_GB.aff | 3411
dictionaries/en/en_GB.dic |56507 +
dictionaries/en/en_US.aff | 3107
dictionaries/en/en_US.dic |52891 +
dictionaries/en/en_ZA.aff | 1440
dictionaries/en/en_ZA.dic |53477 +
dictionaries/en/hyph_en_GB.dic |14334
dictionaries/en/hyph_en_US.dic |11402
dictionaries/en/license.txt | 280
dictionaries/en/makefile.mk | 94
dictionaries/en/manifest.xml | 6
dictionaries/en/th_en_US_v2.dat |350654 ++++++++++
dictionaries/en/th_en_US_v2.idx |145868 ++++
dictionaries/en_AU/README_en_AU.txt | 49
dictionaries/en_AU/changelog.txt | 95
dictionaries/en_AU/dictionaries.xcu | 20
dictionaries/en_AU/en_AU.aff | 1526
dictionaries/en_AU/en_AU.dic |49845 -
dictionaries/en_AU/license.txt | 280
dictionaries/en_AU/makefile.mk | 78
dictionaries/en_AU/manifest.xml | 6
dictionaries/en_CA/README_en_CA.txt | 276
dictionaries/en_CA/en_CA.aff | 2846
dictionaries/en_CA/en_CA.dic |52992 -
dictionaries/en_CA/makefile.mk | 76
dictionaries/en_GB/README_en_GB.txt | 56
dictionaries/en_GB/README_en_GB_thes.txt | 1
dictionaries/en_GB/README_hyph_en_GB.txt | 185
dictionaries/en_GB/affDescription.txt | 149
dictionaries/en_GB/description.xml | 13
dictionaries/en_GB/dictionaries.xcu | 86
dictionaries/en_GB/dictionary.lst | 3
dictionaries/en_GB/en_GB.aff | 3130
dictionaries/en_GB/en_GB.dic |56507 -
dictionaries/en_GB/hyph_en_GB.dic |11488
dictionaries/en_GB/makefile.mk | 82
dictionaries/en_GB/manifest.xml | 6
dictionaries/en_US/README.txt | 68
dictionaries/en_US/README_en_US.txt | 276
dictionaries/en_US/README_hyph_en_US.txt | 51
dictionaries/en_US/WordNet_license.txt | 31
dictionaries/en_US/dictionaries.xcu | 31
dictionaries/en_US/dictionary.lst | 3
dictionaries/en_US/en_US.aff | 2832
dictionaries/en_US/en_US.dic |52891 -
dictionaries/en_US/hyph_en_US.dic | 9843
dictionaries/en_US/makefile.mk | 92
dictionaries/en_US/manifest.xml | 6
dictionaries/en_ZA/README_en_ZA.txt | 709
dictionaries/en_ZA/dictionaries.xcu | 53
dictionaries/en_ZA/dictionary.lst | 3
dictionaries/en_ZA/en_ZA.aff | 1157
dictionaries/en_ZA/en_ZA.dic |53364 -
dictionaries/en_ZA/makefile.mk | 76
dictionaries/en_ZA/manifest.xml | 6
dictionaries/es_ES/dictionary.lst | 1
dictionaries/es_ES/makefile.mk | 8
dictionaries/et_EE/README_hyph_et_EE.txt | 4
dictionaries/et_EE/dictionary.lst | 2
dictionaries/et_EE/eehyph.tex | 3714
dictionaries/et_EE/makefile.mk | 9
dictionaries/fr_FR/LICENCES-fr.txt | 12
dictionaries/fr_FR/LICENSES-en.txt | 12
dictionaries/fr_FR/README_fr.txt | 84
dictionaries/fr_FR/README_fr_FR.txt | 335
dictionaries/fr_FR/README_hyph_fr.txt | 49
dictionaries/fr_FR/README_hyph_fr_FR.txt | 17
dictionaries/fr_FR/README_thes_fr.txt | 44
dictionaries/fr_FR/description.xml | 75
dictionaries/fr_FR/dictionaries.xcu | 12
dictionaries/fr_FR/fr.aff |12596
dictionaries/fr_FR/fr.dic |64137 +
dictionaries/fr_FR/fr_FR.aff | 679
dictionaries/fr_FR/fr_FR.dic |91582 --
dictionaries/fr_FR/frhyph.tex | 1458
dictionaries/fr_FR/hyph_fr.dic | 1778
dictionaries/fr_FR/hyph_fr_FR.dic | 1778
dictionaries/fr_FR/makefile.mk | 36
dictionaries/fr_FR/thes_fr.dat |72457 ++
dictionaries/fr_FR/thes_fr.idx |36206 +
dictionaries/gl/makefile.mk | 8
dictionaries/he_IL/README_he_IL.txt | 11
dictionaries/he_IL/description.xml | 12
dictionaries/he_IL/dictionaries.xcu | 20
dictionaries/he_IL/he_IL.aff | 3358
dictionaries/he_IL/he_IL.dic |329237 +++++++++
dictionaries/he_IL/makefile.mk | 73
dictionaries/he_IL/manifest.xml | 5
dictionaries/hu_HU/LICENSES-en.txt | 22
dictionaries/hu_HU/README_hu_HU.txt | 15
dictionaries/hu_HU/README_hyph_hu_HU.txt | 5
dictionaries/hu_HU/README_th_hu_HU_v2.txt | 683
dictionaries/hu_HU/description.xml | 4
dictionaries/hu_HU/dictionary.lst | 2
dictionaries/hu_HU/hu_HU.aff |53193 -
dictionaries/hu_HU/hu_HU.dic |139365 ++--
dictionaries/hu_HU/hyph_hu_HU.dic |119037 +--
dictionaries/hu_HU/makefile.mk | 28
dictionaries/hu_HU/th_hu_HU_v2.dat |52192 +
dictionaries/hu_HU/th_hu_HU_v2.idx |21692
dictionaries/it_IT/README_hyph_it_IT.txt | 2
dictionaries/it_IT/dictionary.lst | 3
dictionaries/it_IT/makefile.mk | 11
dictionaries/ku_TR/MPL-1.1.txt | 470
dictionaries/ku_TR/README_ku_TR.txt | 47
dictionaries/ku_TR/description.xml | 71
dictionaries/ku_TR/dictionaries.xcu | 20
dictionaries/ku_TR/ferheng.org.png |binary
dictionaries/ku_TR/gpl-3.0.txt | 674
dictionaries/ku_TR/ku_TR.aff | 234
dictionaries/ku_TR/ku_TR.dic | 4760
dictionaries/ku_TR/lgpl-2.1.txt | 504
dictionaries/ku_TR/license.txt | 9
dictionaries/ku_TR/makefile.mk | 83
dictionaries/ku_TR/manifest.xml | 6
dictionaries/lt_LT/dictionary.lst | 2
dictionaries/lt_LT/makefile.mk | 8
dictionaries/ne_NP/dictionary.lst | 2
dictionaries/ne_NP/makefile.mk | 11
dictionaries/nl_NL/description.xml | 26
dictionaries/nl_NL/dictionaries.xcu | 4
dictionaries/nl_NL/dictionary.lst | 2
dictionaries/nl_NL/makefile.mk | 8
dictionaries/no/COPYING | 340
dictionaries/no/README_hyph_NO.txt | 12
dictionaries/no/description.xml | 32
dictionaries/no/dictionaries.xcu | 77
dictionaries/no/hyph_nb_NO.dic |27142
dictionaries/no/hyph_nn_NO.dic |27142
dictionaries/no/makefile.mk | 83
dictionaries/no/manifest.xml | 5
dictionaries/no/nb_NO.aff | 627
dictionaries/no/nb_NO.dic |322044 +++++++++
dictionaries/no/nn_NO.aff | 511
dictionaries/no/nn_NO.dic |213550 ++++++
dictionaries/no/th_nb_NO_v2.dat |29267
dictionaries/no/th_nb_NO_v2.idx |13033
dictionaries/no/th_nn_NO_v2.dat | 69
dictionaries/no/th_nn_NO_v2.idx | 36
dictionaries/pl_PL/README_en.txt | 66
dictionaries/pl_PL/README_hyph_pl_PL.txt | 37
dictionaries/pl_PL/README_pl.txt | 544
dictionaries/pl_PL/README_pl_PL.txt | 27
dictionaries/pl_PL/description.xml | 77
dictionaries/pl_PL/dictionaries.xcu | 87
dictionaries/pl_PL/dictionary.lst | 3
dictionaries/pl_PL/flaga.png |binary
dictionaries/pl_PL/makefile.mk | 30
dictionaries/pl_PL/manifest.xml | 2
dictionaries/pl_PL/pl_PL.aff | 1376
dictionaries/pl_PL/pl_PL.dic |297489 ++++----
dictionaries/pl_PL/plhyph.tex | 4170
dictionaries/pl_PL/th_pl_PL_v2.dat |80252 ++
dictionaries/pl_PL/th_pl_PL_v2.idx |33849
dictionaries/prj/build.lst | 15
dictionaries/pt_BR/README_en.TXT | 59
dictionaries/pt_BR/README_hyph_pt_BR.TXT | 709
dictionaries/pt_BR/README_pt_BR.txt | 103
dictionaries/pt_BR/copyright.txt | 7
dictionaries/pt_BR/description.xml | 9
dictionaries/pt_BR/dictionaries.xcu | 4
dictionaries/pt_BR/dictionary.lst | 1
dictionaries/pt_BR/hyph_pt_BR.dic | 3751
dictionaries/pt_BR/makefile.mk | 14
dictionaries/pt_BR/pt_BR.aff |51374 -
dictionaries/pt_BR/pt_BR.dic |611462 +++++++++---------
dictionaries/ro/COPYING.GPL | 342
dictionaries/ro/COPYING.LGPL | 515
dictionaries/ro/COPYING.MPL | 470
dictionaries/ro/README_EN.txt | 34
dictionaries/ro/README_RO.txt | 36
dictionaries/ro/description.xml | 30
dictionaries/ro/dictionaries.xcu | 42
dictionaries/ro/hyph_ro_RO.dic | 4431
dictionaries/ro/makefile.mk | 81
dictionaries/ro/manifest.xml | 6
dictionaries/ro/ro_RO.aff | 1614
dictionaries/ro/ro_RO.dic |154975 ++++
dictionaries/ro/th_ro_RO_v2.dat |94191 ++
dictionaries/ro/th_ro_RO_v2.idx |45417 +
dictionaries/ru_RU/dictionary.lst | 2
dictionaries/ru_RU/makefile.mk | 11
dictionaries/sk_SK/LICENSE.txt | 1320
dictionaries/sk_SK/README_en.txt | 24
dictionaries/sk_SK/README_sk.txt | 25
dictionaries/sk_SK/README_sk_SK.txt | 1062
dictionaries/sk_SK/README_th_sk_SK_v2.txt | 55
dictionaries/sk_SK/description.xml | 44
dictionaries/sk_SK/dictionaries.xcu | 19
dictionaries/sk_SK/dictionary.lst | 2
dictionaries/sk_SK/hyph_sk_SK.dic | 2468
dictionaries/sk_SK/iconsk3.png |binary
dictionaries/sk_SK/makefile.mk | 35
dictionaries/sk_SK/manifest.xml | 2
dictionaries/sk_SK/release_en.txt | 10
dictionaries/sk_SK/release_sk.txt | 11
dictionaries/sk_SK/sk_SK.aff | 3718
dictionaries/sk_SK/sk_SK.dic |418923 ++++++++----
dictionaries/sk_SK/th_sk_SK_license.txt | 22
dictionaries/sk_SK/th_sk_SK_v2.dat |27958
dictionaries/sk_SK/th_sk_SK_v2.idx |12999
dictionaries/sl_SI/README_hyph_sl_SI.txt | 17
dictionaries/sl_SI/README_sl_SI.txt | 88
dictionaries/sl_SI/README_th_sl_SI.txt | 39
dictionaries/sl_SI/desc_en_US.txt | 1
dictionaries/sl_SI/desc_sl_SI.txt | 1
dictionaries/sl_SI/description.xml | 42
dictionaries/sl_SI/dictionaries.xcu | 20
dictionaries/sl_SI/dictionary.lst | 2
dictionaries/sl_SI/makefile.mk | 13
dictionaries/sl_SI/manifest.xml | 2
dictionaries/sl_SI/th_sl_SI_v2.dat |23006
dictionaries/sl_SI/th_sl_SI_v2.idx |10998
dictionaries/sr/LICENSE_en-US | 856
dictionaries/sr/LICENSE_sh | 856
dictionaries/sr/LICENSE_sr | 856
dictionaries/sr/README_sh.txt | 8
dictionaries/sr/README_sr.txt | 6
dictionaries/sr/description.xml | 6
dictionaries/sr/dictionaries.xcu | 8
dictionaries/sr/hyph_sh.dic | 4450
dictionaries/sr/hyph_sr.dic | 5079
dictionaries/sr/license_en-US.txt | 858
dictionaries/sr/license_sh.txt | 858
dictionaries/sr/license_sr.txt | 858
dictionaries/sr/makefile.mk | 14
dictionaries/sr/sh.dic |14250
dictionaries/sr/sr.dic |14778
dictionaries/sv_SE/README_sv_SE.txt | 542
dictionaries/sv_SE/description.xml | 2
dictionaries/sv_SE/dictionaries.xcu | 38
dictionaries/sv_SE/dictionary.lst | 1
dictionaries/sv_SE/makefile.mk | 8
dictionaries/sv_SE/sv_SE.aff | 28
dictionaries/sv_SE/sv_SE.dic |34697 -
dictionaries/sw_TZ/dictionary.lst | 2
dictionaries/sw_TZ/makefile.mk | 8
dictionaries/th_TH/dictionary.lst | 1
dictionaries/th_TH/makefile.mk | 8
dictionaries/util/target.pmk | 6
dictionaries/util/th_gen_idx.pl | 113
dictionaries/vi/makefile.mk | 8
dictionaries/zu_ZA/dictionary.lst | 1
dictionaries/zu_ZA/makefile.mk | 8
expat/expat-2.0.1.patch | 93
expat/expat-winapi.patch | 13
expat/expat.patch | 183
expat/makefile.mk | 22
expat/prj/d.lst | 3
graphite/graphite-2.3.1.patch | 2396
graphite/graphite-2.3.1.patch.mingw | 168
graphite/makefile.mk | 175
graphite/prj/build.lst | 3
graphite/prj/d.lst | 15
hunspell/hunspell-1.2.8-thesfix.patch | 28
hunspell/hunspell-1.2.8.patch | 631
hunspell/hunspell-consts-1.2.8.patch | 22
hunspell/hunspell-mingw.patch | 12
hunspell/hunspell-solaris.patch | 12
hunspell/hunspell-stacksmash.patch | 28
hunspell/hunspell-wntconfig.patch | 4
hunspell/makefile.mk | 28
hunspell/prj/build.lst | 2
icu/createmak.cfg | 907
icu/createmak.pl | 42
icu/icu-4.0.patch | 234
icu/icu4c-4_0_1-src.patch | 247
icu/icuversion.mk | 33
icu/makefile.mk | 39
icu/prj/build.lst | 2
jpeg/jpeg-6b.patch | 125
jpeg/makefile.mk | 7
libxml2/libxml2-2.6.31.patch | 284
libxml2/libxml2-configure.patch | 118
libxml2/libxml2-global-symbols.patch | 59
libxml2/libxml2-gnome599717.patch | 20
libxml2/libxml2-mingw.patch | 48
libxml2/makefile.mk | 35
libxml2/prj/build.lst | 2
libxslt/libxslt-1.1.24.patch | 79
libxslt/libxslt-1.1.24_win_manifest.patch | 11
libxslt/libxslt-configure.patch | 79
libxslt/libxslt-internal-symbols.patch | 66
libxslt/libxslt-mingw.patch | 36
libxslt/libxslt-win_manifest.patch | 11
libxslt/libxsltversion.mk | 8
libxslt/makefile.mk | 31
more_fonts/fonts/fc_local.conf | 24
more_fonts/fonts/ttf_dejavu/makefile.mk | 61
more_fonts/fonts/ttf_gentium/makefile.mk | 61
more_fonts/fonts/ttf_liberation/makefile.mk | 60
more_fonts/prj/build.lst | 5
more_fonts/prj/d.lst | 10
moz/README | 4
moz/download/mozilla-source.txt | 15
moz/extractfiles.mk | 192
moz/makefile.mk | 272
moz/mozilla-source-1.0.patch | 4499
moz/mozilla-source-1.7.5.patch | 9658
moz/mozilla-source-1.7b.patch | 5107
moz/patches/arm_build_fix.patch | 189
moz/patches/consecutive_ldap_queries.patch | 13
moz/patches/cygwin_paths_in_ldap_sdk.patch | 12
moz/patches/dtoa.patch | 237
moz/patches/embed_manifest.patch | 142
moz/patches/index.txt | 65
moz/patches/link_fontconfig.patch | 11
moz/patches/no_core_abspath_in_nss.patch | 52
moz/patches/respect_disable_pango.patch | 54
moz/patches/wchart_on_msvc8.patch | 20
moz/prj/build.lst | 2
moz/seamonkey-source-1.1.14.patch | 6346
moz/zipped/makefile.mk | 149
neon/makefile.mk | 19
neon/neon.patch | 382
neon/neon_exports_unix.patch | 291
neon/neon_exports_win.patch | 297
neon/prj/build.lst | 2
neon/prj/d.lst | 6
neon/version.mk | 8
nss/makefile.mk | 184
nss/nss.patch | 191
nss/nss.patch.mingw | 167
nss/nss_macosx.patch | 12
nss/prj/build.lst | 3
nss/prj/d.lst | 31
nss/readme.txt | 75
python/Python-2.6.1-mingw.patch | 6
python/Python-2.6.1.patch | 14
python/Python-ssl.patch | 210
python/download/LICENSE | 263
python/makefile.mk | 23
python/prj/build.lst | 2
python/prj/d.lst | 1
saxon/download/LICENSE.html | 419
saxon/download/README_source-9.0.0.7-bj.txt | 9
saxon/makefile.mk | 7
saxon/prj/build.lst | 2
stax/download/LICENSE.html | 1077
stax/download/README_jsr173_1.0_api.jar | 3
stax/download/README_stax-api-1.0-2-sources.txt | 8
stax/makefile.mk | 15
stax/prj/build.lst | 2
zlib/make_patched_header.pl | 6
zlib/makefile.mk | 10
zlib/prj/d.lst | 1
zlib/zlib-1.1.4.patch | 3109
509 files changed, 4879719 insertions(+), 1585677 deletions(-)
New commits:
commit d4f3f41b1fbc514733380f134aac554af7fa0023
Merge: 17e1caa... 9432a6f...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 18 18:09:14 2010 +0200
Merge commit 'ooo/OOO330_m4'
commit 17e1caa057743dfa5e73ae4d33c00e9e6374fbeb
Author: Jan Holesovsky <kendy at suse.cz>
Date: Wed Aug 18 18:09:06 2010 +0200
Split build: Revert it for now.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 7a7ce93..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-/Makefile
-/Makefile.in
-/aclocal.m4
-/autom4te.cache
-/buildenv
-/config.log
-/config.parms
-/config.status
-/configure
-/install-sh
-/logfile.log
-/missing
-/OpenOffice
-/solver
-
-/*/unxlng??.pro
-
-localize.sdf
-
-# temp files
-.*.swp
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 120da2f..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-http://www.openoffice.org/welcome/credits.html
diff --git a/COPYING b/COPYING
deleted file mode 100644
index cca7fc2..0000000
--- a/COPYING
+++ /dev/null
@@ -1,165 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
- This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
- 0. Additional Definitions.
-
- As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
- "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
- An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
- A "Combined Work" is a work produced by combining or linking an
-Application with the Library. The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
- The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
- The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
- 1. Exception to Section 3 of the GNU GPL.
-
- You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
- 2. Conveying Modified Versions.
-
- If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
- a) under this License, provided that you make a good faith effort to
- ensure that, in the event an Application does not supply the
- function or data, the facility still operates, and performs
- whatever part of its purpose remains meaningful, or
-
- b) under the GNU GPL, with none of the additional permissions of
- this License applicable to that copy.
-
- 3. Object Code Incorporating Material from Library Header Files.
-
- The object code form of an Application may incorporate material from
-a header file that is part of the Library. You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
- a) Give prominent notice with each copy of the object code that the
- Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the object code with a copy of the GNU GPL and this license
- document.
-
- 4. Combined Works.
-
- You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
- a) Give prominent notice with each copy of the Combined Work that
- the Library is used in it and that the Library and its use are
- covered by this License.
-
- b) Accompany the Combined Work with a copy of the GNU GPL and this license
- document.
-
- c) For a Combined Work that displays copyright notices during
- execution, include the copyright notice for the Library among
- these notices, as well as a reference directing the user to the
- copies of the GNU GPL and this license document.
-
- d) Do one of the following:
-
- 0) Convey the Minimal Corresponding Source under the terms of this
- License, and the Corresponding Application Code in a form
- suitable for, and under terms that permit, the user to
- recombine or relink the Application with a modified version of
- the Linked Version to produce a modified Combined Work, in the
- manner specified by section 6 of the GNU GPL for conveying
- Corresponding Source.
-
- 1) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (a) uses at run time
- a copy of the Library already present on the user's computer
- system, and (b) will operate properly with a modified version
- of the Library that is interface-compatible with the Linked
- Version.
-
- e) Provide Installation Information, but only if you would otherwise
- be required to provide such information under section 6 of the
- GNU GPL, and only to the extent that such information is
- necessary to install and execute a modified version of the
- Combined Work produced by recombining or relinking the
- Application with a modified version of the Linked Version. (If
- you use option 4d0, the Installation Information must accompany
- the Minimal Corresponding Source and Corresponding Application
- Code. If you use option 4d1, you must provide the Installation
- Information in the manner specified by section 6 of the GNU GPL
- for conveying Corresponding Source.)
-
- 5. Combined Libraries.
-
- You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
- a) Accompany the combined library with a copy of the same work based
- on the Library, uncombined with any other library facilities,
- conveyed under the terms of this License.
-
- b) Give prominent notice with the combined library that part of it
- is a work based on the Library, and explaining where to find the
- accompanying uncombined form of the same work.
-
- 6. Revised Versions of the GNU Lesser General Public License.
-
- The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
- If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 73c8beb..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1 +0,0 @@
-Please see the output of git log.
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index d3c5b40..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
-
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index da90ca2..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-# few needed variables
-
-stampdir = $(top_builddir)/build/stamp
-pkgconfigdir = $(libdir)/pkgconfig
-ooo_prefix = @OOO_PREFIX@
-solenvdir = $(ooo_prefix)/solenv
-solverdir = $(ooo_prefix)/solver
-buildsolverdir = "@abs_builddir@/solver"
-
-# the predefined rules
-
-include $(solverdir)/Makefile.common
-
-# what to add to the package
-
-# TODO
-EXTRA_DIST =
-
-dist-hook: dist-hook-common
-
-# rules to execute
-
-all-local: $(stampdir)/all
-
-# TODO
-clean-local:
-
-# TODO
-distclean-local:
-
-install-data-local: $(stampdir)/all install-data-common
- $(INSTALL_DATA) $(top_builddir)/build/src/OpenOffice.org-libs-extern-sys.pc $(DESTDIR)$(pkgconfigdir)/
-
-$(stampdir)/all: buildenv all-common
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/README b/README
deleted file mode 100644
index 138a828..0000000
--- a/README
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenOffice.org - split build
-============================
-
-This package provides the possibility to build OpenOffice.org by pieces. This
-one contains the 3rd party libraries that are usually available in the Linux
-systems.
-
-To build, do the usual
-
-./autogen.sh or ./configure
-make
-make install
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 8183a7f..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-aclocal $ACLOCAL_FLAGS || exit 1
-automake --gnu --add-missing --copy || exit 1
-autoconf || exit 1
-
-if test "x$NOCONFIGURE" = "x"; then
- ./configure "$@"
-else
- echo "Skipping configure process."
-fi
diff --git a/berkeleydb/prj/build.lst b/berkeleydb/prj/build.lst
index 4019bbe..4631e56 100644
--- a/berkeleydb/prj/build.lst
+++ b/berkeleydb/prj/build.lst
@@ -1,3 +1,3 @@
-db berkeleydb : xml2cmp NULL
+db berkeleydb : external xml2cmp sal NULL
db berkeleydb nmake - u as_mkout NULL
db berkeleydb nmake - w,vc7 as_mkout NULL
diff --git a/bitstream_vera_fonts/prj/build.lst b/bitstream_vera_fonts/prj/build.lst
index 72bb590..93449f0 100644
--- a/bitstream_vera_fonts/prj/build.lst
+++ b/bitstream_vera_fonts/prj/build.lst
@@ -1,4 +1,4 @@
-bs bitstream_vera_fonts : NULL
+bs bitstream_vera_fonts : solenv NULL
bs bitstream_vera_fonts\fonts\ttf_dejavu nmake - all deja_fonts NULL
bs bitstream_vera_fonts\fonts\ttf_liberation nmake - all libe_fonts NULL
diff --git a/boost/prj/build.lst b/boost/prj/build.lst
index d5692a1..5076257 100644
--- a/boost/prj/build.lst
+++ b/boost/prj/build.lst
@@ -1,4 +1,4 @@
-bo boost : SO:so_prereq NULL
+bo boost : SO:so_prereq solenv NULL
bo boost usr1 - all bo_mkout NULL
bo boost nmake - all bo_boost NULL
bo boost\spirit nmake - all bo_spirit NULL
diff --git a/build/prj/build.lst b/build/prj/build.lst
deleted file mode 100644
index 0e8a413..0000000
--- a/build/prj/build.lst
+++ /dev/null
@@ -1 +0,0 @@
-bs build : BERKELEYDB:berkeleydb BITSTREAM_VERA_FONTS:bitstream_vera_fonts BOOST:boost CAIRO:cairo CURL:curl DICTIONARIES:dictionaries EXPAT:expat HUNSPELL:hunspell ICU:icu JPEG:jpeg LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NEON:neon PYTHON:python SAXON:saxon stax ZLIB:zlib NULL
diff --git a/build/src/.gitignore b/build/src/.gitignore
deleted file mode 100644
index 840ea15..0000000
--- a/build/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/OpenOffice.org-*.pc
diff --git a/build/src/OpenOffice.org-libs-extern-sys.pc.in b/build/src/OpenOffice.org-libs-extern-sys.pc.in
deleted file mode 100644
index e7aeeca..0000000
--- a/build/src/OpenOffice.org-libs-extern-sys.pc.in
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
-Name: OpenOffice.org 3rd party system libraries
-Description: OpenOffice.org 3rd party system libraries package
-Version: @PACKAGE_VERSION@
diff --git a/build/stamp/.gitignore b/build/stamp/.gitignore
deleted file mode 100644
index a9a95e9..0000000
--- a/build/stamp/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
-!/README.txt
-!/.gitignore
diff --git a/build/stamp/README.txt b/build/stamp/README.txt
deleted file mode 100644
index a28c9d7..0000000
--- a/build/stamp/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This directory is for storing the stamps generated by the toplevel Makefile.
diff --git a/buildenv.in b/buildenv.in
deleted file mode 100644
index 6c6c26e..0000000
--- a/buildenv.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# Source this if you want to use build.pl directly, like:
-# . buildenv
-# or
-# source buildenv
-
-ooo_prefix="@OOO_PREFIX@"
-solverdir="$ooo_prefix/solver"
-buildsolverdir="@abs_builddir@/solver"
-
-. "$solverdir"/buildenv-common
diff --git a/configure.in b/configure.in
deleted file mode 100644
index 12b7358..0000000
--- a/configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl Version X.Y.A.M
-dnl X.Y - version
-dnl A - minor, or 97 for devel, 98 for alpha, 99 for beta
-dnl M - milestone, or micro version
-AC_INIT(OpenOffice.org-libs-extern-sys,3.1.97.50)
-
-AM_INIT_AUTOMAKE([1.8b tar-ustar])
-PKG_PROG_PKG_CONFIG
-
-dnl Where should be the OOo installed
-PKG_CHECK_MODULES(OOO_BOOTSTRAP,OpenOffice.org-bootstrap)
-OOO_PREFIX=$($PKG_CONFIG --variable=ooo_prefix OpenOffice.org-bootstrap)
-AC_SUBST(OOO_PREFIX)
-
-dnl OpenOffice.org build dependencies
-PKG_CHECK_MODULES(OOO_URE,OpenOffice.org-ure)
-
-dnl Create what is necessary
-AC_OUTPUT([Makefile buildenv build/src/OpenOffice.org-libs-extern-sys.pc])
diff --git a/curl/prj/build.lst b/curl/prj/build.lst
index af4e35f..0c9a917 100644
--- a/curl/prj/build.lst
+++ b/curl/prj/build.lst
@@ -1,3 +1,3 @@
-xc curl : NULL
+xc curl : external NULL
xc curl usr1 - all xc_mkout NULL
xc curl nmake - all xc_curl NULL
diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst
index 83a2c8e..ac3a882 100644
--- a/hunspell/prj/build.lst
+++ b/hunspell/prj/build.lst
@@ -1,3 +1,3 @@
-hun hunspell : ICU:icu NULL
+hun hunspell : solenv ICU:icu sal NULL
hun hunspell usr1 - all hun_mkout NULL
hun hunspell nmake - all hun_hunspell NULL
diff --git a/icu/icuversion.mk b/icu/icuversion.mk
new file mode 100755
index 0000000..7c03890
--- /dev/null
+++ b/icu/icuversion.mk
@@ -0,0 +1,37 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: icuversion.mk,v $
+#
+# $Revision: 1.5 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+# major
+ICU_MAJOR=4
+# minor
+ICU_MINOR=0
+# micro
+ICU_MICRO=0
+
diff --git a/icu/prj/build.lst b/icu/prj/build.lst
index 81ea915..c633589 100644
--- a/icu/prj/build.lst
+++ b/icu/prj/build.lst
@@ -1,4 +1,4 @@
-ic icu : NULL
+ic icu : solenv external NULL
ic icu usr1 - all ic_mkout NULL
ic icu nmake - u ic_icu NULL
ic icu nmake - w,vc7 ic_icu NULL
diff --git a/moz/prj/build.lst b/moz/prj/build.lst
index 30fccd3..f5593fa 100644
--- a/moz/prj/build.lst
+++ b/moz/prj/build.lst
@@ -1,4 +1,4 @@
-moz moz : SO:so_prereq NULL
+moz moz : solenv SO:so_prereq NULL
moz moz usr1 - all moz_mkout NULL
moz moz nmake - all moz_mozilla NULL
moz moz\zipped nmake - all moz_zipped moz_mozilla NULL
diff --git a/neon/prj/build.lst b/neon/prj/build.lst
index 2a9078a..2a13360 100755
--- a/neon/prj/build.lst
+++ b/neon/prj/build.lst
@@ -1,3 +1,3 @@
-xh neon : OPENSSL:openssl soltools EXPAT:expat LIBXML2:libxml2 NULL
+xh neon : OPENSSL:openssl soltools external EXPAT:expat LIBXML2:libxml2 NULL
xh neon usr1 - all xh_mkout NULL
xh neon nmake - all xh_neon NULL
diff --git a/python/prj/build.lst b/python/prj/build.lst
index deff517..e742133 100644
--- a/python/prj/build.lst
+++ b/python/prj/build.lst
@@ -1,3 +1,3 @@
-py python : SO:so_prereq NULL
+py python : SO:so_prereq solenv NULL
py python nmake - w,vc7 py_mkout NULL
py python nmake - u py_mkout NULL
diff --git a/saxon/prj/build.lst b/saxon/prj/build.lst
index 493828c..813097c 100644
--- a/saxon/prj/build.lst
+++ b/saxon/prj/build.lst
@@ -1,2 +1,2 @@
-xx saxon : stax NULL
+xx saxon : solenv stax NULL
xx saxon nmake - all xx_saxon NULL
diff --git a/stax/prj/build.lst b/stax/prj/build.lst
index c76a30c..cbfc6ea 100644
--- a/stax/prj/build.lst
+++ b/stax/prj/build.lst
@@ -1,2 +1,2 @@
-tx stax : NULL
+tx stax : solenv NULL
tx stax nmake - all tx_stax NULL
commit 9432a6fa09652e5ce24b9af82635d49de34ba7d2
Merge: 4fdf5c7... 35a32fb...
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Aug 11 13:41:20 2010 +0200
CWS-TOOLING: integrate CWS narrow02_OOO330
commit 4fdf5c70ff4a927366c375b330108c427f5d31ad
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Mon Jul 26 18:27:06 2010 +0200
OOO330 masterfix: dictionaries needs thesaurus generated idx
diff --git a/dictionaries/prj/build.lst b/dictionaries/prj/build.lst
index 6052a8a..e4efbfd 100644
--- a/dictionaries/prj/build.lst
+++ b/dictionaries/prj/build.lst
@@ -1,4 +1,4 @@
-di dictionaries : soltools MYTHES:mythes NULL
+di dictionaries : soltools mythes NULL
di dictionaries usr1 - all di_mkout NULL
di dictionaries\af_ZA nmake - all di_af_ZA NULL
di dictionaries\ca nmake - all di_ca NULL
commit 1c1cc69e9917819e2d5e2c0ca5eb8f5b5affd4a3
Merge: fdd7971... 07d1b31...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Thu Jul 22 13:49:22 2010 +0200
CWS-TOOLING: integrate CWS graphite03_OOO330
commit 35a32fb15b5711eb0fbfcfe1a2b1852213d0c81d
Author: Herbert Duerr [hdu] <duerr at sun.com>
Date: Thu Jul 22 10:18:09 2010 +0200
#i111719# deliver updated versions of liberation fonts
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 0bc1524..261aae0 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,9 +1,10 @@
mkdir: %COMMON_DEST%\pck%_EXT%
..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf
+# TODO: replace explicit versions by wildcard when the build system learns to handle them
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
-..\%__SRC%\misc\build\Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt %COMMON_DEST%\pck%_EXT%\LICENSE_liberation
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\OFL.txt %COMMON_DEST%\pck%_EXT%\LICENSE_gentium
commit 872ef0738cfd7765698dc6d1682be9b8601a90aa
Author: Herbert Duerr [hdu] <duerr at sun.com>
Date: Thu Jul 22 09:59:29 2010 +0200
#i111719# updated liberation fonts to release 1.06
diff --git a/more_fonts/fonts/ttf_liberation/makefile.mk b/more_fonts/fonts/ttf_liberation/makefile.mk
index de711a6..a49c568 100644
--- a/more_fonts/fonts/ttf_liberation/makefile.mk
+++ b/more_fonts/fonts/ttf_liberation/makefile.mk
@@ -36,8 +36,8 @@ TARGET=ttf_liberation
# --- Files --------------------------------------------------------
-TARFILE_NAME=liberation-fonts-ttf-1.05.3.20100427
-TARFILE_MD5=ef9ab6c1740682fbd730606d5f6922e6
+TARFILE_NAME=liberation-fonts-ttf-1.06.0.20100721
+TARFILE_MD5=ca4870d899fd7e943ffc310a5421ad4d
TARFILE_ROOTDIR=.
PATCH_FILES=
commit fdd797136256e93c3ec294763690d6e6b9fbb110
Merge: 8ffb743... a6564cf...
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Jul 21 16:23:13 2010 +0200
CWS-TOOLING: integrate CWS solaris10u8_OOO330
diff --cc libxslt/makefile.mk
index 1c9370b,11e8d14..fd7273b
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@@ -50,10 -50,12 +50,13 @@@ LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXS
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+
+ # libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined
PATCH_FILES=libxslt-configure.patch \
libxslt-win_manifest.patch \
- libxslt-internal-symbols.patch \
+ libxslt-mingw.patch \
- libxslt-gnome602728.patch
++ libxslt-internal-symbols.patch
+
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
commit 8ffb743d2f98c18152c0031ded3d71f13a965e9d
Merge: d59c455... 0c286b7...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 14:03:52 2010 +0200
CWS-TOOLING: integrate CWS jl153_OOO330
commit d59c45575110d4ec4d2783fc74bfe4f460ab9fee
Merge: 3cbef79... f06803c...
Author: Kurt Zenker <kz at openoffice.org>
Date: Tue Jul 13 13:58:14 2010 +0200
CWS-TOOLING: integrate CWS configure25_OOO330
commit a6564cf8c477ae06459acc25ec917525d8e496fd
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Jul 12 15:57:26 2010 +0200
solaris10u8: #i112480#: build libxslt with versioned symbols on solaris:
libxslt-gnome602728.patch: remove (disables version script).
libxslt-internal-symbols.patch: do not export non-existing symbols.
diff --git a/libxslt/libxslt-gnome602728.patch b/libxslt/libxslt-gnome602728.patch
deleted file mode 100644
index 182855b..0000000
--- a/libxslt/libxslt-gnome602728.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libxslt-1.1.26.orig/configure 2009-12-21 10:07:14.000000000 +0000
-+++ misc/build/libxslt-1.1.26/configure 2009-12-21 10:07:42.000000000 +0000
-@@ -13402,7 +13402,7 @@
- $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
- VERSION_SCRIPT_FLAGS=-Wl,--version-script=
- test "`uname`" == "SunOS" && \
-- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
-+ VERSION_SCRIPT_FLAGS=""
-
- if test -n "$VERSION_SCRIPT_FLAGS"; then
- USE_VERSION_SCRIPT_TRUE=
diff --git a/libxslt/libxslt-internal-symbols.patch b/libxslt/libxslt-internal-symbols.patch
new file mode 100644
index 0000000..813c34f
--- /dev/null
+++ b/libxslt/libxslt-internal-symbols.patch
@@ -0,0 +1,66 @@
+--- misc/libxslt-1.1.26/libxslt/libxslt.syms Thu Sep 24 16:28:46 2009
++++ misc/build/libxslt-1.1.26/libxslt/libxslt.syms Thu Jul 8 12:22:14 2010
+@@ -107,7 +107,7 @@
+ xsltFreeCompMatchList;
+ xsltFreeTemplateHashes;
+ xsltGetTemplate;
+- xsltMatchPattern;
++#NOT_IMPLEMENTED xsltMatchPattern;
+ xsltTestCompMatchList;
+
+ # preproc
+@@ -406,7 +406,7 @@
+ global:
+
+ # xsltInternals
+- xsltConstNamespaceNameXSLT; # variable
++#XSLT_REFACTORED_XSLT_NSCOMP xsltConstNamespaceNameXSLT; # variable
+ xsltExtensionInstructionResultFinalize;
+ xsltExtensionInstructionResultRegister;
+ xsltInitCtxtKey;
+@@ -415,24 +415,24 @@
+ xsltInit;
+
+ # xsltInternals
+- xsltParseAnyXSLTElem;
+- xsltParseSequenceConstructor;
+- xsltPointerListAddSize;
+- xsltPointerListClear;
+- xsltPointerListCreate;
+- xsltPointerListFree;
++#XSLT_REFACTORED xsltParseAnyXSLTElem;
++#XSLT_REFACTORED xsltParseSequenceConstructor;
++#XSLT_REFACTORED xsltPointerListAddSize;
++#XSLT_REFACTORED xsltPointerListClear;
++#XSLT_REFACTORED xsltPointerListCreate;
++#XSLT_REFACTORED xsltPointerListFree;
+ xsltRegisterLocalRVT;
+ xsltReleaseRVT;
+- xsltRestoreDocumentNamespaces;
++#XSLT_REFACTORED_XSLT_NSCOMP xsltRestoreDocumentNamespaces;
+
+ # extensions
+- xsltStyleStylesheetLevelGetExtData;
++#XSLT_REFACTORED xsltStyleStylesheetLevelGetExtData;
+
+ # xsltInternals
+- xsltTransStorageAdd;
+- xsltTransStorageRemove;
++#NOT_IMPLEMENTED xsltTransStorageAdd;
++#NOT_IMPLEMENTED xsltTransStorageRemove;
+ xsltUninit;
+- xsltXSLTAttrMarker; # variable
++#XSLT_REFACTORED xsltXSLTAttrMarker; # variable
+ } LIBXML2_1.1.9;
+
+ LIBXML2_1.1.20 {
+@@ -475,5 +475,9 @@
+
+ # transform
+ xsltProcessOneNode;
++
++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
++ local:
++ *;
+ } LIBXML2_1.1.25;
+
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index b3f9ed2..11e8d14 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -50,9 +50,12 @@ LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+
+# libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined
PATCH_FILES=libxslt-configure.patch \
libxslt-win_manifest.patch \
- libxslt-gnome602728.patch
+ libxslt-internal-symbols.patch \
+
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
commit 84f786a04d2911b6acc3d65834b017845bea0abe
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Jul 12 15:56:54 2010 +0200
solaris10u8: #i112480#: build libxml2 with versioned symbols on solaris:
libxml2-gnome602728.patch: remove (disables version script).
libxml2-global-symbols.patch: export various global variable symbols.
diff --git a/libxml2/libxml2-global-symbols.patch b/libxml2/libxml2-global-symbols.patch
new file mode 100644
index 0000000..20cd273
--- /dev/null
+++ b/libxml2/libxml2-global-symbols.patch
@@ -0,0 +1,59 @@
+--- misc/libxml2-2.7.6/libxml2.syms Tue Oct 6 18:31:35 2009
++++ misc/build/libxml2-2.7.6/libxml2.syms Wed Jul 7 15:43:17 2010
+@@ -2184,10 +2184,10 @@
+ } LIBXML2_2.6.27;
+
+ LIBXML2_2.6.29 {
+- global:
++# global:
+
+ # threads
+- xmlDllMain;
++#WIN32 only! xmlDllMain;
+ } LIBXML2_2.6.28;
+
+ LIBXML2_2.6.32 {
+@@ -2231,3 +2231,43 @@
+ xmlXIncludeProcessTreeFlagsData;
+ } LIBXML2_2.7.3;
+
++# HACK: export global variable accessor functions (globals.h)
++LIBXML2_GLOBAL_VARIABLES {
++ global:
++# __xmlMalloc;
++# __xmlMallocAtomic;
++# __xmlRealloc;
++# __xmlFree;
++# __xmlMemStrdup;
++ __docbDefaultSAXHandler;
++ __htmlDefaultSAXHandler;
++ __xmlLastError;
++ __oldXMLWDcompatibility;
++ __xmlBufferAllocScheme;
++ __xmlDefaultBufferSize;
++ __xmlDefaultSAXHandler;
++ __xmlDefaultSAXLocator;
++ __xmlDoValidityCheckingDefaultValue;
++ __xmlGenericError;
++ __xmlStructuredError;
++ __xmlGenericErrorContext;
++ __xmlStructuredErrorContext;
++ __xmlGetWarningsDefaultValue;
++ __xmlIndentTreeOutput;
++ __xmlTreeIndentString;
++ __xmlKeepBlanksDefaultValue;
++ __xmlLineNumbersDefaultValue;
++ __xmlLoadExtDtdDefaultValue;
++ __xmlParserDebugEntities;
++ __xmlParserVersion;
++ __xmlPedanticParserDefaultValue;
++ __xmlSaveNoEmptyTags;
++ __xmlSubstituteEntitiesDefaultValue;
++ __xmlRegisterNodeDefaultValue;
++ __xmlDeregisterNodeDefaultValue;
++ __xmlParserInputBufferCreateFilenameValue;
++ __xmlOutputBufferCreateFilenameValue;
++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
++ local:
++ *;
++} LIBXML2_2.7.4;
diff --git a/libxml2/libxml2-gnome602728.patch b/libxml2/libxml2-gnome602728.patch
deleted file mode 100644
index b284d45..0000000
--- a/libxml2/libxml2-gnome602728.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- misc/libxml2-2.7.6/configure 2009-12-18 12:12:08.000000000 +0000
-+++ misc/build/libxml2-2.7.6/configure 2009-12-18 12:20:40.000000000 +0000
-@@ -12150,7 +12150,7 @@
- $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \
- VERSION_SCRIPT_FLAGS=-Wl,--version-script=
- test "`uname`" == "SunOS" && \
-- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
-+ VERSION_SCRIPT_FLAGS=""
-
- if test -n "$VERSION_SCRIPT_FLAGS"; then
- USE_VERSION_SCRIPT_TRUE=
-
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 93275b6..4258974 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -46,10 +46,13 @@ LIBXML2VERSION=2.7.6
TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION)
TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2
+
+# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols
PATCH_FILES=libxml2-configure.patch \
libxml2-mingw.patch \
libxml2-gnome599717.patch \
- libxml2-gnome602728.patch
+ libxml2-global-symbols.patch \
+
# This is only for UNX environment now
commit 2fba2ef0a8f953bd8078b78dcfe1de51a096919a
Merge: 14e45db... c1ae9ef...
Author: Herbert Duerr [hdu] <duerr at sun.com>
Date: Wed Jul 7 15:06:48 2010 +0200
merged with DEV300_m83
commit 07d1b31a39e3449d57e192e9d8c028f9cf1f1453
Author: Keith Stribley <devel at thanlwinsoft.org>
Date: Tue Jun 29 14:14:34 2010 +0630
graphite03: #i112730# updated graphite patch and improvements to glyph metric caching
diff --git a/graphite/graphite-2.3.1.patch b/graphite/graphite-2.3.1.patch
index badbd92..934eb8e 100644
--- a/graphite/graphite-2.3.1.patch
+++ b/graphite/graphite-2.3.1.patch
@@ -67,7 +67,7 @@
+###CPPFLAGS= /Zc:wchar_t- /nologo /W4 /GR /EHsc /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c
+### HDU: because for full binary compatibility with the rest of OOo all compile flags must match exactly
+### which is especially true for template-heavy C++ code with non-default config (e.g. _STLP_DEBUG enabled)
-+CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /Fd"$(INTDIR)\\" /FD /c
++CPPFLAGS= $(CFLAGS4MSC) /nologo /W4 /I "./src/font" /I "./src/painter" /I "./src/segment" /I "./src/textsource" /I "./src/generic" /I "./include/graphite" /I "../wrappers/win32" /D "GR_NAMESPACE" /D "WIN32" /D "_WINDOWS" /D "_UNICODE" /D "UNICODE" /D "TRACING" /Fp"$(INTDIR)\graphite.pch" /FD /c
+
# /Wp62
@@ -77,7 +77,33 @@
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\\$(TARGET).bsc"
-@@ -48,11 +52,7 @@
+@@ -24,21 +29,21 @@
+ SBREXT = .sbr
+
+ !IF "$(CFG)" == "DEBUG"
+-CPP_DEBUG=/D "DEBUG" /Gm /GR /ZI /Od /RTC1 /FR"$(INTDIR)\\" /$(MLIB)d
++CPP_DEBUG=/D "DEBUG" /Gm /GR /Od /RTC1 /FR"$(INTDIR)\\"
+ # CPP_DEBUG=/D "DEBUG" /Gm /GR /ZI /Od /RTC1 /FR"$(INTDIR)\\" /MDd
+
+ OUTDIR=.\debug
+ INTDIR=.\debug_temp
+-LINK_DEBUG= MSVCRTD.lib /debug /incremental:yes #/pdbtype:sept
++LINK_DEBUG= /debug
+
+ all : lib lib_dll bsc
+
+ !ELSE
+-CPP_DEBUG=/D "NDEBUG" /O2 /$(MLIB)
++CPP_DEBUG=/D "NDEBUG" /O2
+ # CPP_DEBUG=/D "NDEBUG" /O2 /MD
+ OUTDIR=.\release
+ INTDIR=.\release_temp
+-LINK_DEBUG= MSVCRT.lib /incremental:no /NODEFAULTLIB:libc
++LINK_DEBUG= /incremental:no /NODEFAULTLIB:libc
+
+ all : lib lib_dll
+
+@@ -48,11 +53,7 @@
CPP_DEBUG=/D "TRACING" $(CPP_DEBUG)
!ENDIF
@@ -89,7 +115,7 @@
clean :
@- rd /s/q .\release_temp
-@@ -779,7 +779,7 @@
+@@ -779,7 +780,7 @@
@- $(CPP) $(CPPFLAGS) $(CPP_DEBUG) /Fo"$(INTDIR)\FileFont$(OBJEXT)" $?
"$(INTDIR)\FileFont_dll$(OBJEXT)" : "src/font/FileFont.cpp"
@@ -1200,39 +1226,51 @@
bool fSkipChunkStart, int cslotReprocess, bool fBackingUp)
{
Assert(AssertValid());
-@@ -1863,7 +1872,7 @@
+@@ -1863,7 +1872,11 @@
Ensure that the chunk maps for a pair of streams match properly. The recipient is
the input stream.
----------------------------------------------------------------------------------------------*/
--void GrSlotStream::AssertChunkMapsValid(GrSlotStream * psstrmOut)
-+void GrSlotStream::AssertChunkMapsValid(GrSlotStream * /*psstrmOut*/)
++#ifdef _DEBUG
+ void GrSlotStream::AssertChunkMapsValid(GrSlotStream * psstrmOut)
++#else
++void GrSlotStream::AssertChunkMapsValid(GrSlotStream * )
++#endif
{
#ifdef _DEBUG
GrSlotStream * psstrmIn = this;
-@@ -1915,7 +1924,7 @@
+@@ -1915,7 +1924,11 @@
Ensure that corresponding items in the streams of a positioning pass have matching
stream indices. The recipient is the output stream.
----------------------------------------------------------------------------------------------*/
--void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * psstrmIn)
-+void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * /*psstrmIn*/)
++#ifdef _DEBUG
+ void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * psstrmIn)
++#else
++void GrSlotStream::AssertStreamIndicesValid(GrSlotStream * )
++#endif
{
#ifdef _DEBUG
if (!GotIndexOffset())
-@@ -1939,7 +1948,7 @@
+@@ -1939,7 +1948,11 @@
in the output stream. (Currently the compiler ensures this by making it an error
to write rules that don't do this.)
----------------------------------------------------------------------------------------------*/
--void GrSlotStream::AssertAttachmentsInOutput(int islotMin, int islotLim)
-+void GrSlotStream::AssertAttachmentsInOutput(int /*islotMin*/, int /*islotLim*/)
++#ifdef _DEBUG
+ void GrSlotStream::AssertAttachmentsInOutput(int islotMin, int islotLim)
++#else
++void GrSlotStream::AssertAttachmentsInOutput(int , int )
++#endif
{
#ifdef _DEBUG
for (int islot = islotMin; islot < islotLim; islot++)
-@@ -2007,7 +2016,7 @@
+@@ -2007,7 +2016,11 @@
Record the number of slots in the stream that are previous to the official start of the
segment.
----------------------------------------------------------------------------------------------*/
--void GrSlotStream::CalcIndexOffset(GrTableManager * ptman)
-+void GrSlotStream::CalcIndexOffset(GrTableManager * /*ptman*/)
++#ifdef _DEBUG
+ void GrSlotStream::CalcIndexOffset(GrTableManager * ptman)
++#else
++void GrSlotStream::CalcIndexOffset(GrTableManager * )
++#endif
{
if (GotIndexOffset())
return; // already figured it
@@ -1990,6 +2028,94 @@
*pclrBack = kclrTransparent;
--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.cpp Thu Jan 29 10:33:19 2009
+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.cpp Sat Aug 22 19:36:36 2009
+@@ -70,6 +72,7 @@
+ // But don't store m_hfont, because we don't really "own" it; the client is
+ // responsible for releasing it.
+ m_hfont = 0;
++ m_pGlyphMetricMap = NULL;
+ memset(&m_fpropSet, 0, sizeof(m_fpropSet));
+
+ m_pbCmapTbl = NULL;
+@@ -196,6 +198,7 @@
+ m_hdc = 0;
+ m_hfont = 0;
+ m_hfontClient = 0;
++ m_pGlyphMetricMap = NULL;
+ memset(&m_fpropSet, 0, sizeof(FontProps));
+
+ m_pbCmapTbl = NULL;
+@@ -408,7 +410,7 @@
+ if (pPolyCurve->wType == TT_PRIM_QSPLINE &&
+ // test if this is the last curve
+ pPolyHdr->cb - (int)((byte *)(&pPolyCurve->apfx[j]) - (byte *)(pPolyHdr))
+- == sizeof POINTFX &&
++ == sizeof (POINTFX) &&
+ // and the two points are identical
+ CompareFixed(pPolyCurve->apfx[j].x, pPolyHdr->pfxStart.x) &&
+ CompareFixed(pPolyCurve->apfx[j].y, pPolyHdr->pfxStart.y))
+@@ -457,6 +459,16 @@
+ ----------------------------------------------------------------------------------------------*/
+ void WinFont::getGlyphMetrics(gid16 chw, gr::Rect & boundingBox, gr::Point & advances)
+ {
++ if (m_pGlyphMetricMap)
++ {
++ GlyphMetricMap::iterator i = m_pGlyphMetricMap->find(chw);
++ if (i != m_pGlyphMetricMap->end())
++ {
++ boundingBox = i->second.first;
++ advances = i->second.second;
++ return;
++ }
++ }
+ GLYPHMETRICS gm;
+ const MAT2 mat2 = {{0,1}, {0,0}, {0,0}, {0,1}};
+ if (GDI_ERROR == ::GetGlyphOutline(m_hdc, chw, GGO_GLYPH_INDEX | GGO_METRICS,
+@@ -474,6 +476,10 @@
+ boundingBox.bottom = (float)gm.gmptGlyphOrigin.y - gm.gmBlackBoxY;
+ advances.x = gm.gmCellIncX;
+ advances.y = gm.gmCellIncY;
++ if (m_pGlyphMetricMap)
++ {
++ (*m_pGlyphMetricMap)[chw] = std::pair<gr::Rect,gr::Point>(boundingBox, advances);
++ }
+ }
+
+ /*----------------------------------------------------------------------------------------------
+@@ -618,7 +620,10 @@
+
+ static int cCreateFontCalls = 0;
+ static int cCreateFontZero = 0;
+- HFONT hfont = g_fhc.GetFont(lf);
++ FontHandleCache::FontCacheValue cache = g_fhc.GetCache(lf);
++ HFONT hfont = cache.hfont;
++ m_pGlyphMetricMap = cache.pGlyphMetricMap;
++ //HFONT hfont = g_fhc.GetFont(lf);
+ //char ch1[200];
+ //if (hfont == 0)
+ //{
+@@ -731,7 +733,7 @@
+ @param lf LOGFONT value that describes the desired font
+ @return Font handle
+ ----------------------------------------------------------------------------------------------*/
+-HFONT WinFont::FontHandleCache::GetFont(LOGFONT & lf)
++WinFont::FontHandleCache::FontCacheValue WinFont::FontHandleCache::GetCache(LOGFONT & lf)
+ {
+ FontCacheValue fcv;
+ FontHandleHashMap::iterator itFound = m_hmlffcv.find(lf);
+@@ -752,11 +754,12 @@
+ THROW(kresFail);
+
+ fcv.nRefs = 1;
++ fcv.pGlyphMetricMap = new GlyphMetricMap();
+
+ m_hmlffcv.insert(std::pair<LOGFONT, FontCacheValue>(lf, fcv));
+ }
+
+- return fcv.hfont;
++ return fcv;
+ }
+
+ /*----------------------------------------------------------------------------------------------
@@ -767,7 +767,7 @@
----------------------------------------------------------------------------------------------*/
void WinFont::FontHandleCache::DeleteFont(HFONT hfont)
@@ -1999,11 +2125,31 @@
return;
// find the font in the hash map
+@@ -782,6 +784,8 @@
+ {
+ // delete font
+ ::DeleteObject(hfont);
++ if (fcv.pGlyphMetricMap)
++ delete fcv.pGlyphMetricMap;
+ m_hmlffcv.erase(it);
+ }
+ else
+@@ -832,7 +832,8 @@
+ bool WinFont::LogFontHashFuncs::operator() (const WinFont::LogFontWrapper & key1,
+ const WinFont::LogFontWrapper & key2) const
+ {
+- return (key1 == key2);
++ // return true if key1 should be ordered before key2
++ return (operator()(key1) < operator()(key2));
+ }
+
+ /*--------------------------------------------------------------------------------------
--- misc/silgraphite-2.3.1/wrappers/win32/WinFont.h Thu Jan 29 10:33:19 2009
+++ misc/build/silgraphite-2.3.1/wrappers/win32/WinFont.h Sat Aug 22 19:36:36 2009
-@@ -27,6 +27,10 @@
+@@ -27,7 +27,13 @@
#include "GrClient.h"
#include "Font.h"
++#include <map>
+#ifdef _STLPORT_VERSION
+namespace stdext = _STLP_STD;
@@ -2011,4 +2157,240 @@
+
namespace gr
{
++typedef std::map<gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap;
+
+ class FontFace;
+@@ -100,6 +110,7 @@
+ HFONT m_hfontClient; // need to replace this HFONT into the DC when we are finished
+ // with it
+
++ GlyphMetricMap * m_pGlyphMetricMap;
+ // Debugging:
+ //OLECHAR m_rgchTemp[32];
+
+@@ -185,11 +196,13 @@
+ class FontHandleCache // hungarian: fhc
+ {
+ public:
+- struct FontCacheValue
++ struct FontCacheValue
+ {
+ int nRefs; // reference count
+ HFONT hfont; // font handle
+
++ GlyphMetricMap * pGlyphMetricMap; // glyph metrics
++
+ bool operator==(const FontCacheValue & val) const
+ {
+ return (hfont == val.hfont);
+@@ -199,7 +212,8 @@
+ FontHandleCache() : m_bValid(true) {};
+ ~FontHandleCache();
+
+- HFONT GetFont(LOGFONT & lf);
++ //HFONT GetFont(LOGFONT & lf);
++ FontCacheValue GetCache(LOGFONT & lf);
+ void DeleteFont(HFONT hfont);
+
+ typedef stdext::hash_map<LogFontWrapper, FontCacheValue, LogFontHashFuncs> FontHandleHashMap;
+--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RtTextSrc.h~ 2009-01-22 05:06:42.000000000 +0630
++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/RtTextSrc.h 2010-04-30 23:14:49.000000000 +0630
+@@ -44,18 +44,18 @@
+ }
+ }
+
+- virtual size_t getFontFeatures(toffset ich, FeatureSetting * prgfset)
++ virtual size_t getFontFeatures(toffset /*ich*/, FeatureSetting * prgfset)
+ {
+ // Note: size of prgfset buffer = gr::kMaxFeatures = 64
+ std::copy(m_fset, m_fset + MAXFEAT, prgfset);
+ return m_cFeats;
+ }
+
+- virtual bool getRightToLeft(toffset ich)
++ virtual bool getRightToLeft(toffset /*ich*/)
+ {
+ return m_fRtl;
+ }
+- virtual unsigned int getDirectionDepth(toffset ich)
++ virtual unsigned int getDirectionDepth(toffset /*ich*/)
+ {
+ return ((m_fRtl == 1) ? 1 : 0);
+ }
+
+--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2010-06-21 12:55:34.000000000 +0630
++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.cpp 2010-06-21 13:16:59.000000000 +0630
+@@ -16,8 +16,9 @@
+ //:> Include files
+ //:>********************************************************************************************
+ //#include "main.h" // This is used by clients, so main.h is not available
+-
++#ifdef _MSC_VER
+ #pragma hdrstop
++#endif
+ // any other headers (not precompiled)
+ #include "GrClient.h"
+ #include "ITextSource.h"
+@@ -31,9 +32,6 @@
+ #include <string>
+ #endif
+
+-#undef THIS_FILE
+-DEFINE_THIS_FILE
+-
+ //:>********************************************************************************************
+ //:> Global constants
+ //:>********************************************************************************************
+@@ -327,9 +325,9 @@
+ &dxStretchAchieved);
+ for (int iiiGlyph = 0; iiiGlyph < cStretchable; iiiGlyph++)
+ {
+- iiGlyph = viiGlyphsRem[iiiGlyph];
+- vdxStretchLeft[iiGlyph] = vdxStretchRem[iiiGlyph];
+- vdxWidth[iiGlyph] = vdxWidthRem[iiiGlyph];
++ int ivGlyph = viiGlyphsRem[iiiGlyph];
++ vdxStretchLeft[ivGlyph] = vdxStretchRem[iiiGlyph];
++ vdxWidth[ivGlyph] = vdxWidthRem[iiiGlyph];
+ }
+ }
+ else
+@@ -366,12 +364,12 @@
+ {
+ #ifdef WIN32
+ wchar_t rgchw[20];
+- std::fill_n(rgchw, 20, 0);
++ std::fill_n(rgchw, 20, L'\0');
+ _itow(dxStretchNeeded - dxStretchAchieved, rgchw, 10);
+ std::wstring strTmp(L"justification failed by ");
+ strTmp += rgchw;
+ strTmp += L" units (width needed = ";
+- std::fill_n(rgchw, 10, 0);
++ std::fill_n(rgchw, 10, L'\0');
+ _itow(dxDesiredWidth, rgchw, 10);
+ strTmp += rgchw;
+ strTmp += L")\n";
+--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.h 2009-01-22 05:06:42.000000000 +0630
++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/GrJustifier.h 2010-06-21 13:16:49.000000000 +0630
+@@ -11,7 +11,9 @@
+ Description:
+ A default justification agent for Graphite.
+ -------------------------------------------------------------------------------*//*:End Ignore*/
++#ifdef _MSC_VER
+ #pragma once
++#endif
+ #ifndef GRJUSTIFIER_INCLUDED
+ #define GRJUSTIFIER_INCLUDED
+
+--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h 2010-06-21 12:55:34.000000000 +0630
++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.h 2010-06-21 13:18:12.000000000 +0630
+@@ -11,7 +11,9 @@
+ Description:
+ A simple text source that shows how to use this interface within Graphite.
+ -------------------------------------------------------------------------------*//*:End Ignore*/
++#ifdef _MSC_VER
+ #pragma once
++#endif
+ #ifndef GRTXTSRC_INCLUDED
+ #define GRTXTSRC_INCLUDED
+
+
+--- misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp 2010-06-21 12:55:34.000000000 +0630
++++ misc/build/silgraphite-2.3.1/engine/test/RegressionTest/SimpleTextSrc.cpp 2010-06-21 13:18:24.000000000 +0630
+@@ -15,7 +15,9 @@
+ //:>********************************************************************************************
+ //:> Include files
+ //:>********************************************************************************************
++#ifdef _MSC_VER
+ #pragma hdrstop
++#endif
+ // any other headers (not precompiled)
+
+ #include "GrClient.h"
+@@ -23,9 +25,6 @@
+ #include "ITextSource.h"
+ #include "SimpleTextSrc.h"
+
+-#undef THIS_FILE
+-DEFINE_THIS_FILE
+-
+ //:>********************************************************************************************
+ //:> Initialization and destruction
+ //:>********************************************************************************************
+--- misc/build/silgraphite-2.3.1/engine/src/segment/MemoryUsage.cpp 2009-01-22 05:06:42.000000000 +0630
++++ misc/build/silgraphite-2.3.1/engine/src/segment/MemoryUsage.cpp 2010-06-21 13:36:36.000000000 +0630
+@@ -11,10 +11,10 @@
+ Description:
+ Calculates memory usage for the engine and segments.
+ ----------------------------------------------------------------------------------------------*/
+-
++#ifdef _MSC_VER
+ #pragma warning(disable: 4244) // conversion from wchar_t to char
+ #pragma warning(disable: 4702) // unreachable code
+-
++#endif
+ //:>********************************************************************************************
+ //:> Include files
+ //:>********************************************************************************************
+@@ -54,8 +54,6 @@
+ #ifdef _MSC_VER
+ #pragma hdrstop
+ #endif
+-#undef THIS_FILE
+-DEFINE_THIS_FILE
+
+ //:End Ignore
+
+--- misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 2010-06-23 19:52:56.429060400 +0700
++++ misc/build/silgraphite-2.3.1/engine/src/segment/GrSlotState.h 2010-05-25 11:51:15.195066300 +0700
+@@ -48,7 +48,7 @@
+ {
+ }
+
+- ~GrSlotAbstract()
++ virtual ~GrSlotAbstract()
+ {
+ // the table manager is responsible for destroying the contents of m_prgnVarLenBuf
+ }
+@@ -231,7 +231,7 @@
+ ZapCompositeMetrics();
+ }
+
+- ~GrSlotState()
++ virtual ~GrSlotState()
+ {
+ }
+
+--- misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp.bak 2010-06-23 19:59:54.611660400 +0700
++++ misc/build/silgraphite-2.3.1/engine/src/segment/Segment.cpp 2010-06-23 21:30:16.335460400 +0700
+@@ -246,6 +246,8 @@
+
+ m_dxsVisibleWidth = -1;
+ m_dxsTotalWidth = -1;
++ m_ichwAssocsMin = 0;
++ m_ichwAssocsLim = 0;
+
+ // m_psstrm = NULL;
+ m_prgslout = NULL;
+@@ -2988,9 +2988,10 @@
+ return kresOk;
+ }
+
+-
++#ifdef __GNUC__
+ // suppress GCC 4.3 warning for optimized min()/max() when called with (ich, ich+1) or similar
+ #pragma GCC diagnostic ignored "-Wstrict-overflow"
++#endif
+
+ /*----------------------------------------------------------------------------------------------
+ Merge the given characters into the same Uniscribe cluster. This means merging any
+--- misc/build/silgraphite-2.3.1/wrappers/win32/win32_dll.cpp.bak 2008-05-09 18:10:30.000000000 +0700
++++ misc/build/silgraphite-2.3.1/wrappers/win32/win32_dll.cpp 2010-05-10 15:46:54.291818000 +0700
+@@ -14,7 +14,7 @@
+ DllMain. This is the main DLL entry point for a non-MFC DLL. For an MFC DLL, DllMain is
+ in DllModul.cpp. Both DllMains call ModuleEntry::DllMain.
+ ----------------------------------------------------------------------------------------------*/
+-extern "C" BOOL WINAPI DllMain(HMODULE hmod, DWORD dwReason, PVOID pvReserved)
++extern "C" BOOL WINAPI DllMain(HMODULE hmod, DWORD dwReason, PVOID /*pvReserved*/)
+ {
+ bool fRet = true;
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 2f4ff25..58735e1 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -51,7 +51,8 @@ PATCH_FILES=graphite-2.3.1.patch
# convert line-endings to avoid problems when patching
CONVERTFILES=\
- engine/makefile.vc8
+ engine/makefile.vc8 \
+ engine/test/RegressionTest/RtTextSrc.h
#.IF "$(OS)"=="WNT" && "$(COM)"!="GCC"
#CONFIGURE_DIR=win32
@@ -72,14 +73,18 @@ EXT_USE_STLPORT=TRUE
BUILD_ACTION=nmake VERBOSE=1
.IF "$(debug)"=="true"
BUILD_FLAGS= "CFG=DEBUG"
+CFLAGSWITHPATH= $(CFLAGS:s!-Fd.!-Fd../../../../../!)
+.ELSE
+# Speed Optimization is really needed for Graphite
+CFLAGSWITHPATH= $(CFLAGS) /O2
.ENDIF
### convert CFLAGS as cl.exe cannot handle OOO"s generic ones directly
### TODO: use "guw.exe" instead?
-ALLCFLAGS= $(CFLAGS) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS)
+ALLCFLAGS= $(CFLAGSWITHPATH) $(CFLAGSCXX) $(CFLAGSEXCEPTIONS) $(CDEFS)
JUSTASLASH= /
CFLAGS2MSC= $(ALLCFLAGS:s/-Z/$(JUSTASLASH)Z/)
CFLAGS4MSC= $(CFLAGS2MSC:s/ -/ $(JUSTASLASH)/)
-BUILD_FLAGS+= "MLIB=MD" "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) dll
+BUILD_FLAGS+= "CFLAGS4MSC=$(CFLAGS4MSC)" /F makefile.vc$(VCNUM) lib_dll
.ENDIF
.IF "$(COM)"=="GCC"
@@ -138,11 +143,11 @@ OUT2LIB+=src$/.libs$/libgraphite.*.dylib
#OUT2LIB+=engine$/src$/.libs$/libgraphite*.dll
.IF "$(debug)"=="true"
OUT2BIN= \
- engine$/debug$/*.dll \
+# engine$/debug$/*.dll \
engine$/debug$/*.pdb
.ELSE
-OUT2BIN= \
- engine$/release$/*.dll
+OUT2BIN=
+# engine$/release$/*.dll
# engine$/release$/*.pdb
.ENDIF
.ELSE
commit f06803ce67ca519cb9bdaf4cea5a9fe710c060fe
Author: Rene Engelhard <rene at openoffice.org>
Date: Wed Jun 23 17:34:15 2010 +0200
configure25: configure should check for new download/stax too; some beautifications
diff --git a/stax/download/README_jsr173_1.0_api.jar b/stax/download/README_jsr173_1.0_api.jar
index d8e8bd0..04c099d 100644
--- a/stax/download/README_jsr173_1.0_api.jar
+++ b/stax/download/README_jsr173_1.0_api.jar
@@ -1,3 +1,3 @@
The JSR173 is the XML pull API used at build time for the saxon9 XSLT processor, it has become part of OpenJDK 6.
When using an older JDK, get the API from <https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/lib/jars/jsr173_1.0_api.jar>
-located at the StAS Java site <https://sjsxp.dev.java.net/> and put it into stax/download.
\ No newline at end of file
+located at the StAX Java site <https://sjsxp.dev.java.net/> and put it into stax/download.
\ No newline at end of file
commit 57a7cf778fe647f0b912bd952bac862e502ae80f
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 22 22:56:36 2010 +0200
configure25: per request of QA: external/StAX -> stax/download
diff --git a/stax/download/README_jsr173_1.0_api.jar b/stax/download/README_jsr173_1.0_api.jar
new file mode 100644
index 0000000..d8e8bd0
--- /dev/null
+++ b/stax/download/README_jsr173_1.0_api.jar
@@ -0,0 +1,3 @@
+The JSR173 is the XML pull API used at build time for the saxon9 XSLT processor, it has become part of OpenJDK 6.
+When using an older JDK, get the API from <https://stax-utils.dev.java.net/source/browse/*checkout*/stax-utils/lib/jars/jsr173_1.0_api.jar>
+located at the StAS Java site <https://sjsxp.dev.java.net/> and put it into stax/download.
\ No newline at end of file
diff --git a/stax/makefile.mk b/stax/makefile.mk
index 0c755a8..ff3238b 100644
--- a/stax/makefile.mk
+++ b/stax/makefile.mk
@@ -47,11 +47,9 @@ all:
@echo "Therefore the files provided here does not need to be built in addition."
.ENDIF
-EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
-
.IF "$(BUILD_STAX)" != "YES"
-$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
+$(OUT)$/class$/jsr173_1.0_api.jar : $(PRJ)$/download$/jsr173_1.0_api.jar
+$(COPY) $< $@
.ELSE # "$(BUILD_STAX)" != "YES"
commit 40c89d620f4621f490816d2ab2411b18282cd7b5
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 22 22:30:13 2010 +0200
configure25: fix stax build
diff --git a/stax/makefile.mk b/stax/makefile.mk
index 6357761..0c755a8 100644
--- a/stax/makefile.mk
+++ b/stax/makefile.mk
@@ -64,6 +64,7 @@ TARFILE_ROOTDIR=src
BUILD_ACTION=$(JAVAC) javax$/xml$/stream$/*.java && jar -cf jsr173_1.0_api.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class
OUT2CLASS=jsr173_1.0_api.jar
+.ENDIF # "$(BUILD_STAX)" != "YES"
.ELSE # $(SOLAR_JAVA)!= ""
nojava:
@@ -77,4 +78,3 @@ nojava:
.INCLUDE : tg_ext.mk
.ENDIF
-.ENDIF # "$(BUILD_STAX)" != "YES"
commit 5676ef6ad995813de054646928446562261e32c6
Author: Rene Engelhard <rene at openoffice.org>
Date: Tue Jun 22 18:29:17 2010 +0200
configure25: #i93116# Allow to use the prebuilt stax
diff --git a/stax/makefile.mk b/stax/makefile.mk
index 6dbe81e..6357761 100644
--- a/stax/makefile.mk
+++ b/stax/makefile.mk
@@ -47,6 +47,15 @@ all:
@echo "Therefore the files provided here does not need to be built in addition."
.ENDIF
+EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
+
+.IF "$(BUILD_STAX)" != "YES"
+
+$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
+ +$(COPY) $< $@
+
+.ELSE # "$(BUILD_STAX)" != "YES"
+
# --- Files --------------------------------------------------------
TARFILE_NAME=stax-api-1.0-2-sources
TARFILE_MD5=8294d6c42e3553229af9934c5c0ed997
@@ -68,3 +77,4 @@ nojava:
.INCLUDE : tg_ext.mk
.ENDIF
+.ENDIF # "$(BUILD_STAX)" != "YES"
commit 3cbef7909938794a2c46d0bc5b839e0212cb50bb
Merge: c1e54a1... b0801bb...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 16:02:44 2010 +0200
CWS-TOOLING: integrate CWS mingwport30
commit c1e54a19eba7f095972fe061077c0f98fb1a3adb
Merge: c1ae9ef... a4c3ed3...
Author: obo <obo at openoffice.org>
Date: Tue Jun 22 12:09:13 2010 +0200
CWS-TOOLING: integrate CWS mythes12
commit 0c286b73e2a22475801c5e7fbac11841b27457a0
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Jun 21 10:36:29 2010 +0200
jl153 #i111877# MinGW patch for nss from tono
diff --git a/nss/nss.patch.mingw b/nss/nss.patch.mingw
old mode 100644
new mode 100755
index 01a9ff4..89edd56
--- a/nss/nss.patch.mingw
+++ b/nss/nss.patch.mingw
@@ -1,5 +1,5 @@
---- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-03 23:04:23.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-09-18 17:24:12.042630830 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-04 07:04:23.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2010-06-17 08:42:08.010625000 +0900
@@ -22,6 +22,7 @@
RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
OBJDIR_NAME = @OBJDIR_NAME@
@@ -8,12 +8,12 @@
OBJ_SUFFIX = @OBJ_SUFFIX@
LIB_SUFFIX = @LIB_SUFFIX@
DLL_SUFFIX = @DLL_SUFFIX@
---- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-09-18 17:24:52.422809433 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-10 06:24:37.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-17 08:42:08.057500000 +0900
@@ -113,9 +113,9 @@
# other platforms do not.
#
- ifeq (,$(filter-out WIN95 WINCE OS2,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET)))
-LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
+LIBRARY = $(OBJDIR)/$(LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
@@ -22,8 +22,8 @@
SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
---- misc/nss-3.12.6/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2009-09-18 17:25:50.277803372 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-02-09 03:41:35.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-17 08:42:10.000000000 +0900
@@ -2770,6 +2770,7 @@
LIB_SUFFIX=a
DLL_SUFFIX=so
@@ -32,7 +32,7 @@
MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@'
PR_MD_ASFILES=
PR_MD_CSRCS=
-@@ -3998,6 +3999,7 @@
+@@ -4000,6 +4001,7 @@
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
DLL_SUFFIX=dll
@@ -40,7 +40,7 @@
# Determine compiler version
CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' -e 's| .*||'`
-@@ -6291,6 +6293,7 @@
+@@ -6262,6 +6264,7 @@
s%@LIB_SUFFIX@%$LIB_SUFFIX%g
s%@DLL_SUFFIX@%$DLL_SUFFIX%g
s%@ASM_SUFFIX@%$ASM_SUFFIX%g
@@ -48,8 +48,8 @@
s%@MKSHLIB@%$MKSHLIB%g
s%@DSO_CFLAGS@%$DSO_CFLAGS%g
s%@DSO_LDOPTS@%$DSO_LDOPTS%g
---- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-02-04 23:47:01.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-09-18 17:26:33.544145410 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-12-19 18:06:07.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2010-06-17 08:42:08.151250000 +0900
@@ -195,7 +195,7 @@
ifeq ($(OS_ARCH),WINNT)
@@ -59,8 +59,8 @@
else
OS_LIBS = advapi32.lib wsock32.lib winmm.lib
endif
---- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 02:15:46.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-09-18 17:27:39.253588269 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 09:15:46.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2010-06-17 08:42:08.198125000 +0900
@@ -43,8 +43,8 @@
DEFAULT_COMPILER = cl
@@ -72,8 +72,8 @@
LINK = ld
AR = ar
AR += cr $@
---- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 06:51:10.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-09-18 17:28:06.433136076 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 14:51:10.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2010-06-17 08:42:08.245000000 +0900
@@ -44,4 +44,8 @@
DEFINES += -DWIN95
@@ -85,8 +85,8 @@
+ NSPR31_LIB_PREFIX = $(NULL)
+endif
\ No newline at end of file
---- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-09-18 17:29:05.079376677 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 10:33:36.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-17 08:42:08.291875000 +0900
@@ -281,8 +281,12 @@
fi
endif # MSVC with manifest tool
@@ -100,8 +100,8 @@
get_objs:
@echo $(OBJS)
---- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2009-09-18 17:29:46.194949392 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/Makefile 2009-12-09 01:47:03.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2010-06-17 08:42:08.338750000 +0900
@@ -108,7 +108,7 @@
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
@@ -111,8 +111,8 @@
endif
#
---- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 01:17:21.000000000 +0100
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2009-09-18 17:30:33.267190024 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 09:17:21.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2010-06-17 08:42:08.370000000 +0900
@@ -90,7 +90,7 @@
LDDIST = $(DIST)/lib
@@ -122,8 +122,8 @@
endif
include ../platrules.mk
---- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-09-18 17:31:02.168253398 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-08 04:06:37.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-17 08:42:10.000000000 +0900
@@ -115,10 +115,16 @@
$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
@@ -141,8 +141,8 @@
libs install :: $(CHECKLOC)
---- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-04-11 23:18:42.000000000 +0200
-+++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-09-18 17:31:40.067954076 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-04-12 06:18:42.000000000 +0900
++++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2010-06-17 08:42:08.557500000 +0900
@@ -84,10 +84,6 @@
RES = $(OBJDIR)/$(LIBRARY_NAME).res
RESNAME = freebl.rc
commit a0ebc12a3b29ff99d66791fc317d603f1a836024
Merge: d381090... eea9317...
Author: Joachim Lingner <jl at openoffice.org>
Date: Wed Jun 16 16:20:29 2010 +0200
jl153 merge with DEV300_m82
commit c1ae9ef5c8075861e638c599b75b84a63afd016e
Merge: eea9317... eca8714...
Author: obo <obo at openoffice.org>
Date: Mon Jun 14 16:56:41 2010 +0200
CWS-TOOLING: integrate CWS ause120
commit d38109053845dd1218eb4697329084bb50ad6892
Author: Joachim Lingner <jl at openoffice.org>
Date: Mon Jun 14 14:13:16 2010 +0200
jl153 #i111877# updating nss libraries
diff --git a/nss/makefile.mk b/nss/makefile.mk
index 78de2a9..22b126a 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -41,9 +41,9 @@ all:
@echo "NSS will not be built. ENABLE_NSS_MODULE is '$(ENABLE_NSS_MODULE)'"
.ENDIF
-TARFILE_NAME=nss_3_12_5
-TARFILE_MD5=6244eb0b6e2647ee50470951fa6efb47
-TARFILE_ROOTDIR=mozilla
+TARFILE_NAME=nss-3.12.6-with-nspr-4.8.4
+TARFILE_MD5=b92261a5679276c400555004937af965
+TARFILE_ROOTDIR=nss-3.12.6
PATCH_FILES=nss.patch
.IF "$(OS)"=="MACOSX"
@@ -83,9 +83,9 @@ MACOS_SDK_DIR*=$(MACDEVSDK)
.ENDIF # "$(EXTRA_CFLAGS)"!=""
.ENDIF # "$(OS)"=="MACOSX"
-OUT2LIB=dist$/out$/lib$/*$(DLLPOST)
+OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
-BUILD_DIR=security$/nss
+BUILD_DIR=mozilla$/security$/nss
BUILD_ACTION= $(GNUMAKE) nss_build_all
#See #i105566# && moz#513024#
.IF "$(OS)"=="LINUX"
@@ -117,20 +117,20 @@ nss_LIBS+=-lstdc++_s
.ENDIF
-BUILD_DIR=security$/nss
+BUILD_DIR=mozilla$/security$/nss
BUILD_ACTION=NS_USE_GCC=1 CC="$(nss_CC)" CXX="$(nss_CXX)" OS_LIBS="$(nss_LIBS)" OS_TARGET=WIN95 _WIN32_IE=0x500 PATH="$(PATH)" DEFINES=-D_WIN32_IE=0x500 $(GNUMAKE) nss_build_all
OUT2LIB= \
- dist$/out$/lib$/libnspr4.a \
- dist$/out$/lib$/libnss3.a \
- dist$/out$/lib$/libnssdbm3.a \
- dist$/out$/lib$/libnssutil3.a \
- dist$/out$/lib$/libplc4.a \
- dist$/out$/lib$/libplds4.a \
- dist$/out$/lib$/libsmime3.a \
- dist$/out$/lib$/libsoftokn3.a \
- dist$/out$/lib$/libsqlite3.a \
- dist$/out$/lib$/libssl3.a
+ mozilla$/dist$/out$/lib$/libnspr4.a \
+ mozilla$/dist$/out$/lib$/libnss3.a \
+ mozilla$/dist$/out$/lib$/libnssdbm3.a \
+ mozilla$/dist$/out$/lib$/libnssutil3.a \
+ mozilla$/dist$/out$/lib$/libplc4.a \
+ mozilla$/dist$/out$/lib$/libplds4.a \
+ mozilla$/dist$/out$/lib$/libsmime3.a \
+ mozilla$/dist$/out$/lib$/libsoftokn3.a \
+ mozilla$/dist$/out$/lib$/libsqlite3.a \
+ mozilla$/dist$/out$/lib$/libssl3.a
.ELSE # "$(COM)"=="GCC"
MOZ_MSVCVERSION= 9
@@ -151,29 +151,29 @@ EXT_USE_STLPORT=TRUE
#To build nss one has to call "make nss_build_all" in
#mozilla/security/nss
-NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/mozilla/security/nss)
+NSS_BUILD_DIR= $(subst,\,/ $(PWD)/$(MISC)/build/$(TARFILE_ROOTDIR)/mozilla/security/nss)
BUILD_ACTION= $(subst,/,$/ $(MOZILLABUILD)/msys/bin/bash) -i \
-c "cd $(NSS_BUILD_DIR) && make nss_build_all"
OUT2LIB= \
- dist$/out$/lib$/nspr4.lib \
- dist$/out$/lib$/nss3.lib \
- dist$/out$/lib$/nssdbm3.lib \
- dist$/out$/lib$/nssutil3.lib \
- dist$/out$/lib$/plc4.lib \
- dist$/out$/lib$/plds4.lib \
- dist$/out$/lib$/smime3.lib \
- dist$/out$/lib$/softokn3.lib \
- dist$/out$/lib$/sqlite3.lib \
- dist$/out$/lib$/ssl3.lib
+ mozilla$/dist$/out$/lib$/nspr4.lib \
+ mozilla$/dist$/out$/lib$/nss3.lib \
+ mozilla$/dist$/out$/lib$/nssdbm3.lib \
+ mozilla$/dist$/out$/lib$/nssutil3.lib \
+ mozilla$/dist$/out$/lib$/plc4.lib \
+ mozilla$/dist$/out$/lib$/plds4.lib \
+ mozilla$/dist$/out$/lib$/smime3.lib \
+ mozilla$/dist$/out$/lib$/softokn3.lib \
+ mozilla$/dist$/out$/lib$/sqlite3.lib \
+ mozilla$/dist$/out$/lib$/ssl3.lib
.ENDIF # "$(COM)"=="GCC"
-OUT2BIN=dist$/out$/lib$/*$(DLLPOST)
+OUT2BIN=mozilla$/dist$/out$/lib$/*$(DLLPOST)
.ENDIF # "$(GUI)"=="WNT"
-OUTDIR2INC=dist$/public$/nss dist$/out$/include
+OUTDIR2INC=mozilla$/dist$/public$/nss mozilla$/dist$/out$/include
# --- Targets ------------------------------------------------------
diff --git a/nss/nss.patch b/nss/nss.patch
index a6ce160..b5f871d 100644
--- a/nss/nss.patch
+++ b/nss/nss.patch
@@ -1,6 +1,6 @@
---- misc/mozilla/nsprpub/config/rules.mk Sat May 2 01:08:01 2009
-+++ misc/build/mozilla/nsprpub/config/rules.mk Wed Nov 25 08:06:47 2009
-@@ -350,7 +350,12 @@
+--- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-12-09 22:24:37.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2010-06-11 16:35:54.946870871 +0200
+@@ -345,7 +345,12 @@
ifdef NS_USE_GCC
$(RC) $(RCFLAGS) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
else
@@ -14,9 +14,9 @@
endif # GCC
@echo $(RES) finished
endif
---- misc/mozilla/nsprpub/configure Mon Nov 23 11:44:15 2009
-+++ misc/build/mozilla/nsprpub/configure Wed Nov 25 08:06:47 2009
-@@ -3899,7 +3899,7 @@
+--- misc/nss-3.12.6/mozilla/nsprpub/configure 2010-02-08 19:41:35.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2010-06-11 16:35:54.960188991 +0200
+@@ -3900,7 +3900,7 @@
PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
@@ -25,8 +25,8 @@
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb, and that
# combo is not yet good at debugging inlined
---- misc/mozilla/security/coreconf/Darwin.mk Thu Jul 30 23:36:02 2009
-+++ misc/build/mozilla/security/coreconf/Darwin.mk Wed Nov 25 08:06:47 2009
+--- misc/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-02-04 19:59:10.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/Darwin.mk 2010-06-11 16:35:54.966185975 +0200
@@ -39,8 +39,12 @@
DEFAULT_COMPILER = cc
@@ -42,8 +42,8 @@
RANLIB = ranlib
ifndef CPU_ARCH
---- misc/mozilla/security/coreconf/Linux.mk Mon Nov 23 11:06:29 2009
-+++ misc/build/mozilla/security/coreconf/Linux.mk Wed Nov 25 08:11:35 2009
+--- misc/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-01-15 23:19:00.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/Linux.mk 2010-06-11 16:35:54.981151732 +0200
@@ -46,8 +46,11 @@
IMPL_STRATEGY = _PTH
endif
@@ -58,7 +58,7 @@
RANLIB = ranlib
DEFAULT_COMPILER = gcc
-@@ -149,7 +152,7 @@
+@@ -147,7 +150,7 @@
# incorrectly reports undefined references in the libraries we link with, so
# we don't use -z defs there.
ZDEFS_FLAG = -Wl,-z,defs
@@ -67,7 +67,7 @@
LDFLAGS += $(ARCHFLAG)
# INCLUDES += -I/usr/include -Y/usr/include/linux
-@@ -160,8 +163,13 @@
+@@ -158,8 +161,13 @@
#
CPU_TAG = _$(CPU_ARCH)
@@ -81,8 +81,8 @@
# The -rpath '$$ORIGIN' linker option instructs this library to search for its
# dependencies in the same directory where it resides.
---- misc/mozilla/security/coreconf/SunOS5.mk Thu Jun 11 02:55:32 2009
-+++ misc/build/mozilla/security/coreconf/SunOS5.mk Wed Nov 25 08:06:47 2009
+--- misc/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200
@@ -89,8 +89,12 @@
# OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
endif
@@ -98,8 +98,8 @@
ASFLAGS += -Wa,-P
OS_CFLAGS += $(NOMD_OS_CFLAGS) $(ARCHFLAG)
ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/arch.mk Fri Jun 5 04:14:49 2009
-+++ misc/build/mozilla/security/coreconf/arch.mk Wed Nov 25 08:06:47 2009
+--- misc/nss-3.12.6/mozilla/security/coreconf/arch.mk 2009-06-05 04:14:49.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/arch.mk 2010-06-11 16:35:54.990913282 +0200
@@ -324,7 +324,12 @@
# IMPL_STRATEGY may be defined too.
#
@@ -114,8 +114,8 @@
ifeq (,$(filter-out WIN%,$(OS_TARGET)))
ifndef BUILD_OPT
---- misc/mozilla/security/coreconf/rules.mk Tue Aug 11 05:23:39 2009
-+++ misc/build/mozilla/security/coreconf/rules.mk Wed Nov 25 08:06:47 2009
+--- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-12-08 02:33:36.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2010-06-11 16:35:54.996448704 +0200
@@ -355,7 +355,12 @@
ifdef NS_USE_GCC
$(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES:-I%=--include-dir %) -o $@ $<
@@ -130,9 +130,9 @@
endif
@echo $(RES) finished
endif
---- misc/mozilla/security/nss/cmd/platlibs.mk Thu Jun 18 01:01:48 2009
-+++ misc/build/mozilla/security/nss/cmd/platlibs.mk Wed Nov 25 08:06:47 2009
-@@ -41,12 +41,13 @@
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-02-04 19:59:10.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/platlibs.mk 2010-06-11 16:35:55.004869805 +0200
+@@ -41,27 +41,28 @@
ifeq ($(OS_ARCH), SunOS)
ifeq ($(BUILD_SUN_PKG), 1)
ifeq ($(USE_64), 1)
@@ -149,7 +149,6 @@
endif
endif
-@@ -53,15 +54,15 @@
ifeq ($(OS_ARCH), Linux)
ifeq ($(BUILD_SUN_PKG), 1)
ifeq ($(USE_64), 1)
@@ -169,8 +168,8 @@
endif
endif
endif
---- misc/mozilla/security/nss/cmd/shlibsign/Makefile Fri Aug 7 21:06:37 2009
-+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile Fri Nov 27 13:07:52 2009
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2010-06-11 16:35:55.009851148 +0200
@@ -78,10 +78,15 @@
# sign any and all shared libraries that contain the word freebl
diff --git a/nss/nss.patch.mingw b/nss/nss.patch.mingw
index bead795..01a9ff4 100644
--- a/nss/nss.patch.mingw
+++ b/nss/nss.patch.mingw
@@ -1,5 +1,5 @@
---- misc/mozilla/nsprpub/config/autoconf.mk.in 2009-03-03 23:04:23.000000000 +0100
-+++ misc/build/mozilla/nsprpub/config/autoconf.mk.in 2009-09-18 17:24:12.042630830 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-03-03 23:04:23.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/autoconf.mk.in 2009-09-18 17:24:12.042630830 +0200
@@ -22,6 +22,7 @@
RELEASE_OBJDIR_NAME = @RELEASE_OBJDIR_NAME@
OBJDIR_NAME = @OBJDIR_NAME@
@@ -8,8 +8,8 @@
OBJ_SUFFIX = @OBJ_SUFFIX@
LIB_SUFFIX = @LIB_SUFFIX@
DLL_SUFFIX = @DLL_SUFFIX@
---- misc/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200
-+++ misc/build/mozilla/nsprpub/config/rules.mk 2009-09-18 17:24:52.422809433 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-05-02 01:08:01.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/nsprpub/config/rules.mk 2009-09-18 17:24:52.422809433 +0200
@@ -113,9 +113,9 @@
# other platforms do not.
#
@@ -22,8 +22,8 @@
SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb
else
LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX)
---- misc/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200
-+++ misc/build/mozilla/nsprpub/configure 2009-09-18 17:25:50.277803372 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/configure 2009-05-08 15:12:31.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/nsprpub/configure 2009-09-18 17:25:50.277803372 +0200
@@ -2770,6 +2770,7 @@
LIB_SUFFIX=a
DLL_SUFFIX=so
@@ -48,8 +48,8 @@
s%@MKSHLIB@%$MKSHLIB%g
s%@DSO_CFLAGS@%$DSO_CFLAGS%g
s%@DSO_LDOPTS@%$DSO_LDOPTS%g
---- misc/mozilla/nsprpub/pr/src/Makefile.in 2009-02-04 23:47:01.000000000 +0100
-+++ misc/build/mozilla/nsprpub/pr/src/Makefile.in 2009-09-18 17:26:33.544145410 +0200
+--- misc/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-02-04 23:47:01.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/nsprpub/pr/src/Makefile.in 2009-09-18 17:26:33.544145410 +0200
@@ -195,7 +195,7 @@
ifeq ($(OS_ARCH),WINNT)
@@ -59,8 +59,8 @@
else
OS_LIBS = advapi32.lib wsock32.lib winmm.lib
endif
---- misc/mozilla/security/coreconf/WIN32.mk 2009-07-29 02:15:46.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/WIN32.mk 2009-09-18 17:27:39.253588269 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-07-29 02:15:46.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN32.mk 2009-09-18 17:27:39.253588269 +0200
@@ -43,8 +43,8 @@
DEFAULT_COMPILER = cl
@@ -72,8 +72,8 @@
LINK = ld
AR = ar
AR += cr $@
---- misc/mozilla/security/coreconf/WIN95.mk 2009-02-14 06:51:10.000000000 +0100
-+++ misc/build/mozilla/security/coreconf/WIN95.mk 2009-09-18 17:28:06.433136076 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-02-14 06:51:10.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/WIN95.mk 2009-09-18 17:28:06.433136076 +0200
@@ -44,4 +44,8 @@
DEFINES += -DWIN95
@@ -85,8 +85,8 @@
+ NSPR31_LIB_PREFIX = $(NULL)
+endif
\ No newline at end of file
---- misc/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200
-+++ misc/build/mozilla/security/coreconf/rules.mk 2009-09-18 17:29:05.079376677 +0200
+--- misc/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-08-11 05:23:39.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/coreconf/rules.mk 2009-09-18 17:29:05.079376677 +0200
@@ -281,8 +281,12 @@
fi
endif # MSVC with manifest tool
@@ -100,8 +100,8 @@
get_objs:
@echo $(OBJS)
---- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/mozilla/security/nss/Makefile 2009-09-18 17:29:46.194949392 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2009-09-18 17:29:46.194949392 +0200
@@ -108,7 +108,7 @@
NSPR_CONFIGURE_OPTS += --enable-debug-rtl
endif
@@ -111,8 +111,8 @@
endif
#
---- misc/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 01:17:21.000000000 +0100
-+++ misc/build/mozilla/security/nss/cmd/crmftest/Makefile 2009-09-18 17:30:33.267190024 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2005-11-14 01:17:21.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/crmftest/Makefile 2009-09-18 17:30:33.267190024 +0200
@@ -90,7 +90,7 @@
LDDIST = $(DIST)/lib
@@ -122,8 +122,8 @@
endif
include ../platrules.mk
---- misc/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
-+++ misc/build/mozilla/security/nss/cmd/shlibsign/Makefile 2009-09-18 17:31:02.168253398 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-08-07 21:06:37.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/nss/cmd/shlibsign/Makefile 2009-09-18 17:31:02.168253398 +0200
@@ -115,10 +115,16 @@
$(call core_abspath,$(OBJDIR)) $(OS_TARGET) \
$(call core_abspath,$(NSPR_LIB_DIR)) $(call core_abspath,$<)
@@ -141,8 +141,8 @@
libs install :: $(CHECKLOC)
---- misc/mozilla/security/nss/lib/freebl/config.mk 2009-04-11 23:18:42.000000000 +0200
-+++ misc/build/mozilla/security/nss/lib/freebl/config.mk 2009-09-18 17:31:40.067954076 +0200
+--- misc/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-04-11 23:18:42.000000000 +0200
++++ misc/build/nss-3.12.6/mozilla/security/nss/lib/freebl/config.mk 2009-09-18 17:31:40.067954076 +0200
@@ -84,10 +84,6 @@
RES = $(OBJDIR)/$(LIBRARY_NAME).res
RESNAME = freebl.rc
diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch
index d6ce6ff..5a02283 100644
--- a/nss/nss_macosx.patch
+++ b/nss/nss_macosx.patch
@@ -1,5 +1,5 @@
---- misc/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
-+++ misc/build/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
+--- misc/nss-3.12.6/mozilla/security/nss/Makefile 2008-12-03 00:24:39.000000000 +0100
++++ misc/build/nss-3.12.6/mozilla/security/nss/Makefile 2009-11-27 13:36:22.662753328 +0100
@@ -104,6 +104,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
commit b0801bbec4ae651e4a6081b3aba7e6b5d93a0a7c
Author: tono <tono at openoffice.org>
Date: Sat Jun 12 19:04:29 2010 +0900
i#112159: MinGW port: more fix for libxml2 2.7.6 to avoid using pthreads
diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch
index 37f48c6..651b0c1 100644
--- a/libxml2/libxml2-mingw.patch
+++ b/libxml2/libxml2-mingw.patch
@@ -9,6 +9,19 @@
*-*-cygwin*)
MODULE_EXTENSION=".dll"
{ $as_echo "$as_me:$LINENO: checking for dlopen in -lcygwin" >&5
+@@ -20632,11 +20636,10 @@
+
+ fi
+ case $host_os in
+- *mingw32*) if test "$THREAD_LIBS" != "-lpthread"; then
++ *mingw32*)
+ WITH_THREADS="1"
+ THREADS_W32="Win32"
+ THREAD_CFLAGS="$THREAD_CFLAGS -DHAVE_WIN32_THREADS"
+- fi
+ ;;
+ *cygwin*) THREAD_LIBS=""
+ ;;
--- misc/libxml2-2.7.6/libxml.h 2007-11-23 19:47:23.000000000 +0900
+++ misc/build/libxml2-2.7.6/libxml.h 2009-07-10 14:37:34.988250000 +0900
@@ -30,6 +30,10 @@
commit eea9317eb906e5fb0369f9e0de4797c986f2b2d5
Author: obo <obo at openoffice.org>
Date: Thu Jun 10 15:24:27 2010 +0200
masterfix: #i10000# remove typo
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index ac74d7c..f58204a 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -1,4 +1,4 @@
-jedit#*************************************************************************
+#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
commit 968d5b3e28e39a35c3dfe0c98bcda3f9c0f7f3bf
Merge: 14e45db... 0bcc70e...
Author: obo <obo at openoffice.org>
Date: Wed Jun 9 16:35:27 2010 +0200
CWS-TOOLING: integrate CWS tl74
commit 0bcc70e5db5443441ee37e6ce13ade6e8fc12717
Merge: e48e017... 14e45db...
Author: Thomas Lange [tl] <tl at openoffice.org>
Date: Wed Jun 9 14:50:43 2010 +0200
cws tl74: merge with DEV300_m81
diff --cc hunspell/makefile.mk
index db6eb10,f58204a..ac74d7c
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@@ -1,4 -1,4 +1,4 @@@
--#*************************************************************************
++jedit#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
commit 14e45db1de4da3f6301be0597aa8f510849cb926
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Jun 7 10:45:08 2010 +0200
masterfix: #i10000# #i112124# build fails in configure fix
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index 6610024..2f4ff25 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -93,7 +93,8 @@ GR_CONFIGURE_FLAGS= --enable-final=yes --enable-static --disable-shared
EXTRA_GR_CXX_FLAGS=-fPIC
.IF "$(USE_SYSTEM_STL)"!="YES"
-EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm
+# #i112124# STLPort seems to require libstdc++
+EXTRA_GR_LD_FLAGS=$(LIBSTLPORT) -lm -lstdc++
GR_LIB_PATH=LD_LIBRARY_PATH=$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)
.ELSE
GR_LIB_PATH=
commit 8a3863ddc4d01a13a5c0fa58b2d0065f40aabc7f
Author: tono <tono at openoffice.org>
Date: Sun Jun 6 20:54:55 2010 +0900
i#112159: MinGW port: libxmlsec 1.2.14, libxml2 2.7.6, libxslt 1.1.26
diff --git a/libxml2/libxml2-mingw.patch b/libxml2/libxml2-mingw.patch
index d160dcb..37f48c6 100644
--- a/libxml2/libxml2-mingw.patch
+++ b/libxml2/libxml2-mingw.patch
@@ -22,3 +22,14 @@
#include <libxml/xmlversion.h>
#endif
+--- misc/libxml2-2.7.6/include/libxml/xmlexports.h 2009-09-25 00:31:59.000000000 +0900
++++ misc/build/libxml2-2.7.6/include/libxml/xmlexports.h 2010-06-06 11:15:54.160750000 +0900
+@@ -113,7 +113,7 @@
+ * _imp__xmlFree listed as missing. Try to workaround the problem
+ * by also making that declaration when compiling client code.
+ */
+- #if !defined(LIBXML_STATIC)
++ #if defined(IN_LIBXML) && !defined(LIBXML_STATIC)
+ #define XMLPUBFUN __declspec(dllexport)
+ #define XMLPUBVAR __declspec(dllexport)
+ #else
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 4502c90..555d872 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -65,7 +65,7 @@ xml2_LIBS+=-lstdc++_s
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP=objdump
BUILD_ACTION=$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
diff --git a/libxslt/libxslt-mingw.patch b/libxslt/libxslt-mingw.patch
new file mode 100644
index 0000000..da8eee3
--- /dev/null
+++ b/libxslt/libxslt-mingw.patch
@@ -0,0 +1,36 @@
+--- misc/libxslt-1.1.26/ltmain.sh 2010-06-06 14:43:28.785750000 +0900
++++ misc/build/libxslt-1.1.26/ltmain.sh 2010-06-06 15:14:26.176375000 +0900
+@@ -2983,15 +2983,7 @@
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ case $build in
+- *mingw* ) # actually, msys
+- # awkward: cmd appends spaces to result
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- *cygwin* )
++ *cygwin* | *mingw* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+@@ -3062,15 +3054,7 @@
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e 's|^:*||' -e 's|:*$||'`
+ case $build in
+- *mingw* ) # Actually, msys.
+- # Awkward: cmd appends spaces to result.
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- *cygwin* )
++ *cygwin* | *mingw* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 7df2fc8..1c9370b 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -52,6 +52,7 @@ TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
PATCH_FILES=libxslt-configure.patch \
libxslt-win_manifest.patch \
+ libxslt-mingw.patch \
libxslt-gnome602728.patch
# This is only for UNX environment now
@@ -67,7 +68,7 @@ xslt_LIBS+=-lstdc++_s
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xslt_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xslt_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP=objdump
BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
BUILD_DIR=$(CONFIGURE_DIR)
commit 77c19675cf7ba73b5af2f05ace0a17253a9cea65
Merge: 29a4558... fc2a73b...
Author: tono <tono at openoffice.org>
Date: Sat Jun 5 22:39:55 2010 +0900
mingwport30: merge with DEV300 m80
diff --cc libxml2/libxml2-mingw.patch
index 0000000,d160dcb..d160dcb
mode 000000,100755..100644
--- a/libxml2/libxml2-mingw.patch
+++ b/libxml2/libxml2-mingw.patch
diff --cc libxml2/makefile.mk
index c315b87,93275b6..4502c90
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@@ -56,8 -55,7 +55,7 @@@ PATCH_FILES=libxml2-configure.patch
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
- PATCH_FILES+=$(TARFILE_NAME)-mingw.patch
-xml2_CC=$(CC)
+xml2_CC=$(CC) -mthreads
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
xml2_CC+=-shared-libgcc
.ENDIF
commit 29a45582e03147ee43aac96339f0b9194a604cf2
Author: tono <tono at openoffice.org>
Date: Sat Jun 5 07:44:18 2010 +0900
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 : more fixes
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index 057b92a..c315b87 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -67,7 +67,7 @@ xml2_LIBS+=-lstdc++_s
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
BUILD_ACTION=$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
commit da09a1c03d30a6794b54ec399cfcd436c2b525cb
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jun 3 17:06:35 2010 +0200
masterfix: #i10000# removed obsolete libc patch
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 967e296..9629f71 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,10 +88,6 @@ PATCH_FILES = \
patches/arm_build_fix.patch \
patches/link_fontconfig.patch
-.IF "$(OUTPATH)"=="unxlngi6"
-PATCH_FILES += patches/linux_libc2.5.patch
-.ENDIF
-
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
.IF "$(COM)"=="GCC"
diff --git a/moz/patches/linux_libc2.5.patch b/moz/patches/linux_libc2.5.patch
deleted file mode 100644
index b7f1814..0000000
--- a/moz/patches/linux_libc2.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/mozilla/configure 2010-04-14 18:08:55.402759185 +0200
-+++ misc/build/mozilla/configure 2010-04-14 18:07:13.036410334 +0200
-@@ -11886,7 +11886,7 @@
- $(DIST)/lib/$(LIB_PREFIX)nss'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX) \\\
- $(DIST)/lib/$(LIB_PREFIX)softokn'$NSS_VERSION'.$(IMPORT_LIB_SUFFIX)'
- else
-- NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lsoftokn$NSS_VERSION"
-+ NSS_LIBS='-L$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION -lsoftokn$NSS_VERSION"
- fi
- fi
-
commit 3dcf232737f4aae5a001c85a5f20c823889cdb45
Merge: 5a58cc9... b2ffa59...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Thu Jun 3 16:26:59 2010 +0200
CWS-TOOLING: integrate CWS narrow01
commit 6aa0f207e5d7db76ff752cd5475ca2d767bb889e
Author: tono <tono at openoffice.org>
Date: Thu Jun 3 19:12:00 2010 +0900
i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 : fix interference to other platforms
diff --git a/graphite/makefile.mk b/graphite/makefile.mk
index a2da080..bd85c51 100644
--- a/graphite/makefile.mk
+++ b/graphite/makefile.mk
@@ -105,12 +105,12 @@ EXTRA_GR_CXX_FLAGS=-mthreads -nostdinc
.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
EXTRA_GR_CXX_FLAGS+=-shared-libgcc
.ENDIF
-EXTRA_GR_LD_FLAGS+=-no-undefined
+EXTRA_GR_LD_FLAGS+=-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2
.ENDIF
# don't use SOLARLIB for LDFLAGS because it pulls in system graphite so build will fail
#
-CONFIGURE_ACTION=bash -c 'CXXFLAGS="$(INCLUDE) $(CFLAGSCXX) $(CFLAGSCOBJ) $(CDEFS) $(CDEFSOBJ) $(SOLARINC) $(LFS_CFLAGS) $(EXTRA_GR_CXX_FLAGS)" $(GR_LIB_PATH) LDFLAGS="-L$(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT) $(EXTRA_GR_LD_FLAGS) -Wl,--enable-runtime-pseudo-reloc-v2" ./configure $(GR_CONFIGURE_FLAGS)'
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list