зеркало из https://github.com/mozilla/pjs.git
Removal of MNG support. Bug 195280. Patch by tor@acm.org. r=pavlov sr=blizzard.
This commit is contained in:
pavlov%pavlov.net
Родитель
70fd6c9c78
Коммит
7237927e55
|
|
@ -961,7 +961,6 @@ embedding/components/profilesharingsetup/src/Makefile
|
|||
modules/libpr0n/decoders/png/Makefile
|
||||
modules/libpr0n/decoders/jpeg/Makefile
|
||||
modules/libpr0n/decoders/bmp/Makefile
|
||||
modules/libpr0n/decoders/mng/Makefile
|
||||
modules/libpr0n/decoders/icon/Makefile
|
||||
modules/libpr0n/decoders/icon/win/Makefile
|
||||
modules/libpr0n/decoders/xbm/Makefile
|
||||
|
|
@ -1002,10 +1001,6 @@ if [ ! "$SYSTEM_PNG" ]; then
|
|||
MAKEFILES_libimg="$MAKEFILES_libimg modules/libimg/png/Makefile"
|
||||
fi
|
||||
|
||||
if [ ! "$SYSTEM_MNG" ]; then
|
||||
MAKEFILES_libimg="$MAKEFILES_libimg modules/libimg/mng/Makefile"
|
||||
fi
|
||||
|
||||
#
|
||||
# l10n/
|
||||
#
|
||||
|
|
@ -1443,8 +1438,6 @@ MAKEFILES_imgjpeg="js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefil
|
|||
|
||||
MAKEFILES_imglib2="js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefile string/Makefile xpcom/Makefile expat/Makefile intl/Makefile embedding/components/windowwatcher/Makefile intl/lwbrk/Makefile sun-java/stubs/Makefile js/jsd/classes/Makefile js/src/liveconnect/Makefile modules/zlib/Makefile modules/libjar/Makefile netwerk/cache/Makefile webshell/Makefile embedding/components/ui/helperAppDlg/Makefile rdf/util/Makefile rdf/Makefile gfx/src/xlibrgb/Makefile widget/src/gtkxtbin/Makefile modules/plugin/Makefile uriloader/exthandler/Makefile view/Makefile editor/composer/Makefile editor/txtsvc/Makefile content/xul/content/Makefile content/xul/templates/Makefile profile/pref-migrator/Makefile profile/Makefile embedding/components/jsconsole/Makefile embedding/components/commandhandler/Makefile xpfe/components/find/Makefile embedding/components/find/Makefile embedding/components/appstartup/Makefile embedding/components/windowwatcher/Makefile embedding/components/printingui/Makefile embedding/components/build/Makefile embedding/base/Makefile xpfe/appshell/Makefile rdf/chrome/Makefile content/xul/document/Makefile editor/txmgr/Makefile editor/Makefile intl/chardet/Makefile modules/libutil/Makefile content/Makefile embedding/components/webbrowserpersist/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile modules/oji/Makefile accessible/Makefile layout/Makefile xpfe/components/shistory/Makefile xpfe/browser/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile db/mork/Makefile db/mdb/Makefile directory/xpcom/base/Makefile xpfe/components/Makefile docshell/Makefile uriloader/Makefile xpfe/components/xremote/Makefile widget/Makefile gfx/Makefile intl/locale/Makefile intl/uconv/Makefile intl/unicharutil/Makefile htmlparser/Makefile xpfe/components/sidebar/Makefile dom/Makefile caps/Makefile js/src/xpconnect/Makefile modules/libpref/Makefile netwerk/mime/Makefile netwerk/protocol/ftp/Makefile netwerk/protocol/gopher/Makefile netwerk/protocol/viewsource/Makefile netwerk/build2/Makefile netwerk/base/Makefile netwerk/protocol/about/Makefile netwerk/protocol/data/Makefile netwerk/protocol/file/Makefile netwerk/protocol/http/Makefile netwerk/protocol/jar/Makefile netwerk/protocol/keyword/Makefile netwerk/protocol/res/Makefile netwerk/dns/Makefile netwerk/socket/Makefile netwerk/streamconv/Makefile netwerk/cookie/Makefile netwerk/build/Makefile modules/libimg/png/Makefile jpeg/Makefile modules/libpr0n/public/Makefile modules/libpr0n/src/Makefile"
|
||||
|
||||
MAKEFILES_imgmng="modules/zlib/Makefile jpeg/Makefile modules/libimg/mng/Makefile js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefile string/Makefile xpcom/Makefile expat/Makefile intl/Makefile netwerk/cache/Makefile intl/lwbrk/Makefile sun-java/stubs/Makefile js/jsd/classes/Makefile js/src/liveconnect/Makefile modules/libjar/Makefile xpfe/components/shistory/Makefile embedding/components/windowwatcher/Makefile webshell/Makefile embedding/components/ui/helperAppDlg/Makefile rdf/util/Makefile modules/libimg/png/Makefile modules/libpr0n/public/Makefile modules/libpr0n/src/Makefile view/Makefile editor/composer/Makefile editor/txtsvc/Makefile embedding/components/webbrowserpersist/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile content/xul/content/Makefile content/xul/templates/Makefile profile/pref-migrator/Makefile profile/Makefile embedding/components/jsconsole/Makefile embedding/components/commandhandler/Makefile xpfe/components/find/Makefile embedding/components/find/Makefile embedding/components/appstartup/Makefile embedding/components/windowwatcher/Makefile embedding/components/printingui/Makefile embedding/components/build/Makefile embedding/base/Makefile xpfe/appshell/Makefile rdf/chrome/Makefile content/xul/document/Makefile editor/txmgr/Makefile editor/Makefile modules/libutil/Makefile content/Makefile rdf/Makefile gfx/src/xlibrgb/Makefile widget/src/gtkxtbin/Makefile modules/plugin/Makefile uriloader/exthandler/Makefile uriloader/Makefile xpfe/browser/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile db/mork/Makefile db/mdb/Makefile directory/xpcom/base/Makefile xpfe/components/Makefile docshell/Makefile modules/oji/Makefile accessible/Makefile layout/Makefile htmlparser/Makefile intl/chardet/Makefile intl/uconv/Makefile intl/unicharutil/Makefile intl/locale/Makefile xpfe/components/xremote/Makefile widget/Makefile caps/Makefile js/src/xpconnect/Makefile modules/libpref/Makefile netwerk/mime/Makefile netwerk/protocol/ftp/Makefile netwerk/protocol/gopher/Makefile netwerk/protocol/viewsource/Makefile netwerk/build2/Makefile netwerk/base/Makefile netwerk/protocol/about/Makefile netwerk/protocol/data/Makefile netwerk/protocol/file/Makefile netwerk/protocol/http/Makefile netwerk/protocol/jar/Makefile netwerk/protocol/keyword/Makefile netwerk/protocol/res/Makefile netwerk/dns/Makefile netwerk/socket/Makefile netwerk/streamconv/Makefile netwerk/cookie/Makefile netwerk/build/Makefile xpfe/components/sidebar/Makefile dom/Makefile gfx/Makefile modules/libpr0n/decoders/mng/Makefile"
|
||||
|
||||
MAKEFILES_imgpng="modules/zlib/Makefile js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefile string/Makefile xpcom/Makefile expat/Makefile intl/Makefile netwerk/cache/Makefile intl/lwbrk/Makefile sun-java/stubs/Makefile js/jsd/classes/Makefile js/src/liveconnect/Makefile modules/libjar/Makefile xpfe/components/shistory/Makefile embedding/components/windowwatcher/Makefile webshell/Makefile embedding/components/ui/helperAppDlg/Makefile rdf/util/Makefile modules/libimg/png/Makefile jpeg/Makefile modules/libpr0n/public/Makefile modules/libpr0n/src/Makefile view/Makefile editor/composer/Makefile editor/txtsvc/Makefile embedding/components/webbrowserpersist/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile content/xul/content/Makefile content/xul/templates/Makefile profile/pref-migrator/Makefile profile/Makefile embedding/components/jsconsole/Makefile embedding/components/commandhandler/Makefile xpfe/components/find/Makefile embedding/components/find/Makefile embedding/components/appstartup/Makefile embedding/components/windowwatcher/Makefile embedding/components/printingui/Makefile embedding/components/build/Makefile embedding/base/Makefile xpfe/appshell/Makefile rdf/chrome/Makefile content/xul/document/Makefile editor/txmgr/Makefile editor/Makefile modules/libutil/Makefile content/Makefile rdf/Makefile gfx/src/xlibrgb/Makefile widget/src/gtkxtbin/Makefile modules/plugin/Makefile uriloader/exthandler/Makefile uriloader/Makefile xpfe/browser/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile db/mork/Makefile db/mdb/Makefile directory/xpcom/base/Makefile xpfe/components/Makefile docshell/Makefile modules/oji/Makefile accessible/Makefile layout/Makefile htmlparser/Makefile intl/chardet/Makefile intl/uconv/Makefile intl/unicharutil/Makefile intl/locale/Makefile xpfe/components/xremote/Makefile widget/Makefile caps/Makefile js/src/xpconnect/Makefile modules/libpref/Makefile netwerk/mime/Makefile netwerk/protocol/ftp/Makefile netwerk/protocol/gopher/Makefile netwerk/protocol/viewsource/Makefile netwerk/build2/Makefile netwerk/base/Makefile netwerk/protocol/about/Makefile netwerk/protocol/data/Makefile netwerk/protocol/file/Makefile netwerk/protocol/http/Makefile netwerk/protocol/jar/Makefile netwerk/protocol/keyword/Makefile netwerk/protocol/res/Makefile netwerk/dns/Makefile netwerk/socket/Makefile netwerk/streamconv/Makefile netwerk/cookie/Makefile netwerk/build/Makefile xpfe/components/sidebar/Makefile dom/Makefile gfx/Makefile modules/libpr0n/decoders/png/Makefile"
|
||||
|
||||
MAKEFILES_imgxbm="js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefile string/Makefile xpcom/Makefile expat/Makefile intl/Makefile netwerk/cache/Makefile intl/lwbrk/Makefile sun-java/stubs/Makefile js/jsd/classes/Makefile js/src/liveconnect/Makefile modules/zlib/Makefile modules/libjar/Makefile xpfe/components/shistory/Makefile embedding/components/windowwatcher/Makefile webshell/Makefile embedding/components/ui/helperAppDlg/Makefile rdf/util/Makefile modules/libimg/png/Makefile jpeg/Makefile modules/libpr0n/public/Makefile modules/libpr0n/src/Makefile view/Makefile editor/composer/Makefile editor/txtsvc/Makefile embedding/components/webbrowserpersist/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile content/xul/content/Makefile content/xul/templates/Makefile profile/pref-migrator/Makefile profile/Makefile embedding/components/jsconsole/Makefile embedding/components/commandhandler/Makefile xpfe/components/find/Makefile embedding/components/find/Makefile embedding/components/appstartup/Makefile embedding/components/windowwatcher/Makefile embedding/components/printingui/Makefile embedding/components/build/Makefile embedding/base/Makefile xpfe/appshell/Makefile rdf/chrome/Makefile content/xul/document/Makefile editor/txmgr/Makefile editor/Makefile modules/libutil/Makefile content/Makefile rdf/Makefile gfx/src/xlibrgb/Makefile widget/src/gtkxtbin/Makefile modules/plugin/Makefile uriloader/exthandler/Makefile uriloader/Makefile xpfe/browser/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile db/mork/Makefile db/mdb/Makefile directory/xpcom/base/Makefile xpfe/components/Makefile docshell/Makefile modules/oji/Makefile accessible/Makefile layout/Makefile htmlparser/Makefile intl/chardet/Makefile intl/uconv/Makefile intl/unicharutil/Makefile intl/locale/Makefile xpfe/components/xremote/Makefile widget/Makefile caps/Makefile js/src/xpconnect/Makefile modules/libpref/Makefile netwerk/mime/Makefile netwerk/protocol/ftp/Makefile netwerk/protocol/gopher/Makefile netwerk/protocol/viewsource/Makefile netwerk/build2/Makefile netwerk/base/Makefile netwerk/protocol/about/Makefile netwerk/protocol/data/Makefile netwerk/protocol/file/Makefile netwerk/protocol/http/Makefile netwerk/protocol/jar/Makefile netwerk/protocol/keyword/Makefile netwerk/protocol/res/Makefile netwerk/dns/Makefile netwerk/socket/Makefile netwerk/streamconv/Makefile netwerk/cookie/Makefile netwerk/build/Makefile xpfe/components/sidebar/Makefile dom/Makefile gfx/Makefile modules/libpr0n/decoders/xbm/Makefile"
|
||||
|
|
@ -1495,8 +1488,6 @@ MAKEFILES_mimeemitter="mailnews/Makefile js/src/fdlibm/Makefile js/src/Makefile
|
|||
|
||||
MAKEFILES_mimetype="js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefile string/Makefile xpcom/Makefile expat/Makefile intl/Makefile embedding/components/windowwatcher/Makefile intl/lwbrk/Makefile sun-java/stubs/Makefile js/jsd/classes/Makefile js/src/liveconnect/Makefile modules/zlib/Makefile modules/libjar/Makefile modules/libimg/png/Makefile jpeg/Makefile modules/libpr0n/public/Makefile modules/libpr0n/src/Makefile webshell/Makefile embedding/components/ui/helperAppDlg/Makefile rdf/util/Makefile rdf/Makefile gfx/src/xlibrgb/Makefile widget/src/gtkxtbin/Makefile modules/plugin/Makefile uriloader/exthandler/Makefile view/Makefile editor/composer/Makefile editor/txtsvc/Makefile content/xul/content/Makefile content/xul/templates/Makefile profile/pref-migrator/Makefile profile/Makefile embedding/components/jsconsole/Makefile embedding/components/commandhandler/Makefile xpfe/components/find/Makefile embedding/components/find/Makefile embedding/components/appstartup/Makefile embedding/components/windowwatcher/Makefile embedding/components/printingui/Makefile embedding/components/build/Makefile embedding/base/Makefile xpfe/appshell/Makefile rdf/chrome/Makefile content/xul/document/Makefile editor/txmgr/Makefile editor/Makefile intl/chardet/Makefile modules/libutil/Makefile content/Makefile embedding/components/webbrowserpersist/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile modules/oji/Makefile accessible/Makefile layout/Makefile xpfe/components/shistory/Makefile xpfe/browser/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile db/mork/Makefile db/mdb/Makefile directory/xpcom/base/Makefile xpfe/components/Makefile docshell/Makefile uriloader/Makefile xpfe/components/xremote/Makefile widget/Makefile gfx/Makefile intl/locale/Makefile intl/uconv/Makefile intl/unicharutil/Makefile htmlparser/Makefile xpfe/components/sidebar/Makefile dom/Makefile caps/Makefile js/src/xpconnect/Makefile modules/libpref/Makefile netwerk/cache/Makefile netwerk/protocol/ftp/Makefile netwerk/protocol/gopher/Makefile netwerk/protocol/viewsource/Makefile netwerk/build2/Makefile netwerk/base/Makefile netwerk/protocol/about/Makefile netwerk/protocol/data/Makefile netwerk/protocol/file/Makefile netwerk/protocol/http/Makefile netwerk/protocol/jar/Makefile netwerk/protocol/keyword/Makefile netwerk/protocol/res/Makefile netwerk/dns/Makefile netwerk/socket/Makefile netwerk/streamconv/Makefile netwerk/cookie/Makefile netwerk/build/Makefile netwerk/mime/Makefile"
|
||||
|
||||
MAKEFILES_mng="modules/zlib/Makefile jpeg/Makefile modules/libimg/mng/Makefile"
|
||||
|
||||
MAKEFILES_mork="modules/libreg/Makefile string/Makefile xpcom/Makefile db/mork/Makefile db/mdb/Makefile"
|
||||
|
||||
MAKEFILES_mozldap="js/src/fdlibm/Makefile js/src/Makefile modules/libreg/Makefile string/Makefile xpcom/Makefile expat/Makefile intl/Makefile embedding/components/windowwatcher/Makefile intl/lwbrk/Makefile sun-java/stubs/Makefile js/jsd/classes/Makefile js/src/liveconnect/Makefile modules/zlib/Makefile modules/libjar/Makefile modules/libimg/png/Makefile jpeg/Makefile netwerk/cache/Makefile modules/libpr0n/public/Makefile modules/libpr0n/src/Makefile webshell/Makefile embedding/components/ui/helperAppDlg/Makefile rdf/util/Makefile rdf/Makefile gfx/src/xlibrgb/Makefile widget/src/gtkxtbin/Makefile modules/plugin/Makefile uriloader/exthandler/Makefile view/Makefile editor/composer/Makefile editor/txtsvc/Makefile content/xul/content/Makefile content/xul/templates/Makefile profile/pref-migrator/Makefile profile/Makefile embedding/components/jsconsole/Makefile embedding/components/commandhandler/Makefile xpfe/components/find/Makefile embedding/components/find/Makefile embedding/components/appstartup/Makefile embedding/components/windowwatcher/Makefile embedding/components/printingui/Makefile embedding/components/build/Makefile embedding/base/Makefile xpfe/appshell/Makefile rdf/chrome/Makefile content/xul/document/Makefile editor/txmgr/Makefile editor/Makefile intl/chardet/Makefile modules/libutil/Makefile content/Makefile embedding/components/webbrowserpersist/Makefile embedding/browser/webBrowser/Makefile embedding/browser/build/Makefile modules/oji/Makefile accessible/Makefile layout/Makefile xpfe/components/shistory/Makefile xpfe/browser/Makefile embedding/components/ui/progressDlg/Makefile xpfe/components/download-manager/Makefile db/mork/Makefile db/mdb/Makefile xpfe/components/Makefile docshell/Makefile uriloader/Makefile xpfe/components/xremote/Makefile widget/Makefile gfx/Makefile intl/locale/Makefile intl/uconv/Makefile intl/unicharutil/Makefile htmlparser/Makefile xpfe/components/sidebar/Makefile dom/Makefile caps/Makefile js/src/xpconnect/Makefile modules/libpref/Makefile netwerk/mime/Makefile netwerk/protocol/ftp/Makefile netwerk/protocol/gopher/Makefile netwerk/protocol/viewsource/Makefile netwerk/build2/Makefile netwerk/base/Makefile netwerk/protocol/about/Makefile netwerk/protocol/data/Makefile netwerk/protocol/file/Makefile netwerk/protocol/http/Makefile netwerk/protocol/jar/Makefile netwerk/protocol/keyword/Makefile netwerk/protocol/res/Makefile netwerk/dns/Makefile netwerk/socket/Makefile netwerk/streamconv/Makefile netwerk/cookie/Makefile netwerk/build/Makefile directory/xpcom/base/Makefile"
|
||||
|
|
@ -1702,7 +1693,6 @@ MAKEFILES_zlib="modules/zlib/Makefile"
|
|||
imggif) add_makefiles "$MAKEFILES_imggif" ;;
|
||||
imgjpeg) add_makefiles "$MAKEFILES_imgjpeg" ;;
|
||||
imglib2) add_makefiles "$MAKEFILES_imglib2" ;;
|
||||
imgmng) add_makefiles "$MAKEFILES_imgmng" ;;
|
||||
imgpng) add_makefiles "$MAKEFILES_imgpng" ;;
|
||||
imgxbm) add_makefiles "$MAKEFILES_imgxbm" ;;
|
||||
impComm4xMail) add_makefiles "$MAKEFILES_impComm4xMail" ;;
|
||||
|
|
@ -1728,7 +1718,6 @@ MAKEFILES_zlib="modules/zlib/Makefile"
|
|||
mime) add_makefiles "$MAKEFILES_mime" ;;
|
||||
mimeemitter) add_makefiles "$MAKEFILES_mimeemitter" ;;
|
||||
mimetype) add_makefiles "$MAKEFILES_mimetype" ;;
|
||||
mng) add_makefiles "$MAKEFILES_mng" ;;
|
||||
mork) add_makefiles "$MAKEFILES_mork" ;;
|
||||
mozldap) add_makefiles "$MAKEFILES_mozldap" ;;
|
||||
mpfilelocprovider) add_makefiles "$MAKEFILES_mpfilelocprovider" ;;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ ifneq ($(BUILD_MODULES),all)
|
|||
#### Generated lines go after this line.
|
||||
|
||||
# Available modules are:
|
||||
# TestStreamConv TestXPC TestXPTC accessibility accessproxy addrbook appcomps apprunner appshell autoconfig browser caps chardet chrome commandhandler composer content cookie dbm docshell dom downloadmanager editor embed_base embedcomponents expat exthandler filepicker find gfx gtkembedmoz gtkxtbin helperAppDlg htmlparser i18n iiextras imgbmp imggif imgjpeg imglib2 imgmng imgpng imgxbm impComm4xMail impText import inspector intl jar java jpeg js jsconsole jsdebug jsloader jsurl layout libart_lgpl libreg liveconnect locale lwbrk mailnews mime mimeemitter mimetype mng mork mozldap mpfilelocprovider msgbase msgbaseutil msgcompose msgdb msgimap msglocal msgmdn msgnews msgsmime necko necko2 nkcache nkdatetime nkfinger npsimple oji p3p plugin png pref prefetch prefmigr profile progressDlg rdf rdfutil shistory sidebar string svg_doc test_necko timebombgen transformiix txmgr txtsvc typeaheadfind uconv ucvcn ucvibm ucvja ucvko ucvlatin ucvmath ucvtw ucvtw2 unicharutil universalchardet uriloader util vcard view wallet walletviewers webbrowserpersist webbrwsr webshell webshell_tests widget windowwatcher xlibrgb xml-rpc xmlextras xmlterm xpcom xpcomsample xpconnect xpconnect_tests xpcshell xpctest xpinstall xpistub xpnet xremoteservice xul xuldoc xultmpl zlib
|
||||
# TestStreamConv TestXPC TestXPTC accessibility accessproxy addrbook appcomps apprunner appshell autoconfig browser caps chardet chrome commandhandler composer content cookie dbm docshell dom downloadmanager editor embed_base embedcomponents expat exthandler filepicker find gfx gtkembedmoz gtkxtbin helperAppDlg htmlparser i18n iiextras imgbmp imggif imgjpeg imglib2 imgpng imgxbm impComm4xMail impText import inspector intl jar java jpeg js jsconsole jsdebug jsloader jsurl layout libart_lgpl libreg liveconnect locale lwbrk mailnews mime mimeemitter mimetype mork mozldap mpfilelocprovider msgbase msgbaseutil msgcompose msgdb msgimap msglocal msgmdn msgnews msgsmime necko necko2 nkcache nkdatetime nkfinger npsimple oji p3p plugin png pref prefetch prefmigr profile progressDlg rdf rdfutil shistory sidebar string svg_doc test_necko timebombgen transformiix txmgr txtsvc typeaheadfind uconv ucvcn ucvibm ucvja ucvko ucvlatin ucvmath ucvtw ucvtw2 unicharutil universalchardet uriloader util vcard view wallet walletviewers webbrowserpersist webbrwsr webshell webshell_tests widget windowwatcher xlibrgb xml-rpc xmlextras xmlterm xpcom xpcomsample xpconnect xpconnect_tests xpcshell xpctest xpinstall xpistub xpnet xremoteservice xul xuldoc xultmpl zlib
|
||||
|
||||
BM_DIRS_TestStreamConv = js/src/fdlibm js/src modules/libreg string xpcom expat intl embedding/components/windowwatcher intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg netwerk/cache modules/libpr0n/public modules/libpr0n/src webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil htmlparser xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build netwerk/streamconv/test
|
||||
BM_CVS_TestStreamConv = js/src/fdlibm js/src modules/libreg string xpcom expat intl embedding/components/windowwatcher intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg netwerk/cache modules/libpr0n/public modules/libpr0n/src webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil htmlparser xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build netwerk/streamconv/test
|
||||
|
|
@ -207,10 +207,6 @@ BM_DIRS_imglib2 = js/src/fdlibm js/src modules/libreg string xpcom expat intl em
|
|||
BM_CVS_imglib2 = js/src/fdlibm js/src modules/libreg string xpcom expat intl embedding/components/windowwatcher intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar netwerk/cache webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil htmlparser xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build modules/libimg/png jpeg modules/libpr0n/public modules/libpr0n/src
|
||||
|
||||
|
||||
BM_DIRS_imgmng = modules/zlib jpeg modules/libimg/mng js/src/fdlibm js/src modules/libreg string xpcom expat intl netwerk/cache intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/libjar xpfe/components/shistory embedding/components/windowwatcher webshell embedding/components/ui/helperAppDlg rdf/util modules/libimg/png modules/libpr0n/public modules/libpr0n/src view editor/composer editor/txtsvc embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor modules/libutil content rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler uriloader xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell modules/oji accessible layout htmlparser intl/chardet intl/uconv intl/unicharutil intl/locale xpfe/components/xremote widget caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build xpfe/components/sidebar dom gfx modules/libpr0n/decoders/mng
|
||||
BM_CVS_imgmng = modules/zlib jpeg modules/libimg/mng js/src/fdlibm js/src modules/libreg string xpcom expat intl netwerk/cache intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/libjar xpfe/components/shistory embedding/components/windowwatcher webshell embedding/components/ui/helperAppDlg rdf/util modules/libimg/png modules/libpr0n/public modules/libpr0n/src view editor/composer editor/txtsvc embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor modules/libutil content rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler uriloader xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell modules/oji accessible layout htmlparser intl/chardet intl/uconv intl/unicharutil intl/locale xpfe/components/xremote widget caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build xpfe/components/sidebar dom gfx modules/libpr0n/decoders/mng
|
||||
|
||||
|
||||
BM_DIRS_imgpng = modules/zlib js/src/fdlibm js/src modules/libreg string xpcom expat intl netwerk/cache intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/libjar xpfe/components/shistory embedding/components/windowwatcher webshell embedding/components/ui/helperAppDlg rdf/util modules/libimg/png jpeg modules/libpr0n/public modules/libpr0n/src view editor/composer editor/txtsvc embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor modules/libutil content rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler uriloader xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell modules/oji accessible layout htmlparser intl/chardet intl/uconv intl/unicharutil intl/locale xpfe/components/xremote widget caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build xpfe/components/sidebar dom gfx modules/libpr0n/decoders/png
|
||||
BM_CVS_imgpng = modules/zlib js/src/fdlibm js/src modules/libreg string xpcom expat intl netwerk/cache intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/libjar xpfe/components/shistory embedding/components/windowwatcher webshell embedding/components/ui/helperAppDlg rdf/util modules/libimg/png jpeg modules/libpr0n/public modules/libpr0n/src view editor/composer editor/txtsvc embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor modules/libutil content rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler uriloader xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell modules/oji accessible layout htmlparser intl/chardet intl/uconv intl/unicharutil intl/locale xpfe/components/xremote widget caps js/src/xpconnect modules/libpref netwerk/mime netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build xpfe/components/sidebar dom gfx modules/libpr0n/decoders/png
|
||||
|
||||
|
|
@ -311,10 +307,6 @@ BM_DIRS_mimetype = js/src/fdlibm js/src modules/libreg string xpcom expat intl e
|
|||
BM_CVS_mimetype = js/src/fdlibm js/src modules/libreg string xpcom expat intl embedding/components/windowwatcher intl/lwbrk sun-java/stubs js/jsd/classes js/src/liveconnect modules/zlib modules/libjar modules/libimg/png jpeg modules/libpr0n/public modules/libpr0n/src webshell embedding/components/ui/helperAppDlg rdf/util rdf gfx/src/xlibrgb widget/src/gtkxtbin modules/plugin uriloader/exthandler view editor/composer editor/txtsvc content/xul/content content/xul/templates profile/pref-migrator profile embedding/components/jsconsole embedding/components/commandhandler xpfe/components/find embedding/components/find embedding/components/appstartup embedding/components/windowwatcher embedding/components/printingui embedding/components/build embedding/base xpfe/appshell rdf/chrome content/xul/document editor/txmgr editor intl/chardet modules/libutil content embedding/components/webbrowserpersist embedding/browser/webBrowser embedding/browser/build modules/oji accessible layout xpfe/components/shistory xpfe/browser embedding/components/ui/progressDlg xpfe/components/download-manager db/mork db/mdb directory/xpcom/base xpfe/components docshell uriloader xpfe/components/xremote widget gfx intl/locale intl/uconv intl/unicharutil htmlparser xpfe/components/sidebar dom caps js/src/xpconnect modules/libpref netwerk/cache netwerk/protocol/ftp netwerk/protocol/gopher netwerk/protocol/viewsource netwerk/build2 netwerk/base netwerk/protocol/about netwerk/protocol/data netwerk/protocol/file netwerk/protocol/http netwerk/protocol/jar netwerk/protocol/keyword netwerk/protocol/res netwerk/dns netwerk/socket netwerk/streamconv netwerk/cookie netwerk/build netwerk/mime
|
||||
|
||||
|
||||
BM_DIRS_mng = modules/zlib jpeg modules/libimg/mng
|
||||
BM_CVS_mng = modules/zlib jpeg modules/libimg/mng
|
||||
|
||||
|
||||
BM_DIRS_mork = modules/libreg string xpcom db/mork db/mdb
|
||||
BM_CVS_mork = modules/libreg string xpcom db/mork db/mdb
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,6 @@ NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
|
|||
MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
|
||||
MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
|
||||
MOZ_NATIVE_PNG = @SYSTEM_PNG@
|
||||
MOZ_NATIVE_MNG = @SYSTEM_MNG@
|
||||
|
||||
MOZ_INTERNAL_LIBART_LGPL = @MOZ_INTERNAL_LIBART_LGPL@
|
||||
|
||||
|
|
@ -169,7 +168,7 @@ OS_LDFLAGS = @LDFLAGS@
|
|||
OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
|
||||
OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
|
||||
|
||||
OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(MNG_CFLAGS) $(ZLIB_CFLAGS)
|
||||
OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
|
||||
OS_LIBS = @LIBS@
|
||||
ACDEFINES = @MOZ_DEFINES@
|
||||
|
||||
|
|
@ -287,16 +286,6 @@ PNG_LIBS = @MOZ_PNG_LIBS@
|
|||
PNG_REQUIRES = png
|
||||
endif
|
||||
|
||||
ifdef MOZ_NATIVE_MNG
|
||||
MNG_CFLAGS = @MNG_CFLAGS@
|
||||
MNG_LIBS = @MNG_LIBS@
|
||||
MNG_REQUIRES =
|
||||
else
|
||||
MNG_CFLAGS = @MOZ_MNG_CFLAGS@
|
||||
MNG_LIBS = @MOZ_MNG_LIBS@
|
||||
MNG_REQUIRES = mng
|
||||
endif
|
||||
|
||||
NSPR_CFLAGS = @NSPR_CFLAGS@
|
||||
NSPR_LIBS = @NSPR_LIBS@
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ my %map = (
|
|||
'imgicon', 'modules/libpr0n/decoders/icon',
|
||||
'imgjpeg', 'modules/libpr0n/decoders/jpeg',
|
||||
'imglib2', 'modules/libpr0n/public modules/libpr0n/src',
|
||||
'imgmng', 'modules/libpr0n/decoders/mng',
|
||||
'imgpng', 'modules/libpr0n/decoders/png',
|
||||
'imgxbm', 'modules/libpr0n/decoders/xbm',
|
||||
'impComm4xMail', 'mailnews/import/comm4x',
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ endif
|
|||
|
||||
STATIC_EXTRA_LIBS += \
|
||||
$(PNG_LIBS) \
|
||||
$(MNG_LIBS) \
|
||||
$(JPEG_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NULL)
|
||||
|
|
|
|||
60
configure.in
60
configure.in
|
|
@ -77,7 +77,6 @@ dnl Set the version number of the libs included with mozilla
|
|||
dnl ========================================================
|
||||
MOZJPEG=62
|
||||
MOZPNG=10200
|
||||
MOZMNG="((1<<16)|(0<<8)|(0))"
|
||||
MOZZLIB=1.0.0
|
||||
NSPR_VERSION=4
|
||||
|
||||
|
|
@ -504,8 +503,6 @@ MOZ_ZLIB_CFLAGS=
|
|||
MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz'
|
||||
MOZ_PNG_CFLAGS=
|
||||
MOZ_PNG_LIBS='-L$(DIST)/lib -lmozpng'
|
||||
MOZ_MNG_CFLAGS=
|
||||
MOZ_MNG_LIBS='-L$(DIST)/lib -lmozmng'
|
||||
|
||||
MOZ_JS_LIBS='-L$(DIST)/bin -lmozjs'
|
||||
XPCOM_LIBS='-L$(DIST)/bin -lxpcom'
|
||||
|
|
@ -1007,7 +1004,6 @@ case "$target" in
|
|||
MOZ_JPEG_LIBS='-L$(DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)'
|
||||
MOZ_ZLIB_LIBS='-L$(DIST)/lib -lmozz'
|
||||
MOZ_PNG_LIBS='-L$(DIST)/lib -lpng'
|
||||
MOZ_MNG_LIBS='-L$(DIST)/lib -lmng'
|
||||
MOZ_JS_LIBS='-L$(DIST)/lib -ljs$(MOZ_BITS)$(VERSION_NUMBER)'
|
||||
XPCOM_LIBS='-L$(DIST)/lib -lxpcom'
|
||||
DLL_PREFIX=
|
||||
|
|
@ -1050,7 +1046,6 @@ case "$target" in
|
|||
MOZ_JPEG_LIBS='$(DIST)/lib/jpeg$(MOZ_BITS)$(VERSION_NUMBER).lib'
|
||||
MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.lib'
|
||||
MOZ_PNG_LIBS='$(DIST)/lib/png.lib'
|
||||
MOZ_MNG_LIBS='$(DIST)/lib/mng.lib'
|
||||
MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib'
|
||||
XPCOM_LIBS='$(DIST)/lib/xpcom.lib'
|
||||
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
|
||||
|
|
@ -1332,7 +1327,6 @@ case "$target" in
|
|||
MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)'
|
||||
MOZ_ZLIB_LIBS='$(DIST)/lib/mozz.$(LIB_SUFFIX)'
|
||||
MOZ_PNG_LIBS='$(DIST)/lib/mozpng.$(LIB_SUFFIX)'
|
||||
MOZ_MNG_LIBS='$(DIST)/lib/mozmng.$(LIB_SUFFIX)'
|
||||
MOZ_WIDGET_TOOLKIT_LDFLAGS='$(DIST)/lib/wdgt$(MOZ_WIDGET_TOOLKIT)'
|
||||
MOZ_GFX_TOOLKIT_LDFLAGS='$(DIST)/lib/gfx_$(MOZ_WIDGET_TOOLKIT)'
|
||||
fi
|
||||
|
|
@ -3044,53 +3038,6 @@ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
|
|||
PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
|
||||
fi
|
||||
|
||||
dnl system MNG Support
|
||||
dnl ========================================================
|
||||
MOZ_ARG_WITH_STRING(system-mng,
|
||||
[ --with-system-mng[=PFX]
|
||||
Use system libmng [installed at prefix PFX]],
|
||||
MNG_DIR=$withval)
|
||||
|
||||
_SAVE_CFLAGS=$CFLAGS
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
_SAVE_LIBS=$LIBS
|
||||
CFLAGS="$ZLIB_CFLAGS $CFLAGS"
|
||||
LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS"
|
||||
if test -n "${MNG_DIR}"; then
|
||||
CFLAGS="-I${MNG_DIR}/include $CFLAGS"
|
||||
LDFLAGS="-L${MNG_DIR}/lib $LDFLAGS"
|
||||
fi
|
||||
if test -z "$MNG_DIR" -o "$MNG_DIR" = no; then
|
||||
SYSTEM_MNG=
|
||||
else
|
||||
AC_CHECK_LIB(mng, mng_initialize, [SYSTEM_MNG=1 MNG_LIBS="-lmng $MNG_LIBS"],
|
||||
SYSTEM_MNG=, $MNG_LIBS)
|
||||
fi
|
||||
if test "$SYSTEM_MNG" = 1; then
|
||||
LIBS="$MNG_LIBS $LIBS"
|
||||
AC_TRY_RUN(
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <libmng.h>
|
||||
int main () {
|
||||
#if (((MNG_VERSION_MAJOR)<<16)|((MNG_VERSION_MINOR)<<8)|(MNG_VERSION_RELEASE)) >= $MOZMNG
|
||||
exit(0);
|
||||
#else
|
||||
exit(1);
|
||||
#endif
|
||||
}
|
||||
, SYSTEM_MNG=1, [SYSTEM_MNG= MNG_CFLAGS= MNG_LIBS=], SYSTEM_MNG= )
|
||||
rm -f core
|
||||
fi
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
LIBS=$_SAVE_LIBS
|
||||
|
||||
if test "${MNG_DIR}" -a -d "${MNG_DIR}" -a "$SYSTEM_MNG" = 1; then
|
||||
MNG_CFLAGS="-I${MNG_DIR}/include"
|
||||
MNG_LIBS="-L${MNG_DIR}/lib ${MNG_LIBS}"
|
||||
fi
|
||||
|
||||
fi # SKIP_LIBRARY_CHECKS
|
||||
|
||||
dnl ========================================================
|
||||
|
|
@ -3643,7 +3590,7 @@ fi
|
|||
dnl ========================================================
|
||||
dnl Image decoders
|
||||
dnl ========================================================
|
||||
MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp mng xbm"
|
||||
MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm"
|
||||
case "$target_os" in
|
||||
cygwin*|mingw*|msvc*|mks*|os2*)
|
||||
MOZ_IMG_DECODERS_DEFAULT="$MOZ_IMG_DECODERS_DEFAULT icon"
|
||||
|
|
@ -5152,7 +5099,6 @@ dnl fi
|
|||
AC_SUBST(SYSTEM_MAKEDEPEND)
|
||||
AC_SUBST(SYSTEM_JPEG)
|
||||
AC_SUBST(SYSTEM_PNG)
|
||||
AC_SUBST(SYSTEM_MNG)
|
||||
AC_SUBST(SYSTEM_ZLIB)
|
||||
|
||||
AC_SUBST(JPEG_CFLAGS)
|
||||
|
|
@ -5161,8 +5107,6 @@ AC_SUBST(ZLIB_CFLAGS)
|
|||
AC_SUBST(ZLIB_LIBS)
|
||||
AC_SUBST(PNG_CFLAGS)
|
||||
AC_SUBST(PNG_LIBS)
|
||||
AC_SUBST(MNG_CFLAGS)
|
||||
AC_SUBST(MNG_LIBS)
|
||||
|
||||
AC_SUBST(MOZ_JPEG_CFLAGS)
|
||||
AC_SUBST(MOZ_JPEG_LIBS)
|
||||
|
|
@ -5170,8 +5114,6 @@ AC_SUBST(MOZ_ZLIB_CFLAGS)
|
|||
AC_SUBST(MOZ_ZLIB_LIBS)
|
||||
AC_SUBST(MOZ_PNG_CFLAGS)
|
||||
AC_SUBST(MOZ_PNG_LIBS)
|
||||
AC_SUBST(MOZ_MNG_CFLAGS)
|
||||
AC_SUBST(MOZ_MNG_LIBS)
|
||||
|
||||
AC_SUBST(NSPR_CFLAGS)
|
||||
AC_SUBST(NSPR_LIBS)
|
||||
|
|
|
|||
|
|
@ -82,7 +82,6 @@ CPPSRCS += EmbedComponents.cpp
|
|||
|
||||
XP_LIBS += \
|
||||
$(PNG_LIBS) \
|
||||
$(MNG_LIBS) \
|
||||
$(JPEG_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(MOZ_GDK_PIXBUF_LIBS) \
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ CPPSRCS += EmbedComponents.cpp
|
|||
|
||||
XP_LIBS += \
|
||||
$(PNG_LIBS) \
|
||||
$(MNG_LIBS) \
|
||||
$(JPEG_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ components\htmlparser.xpt
|
|||
;
|
||||
components\imgbmp.dll
|
||||
components\imgxbm.dll
|
||||
components\imgmng.dll
|
||||
components\imgicon.dll
|
||||
components\imgicon.xpt
|
||||
components\imglib2.xpt
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ components\htmlparser.xpt
|
|||
;
|
||||
components\imgbmp.dll
|
||||
components\imgxbm.dll
|
||||
components\imgmng.dll
|
||||
components\imgicon.dll
|
||||
components\imgicon.xpt
|
||||
components\imglib2.xpt
|
||||
|
|
|
|||
|
|
@ -30,9 +30,5 @@ ifndef MOZ_NATIVE_PNG
|
|||
DIRS = png
|
||||
endif
|
||||
|
||||
ifndef MOZ_NATIVE_MNG
|
||||
DIRS += mng
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -47,18 +47,18 @@ CPPSRCS = \
|
|||
nsImageModule.cpp \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += $(foreach d,$(filter-out icon mng,$(MOZ_IMG_DECODERS)),\
|
||||
DEFINES += $(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)),\
|
||||
-DIMG_BUILD_${d})
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/../src \
|
||||
$(foreach d,$(filter-out icon mng,$(MOZ_IMG_DECODERS)), \
|
||||
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
|
||||
-I$(srcdir)/../decoders/${d}) \
|
||||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
../src/$(LIB_PREFIX)imglib2_s.$(LIB_SUFFIX) \
|
||||
$(foreach d,$(filter-out icon mng,$(MOZ_IMG_DECODERS)), \
|
||||
$(foreach d,$(filter-out icon,$(MOZ_IMG_DECODERS)), \
|
||||
../decoders/${d}/$(LIB_PREFIX)img${d}_s.$(LIB_SUFFIX))\
|
||||
$(NULL)
|
||||
|
||||
|
|
|
|||
|
|
@ -197,7 +197,7 @@ static nsresult NewImageChannel(nsIChannel **aResult,
|
|||
newHttpChannel = do_QueryInterface(*aResult);
|
||||
if (newHttpChannel) {
|
||||
newHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Accept"),
|
||||
NS_LITERAL_CSTRING("video/x-mng,image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1"),
|
||||
NS_LITERAL_CSTRING("image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1"),
|
||||
PR_FALSE);
|
||||
|
||||
nsCOMPtr<nsIHttpChannelInternal> httpChannelInternal = do_QueryInterface(newHttpChannel);
|
||||
|
|
@ -764,22 +764,6 @@ nsresult imgLoader::GetMimeTypeFromContent(const char* aContents, PRUint32 aLeng
|
|||
*aContentType = nsCRT::strndup("image/x-icon", 12);
|
||||
}
|
||||
|
||||
else if (aLength >= 4 && ((unsigned char)aContents[0]==0x8A &&
|
||||
(unsigned char)aContents[1]==0x4D &&
|
||||
(unsigned char)aContents[2]==0x4E &&
|
||||
(unsigned char)aContents[3]==0x47))
|
||||
{
|
||||
*aContentType = nsCRT::strndup("video/x-mng", 11);
|
||||
}
|
||||
|
||||
else if (aLength >= 4 && ((unsigned char)aContents[0]==0x8B &&
|
||||
(unsigned char)aContents[1]==0x4A &&
|
||||
(unsigned char)aContents[2]==0x4E &&
|
||||
(unsigned char)aContents[3]==0x47))
|
||||
{
|
||||
*aContentType = nsCRT::strndup("image/x-jng", 11);
|
||||
}
|
||||
|
||||
else if (aLength >= 8 && !nsCRT::strncmp(aContents, "#define ", 8)) {
|
||||
*aContentType = nsCRT::strndup("image/x-xbitmap", 15);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -555,7 +555,7 @@ pref("network.http.connect.timeout", 30); // in seconds
|
|||
pref("network.http.request.timeout", 120); // in seconds
|
||||
|
||||
// Headers
|
||||
pref("network.http.accept.default", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,video/x-mng,image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1");
|
||||
pref("network.http.accept.default", "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,image/jpeg,image/gif;q=0.2,*/*;q=0.1");
|
||||
|
||||
pref("network.http.sendRefererHeader", 2); // 0=don't send any, 1=send only on clicks, 2=send on image requests as well
|
||||
|
||||
|
|
|
|||
|
|
@ -279,16 +279,6 @@ static const nsModuleComponentInfo components[] = {
|
|||
NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-icon",
|
||||
nsBrowserContentHandlerConstructor
|
||||
},
|
||||
{ "Browser Content Handler",
|
||||
NS_BROWSERCONTENTHANDLER_CID,
|
||||
NS_CONTENT_HANDLER_CONTRACTID_PREFIX"video/x-mng",
|
||||
nsBrowserContentHandlerConstructor
|
||||
},
|
||||
{ "Browser Content Handler",
|
||||
NS_BROWSERCONTENTHANDLER_CID,
|
||||
NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-jng",
|
||||
nsBrowserContentHandlerConstructor
|
||||
},
|
||||
{ "Browser Content Handler",
|
||||
NS_BROWSERCONTENTHANDLER_CID,
|
||||
NS_CONTENT_HANDLER_CONTRACTID_PREFIX"image/x-xbitmap",
|
||||
|
|
|
|||
|
|
@ -414,6 +414,7 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "imgbmp.dll");
|
||||
deleteThisFile("Components", "imgxbm.dll");
|
||||
deleteThisFile("Components", "imgppm.dll");
|
||||
deleteThisFile("Components", "imgmng.dll");
|
||||
deleteThisFile("Components", "ucharuti.dll");
|
||||
deleteThisFile("Components", "chardet.dll");
|
||||
deleteThisFile("Components", "lwbrk.dll");
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "imgbmp.dll");
|
||||
deleteThisFile("Components", "imgxbm.dll");
|
||||
deleteThisFile("Components", "imgppm.dll");
|
||||
deleteThisFile("Components", "imgmng.dll");
|
||||
deleteThisFile("Components", "nkcache.dll");
|
||||
deleteThisFile("Components", "mozbrwsr.dll");
|
||||
deleteThisFile("Components", "jsloader.dll");
|
||||
|
|
|
|||
|
|
@ -143,7 +143,6 @@ bin/components/xultmpl.xpt
|
|||
bin/components/gklayout.dll
|
||||
bin/components/gkparser.dll
|
||||
bin/components/gkplugin.dll
|
||||
bin/components/imgmng.dll
|
||||
bin/components/imglib2.dll
|
||||
bin/components/imglib2.xpt
|
||||
bin/components/imgicon.dll
|
||||
|
|
|
|||
|
|
@ -124,7 +124,6 @@ bin/components/libgfx_gtk.so
|
|||
bin/components/libgfxps.so
|
||||
bin/components/libgfxxprint.so
|
||||
bin/components/libimglib2.so
|
||||
bin/components/libimgmng.so
|
||||
bin/components/libi18n.so
|
||||
bin/components/libmork.so
|
||||
bin/components/libmozfind.so
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ function upgradeCleanup()
|
|||
deleteThisFile("Components", "libimgbmp.so");
|
||||
deleteThisFile("Components", "libimgppm.so");
|
||||
deleteThisFile("Components", "libimgxbm.so");
|
||||
deleteThisFile("Components", "libimgmng.so");
|
||||
deleteThisFile("Components", "libunicharutil.so");
|
||||
deleteThisFile("Components", "libchardet.so");
|
||||
deleteThisFile("Components", "liblwbrk.so");
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче