diff options
Diffstat (limited to 'www/firefox36')
45 files changed, 0 insertions, 4591 deletions
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile deleted file mode 100644 index e303783015cb..000000000000 --- a/www/firefox36/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# New ports collection makefile for: phoenix -# Date created: 2002/10/21 -# Whom: Alan Eldridge <alane@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile,v 1.32 2009/01/09 23:41:22 mezz Exp $ -# - -PORTNAME= firefox -DISTVERSION= 2.0.0.20 -PORTREVISION= 6 -PORTEPOCH= 1 -CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -DISTNAME= ${PORTNAME}-${DISTVERSION}-source - -MAINTAINER= miwi@FreeBSD.org -COMMENT= Web browser based on the browser portion of Mozilla - -BUILD_DEPENDS= nss>=3.11.2:${PORTSDIR}/security/nss - -MOZILLA_NAME= Firefox - -WANT_GNOME= yes -ALL_TARGET= default -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -EXTRA_CFLAGS= -O2 -HAS_CONFIGURE= yes -USE_BZIP2= yes -USE_GMAKE= yes -WANT_PERL= yes -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm -GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/chrome/icons/default lib/${MOZILLA}/chrome/icons - -FIREFOX_ICON= ${MOZILLA}.xpm -FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/icons/default.xpm -MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ - --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ - --enable-application=browser \ - --enable-system-cairo \ - --enable-official-branding \ - --enable-canvas \ - --with-system-nss - -SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js -MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome - -OPTIONS= NEWTAB "Open external links in a new tab" on \ - SMB "Enable smb:// URI support using gnomevfs" off - -.include <bsd.port.pre.mk> - -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - -.if ${HAVE_GNOME:Mlibgnomeui}!="" -USE_GNOME+= libgnomeui -MOZ_OPTIONS+= --enable-gnomeui -.else -MOZ_OPTIONS+= --disable-gnomeui -.endif - -.if ${ARCH} == "sparc64" && ${OSVERSION} < 601101 -IGNORE= does not run, update to 6.2-RELEASE or newer -.endif - -MOZ_OPTIONS+= --enable-svg --enable-svg-renderer=cairo - -post-extract:: - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ - -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop - -post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ - ${WRKSRC}/storage/build/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor - -pre-install: - ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST} -.if !defined(WITHOUT_NEWTAB) - ${ECHO_CMD} >> ${SYSTEM_PREFS} - ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} - ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ - >> ${SYSTEM_PREFS} -.endif # !defined(WITHOUT_NEWTAB) - -post-install: - ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps - ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ - ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default.xpm - ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} - @${CAT} ${PKGMESSAGE} - -.include "${PORTSDIR}/www/mozilla/Makefile.common" -.include <bsd.port.post.mk> diff --git a/www/firefox36/Makefile.webplugins b/www/firefox36/Makefile.webplugins deleted file mode 100644 index dd5db96f0cfc..000000000000 --- a/www/firefox36/Makefile.webplugins +++ /dev/null @@ -1,226 +0,0 @@ -#-*- mode: makefile; tab-width: 4; -* -# ex:ts=4 -# -# New ports collection makefile for: npapi infrastructure -# Date created: 27 June 2006 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports-stable/www/firefox/Makefile.webplugins,v 1.14 2008/11/12 17:55:09 mezz Exp $ -# - -# MAINTAINER= gnome@FreeBSD.org -# -# Documentation and examples: -# -# Makefile.webplugins will create symlinks automatically for each supported -# applications that supports the webplugins framework. Also, it will remove -# these symlinks when the plug-in port is uninstalled. -# -# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in -# port supports. For each of these applications, a -# symlink will be created in -# lib/browser_plugins/symlinks. See -# WEBPLUGINS_APPS_ALL_* below for the list of -# supported applications. -# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all -# applications) -# -# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR}, -# then you can tweak WEBPLUGINS_NAME to change the -# name of the directory -# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME). -# Default: WEBPLUGINS_NAME=${PKGBASE} -# -# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked -# in lib/browser_plugins/symlinks/*/. It cannot -# be empty or the port will set IGNORE. -# -# WEBPLUGINS_DIR - The directory where the plug-in file(s) can be -# found. Each plug-in file in WEBPLUGINS_FILES -# must be found in WEBPLUGINS_DIR. If your port -# does not install in WEBPLUGINS_DIR, but in its own -# path. You will need to specify that here or -# symlinks will be created to non-existent files. -# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} -# -# -# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any -# of the following: -# -# USE_WEBPLUGINS=gecko* (Supports gecko18 and gecko19.) -# USE_WEBPLUGINS=native (Supports gecko*, opera*, and webkit-gtk2) -# USE_WEBPLUGINS=linux (Supports linux-*) -# USE_WEBPLUGINS=opera webkit-gtk2 -# -# Example to add in Makefile and pkg-plist if the plug-in file(s) install in -# WEBPLUGINS_DIR, and if your port does this manually: -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include <bsd.port.pre.mk> -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# post-install: -# ${MKDIR} ${WEBPLUGINS_DIR} -# ${INSTALL_DATA} ${WEBPLUGINS_FILES:S,^,${WRKSRC}/plugins/,} \ -# ${WEBPLUGINS_DIR} -# -# .include <bsd.port.post.mk> -# ------------------------------------------------------ -# -# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks -# in pkg-plist, because they will be removed automatically. -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# %%WEBPLUGINS_DIR%%/fooplugin.so -# %%WEBPLUGINS_DIR%%/fooplugin.xpi -# @dirrmtry %%WEBPLUGINS_DIR%% -# ------------------------------------------------------ -# -# Here is what it will look like when it creates the symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi -# ------------------------------------------------------ -# -# If your port uses libtool, and installs any *.a and *.la files, do not add -# these files to WEBPLUGINS_FILES. WEBPLUGINS_FILES should be *.so or/and -# *.xpi ONLY. -# -# Example to add in Makefile and pkg-plist if your port installs plug-ins in -# its own directory, and you need to set WEBPLUGINS_DIR. -# -# Makefile: -# ------------------------------------------------------ -# [...] -# USE_WEBPLUGINS=gecko* -# WEBPLUGINS_DIR=#{PREFIX}/lib/application -# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi -# -# .include <bsd.port.pre.mk> -# .include "${PORTSDIR}/www/firefox/Makefile.webplugins" -# -# [...] -# -# .include <bsd.port.post.mk> -# ------------------------------------------------------ -# -# As for the pkg-plist, it should only include the actual files your -# port installs: -# -# pkg-plist: -# ------------------------------------------------------ -# [...] -# lib/application/fooplugin.a -# lib/application/fooplugin.la -# lib/application/fooplugin.so -# lib/application/fooplugin.xpi -# @dirrm lib/application -# ------------------------------------------------------ -# -# Here is what it will look like when it creates symlinks: -# -# ------------------------------------------------------ -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko18/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.so -> /usr/local/lib/application/fooplugin.so -# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi -# ------------------------------------------------------ - -WEBPLUGINS_NAME?= ${PKGBASE} -WEBPLUGINS_FILES?= empty -WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \ - linux-flock-devel linux-mozilla \ - linux-nvu linux-opera linux-opera-devel \ - linux-seamonkey linux-seamonkey-devel \ - linux-sunbird linux-sunbird-devel -WEBPLUGINS_APPS_ALL_NATIVE= gecko18 gecko19 opera opera-devel webkit-gtk2 -WEBPLUGINS_APPS_ALL= ${WEBPLUGINS_APPS_ALL_LINUX} \ - ${WEBPLUGINS_APPS_ALL_NATIVE} - -.if !defined(USE_WEBPLUGINS) || ${USE_WEBPLUGINS} == "yes" || \ - ${USE_WEBPLUGINS} == "*" -USE_WEBPLUGINS= ${WEBPLUGINS_APPS_ALL} -.endif - -.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \ - ${WEBPLUGINS_FILES} == "" -IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document -.endif - -.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL} -_TEMP_APP_=${_TEMP_APP__} -_TEMP_FLAG_=0 -. for _TEMP_USE__ in ${USE_WEBPLUGINS} -_TEMP_USE_=${_TEMP_USE__} -. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \ - ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \ - ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} ) -_TEMP_FLAG_=1 -. endif -. endfor -. if ${_TEMP_FLAG_} -USE_WEBPLUGINS_EXP+= ${_TEMP_APP__} -. endif -.endfor - -WEBPLUGINS_APPS= ${USE_WEBPLUGINS_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*} -WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.} -WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS} - -WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins -WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks -WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME} - -PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}" - -_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,} -_Q= 2>/dev/null || true -_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,} -_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,} -_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,} - -webplugins-post-install: - @if [ ! -d ${WEBPLUGINS_DIR} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - else \ - for _f in ${WEBPLUGINS_FILES}; do \ - if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \ - ${ECHO_CMD}; \ - ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \ - ${ECHO_CMD}; \ - fi; \ - done; \ - fi; \ - for _d in ${WEBPLUGINS_LINKFARMS}; do \ - ${INSTALL} -d $${_d}; \ - for _l in ${_LNWF}; do \ - ${LN} -sf $${_l} $${_d}/ ${_Q}; \ - done; \ - done; \ - for _d in ${_WLF}; do \ - ${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \ - for _l in ${_LNWF}; do \ - ${ECHO_CMD} "@exec ${LN} -sf $$_l $$_d/ ${_Q}" >> ${TMPPLIST}; \ - done; \ - for _f in ${WEBPLUGINS_FILES:S,^,\${_d}/,}; do \ - ${ECHO_CMD} "@unexec ${RM} -f $$_f" >> ${TMPPLIST}; \ - done; \ - ${ECHO_CMD} "@unexec rmdir $$_d ${_Q}" >> ${TMPPLIST}; \ - done - @${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST} - -post-install: webplugins-post-install diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo deleted file mode 100644 index af1daa81d623..000000000000 --- a/www/firefox36/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (firefox-2.0.0.20-source.tar.bz2) = f3718fefd01c8edc007ec0b416a8a7b8 -SHA256 (firefox-2.0.0.20-source.tar.bz2) = cc8ac993a38d005d08a325ccaf1255648c38da2c3b7043b277909d1430424494 -SIZE (firefox-2.0.0.20-source.tar.bz2) = 40293412 diff --git a/www/firefox36/files/firefox.desktop.in b/www/firefox36/files/firefox.desktop.in deleted file mode 100644 index d72090e1aabf..000000000000 --- a/www/firefox36/files/firefox.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; diff --git a/www/firefox36/files/moz_pis_S50cleanhome b/www/firefox36/files/moz_pis_S50cleanhome deleted file mode 100644 index 3de5565e39f2..000000000000 --- a/www/firefox36/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to clean up users' Mozilla home directories to make upgrading -# less painful. - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to cleanup ${HOME}/${MOZ_PIS_USER_DIR} - -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # Debian does this for new builds - # rm -f "${dir}/XUL.mfasl" - # force a rebuild of compreg.dat and xpti.dat for new installations - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/www/firefox36/files/patch-Double.cpp b/www/firefox36/files/patch-Double.cpp deleted file mode 100644 index 05052cf7cc9b..000000000000 --- a/www/firefox36/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) || defined(__amd64__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/www/firefox36/files/patch-browser_app_mozilla.in b/www/firefox36/files/patch-browser_app_mozilla.in deleted file mode 100644 index c815a4780038..000000000000 --- a/www/firefox36/files/patch-browser_app_mozilla.in +++ /dev/null @@ -1,125 +0,0 @@ ---- browser/app/mozilla.in.orig Mon Apr 4 15:08:49 2005 -+++ browser/app/mozilla.in Wed Jun 1 14:47:45 2005 -@@ -49,51 +49,83 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+use_openFile="yes" # use openFile() for file/dir -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh diff --git a/www/firefox36/files/patch-build_unix_run-mozilla.sh b/www/firefox36/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 5d8ec822d9a1..000000000000 --- a/www/firefox36/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 12:27:28 2003 -+++ build/unix/run-mozilla.sh Wed Feb 11 14:24:17 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/firefox:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -442,6 +442,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/firefox -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/firefox36/files/patch-config-mkdepend-imakemdep.h b/www/firefox36/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/www/firefox36/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/www/firefox36/files/patch-config-rules.mk b/www/firefox36/files/patch-config-rules.mk deleted file mode 100644 index 8ab35f5a8326..000000000000 --- a/www/firefox36/files/patch-config-rules.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) diff --git a/www/firefox36/files/patch-config_autoconf.mk.in b/www/firefox36/files/patch-config_autoconf.mk.in deleted file mode 100644 index 29fe7f8fbde0..000000000000 --- a/www/firefox36/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,18 +0,0 @@ ---- config/autoconf.mk.in.orig Thu Jul 14 00:50:06 2005 -+++ config/autoconf.mk.in Thu Jul 14 00:50:40 2005 -@@ -50,13 +50,13 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/firefox36/files/patch-config_mkdepend_Makefile.in b/www/firefox36/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index bace012a282e..000000000000 --- a/www/firefox36/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 -@@ -57,6 +57,7 @@ - include $(topsrcdir)/config/rules.mk - - HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox36/files/patch-configure b/www/firefox36/files/patch-configure deleted file mode 100644 index 92cb6ab27ea9..000000000000 --- a/www/firefox36/files/patch-configure +++ /dev/null @@ -1,47 +0,0 @@ ---- configure.orig 2007-07-11 12:44:47.000000000 -0400 -+++ configure 2007-07-19 06:04:36.000000000 -0400 -@@ -1047,7 +1047,7 @@ - - MOZJPEG=62 - MOZPNG=10217 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - NSS_VERSION=3 - -@@ -10403,7 +10403,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10409 "configure" - #include "confdefs.h" -@@ -10434,7 +10434,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10444,7 +10444,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10450 "configure" - #include "confdefs.h" -@@ -10475,7 +10475,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/firefox36/files/patch-embedding_base_nsEmbedAPI.cpp b/www/firefox36/files/patch-embedding_base_nsEmbedAPI.cpp deleted file mode 100644 index 2cc9823fed1c..000000000000 --- a/www/firefox36/files/patch-embedding_base_nsEmbedAPI.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 -+++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 -@@ -53,7 +53,12 @@ static PRBool sRegistryIniti - static PRUint32 sInitCounter = 0; - - #define HACK_AROUND_THREADING_ISSUES --//#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#if __FreeBSD_version < 700042 -+#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#endif -+#endif - - #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM - // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74f62..000000000000 --- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b4334d..000000000000 --- a/www/firefox36/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/firefox36/files/patch-ff-331088 b/www/firefox36/files/patch-ff-331088 deleted file mode 100644 index f121e2f90950..000000000000 --- a/www/firefox36/files/patch-ff-331088 +++ /dev/null @@ -1,154 +0,0 @@ ---- .pc/331088-candidate.patch/layout/forms/nsFileControlFrame.cpp 2009-01-07 16:46:32.000000000 +0100 -+++ layout/forms/nsFileControlFrame.cpp 2009-01-07 17:02:13.000000000 +0100 -@@ -257,35 +257,37 @@ nsFileControlFrame::ScrollIntoView(nsPre - NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE,NS_PRESSHELL_SCROLL_IF_NOT_VISIBLE); - } - } - } - - /** - * This is called when our browse button is clicked - */ --nsresult --nsFileControlFrame::MouseClick(nsIDOMEvent* aMouseEvent) -+NS_IMETHODIMP -+nsFileControlFrame::MouseListener::MouseClick(nsIDOMEvent* aMouseEvent) - { -+ NS_ASSERTION(mFrame, "We should have been unregistered"); -+ - // only allow the left button - nsCOMPtr<nsIDOMMouseEvent> mouseEvent = do_QueryInterface(aMouseEvent); - if (mouseEvent) { - PRUint16 whichButton; - if (NS_SUCCEEDED(mouseEvent->GetButton(&whichButton))) { - if (whichButton != 0) { - return NS_OK; - } - } - } - - - nsresult result; - - // Get parent nsIDOMWindowInternal object. -- nsIContent* content = GetContent(); -+ nsIContent* content = mFrame->GetContent(); - if (!content) - return NS_ERROR_FAILURE; - - nsCOMPtr<nsIDocument> doc = content->GetDocument(); - if (!doc) - return NS_ERROR_FAILURE; - - nsCOMPtr<nsIDOMWindow> parentWindow = -@@ -304,17 +306,17 @@ nsFileControlFrame::MouseClick(nsIDOMEve - if (NS_FAILED(result)) - return result; - - // Set filter "All Files" - filePicker->AppendFilters(nsIFilePicker::filterAll); - - // Set default directry and filename - nsAutoString defaultName; -- GetProperty(nsHTMLAtoms::value, defaultName); -+ mFrame->GetProperty(nsHTMLAtoms::value, defaultName); - - nsCOMPtr<nsILocalFile> currentFile = do_CreateInstance("@mozilla.org/file/local;1"); - if (currentFile && !defaultName.IsEmpty()) { - result = currentFile->InitWithPath(defaultName); - if (NS_SUCCEEDED(result)) { - nsAutoString leafName; - currentFile->GetLeafName(leafName); - if (!leafName.IsEmpty()) { -@@ -328,46 +330,46 @@ nsFileControlFrame::MouseClick(nsIDOMEve - nsCOMPtr<nsILocalFile> parentLocalFile = do_QueryInterface(parentFile, &result); - if (parentLocalFile) - filePicker->SetDisplayDirectory(parentLocalFile); - } - } - } - - // Tell our textframe to remember the currently focused value -- mTextFrame->InitFocusedValue(); -+ mFrame->mTextFrame->InitFocusedValue(); - - // Open dialog - PRInt16 mode; - result = filePicker->Show(&mode); - if (NS_FAILED(result)) - return result; - if (mode == nsIFilePicker::returnCancel) - return NS_OK; - -- if (!mTextFrame) { -+ if (!mFrame) { - // We got destroyed while the filepicker was up. Don't do anything here. - return NS_OK; - } - - // Set property - nsCOMPtr<nsILocalFile> localFile; - result = filePicker->GetFile(getter_AddRefs(localFile)); - if (localFile) { - nsAutoString unicodePath; - result = localFile->GetPath(unicodePath); - if (!unicodePath.IsEmpty()) { -- mTextFrame->SetProperty(mPresContext, nsHTMLAtoms::value, unicodePath); -- nsCOMPtr<nsIFileControlElement> fileControl = do_QueryInterface(mContent); -+ mFrame->mTextFrame->SetProperty(mFrame->mPresContext, nsHTMLAtoms::value, unicodePath); -+ nsCOMPtr<nsIFileControlElement> fileControl = do_QueryInterface(content); - if (fileControl) { - fileControl->SetFileName(unicodePath, PR_FALSE); - } - - // May need to fire an onchange here -- mTextFrame->CheckFireOnChange(); -+ mFrame->mTextFrame->CheckFireOnChange(); - return NS_OK; - } - } - - return NS_FAILED(result) ? result : NS_ERROR_FAILURE; - } - - -@@ -660,18 +662,8 @@ nsFileControlFrame::OnContentReset() - return NS_OK; - } - - //////////////////////////////////////////////////////////// - // Mouse listener implementation - - NS_IMPL_ISUPPORTS1(nsFileControlFrame::MouseListener, nsIDOMMouseListener) - --NS_IMETHODIMP --nsFileControlFrame::MouseListener::MouseClick(nsIDOMEvent* aMouseEvent) --{ -- if (mFrame) { -- return mFrame->MouseClick(aMouseEvent); -- } -- -- return NS_OK; --} -- ---- .pc/331088-candidate.patch/layout/forms/nsFileControlFrame.h 2009-01-07 17:18:55.000000000 +0100 -+++ layout/forms/nsFileControlFrame.h 2009-01-07 17:19:00.000000000 +0100 -@@ -142,18 +142,16 @@ protected: - NS_IMETHOD MouseOver(nsIDOMEvent* aMouseEvent) { return NS_OK; } - NS_IMETHOD MouseOut(nsIDOMEvent* aMouseEvent) { return NS_OK; } - NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; } - - private: - nsFileControlFrame* mFrame; - }; - -- nsresult MouseClick(nsIDOMEvent* aMouseEvent); -- - virtual PRIntn GetSkipSides() const; - - /** - * The text frame (populated on initial reflow). - * @see nsFileControlFrame::Reflow - */ - nsNewFrame* mTextFrame; - /** diff --git a/www/firefox36/files/patch-ff-380418 b/www/firefox36/files/patch-ff-380418 deleted file mode 100644 index f98f54060479..000000000000 --- a/www/firefox36/files/patch-ff-380418 +++ /dev/null @@ -1,66 +0,0 @@ ---- .pc/380418-candidate.patch/content/base/src/nsXMLHttpRequest.cpp 2009-01-05 03:48:53.000000000 +0100 -+++ content/base/src/nsXMLHttpRequest.cpp 2009-01-05 03:54:08.000000000 +0100 -@@ -762,16 +762,28 @@ nsXMLHttpRequest::GetAllResponseHeaders( - /* ACString getResponseHeader (in AUTF8String header); */ - NS_IMETHODIMP - nsXMLHttpRequest::GetResponseHeader(const nsACString& header, - nsACString& _retval) - { - nsresult rv = NS_OK; - _retval.Truncate(); - -+ // See bug #380418. Hide "Set-Cookie" headers from non-chrome scripts. -+ PRBool chrome = PR_FALSE; // default to false in case IsCapabilityEnabled fails -+ nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager(); -+ secMan->IsCapabilityEnabled("UniversalXPConnect", &chrome); -+ if (!chrome && -+ (header.LowerCaseEqualsASCII("set-cookie") || -+ header.LowerCaseEqualsASCII("set-cookie2"))) { -+ NS_WARNING("blocked access to response header"); -+ _retval.SetIsVoid(PR_TRUE); -+ return NS_OK; -+ } -+ - nsCOMPtr<nsIHttpChannel> httpChannel = GetCurrentHttpChannel(); - - if (!mDenyResponseDataAccess && httpChannel) { - rv = httpChannel->GetResponseHeader(header, _retval); - } - - if (rv == NS_ERROR_NOT_AVAILABLE) { - // Means no header -@@ -2183,20 +2195,30 @@ nsXMLHttpRequest::AppendReachableList(ns - } - - - NS_IMPL_ISUPPORTS1(nsXMLHttpRequest::nsHeaderVisitor, nsIHttpHeaderVisitor) - - NS_IMETHODIMP nsXMLHttpRequest:: - nsHeaderVisitor::VisitHeader(const nsACString &header, const nsACString &value) - { -- mHeaders.Append(header); -- mHeaders.Append(": "); -- mHeaders.Append(value); -- mHeaders.Append('\n'); -+ // See bug #380418. Hide "Set-Cookie" headers from non-chrome scripts. -+ PRBool chrome = PR_FALSE; // default to false in case IsCapabilityEnabled fails -+ nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager(); -+ secMan->IsCapabilityEnabled("UniversalXPConnect", &chrome); -+ if (!chrome && -+ (header.LowerCaseEqualsASCII("set-cookie") || -+ header.LowerCaseEqualsASCII("set-cookie2"))) { -+ NS_WARNING("blocked access to response header"); -+ } else { -+ mHeaders.Append(header); -+ mHeaders.Append(": "); -+ mHeaders.Append(value); -+ mHeaders.Append('\n'); -+ } - return NS_OK; - } - - // DOM event class to handle progress notifications - nsXMLHttpProgressEvent::nsXMLHttpProgressEvent(nsIDOMEvent * aInner, PRUint64 aCurrentProgress, PRUint64 aMaxProgress) - { - mInner = aInner; - mCurProgress = aCurrentProgress; diff --git a/www/firefox36/files/patch-ff-401042 b/www/firefox36/files/patch-ff-401042 deleted file mode 100644 index 8a6ff7123d0f..000000000000 --- a/www/firefox36/files/patch-ff-401042 +++ /dev/null @@ -1,57 +0,0 @@ ---- .pc/401042-backport.patch/layout/generic/nsInlineFrame.cpp 2009-01-05 02:55:09.000000000 +0100 -+++ layout/generic/nsInlineFrame.cpp 2009-01-05 02:56:08.000000000 +0100 -@@ -576,27 +576,52 @@ nsInlineFrame::ReflowFrames(nsPresContex - ReparentFloatsForInlineChild(irs.mLineContainer, frame, PR_FALSE); - } - frame->SetParent(this); - // We also need to check if frame has a next-in-flow. It it does, then set - // its parent frame pointer, too. Otherwise, if we reflow frame and it's - // complete we'll fail when deleting its next-in-flow which is no longer - // needed. This scenario doesn't happen often, but it can happen - nsIFrame* nextInFlow = frame->GetNextInFlow(); -- while (nextInFlow) { -+ for ( ; nextInFlow; nextInFlow = nextInFlow->GetNextInFlow()) { - // Since we only do lazy setting of parent pointers for the frame's - // initial reflow, this frame can't have a next-in-flow. That means - // the continuing child frame must be in our child list as well. If - // not, then something is wrong - NS_ASSERTION(mFrames.ContainsFrame(nextInFlow), "unexpected flow"); - if (havePrevBlock) { - ReparentFloatsForInlineChild(irs.mLineContainer, nextInFlow, PR_FALSE); - } - nextInFlow->SetParent(this); -- nextInFlow = nextInFlow->GetNextInFlow(); -+ } -+ -+ // Fix the parent pointer for ::first-letter child frame next-in-flows, -+ // so nsFirstLetterFrame::Reflow can destroy them safely (bug 401042). -+ nsIFrame* realFrame = nsPlaceholderFrame::GetRealFrameFor(frame); -+ if (realFrame->GetType() == nsLayoutAtoms::letterFrame) { -+ nsIFrame* child = realFrame->GetFirstChild(nsnull); -+ if (child) { -+ nsIFrame* nextInFlow = child->GetNextInFlow(); -+ for ( ; nextInFlow; nextInFlow = nextInFlow->GetNextInFlow()) { -+ if (mFrames.ContainsFrame(nextInFlow)) { -+ nextInFlow->SetParent(this); -+ } -+ else { -+#ifdef DEBUG -+ // Once we find a next-in-flow that isn't ours none of the -+ // remaining next-in-flows should be either. -+ for ( ; nextInFlow; nextInFlow = nextInFlow->GetNextInFlow()) { -+ NS_ASSERTION(!mFrames.ContainsFrame(nextInFlow), -+ "unexpected letter frame flow"); -+ } -+#endif -+ break; -+ } -+ } -+ } - } - } - rv = ReflowInlineFrame(aPresContext, aReflowState, irs, frame, aStatus); - if (NS_FAILED(rv)) { - done = PR_TRUE; - break; - } - if (NS_INLINE_IS_BREAK(aStatus) || diff --git a/www/firefox36/files/patch-ff-414540 b/www/firefox36/files/patch-ff-414540 deleted file mode 100644 index 75cbf9b5cf3f..000000000000 --- a/www/firefox36/files/patch-ff-414540 +++ /dev/null @@ -1,118 +0,0 @@ -diff -up mozilla/rdf/base/src/Makefile.in.414540 mozilla/rdf/base/src/Makefile.in ---- rdf/base/src/Makefile.in.414540 2005-06-24 09:49:43.000000000 +0200 -+++ rdf/base/src/Makefile.in 2009-02-20 22:48:06.000000000 +0100 -@@ -49,6 +49,9 @@ LIBXUL_LIBRARY = 1 - REQUIRES = xpcom \ - string \ - rdfutil \ -+ js \ -+ caps \ -+ xpconnect \ - necko \ - content \ - htmlparser \ -diff -up mozilla/rdf/base/src/nsRDFXMLDataSource.cpp.414540 mozilla/rdf/base/src/nsRDFXMLDataSource.cpp ---- rdf/base/src/nsRDFXMLDataSource.cpp.414540 2005-06-24 09:49:43.000000000 +0200 -+++ rdf/base/src/nsRDFXMLDataSource.cpp 2009-02-20 23:20:55.000000000 +0100 -@@ -122,6 +122,9 @@ - #include "prlog.h" - #include "nsNameSpaceMap.h" - #include "nsCRT.h" -+#include "nsIScriptSecurityManager.h" -+#include "nsIChannelEventSink.h" -+#include "nsNetUtil.h" - - #include "rdfIDataSource.h" - -@@ -218,7 +221,9 @@ class RDFXMLDataSourceImpl : public nsIR - public nsIRDFXMLSink, - public nsIRDFXMLSource, - public nsIStreamListener, -- public rdfIDataSource -+ public rdfIDataSource, -+ public nsIInterfaceRequestor, -+ public nsIChannelEventSink - { - protected: - enum LoadState { -@@ -389,6 +394,12 @@ public: - // nsIStreamListener - NS_DECL_NSISTREAMLISTENER - -+ // nsIInterfaceRequestor -+ NS_DECL_NSIINTERFACEREQUESTOR -+ -+ // nsIChannelEventSink -+ NS_DECL_NSICHANNELEVENTSINK -+ - // rdfIDataSource - NS_IMETHOD VisitAllSubjects(rdfITripleVisitor *aVisitor) { - nsresult rv; -@@ -537,15 +548,23 @@ RDFXMLDataSourceImpl::~RDFXMLDataSourceI - } - - --NS_IMPL_ISUPPORTS7(RDFXMLDataSourceImpl, -+NS_IMPL_ISUPPORTS9(RDFXMLDataSourceImpl, - nsIRDFDataSource, - nsIRDFRemoteDataSource, - nsIRDFXMLSink, - nsIRDFXMLSource, - nsIRequestObserver, - nsIStreamListener, -- rdfIDataSource) -- -+ rdfIDataSource, -+ nsIInterfaceRequestor, -+ nsIChannelEventSink) -+ -+// nsIInterfaceRequestor -+NS_IMETHODIMP -+RDFXMLDataSourceImpl::GetInterface(const nsIID& aIID, void** aSink) -+{ -+ return QueryInterface(aIID, aSink); -+} - - nsresult - RDFXMLDataSourceImpl::BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer) -@@ -924,6 +943,31 @@ RDFXMLDataSourceImpl::SetReadOnly(PRBool - - #include "nsITimelineService.h" - -+// nsIChannelEventSink -+ -+NS_IMETHODIMP -+RDFXMLDataSourceImpl::OnChannelRedirect(nsIChannel *aOldChannel, -+ nsIChannel *aNewChannel, -+ PRUint32 aFlags) -+{ -+ NS_PRECONDITION(aNewChannel, "Redirecting to null channel?"); -+ -+ nsresult rv; -+ nsCOMPtr<nsIScriptSecurityManager> secMan = -+ do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIURI> oldURI; -+ rv = aOldChannel->GetURI(getter_AddRefs(oldURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIURI> newURI; -+ rv = aNewChannel->GetURI(getter_AddRefs(newURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ return secMan->CheckSameOriginURI(oldURI, newURI); -+} -+ - NS_IMETHODIMP - RDFXMLDataSourceImpl::Refresh(PRBool aBlocking) - { -@@ -972,7 +1016,7 @@ RDFXMLDataSourceImpl::Refresh(PRBool aBl - } - else { - // Null LoadGroup ? -- rv = NS_OpenURI(this, nsnull, mURL, nsnull); -+ rv = NS_OpenURI(this, nsnull, mURL, nsnull, nsnull, this); - if (NS_FAILED(rv)) return rv; - - // So we don't try to issue two asynchronous loads at once. diff --git a/www/firefox36/files/patch-ff-437142 b/www/firefox36/files/patch-ff-437142 deleted file mode 100644 index 52cf69679265..000000000000 --- a/www/firefox36/files/patch-ff-437142 +++ /dev/null @@ -1,116 +0,0 @@ ---- .pc/437142_backport_att350047.patch/layout/base/nsCSSFrameConstructor.cpp 2009-01-26 12:09:32.000000000 +0100 -+++ layout/base/nsCSSFrameConstructor.cpp 2009-01-26 12:10:17.000000000 +0100 -@@ -9902,17 +9902,19 @@ nsCSSFrameConstructor::ContentRemoved(ns - nsFrameManager *frameManager = mPresShell->FrameManager(); - nsPresContext *presContext = mPresShell->GetPresContext(); - nsresult rv = NS_OK; - - // Find the child frame that maps the content - nsIFrame* childFrame; - mPresShell->GetPrimaryFrameFor(aChild, &childFrame); - -- if (! childFrame) { -+ if (!childFrame || childFrame->GetContent() != aChild) { -+ // XXXbz the GetContent() != aChild check is needed due to bug 135040. -+ // Remove it once that's fixed. - frameManager->ClearUndisplayedContentIn(aChild, aContainer); - } - - // When the last item is removed from a select, - // we need to add a pseudo frame so select gets sized as the best it can - // so here we see if it is a select and then we get the number of options - if (aContainer && childFrame) { - nsCOMPtr<nsIDOMHTMLSelectElement> selectElement = do_QueryInterface(aContainer); -@@ -9991,17 +9993,19 @@ nsCSSFrameConstructor::ContentRemoved(ns - // First update the containing blocks structure by removing the - // existing letter frames. This makes the subsequent logic - // simpler. - RemoveLetterFrames(presContext, mPresShell, frameManager, - containingBlock); - - // Recover childFrame and parentFrame - mPresShell->GetPrimaryFrameFor(aChild, &childFrame); -- if (!childFrame) { -+ if (!childFrame || childFrame->GetContent() != aChild) { -+ // XXXbz the GetContent() != aChild check is needed due to bug 135040. -+ // Remove it once that's fixed. - frameManager->ClearUndisplayedContentIn(aChild, aContainer); - return NS_OK; - } - parentFrame = childFrame->GetParent(); - - #ifdef NOISY_FIRST_LETTER - printf(" ==> revised parentFrame="); - nsFrame::ListTag(stdout, parentFrame); -@@ -10502,16 +10506,24 @@ nsCSSFrameConstructor::ProcessRestyledFr - } - - index = count; - while (0 <= --index) { - nsIFrame* frame; - nsIContent* content; - nsChangeHint hint; - aChangeList.ChangeAt(index, frame, content, hint); -+ if (frame && frame->GetContent() != content) { -+ // XXXbz this is due to image maps messing with the primary frame map. -+ // See bug 135040. Remove this block once that's fixed. -+ frame = nsnull; -+ if (!(hint & nsChangeHint_ReconstructFrame)) { -+ continue; -+ } -+ } - - // skip any frame that has been destroyed due to a ripple effect - if (frame) { - nsresult res; - - propTable->GetProperty(frame, nsLayoutAtoms::changeListProperty, &res); - - if (NS_PROPTABLE_PROP_NOT_THERE == res) -@@ -10567,16 +10579,21 @@ nsCSSFrameConstructor::ProcessRestyledFr - return NS_OK; - } - - void - nsCSSFrameConstructor::RestyleElement(nsIContent *aContent, - nsIFrame *aPrimaryFrame, - nsChangeHint aMinHint) - { -+ if (aPrimaryFrame && aPrimaryFrame->GetContent() != aContent) { -+ // XXXbz this is due to image maps messing with the primary frame mapping. -+ // See bug 135040. We can remove this block once that's fixed. -+ aPrimaryFrame = nsnull; -+ } - #ifdef ACCESSIBILITY - nsIAtom *prevRenderedFrameType = nsnull; - if (mPresShell->IsAccessibilityActive()) { - prevRenderedFrameType = GetRenderedFrameType(aPrimaryFrame); - } - #endif - if (aMinHint & nsChangeHint_ReconstructFrame) { - RecreateFramesForContent(aContent); ---- .pc/437142_backport_att350047.patch/layout/generic/nsImageMap.cpp 2009-01-26 12:09:32.000000000 +0100 -+++ layout/generic/nsImageMap.cpp 2009-01-26 12:10:17.000000000 +0100 -@@ -895,16 +895,22 @@ nsImageMap::AddArea(nsIContent* aArea) - return NS_ERROR_OUT_OF_MEMORY; - - //Add focus listener to track area focus changes - nsCOMPtr<nsIDOMEventReceiver> rec(do_QueryInterface(aArea)); - if (rec) { - rec->AddEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); - } - -+ -+ // This is a nasty hack. It needs to go away: see bug 135040. Once this is -+ // removed, the code added to nsCSSFrameConstructor::RestyleElement, -+ // nsCSSFrameConstructor::ContentRemoved (both hacks there), and -+ // nsCSSFrameConstructor::ProcessRestyledFrames to work around this issue can -+ // be removed. - mPresShell->FrameManager()->SetPrimaryFrameFor(aArea, mImageFrame); - aArea->SetMayHaveFrame(PR_TRUE); - NS_ASSERTION(aArea->MayHaveFrame(), "SetMayHaveFrame failed?"); - - area->ParseCoords(coords); - mAreas.AppendElement(area); - return NS_OK; - } diff --git a/www/firefox36/files/patch-ff-449006 b/www/firefox36/files/patch-ff-449006 deleted file mode 100644 index 5a3862b752a4..000000000000 --- a/www/firefox36/files/patch-ff-449006 +++ /dev/null @@ -1,1173 +0,0 @@ -diff --git a/editor/txmgr/src/nsTransactionItem.cpp b/editor/txmgr/src/nsTransactionItem.cpp ---- editor/txmgr/src/nsTransactionItem.cpp -+++ editor/txmgr/src/nsTransactionItem.cpp -@@ -35,31 +35,51 @@ - * - * ***** END LICENSE BLOCK ***** */ - - #include "nsITransaction.h" - #include "nsTransactionStack.h" - #include "nsTransactionManager.h" - #include "nsTransactionItem.h" - #include "nsCOMPtr.h" -+#include "nsAutoPtr.h" - - nsTransactionItem::nsTransactionItem(nsITransaction *aTransaction) - : mTransaction(aTransaction), mUndoStack(0), mRedoStack(0) - { - } - - nsTransactionItem::~nsTransactionItem() - { - if (mRedoStack) - delete mRedoStack; - - if (mUndoStack) - delete mUndoStack; -+} - -- NS_IF_RELEASE(mTransaction); -+nsrefcnt -+nsTransactionItem::AddRef() -+{ -+ ++mRefCnt; -+ NS_LOG_ADDREF(this, mRefCnt, "nsTransactionItem", -+ sizeof(nsTransactionItem)); -+ return mRefCnt; -+} -+ -+nsrefcnt -+nsTransactionItem::Release() { -+ --mRefCnt; -+ NS_LOG_RELEASE(this, mRefCnt, "nsTransactionItem"); -+ if (mRefCnt == 0) { -+ mRefCnt = 1; -+ delete this; -+ return 0; -+ } -+ return mRefCnt; - } - - nsresult - nsTransactionItem::AddChild(nsTransactionItem *aTransactionItem) - { - if (!aTransactionItem) - return NS_ERROR_NULL_POINTER; - -@@ -75,17 +95,17 @@ nsTransactionItem::AddChild(nsTransactio - } - - nsresult - nsTransactionItem::GetTransaction(nsITransaction **aTransaction) - { - if (!aTransaction) - return NS_ERROR_NULL_POINTER; - -- *aTransaction = mTransaction; -+ NS_IF_ADDREF(*aTransaction = mTransaction); - - return NS_OK; - } - - nsresult - nsTransactionItem::GetIsBatch(PRBool *aIsBatch) - { - if (!aIsBatch) -@@ -202,17 +222,17 @@ nsTransactionItem::UndoTransaction(nsTra - } - - return NS_OK; - } - - nsresult - nsTransactionItem::UndoChildren(nsTransactionManager *aTxMgr) - { -- nsTransactionItem *item; -+ nsRefPtr<nsTransactionItem> item; - nsresult result = NS_OK; - PRInt32 sz = 0; - - if (mUndoStack) { - if (!mRedoStack && mUndoStack) { - mRedoStack = new nsTransactionRedoStack(); - if (!mRedoStack) - return NS_ERROR_OUT_OF_MEMORY; -@@ -220,25 +240,25 @@ nsTransactionItem::UndoChildren(nsTransa - - /* Undo all of the transaction items children! */ - result = mUndoStack->GetSize(&sz); - - if (NS_FAILED(result)) - return result; - - while (sz-- > 0) { -- result = mUndoStack->Peek(&item); -+ result = mUndoStack->Peek(getter_AddRefs(item)); - - if (NS_FAILED(result)) { - return result; - } - -- nsITransaction *t = 0; -+ nsCOMPtr<nsITransaction> t; - -- result = item->GetTransaction(&t); -+ result = item->GetTransaction(getter_AddRefs(t)); - - if (NS_FAILED(result)) { - return result; - } - - PRBool doInterrupt = PR_FALSE; - - result = aTxMgr->WillUndoNotify(t, &doInterrupt); -@@ -249,17 +269,17 @@ nsTransactionItem::UndoChildren(nsTransa - - if (doInterrupt) { - return NS_OK; - } - - result = item->UndoTransaction(aTxMgr); - - if (NS_SUCCEEDED(result)) { -- result = mUndoStack->Pop(&item); -+ result = mUndoStack->Pop(getter_AddRefs(item)); - - if (NS_SUCCEEDED(result)) { - result = mRedoStack->Push(item); - - /* XXX: If we got an error here, I doubt we can recover! - * XXX: Should we just push the item back on the undo stack? - */ - } -@@ -276,16 +296,17 @@ nsTransactionItem::UndoChildren(nsTransa - return result; - } - - nsresult - nsTransactionItem::RedoTransaction(nsTransactionManager *aTxMgr) - { - nsresult result; - -+ nsCOMPtr<nsITransaction> kungfuDeathGrip(mTransaction); - if (mTransaction) { - result = mTransaction->RedoTransaction(); - - if (NS_FAILED(result)) - return result; - } - - result = RedoChildren(aTxMgr); -@@ -296,40 +317,40 @@ nsTransactionItem::RedoTransaction(nsTra - } - - return NS_OK; - } - - nsresult - nsTransactionItem::RedoChildren(nsTransactionManager *aTxMgr) - { -- nsTransactionItem *item; -+ nsRefPtr<nsTransactionItem> item; - nsresult result = NS_OK; - PRInt32 sz = 0; - - if (!mRedoStack) - return NS_OK; - - /* Redo all of the transaction items children! */ - result = mRedoStack->GetSize(&sz); - - if (NS_FAILED(result)) - return result; - - - while (sz-- > 0) { -- result = mRedoStack->Peek(&item); -+ result = mRedoStack->Peek(getter_AddRefs(item)); - - if (NS_FAILED(result)) { - return result; - } - -- nsITransaction *t = 0; -+ nsCOMPtr<nsITransaction> t; - -- result = item->GetTransaction(&t); -+ result = item->GetTransaction(getter_AddRefs(t)); - - if (NS_FAILED(result)) { - return result; - } - - PRBool doInterrupt = PR_FALSE; - - result = aTxMgr->WillRedoNotify(t, &doInterrupt); -@@ -340,17 +361,17 @@ nsTransactionItem::RedoChildren(nsTransa - - if (doInterrupt) { - return NS_OK; - } - - result = item->RedoTransaction(aTxMgr); - - if (NS_SUCCEEDED(result)) { -- result = mRedoStack->Pop(&item); -+ result = mRedoStack->Pop(getter_AddRefs(item)); - - if (NS_SUCCEEDED(result)) { - result = mUndoStack->Push(item); - - // XXX: If we got an error here, I doubt we can recover! - // XXX: Should we just push the item back on the redo stack? - } - } -diff --git a/editor/txmgr/src/nsTransactionItem.h b/editor/txmgr/src/nsTransactionItem.h ---- editor/txmgr/src/nsTransactionItem.h -+++ editor/txmgr/src/nsTransactionItem.h -@@ -33,31 +33,36 @@ - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - #ifndef nsTransactionItem_h__ - #define nsTransactionItem_h__ - --class nsITransaction; -+#include "nsITransaction.h" -+#include "nsCOMPtr.h" -+ - class nsTransactionStack; - class nsTransactionRedoStack; - class nsTransactionManager; - - class nsTransactionItem - { -- nsITransaction *mTransaction; -- nsTransactionStack *mUndoStack; -- nsTransactionRedoStack *mRedoStack; -+ nsCOMPtr<nsITransaction> mTransaction; -+ nsTransactionStack *mUndoStack; -+ nsTransactionRedoStack *mRedoStack; -+ nsAutoRefCnt mRefCnt; - - public: - - nsTransactionItem(nsITransaction *aTransaction); - virtual ~nsTransactionItem(); -+ nsrefcnt AddRef(); -+ nsrefcnt Release(); - - virtual nsresult AddChild(nsTransactionItem *aTransactionItem); - virtual nsresult GetTransaction(nsITransaction **aTransaction); - virtual nsresult GetIsBatch(PRBool *aIsBatch); - virtual nsresult GetNumberOfChildren(PRInt32 *aNumChildren); - virtual nsresult GetChild(PRInt32 aIndex, nsTransactionItem **aChild); - - virtual nsresult DoTransaction(void); -diff --git a/editor/txmgr/src/nsTransactionList.cpp b/editor/txmgr/src/nsTransactionList.cpp ---- editor/txmgr/src/nsTransactionList.cpp -+++ editor/txmgr/src/nsTransactionList.cpp -@@ -95,24 +95,24 @@ NS_IMETHODIMP nsTransactionList::ItemIsB - - *aIsBatch = PR_FALSE; - - nsCOMPtr<nsITransactionManager> txMgr = do_QueryReferent(mTxnMgr); - - if (!txMgr) - return NS_ERROR_FAILURE; - -- nsTransactionItem *item = 0; -+ nsRefPtr<nsTransactionItem> item; - - nsresult result = NS_ERROR_FAILURE; - - if (mTxnStack) -- result = mTxnStack->GetItem(aIndex, &item); -+ result = mTxnStack->GetItem(aIndex, getter_AddRefs(item)); - else if (mTxnItem) -- result = mTxnItem->GetChild(aIndex, &item); -+ result = mTxnItem->GetChild(aIndex, getter_AddRefs(item)); - - if (NS_FAILED(result)) - return result; - - if (!item) - return NS_ERROR_FAILURE; - - return item->GetIsBatch(aIsBatch); -@@ -126,62 +126,55 @@ NS_IMETHODIMP nsTransactionList::GetItem - - *aItem = 0; - - nsCOMPtr<nsITransactionManager> txMgr = do_QueryReferent(mTxnMgr); - - if (!txMgr) - return NS_ERROR_FAILURE; - -- nsTransactionItem *item = 0; -+ nsRefPtr<nsTransactionItem> item; - - nsresult result = NS_ERROR_FAILURE; - - if (mTxnStack) -- result = mTxnStack->GetItem(aIndex, &item); -+ result = mTxnStack->GetItem(aIndex, getter_AddRefs(item)); - else if (mTxnItem) -- result = mTxnItem->GetChild(aIndex, &item); -+ result = mTxnItem->GetChild(aIndex, getter_AddRefs(item)); - - if (NS_FAILED(result)) - return result; - - if (!item) - return NS_ERROR_FAILURE; - -- result = item->GetTransaction(aItem); -- -- if (NS_FAILED(result)) -- return result; -- -- NS_IF_ADDREF(*aItem); -- -- return NS_OK; -+ return item->GetTransaction(aItem); - } - - /* long getNumChildrenForItem (in long aIndex); */ - NS_IMETHODIMP nsTransactionList::GetNumChildrenForItem(PRInt32 aIndex, PRInt32 *aNumChildren) - { - if (!aNumChildren) - return NS_ERROR_NULL_POINTER; - - *aNumChildren = 0; - - nsCOMPtr<nsITransactionManager> txMgr = do_QueryReferent(mTxnMgr); - - if (!txMgr) - return NS_ERROR_FAILURE; - -- nsTransactionItem *item = 0; -+ nsRefPtr<nsTransactionItem> item; - - nsresult result = NS_ERROR_FAILURE; - - if (mTxnStack) -- result = mTxnStack->GetItem(aIndex, &item); -+ result = mTxnStack->GetItem(aIndex, getter_AddRefs(item)); - else if (mTxnItem) -- result = mTxnItem->GetChild(aIndex, &item); -+ result = mTxnItem->GetChild(aIndex, getter_AddRefs(item)); - - if (NS_FAILED(result)) - return result; - - if (!item) - return NS_ERROR_FAILURE; - - return item->GetNumberOfChildren(aNumChildren); -@@ -195,24 +188,24 @@ NS_IMETHODIMP nsTransactionList::GetChil - - *aTxnList = 0; - - nsCOMPtr<nsITransactionManager> txMgr = do_QueryReferent(mTxnMgr); - - if (!txMgr) - return NS_ERROR_FAILURE; - -- nsTransactionItem *item = 0; -+ nsRefPtr<nsTransactionItem> item; - - nsresult result = NS_ERROR_FAILURE; - - if (mTxnStack) -- result = mTxnStack->GetItem(aIndex, &item); -+ result = mTxnStack->GetItem(aIndex, getter_AddRefs(item)); - else if (mTxnItem) -- result = mTxnItem->GetChild(aIndex, &item); -+ result = mTxnItem->GetChild(aIndex, getter_AddRefs(item)); - - if (NS_FAILED(result)) - return result; - - if (!item) - return NS_ERROR_FAILURE; - - *aTxnList = (nsITransactionList *)new nsTransactionList(txMgr, item); -diff --git a/editor/txmgr/src/nsTransactionList.h b/editor/txmgr/src/nsTransactionList.h ---- editor/txmgr/src/nsTransactionList.h -+++ editor/txmgr/src/nsTransactionList.h -@@ -35,33 +35,34 @@ - * - * ***** END LICENSE BLOCK ***** */ - - #ifndef nsTransactionList_h__ - #define nsTransactionList_h__ - - #include "nsWeakReference.h" - #include "nsITransactionList.h" -+#include "nsTransactionItem.h" -+#include "nsAutoPtr.h" - - class nsITransaction; - class nsITransactionManager; --class nsTransactionItem; - class nsTransactionStack; - class nsTransactionRedoStack; - - /** implementation of a transaction list object. - * - */ - class nsTransactionList : public nsITransactionList - { - private: - -- nsWeakPtr mTxnMgr; -- nsTransactionStack *mTxnStack; -- nsTransactionItem *mTxnItem; -+ nsWeakPtr mTxnMgr; -+ nsTransactionStack *mTxnStack; -+ nsRefPtr<nsTransactionItem> mTxnItem; - - public: - - nsTransactionList(nsITransactionManager *aTxnMgr, nsTransactionStack *aTxnStack); - nsTransactionList(nsITransactionManager *aTxnMgr, nsTransactionItem *aTxnItem); - - virtual ~nsTransactionList(); - -diff --git a/editor/txmgr/src/nsTransactionManager.cpp b/editor/txmgr/src/nsTransactionManager.cpp ---- editor/txmgr/src/nsTransactionManager.cpp -+++ editor/txmgr/src/nsTransactionManager.cpp -@@ -38,17 +38,17 @@ - #include "nsITransaction.h" - #include "nsITransactionListener.h" - - #include "nsTransactionItem.h" - #include "nsTransactionStack.h" - #include "nsVoidArray.h" - #include "nsTransactionManager.h" - #include "nsTransactionList.h" -- -+#include "nsAutoPtr.h" - #include "nsCOMPtr.h" - - #define LOCK_TX_MANAGER(mgr) (mgr)->Lock() - #define UNLOCK_TX_MANAGER(mgr) (mgr)->Unlock() - - - nsTransactionManager::nsTransactionManager(PRInt32 aMaxTransactionCount) - : mMaxTransactionCount(aMaxTransactionCount), mListeners(0) -@@ -148,54 +148,54 @@ nsTransactionManager::DoTransaction(nsIT - - return result; - } - - NS_IMETHODIMP - nsTransactionManager::UndoTransaction() - { - nsresult result = NS_OK; -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - - LOCK_TX_MANAGER(this); - - // It is illegal to call UndoTransaction() while the transaction manager is - // executing a transaction's DoTransaction() method! If this happens, - // the UndoTransaction() request is ignored, and we return NS_ERROR_FAILURE. - -- result = mDoStack.Peek(&tx); -+ result = mDoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - if (tx) { - UNLOCK_TX_MANAGER(this); - return NS_ERROR_FAILURE; - } - - // Peek at the top of the undo stack. Don't remove the transaction - // until it has successfully completed. -- result = mUndoStack.Peek(&tx); -+ result = mUndoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - // Bail if there's nothing on the stack. - if (!tx) { - UNLOCK_TX_MANAGER(this); - return NS_OK; - } - -- nsITransaction *t = 0; -+ nsCOMPtr<nsITransaction> t; - -- result = tx->GetTransaction(&t); -+ result = tx->GetTransaction(getter_AddRefs(t)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - PRBool doInterrupt = PR_FALSE; - -@@ -209,17 +209,17 @@ nsTransactionManager::UndoTransaction() - if (doInterrupt) { - UNLOCK_TX_MANAGER(this); - return NS_OK; - } - - result = tx->UndoTransaction(this); - - if (NS_SUCCEEDED(result)) { -- result = mUndoStack.Pop(&tx); -+ result = mUndoStack.Pop(getter_AddRefs(tx)); - - if (NS_SUCCEEDED(result)) - result = mRedoStack.Push(tx); - } - - nsresult result2 = DidUndoNotify(t, result); - - if (NS_SUCCEEDED(result)) -@@ -229,54 +229,54 @@ nsTransactionManager::UndoTransaction() - - return result; - } - - NS_IMETHODIMP - nsTransactionManager::RedoTransaction() - { - nsresult result = NS_OK; -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - - LOCK_TX_MANAGER(this); - - // It is illegal to call RedoTransaction() while the transaction manager is - // executing a transaction's DoTransaction() method! If this happens, - // the RedoTransaction() request is ignored, and we return NS_ERROR_FAILURE. - -- result = mDoStack.Peek(&tx); -+ result = mDoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - if (tx) { - UNLOCK_TX_MANAGER(this); - return NS_ERROR_FAILURE; - } - - // Peek at the top of the redo stack. Don't remove the transaction - // until it has successfully completed. -- result = mRedoStack.Peek(&tx); -+ result = mRedoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - // Bail if there's nothing on the stack. - if (!tx) { - UNLOCK_TX_MANAGER(this); - return NS_OK; - } - -- nsITransaction *t = 0; -+ nsCOMPtr<nsITransaction> t; - -- result = tx->GetTransaction(&t); -+ result = tx->GetTransaction(getter_AddRefs(t)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - PRBool doInterrupt = PR_FALSE; - -@@ -290,17 +290,17 @@ nsTransactionManager::RedoTransaction() - if (doInterrupt) { - UNLOCK_TX_MANAGER(this); - return NS_OK; - } - - result = tx->RedoTransaction(this); - - if (NS_SUCCEEDED(result)) { -- result = mRedoStack.Pop(&tx); -+ result = mRedoStack.Pop(getter_AddRefs(tx)); - - if (NS_SUCCEEDED(result)) - result = mUndoStack.Push(tx); - } - - nsresult result2 = DidRedoNotify(t, result); - - if (NS_SUCCEEDED(result)) -@@ -368,42 +368,42 @@ nsTransactionManager::BeginBatch() - UNLOCK_TX_MANAGER(this); - - return result; - } - - NS_IMETHODIMP - nsTransactionManager::EndBatch() - { -- nsTransactionItem *tx = 0; -- nsITransaction *ti = 0; -+ nsRefPtr<nsTransactionItem> tx; -+ nsCOMPtr<nsITransaction> ti; - nsresult result; - - LOCK_TX_MANAGER(this); - - // XXX: Need to add some mechanism to detect the case where the transaction - // at the top of the do stack isn't the dummy transaction, so we can - // throw an error!! This can happen if someone calls EndBatch() within - // the DoTransaction() method of a transaction. - // - // For now, we can detect this case by checking the value of the - // dummy transaction's mTransaction field. If it is our dummy - // transaction, it should be NULL. This may not be true in the - // future when we allow users to execute a transaction when beginning - // a batch!!!! - -- result = mDoStack.Peek(&tx); -+ result = mDoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - if (tx) -- tx->GetTransaction(&ti); -+ tx->GetTransaction(getter_AddRefs(ti)); - - if (!tx || ti) { - UNLOCK_TX_MANAGER(this); - return NS_ERROR_FAILURE; - } - - PRBool doInterrupt = PR_FALSE; - -@@ -467,28 +467,28 @@ nsTransactionManager::GetMaxTransactionC - - return NS_OK; - } - - NS_IMETHODIMP - nsTransactionManager::SetMaxTransactionCount(PRInt32 aMaxCount) - { - PRInt32 numUndoItems = 0, numRedoItems = 0, total = 0; -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - nsresult result; - - LOCK_TX_MANAGER(this); - - // It is illegal to call SetMaxTransactionCount() while the transaction - // manager is executing a transaction's DoTransaction() method because - // the undo and redo stacks might get pruned! If this happens, the - // SetMaxTransactionCount() request is ignored, and we return - // NS_ERROR_FAILURE. - -- result = mDoStack.Peek(&tx); -+ result = mDoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result)) { - UNLOCK_TX_MANAGER(this); - return result; - } - - if (tx) { - UNLOCK_TX_MANAGER(this); -@@ -529,107 +529,97 @@ nsTransactionManager::SetMaxTransactionC - UNLOCK_TX_MANAGER(this); - return result; - } - - // Try getting rid of some transactions on the undo stack! Start at - // the bottom of the stack and pop towards the top. - - while (numUndoItems > 0 && (numRedoItems + numUndoItems) > aMaxCount) { -- tx = 0; -- result = mUndoStack.PopBottom(&tx); -+ result = mUndoStack.PopBottom(getter_AddRefs(tx)); - - if (NS_FAILED(result) || !tx) { - UNLOCK_TX_MANAGER(this); - return result; - } -- -- delete tx; - - --numUndoItems; - } - - // If necessary, get rid of some transactions on the redo stack! Start at - // the bottom of the stack and pop towards the top. - - while (numRedoItems > 0 && (numRedoItems + numUndoItems) > aMaxCount) { -- tx = 0; -- result = mRedoStack.PopBottom(&tx); -+ result = mRedoStack.PopBottom(getter_AddRefs(tx)); - - if (NS_FAILED(result) || !tx) { - UNLOCK_TX_MANAGER(this); - return result; - } -- -- delete tx; - - --numRedoItems; - } - - mMaxTransactionCount = aMaxCount; - - UNLOCK_TX_MANAGER(this); - - return result; - } - - NS_IMETHODIMP - nsTransactionManager::PeekUndoStack(nsITransaction **aTransaction) - { -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - nsresult result; - - if (!aTransaction) - return NS_ERROR_NULL_POINTER; - - *aTransaction = 0; - - LOCK_TX_MANAGER(this); - -- result = mUndoStack.Peek(&tx); -+ result = mUndoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result) || !tx) { - UNLOCK_TX_MANAGER(this); - return result; - } - - result = tx->GetTransaction(aTransaction); - - UNLOCK_TX_MANAGER(this); - -- NS_IF_ADDREF(*aTransaction); -- - return result; - } - - NS_IMETHODIMP - nsTransactionManager::PeekRedoStack(nsITransaction **aTransaction) - { -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - nsresult result; - - if (!aTransaction) - return NS_ERROR_NULL_POINTER; - - *aTransaction = 0; - - LOCK_TX_MANAGER(this); - -- result = mRedoStack.Peek(&tx); -+ result = mRedoStack.Peek(getter_AddRefs(tx)); - - if (NS_FAILED(result) || !tx) { - UNLOCK_TX_MANAGER(this); - return result; - } - - result = tx->GetTransaction(aTransaction); - - UNLOCK_TX_MANAGER(this); -- -- NS_IF_ADDREF(*aTransaction); - - return result; - } - - NS_IMETHODIMP - nsTransactionManager::GetUndoList(nsITransactionList **aTransactionList) - { - if (!aTransactionList) -@@ -1039,109 +1029,101 @@ nsTransactionManager::DidMergeNotify(nsI - } - - return result; - } - - nsresult - nsTransactionManager::BeginTransaction(nsITransaction *aTransaction) - { -- nsTransactionItem *tx; - nsresult result = NS_OK; - - // No need for LOCK/UNLOCK_TX_MANAGER() calls since the calling routine - // should have done this already! - -- NS_IF_ADDREF(aTransaction); -- - // XXX: POSSIBLE OPTIMIZATION - // We could use a factory that pre-allocates/recycles transaction items. -- tx = new nsTransactionItem(aTransaction); -+ nsRefPtr<nsTransactionItem> tx = new nsTransactionItem(aTransaction); - - if (!tx) { -- NS_IF_RELEASE(aTransaction); - return NS_ERROR_OUT_OF_MEMORY; - } - - result = mDoStack.Push(tx); - - if (NS_FAILED(result)) { -- delete tx; - return result; - } - - result = tx->DoTransaction(); - - if (NS_FAILED(result)) { -- mDoStack.Pop(&tx); -- delete tx; -+ mDoStack.Pop(getter_AddRefs(tx)); - return result; - } - - return NS_OK; - } - - nsresult - nsTransactionManager::EndTransaction() - { -- nsITransaction *tint = 0; -- nsTransactionItem *tx = 0; -+ nsCOMPtr<nsITransaction> tint; -+ nsRefPtr<nsTransactionItem> tx; - nsresult result = NS_OK; - - // No need for LOCK/UNLOCK_TX_MANAGER() calls since the calling routine - // should have done this already! - -- result = mDoStack.Pop(&tx); -+ result = mDoStack.Pop(getter_AddRefs(tx)); - - if (NS_FAILED(result) || !tx) - return result; - -- result = tx->GetTransaction(&tint); -+ result = tx->GetTransaction(getter_AddRefs(tint)); - - if (NS_FAILED(result)) { - // XXX: What do we do with the transaction item at this point? - return result; - } - - if (!tint) { - PRInt32 nc = 0; - - // If we get here, the transaction must be a dummy batch transaction - // created by BeginBatch(). If it contains no children, get rid of it! - - tx->GetNumberOfChildren(&nc); - - if (!nc) { -- delete tx; - return result; - } - } - - // Check if the transaction is transient. If it is, there's nothing - // more to do, just return. - - PRBool isTransient = PR_FALSE; - - if (tint) - result = tint->GetIsTransient(&isTransient); - - if (NS_FAILED(result) || isTransient || !mMaxTransactionCount) { - // XXX: Should we be clearing the redo stack if the transaction - // is transient and there is nothing on the do stack? -- delete tx; - return result; - } - -- nsTransactionItem *top = 0; -+ nsRefPtr<nsTransactionItem> top; - - // Check if there is a transaction on the do stack. If there is, - // the current transaction is a "sub" transaction, and should - // be added to the transaction at the top of the do stack. - -- result = mDoStack.Peek(&top); -+ result = mDoStack.Peek(getter_AddRefs(top)); - if (top) { - result = top->AddChild(tx); - - // XXX: What do we do if this fails? - - return result; - } - -@@ -1152,23 +1134,23 @@ nsTransactionManager::EndTransaction() - if (NS_FAILED(result)) { - // XXX: What do we do if this fails? - } - - // Check if we can coalesce this transaction with the one at the top - // of the undo stack. - - top = 0; -- result = mUndoStack.Peek(&top); -+ result = mUndoStack.Peek(getter_AddRefs(top)); - - if (tint && top) { - PRBool didMerge = PR_FALSE; -- nsITransaction *topTransaction = 0; -+ nsCOMPtr<nsITransaction> topTransaction; - -- result = top->GetTransaction(&topTransaction); -+ result = top->GetTransaction(getter_AddRefs(topTransaction)); - - if (topTransaction) { - - PRBool doInterrupt = PR_FALSE; - - result = WillMergeNotify(topTransaction, tint, &doInterrupt); - - if (NS_FAILED(result)) -@@ -1182,39 +1164,35 @@ nsTransactionManager::EndTransaction() - if (NS_SUCCEEDED(result)) - result = result2; - - if (NS_FAILED(result)) { - // XXX: What do we do if this fails? - } - - if (didMerge) { -- delete tx; - return result; - } - } - } - } - - // Check to see if we've hit the max level of undo. If so, - // pop the bottom transaction off the undo stack and release it! - - PRInt32 sz = 0; - - result = mUndoStack.GetSize(&sz); - - if (mMaxTransactionCount > 0 && sz >= mMaxTransactionCount) { -- nsTransactionItem *overflow = 0; -+ nsRefPtr<nsTransactionItem> overflow; - -- result = mUndoStack.PopBottom(&overflow); -+ result = mUndoStack.PopBottom(getter_AddRefs(overflow)); - - // XXX: What do we do in the case where this fails? -- -- if (overflow) -- delete overflow; - } - - // Push the transaction on the undo stack: - - result = mUndoStack.Push(tx); - - if (NS_FAILED(result)) { - // XXX: What do we do in the case where a clear fails? -diff --git a/editor/txmgr/src/nsTransactionStack.cpp b/editor/txmgr/src/nsTransactionStack.cpp ---- editor/txmgr/src/nsTransactionStack.cpp -+++ editor/txmgr/src/nsTransactionStack.cpp -@@ -34,38 +34,38 @@ - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - #include "nsITransaction.h" - #include "nsTransactionItem.h" - #include "nsTransactionStack.h" - #include "nsCOMPtr.h" -+#include "nsAutoPtr.h" - - nsTransactionStack::nsTransactionStack() - : mQue(0) - { -- nsTransactionReleaseFunctor* theFunctor=new nsTransactionReleaseFunctor(); -- mQue.SetDeallocator(theFunctor); - } - - nsTransactionStack::~nsTransactionStack() - { - Clear(); - } - - nsresult - nsTransactionStack::Push(nsTransactionItem *aTransaction) - { - if (!aTransaction) - return NS_ERROR_NULL_POINTER; - - /* nsDeque's Push() method adds new items at the back - * of the deque. - */ -+ NS_ADDREF(aTransaction); - mQue.Push(aTransaction); - - return NS_OK; - } - - nsresult - nsTransactionStack::Pop(nsTransactionItem **aTransaction) - { -@@ -100,52 +100,51 @@ nsTransactionStack::Peek(nsTransactionIt - if (!aTransaction) - return NS_ERROR_NULL_POINTER; - - if (!mQue.GetSize()) { - *aTransaction = 0; - return NS_OK; - } - -- *aTransaction = (nsTransactionItem *)(mQue.Last()); -+ NS_IF_ADDREF(*aTransaction = static_cast<nsTransactionItem*>(mQue.Last())); - - return NS_OK; - } - - nsresult - nsTransactionStack::GetItem(PRInt32 aIndex, nsTransactionItem **aTransaction) - { - if (!aTransaction) - return NS_ERROR_NULL_POINTER; - - if (aIndex < 0 || aIndex >= mQue.GetSize()) - return NS_ERROR_FAILURE; - -- *aTransaction = (nsTransactionItem *)(mQue.ObjectAt(aIndex)); -+ NS_IF_ADDREF(*aTransaction = -+ static_cast<nsTransactionItem*>(mQue.ObjectAt(aIndex))); - - return NS_OK; - } - - nsresult - nsTransactionStack::Clear(void) - { -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - nsresult result = NS_OK; - - /* Pop all transactions off the stack and release them. */ - -- result = Pop(&tx); -+ result = Pop(getter_AddRefs(tx)); - - if (NS_FAILED(result)) - return result; - - while (tx) { -- delete tx; -- -- result = Pop(&tx); -+ result = Pop(getter_AddRefs(tx)); - - if (NS_FAILED(result)) - return result; - } - - return NS_OK; - } - -@@ -163,39 +162,30 @@ nsTransactionRedoStack::~nsTransactionRe - nsTransactionRedoStack::~nsTransactionRedoStack() - { - Clear(); - } - - nsresult - nsTransactionRedoStack::Clear(void) - { -- nsTransactionItem *tx = 0; -+ nsRefPtr<nsTransactionItem> tx; - nsresult result = NS_OK; - - /* When clearing a Redo stack, we have to clear from the - * bottom of the stack towards the top! - */ - -- result = PopBottom(&tx); -+ result = PopBottom(getter_AddRefs(tx)); - - if (NS_FAILED(result)) - return result; - - while (tx) { -- delete tx; -- -- result = PopBottom(&tx); -+ result = PopBottom(getter_AddRefs(tx)); - - if (NS_FAILED(result)) - return result; - } - - return NS_OK; - } - --void * --nsTransactionReleaseFunctor::operator()(void *aObject) --{ -- nsTransactionItem *item = (nsTransactionItem *)aObject; -- delete item; -- return 0; --} -diff --git a/editor/txmgr/src/nsTransactionStack.h b/editor/txmgr/src/nsTransactionStack.h ---- editor/txmgr/src/nsTransactionStack.h -+++ editor/txmgr/src/nsTransactionStack.h -@@ -37,25 +37,16 @@ - - #ifndef nsTransactionStack_h__ - #define nsTransactionStack_h__ - - #include "nsDeque.h" - - class nsTransactionItem; - --class nsTransactionReleaseFunctor : public nsDequeFunctor --{ --public: -- -- nsTransactionReleaseFunctor() {} -- virtual ~nsTransactionReleaseFunctor() {} -- virtual void *operator()(void *aObject); --}; -- - class nsTransactionStack - { - nsDeque mQue; - - public: - - nsTransactionStack(); - virtual ~nsTransactionStack(); diff --git a/www/firefox36/files/patch-ff-460425 b/www/firefox36/files/patch-ff-460425 deleted file mode 100644 index d792f686a285..000000000000 --- a/www/firefox36/files/patch-ff-460425 +++ /dev/null @@ -1,440 +0,0 @@ ---- .pc/460425_att352061-backport2.patch/content/base/src/nsSyncLoadService.cpp 2006-06-10 00:48:43.000000000 +0200 -+++ content/base/src/nsSyncLoadService.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -424,19 +424,28 @@ nsSyncLoader::OnChannelRedirect(nsIChann - nsresult rv = aOldChannel->GetURI(getter_AddRefs(oldURI)); // The original URI - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIURI> newURI; - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); // The new URI - NS_ENSURE_SUCCESS(rv, rv); - - rv = nsContentUtils::GetSecurityManager()->CheckSameOriginURI(oldURI, newURI); -+ NS_ENSURE_SUCCESS(rv, rv); - -+ nsCOMPtr<nsIURI> newOrigURI; -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); - NS_ENSURE_SUCCESS(rv, rv); - -+ if (newOrigURI != newURI) { -+ rv = nsContentUtils::GetSecurityManager()-> -+ CheckSameOriginURI(oldURI, newOrigURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } -+ - mChannel = aNewChannel; - - return NS_OK; - } - - NS_IMETHODIMP - nsSyncLoader::GetInterface(const nsIID & aIID, - void **aResult) ---- .pc/460425_att352061-backport2.patch/content/base/src/nsXMLHttpRequest.cpp 2009-01-28 17:30:42.000000000 +0100 -+++ content/base/src/nsXMLHttpRequest.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -2058,16 +2058,27 @@ nsXMLHttpRequest::OnChannelRedirect(nsIC - return rv; - - nsCOMPtr<nsIScriptSecurityManager> secMan = - do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID, &rv); - if (NS_FAILED(rv)) - return rv; - - rv = secMan->CheckSameOriginURI(oldURI, newURI); -+ -+ if (NS_SUCCEEDED(rv)) { -+ nsCOMPtr<nsIURI> newOrigURI; -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (newOrigURI != newURI) { -+ rv = secMan->CheckSameOriginURI(oldURI, newOrigURI); -+ } -+ } -+ - if (NS_FAILED(rv)) { - mDenyResponseDataAccess = PR_TRUE; - return rv; - } - } - - if (mChannelEventSink) { - nsresult rv = ---- .pc/460425_att352061-backport2.patch/content/xml/document/src/nsXMLDocument.cpp 2008-08-15 23:57:22.000000000 +0200 -+++ content/xml/document/src/nsXMLDocument.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -297,18 +297,34 @@ nsXMLDocument::OnChannelRedirect(nsIChan - nsCOMPtr<nsIURI> oldURI; - nsresult rv = aOldChannel->GetURI(getter_AddRefs(oldURI)); - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIURI> newURI; - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - NS_ENSURE_SUCCESS(rv, rv); - -- return nsContentUtils::GetSecurityManager()-> -+ rv = nsContentUtils::GetSecurityManager()-> - CheckSameOriginURI(oldURI, newURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIURI> newOrigURI; -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (newOrigURI != newURI) { -+ rv = nsContentUtils::GetSecurityManager()-> -+ CheckSameOriginURI(oldURI, newOrigURI); -+ } -+ -+ if (NS_FAILED(rv)) { -+ return rv; -+ } -+ -+ return NS_OK; - } - - NS_IMETHODIMP - nsXMLDocument::EvaluateFIXptr(const nsAString& aExpression, nsIDOMRange **aRange) - { - nsresult rv; - nsCOMPtr<nsIFIXptrEvaluator> e = - do_CreateInstance("@mozilla.org/xmlextras/fixptrevaluator;1", &rv); ---- .pc/460425_att352061-backport2.patch/extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp 2006-07-07 03:06:03.000000000 +0200 -+++ extensions/transformiix/source/xslt/txMozillaStylesheetCompiler.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -383,17 +383,29 @@ txStylesheetSink::OnChannelRedirect(nsIC - nsCOMPtr<nsIURI> oldURI; - rv = aOldChannel->GetURI(getter_AddRefs(oldURI)); // The original URI - NS_ENSURE_SUCCESS(rv, rv); - - nsCOMPtr<nsIURI> newURI; - rv = aNewChannel->GetURI(getter_AddRefs(newURI)); // The new URI - NS_ENSURE_SUCCESS(rv, rv); - -- return secMan->CheckSameOriginURI(oldURI, newURI); -+ rv = secMan->CheckSameOriginURI(oldURI, newURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCOMPtr<nsIURI> newOrigURI; -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (newOrigURI != newURI) { -+ rv = secMan->CheckSameOriginURI(oldURI, newOrigURI); -+ NS_ENSURE_SUCCESS(rv, rv); -+ } -+ -+ return NS_OK; - } - - NS_IMETHODIMP - txStylesheetSink::GetInterface(const nsIID& aIID, void** aResult) - { - if (aIID.Equals(NS_GET_IID(nsIAuthPrompt))) { - NS_ENSURE_ARG(aResult); - *aResult = nsnull; ---- .pc/460425_att352061-backport2.patch/extensions/xforms/nsXFormsInstanceElement.cpp 2008-07-27 02:35:16.000000000 +0200 -+++ extensions/xforms/nsXFormsInstanceElement.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -203,21 +203,25 @@ nsXFormsInstanceElement::GetInterface(co - NS_IMETHODIMP - nsXFormsInstanceElement::OnChannelRedirect(nsIChannel *OldChannel, - nsIChannel *aNewChannel, - PRUint32 aFlags) - { - NS_PRECONDITION(aNewChannel, "Redirect without a channel?"); - NS_PRECONDITION(!mLazy, "Loading an instance document for a lazy instance?"); - -- nsCOMPtr<nsIURI> newURI; -+ nsCOMPtr<nsIURI> newURI, newOrigURI; - nsresult rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - NS_ENSURE_SUCCESS(rv, rv); -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); -+ NS_ENSURE_SUCCESS(rv, rv); - -- if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI)) { -+ if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI) || -+ (newOrigURI != newURI && -+ !nsXFormsUtils::CheckConnectionAllowed(mElement, newOrigURI))) { - const PRUnichar *strings[] = { NS_LITERAL_STRING("instance").get() }; - nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLinkLoadOrigin"), - strings, 1, mElement, mElement); - return NS_ERROR_ABORT; - } - - return NS_OK; - } ---- .pc/460425_att352061-backport2.patch/extensions/xforms/nsXFormsMessageElement.cpp 2008-03-04 23:47:45.000000000 +0100 -+++ extensions/xforms/nsXFormsMessageElement.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -1062,21 +1062,25 @@ nsXFormsMessageElement::GetInterface(con - - NS_IMETHODIMP - nsXFormsMessageElement::OnChannelRedirect(nsIChannel *OldChannel, - nsIChannel *aNewChannel, - PRUint32 aFlags) - { - NS_PRECONDITION(aNewChannel, "Redirect without a channel?"); - -- nsCOMPtr<nsIURI> newURI; -+ nsCOMPtr<nsIURI> newURI, newOrigURI; - nsresult rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - NS_ENSURE_SUCCESS(rv, rv); -- -- if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI)) { -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI) || -+ (newOrigURI != newURI && -+ !nsXFormsUtils::CheckConnectionAllowed(mElement, newOrigURI))) { - nsAutoString tagName; - mElement->GetLocalName(tagName); - const PRUnichar *strings[] = { tagName.get() }; - nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLinkLoadOrigin"), - strings, 1, mElement, mElement); - mStopType = eStopType_Security; - return NS_ERROR_ABORT; - } ---- .pc/460425_att352061-backport2.patch/extensions/xforms/nsXFormsSubmissionElement.cpp 2008-08-07 23:03:52.000000000 +0200 -+++ extensions/xforms/nsXFormsSubmissionElement.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -400,27 +400,30 @@ nsXFormsSubmissionElement::OnChannelRedi - nsIChannel *aNewChannel, - PRUint32 aFlags) - { - if (!mElement) { - return NS_OK; - } - - NS_PRECONDITION(aNewChannel, "Redirect without a channel?"); -- nsCOMPtr<nsIURI> newURI; -+ nsCOMPtr<nsIURI> newURI, newOrigURI; - nsresult rv = aNewChannel->GetURI(getter_AddRefs(newURI)); - NS_ENSURE_SUCCESS(rv, rv); -+ rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI)); -+ NS_ENSURE_SUCCESS(rv, rv); - - NS_ENSURE_STATE(mElement); - nsCOMPtr<nsIDOMDocument> domDoc; - mElement->GetOwnerDocument(getter_AddRefs(domDoc)); - nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc)); - NS_ENSURE_STATE(doc); - -- if (!CheckSameOrigin(doc, newURI)) { -+ if (!CheckSameOrigin(doc, newURI) || -+ (newOrigURI != newURI && !CheckSameOrigin(doc, newOrigURI))) { - nsXFormsUtils::ReportError(NS_LITERAL_STRING("submitSendOrigin"), - mElement); - return NS_ERROR_ABORT; - } - - return NS_OK; - } - ---- .pc/460425_att352061-backport2.patch/netwerk/protocol/file/src/nsFileChannel.cpp 2008-10-29 06:22:55.000000000 +0100 -+++ netwerk/protocol/file/src/nsFileChannel.cpp 2009-01-30 12:44:19.000000000 +0100 -@@ -94,17 +94,16 @@ CopyProperties(const nsAString &key, nsI - void - nsFileChannel::HandleRedirect(nsIChannel* newChannel) - { - if (NS_SUCCEEDED(mStatus)) { - nsIURI* originalURI = mOriginalURI; - if (!originalURI) - originalURI = mURL; - -- newChannel->SetOriginalURI(originalURI); - newChannel->SetLoadGroup(mLoadGroup); - newChannel->SetNotificationCallbacks(mCallbacks); - newChannel->SetLoadFlags(mLoadFlags | LOAD_REPLACE); - - nsCOMPtr<nsIWritablePropertyBag> bag = do_QueryInterface(newChannel); - if (bag) - mPropertyHash.EnumerateRead(CopyProperties, bag.get()); - -@@ -119,17 +118,21 @@ nsFileChannel::HandleRedirect(nsIChannel - nsCOMPtr<nsIChannelEventSink> channelEventSink; - // Give our consumer a chance to observe/block this redirect. - NS_QueryNotificationCallbacks(mCallbacks, mLoadGroup, - channelEventSink); - if (channelEventSink) { - rv = channelEventSink->OnChannelRedirect(this, newChannel, - redirectFlags); - if (NS_SUCCEEDED(rv)) { -- rv = newChannel->AsyncOpen(mListener, mListenerContext); -+ // Make sure to do this _after_ making all the OnChannelRedirect calls -+ nsCOMPtr<nsIURI> origURI; -+ GetOriginalURI(getter_AddRefs(origURI)); -+ newChannel->SetOriginalURI(origURI); -+ rv = newChannel->AsyncOpen(mListener, mListenerContext); - } - } - } - - if (NS_FAILED(rv)) - Cancel(rv); - } - ---- .pc/460425_att352061-backport2.patch/netwerk/protocol/http/src/nsHttpChannel.cpp 2006-07-21 00:59:31.000000000 +0200 -+++ netwerk/protocol/http/src/nsHttpChannel.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -997,16 +997,19 @@ nsHttpChannel::ReplaceWithProxy(nsIProxy - return rv; - - // Inform consumers about this fake redirect - PRUint32 flags = nsIChannelEventSink::REDIRECT_INTERNAL; - rv = gHttpHandler->OnChannelRedirect(this, newChannel, flags); - if (NS_FAILED(rv)) - return rv; - -+ // Make sure to do this _after_ calling OnChannelRedirect -+ newChannel->SetOriginalURI(mOriginalURI); -+ - // open new channel - rv = newChannel->AsyncOpen(mListener, mListenerContext); - if (NS_FAILED(rv)) - return rv; - - mStatus = NS_BINDING_REDIRECTED; - mListener = nsnull; - mListenerContext = nsnull; -@@ -1906,17 +1909,16 @@ nsHttpChannel::SetupReplacementChannel(n - // SSL, then no need to inhibit persistent caching. however, if the - // original channel was not using SSL and has INHIBIT_PERSISTENT_CACHING - // set, then allow the flag to apply to the redirected channel as well. - // since we force set INHIBIT_PERSISTENT_CACHING on all HTTPS channels, - // we only need to check if the original channel was using SSL. - if (mConnectionInfo->UsingSSL()) - newLoadFlags &= ~INHIBIT_PERSISTENT_CACHING; - -- newChannel->SetOriginalURI(mOriginalURI); - newChannel->SetLoadGroup(mLoadGroup); - newChannel->SetNotificationCallbacks(mCallbacks); - newChannel->SetLoadFlags(newLoadFlags); - - nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(newChannel); - if (!httpChannel) - return NS_OK; // no other options to set - -@@ -2087,16 +2089,19 @@ nsHttpChannel::ProcessRedirection(PRUint - if (redirectType == 301) // Moved Permanently - redirectFlags = nsIChannelEventSink::REDIRECT_PERMANENT; - else - redirectFlags = nsIChannelEventSink::REDIRECT_TEMPORARY; - rv = gHttpHandler->OnChannelRedirect(this, newChannel, redirectFlags); - if (NS_FAILED(rv)) - return rv; - -+ // Make sure to do this _after_ calling OnChannelRedirect -+ newChannel->SetOriginalURI(mOriginalURI); -+ - // And now, the deprecated way - nsCOMPtr<nsIHttpEventSink> httpEventSink; - GetCallback(httpEventSink); - if (httpEventSink) { - // NOTE: nsIHttpEventSink is only used for compatibility with pre-1.8 - // versions. - rv = httpEventSink->OnRedirect(this, newChannel); - if (NS_FAILED(rv)) return rv; ---- .pc/460425_att352061-backport2.patch/uriloader/base/nsDocLoader.cpp 2006-02-06 20:52:11.000000000 +0100 -+++ uriloader/base/nsDocLoader.cpp 2009-01-30 12:39:37.000000000 +0100 -@@ -1397,25 +1397,16 @@ PRInt64 nsDocLoader::CalculateMaxProgres - } - - NS_IMETHODIMP nsDocLoader::OnChannelRedirect(nsIChannel *aOldChannel, - nsIChannel *aNewChannel, - PRUint32 aFlags) - { - if (aOldChannel) - { -- nsresult rv; -- nsCOMPtr<nsIURI> oldURI, newURI; -- -- rv = aOldChannel->GetOriginalURI(getter_AddRefs(oldURI)); -- if (NS_FAILED(rv)) return rv; -- -- rv = aNewChannel->GetURI(getter_AddRefs(newURI)); -- if (NS_FAILED(rv)) return rv; -- - nsLoadFlags loadFlags = 0; - PRInt32 stateFlags = nsIWebProgressListener::STATE_REDIRECTING | - nsIWebProgressListener::STATE_IS_REQUEST; - - aOldChannel->GetLoadFlags(&loadFlags); - // If the document channel is being redirected, then indicate that the - // document is being redirected in the notification... - if (loadFlags & nsIChannel::LOAD_DOCUMENT_URI) ---- .pc/460425_att352061-backport2.patch/xpcom/io/nsLocalFileUnix.cpp 2008-10-29 06:06:16.000000000 +0100 -+++ xpcom/io/nsLocalFileUnix.cpp 2009-01-30 12:58:52.000000000 +0100 -@@ -1295,21 +1295,16 @@ nsLocalFile::IsReadable(PRBool *_retval) - - NS_IMETHODIMP - nsLocalFile::IsExecutable(PRBool *_retval) - { - CHECK_mPath(); - NS_ENSURE_ARG_POINTER(_retval); - struct stat buf; - -- if (IsDesktopFile()) { -- *_retval = PR_TRUE; -- return NS_OK; -- } -- - *_retval = (stat(mPath.get(), &buf) == 0); - if (*_retval || errno == EACCES) { - *_retval = *_retval && (buf.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH )); - return NS_OK; - } - return NSRESULT_FOR_ERRNO(); - } - #else -@@ -1350,21 +1345,16 @@ nsLocalFile::IsReadable(PRBool *_retval) - } - - NS_IMETHODIMP - nsLocalFile::IsExecutable(PRBool *_retval) - { - CHECK_mPath(); - NS_ENSURE_ARG_POINTER(_retval); - -- if (IsDesktopFile()) { -- *_retval = PR_TRUE; -- return NS_OK; -- } -- - *_retval = (access(mPath.get(), X_OK) == 0); - if (*_retval || errno == EACCES) - return NS_OK; - return NSRESULT_FOR_ERRNO(); - } - #endif - NS_IMETHODIMP - nsLocalFile::IsDirectory(PRBool *_retval) -@@ -1780,18 +1770,8 @@ void - nsLocalFile::GlobalInit() - { - } - - void - nsLocalFile::GlobalShutdown() - { - } -- --PRBool --nsLocalFile::IsDesktopFile() --{ -- // Just needs to be good enough to match nsFileProtocolHandler::ReadURLFile -- nsCAutoString leafName; -- nsresult rv = GetNativeLeafName(leafName); -- return NS_FAILED(rv) || -- StringEndsWith(leafName, NS_LITERAL_CSTRING(".desktop")); --} ---- .pc/460425_att352061-backport2.patch/xpcom/io/nsLocalFileUnix.h 2009-01-30 12:58:27.000000000 +0100 -+++ xpcom/io/nsLocalFileUnix.h 2009-01-30 12:58:57.000000000 +0100 -@@ -122,13 +122,11 @@ protected: - - void InvalidateCache() { - mHaveCachedStat = PR_FALSE; - } - nsresult FillStatCache(); - - nsresult CreateAndKeepOpen(PRUint32 type, PRIntn flags, - PRUint32 permissions, PRFileDesc **_retval); -- -- PRBool IsDesktopFile(); - }; - - #endif /* _nsLocalFileUNIX_H_ */ diff --git a/www/firefox36/files/patch-ff-466937 b/www/firefox36/files/patch-ff-466937 deleted file mode 100644 index 308171d42976..000000000000 --- a/www/firefox36/files/patch-ff-466937 +++ /dev/null @@ -1,46 +0,0 @@ -Index: browser/components/sessionstore/src/nsSessionStore.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/components/sessionstore/src/nsSessionStore.js,v -retrieving revision 1.5.2.54 -diff -u -8 -d -p -r1.5.2.54 nsSessionStore.js ---- browser/components/sessionstore/src/nsSessionStore.js 20 Nov 2008 22:12:06 -0000 1.5.2.54 -+++ browser/components/sessionstore/src/nsSessionStore.js 27 Nov 2008 21:00:18 -0000 -@@ -919,17 +919,18 @@ SessionStoreService.prototype = { - * @returns bool - */ - _saveTextData: function sss_saveTextData(aPanel, aTextarea) { - var wrappedTextarea = XPCNativeWrapper(aTextarea); - var id = wrappedTextarea.id ? "#" + wrappedTextarea.id : - wrappedTextarea.name; - if (!id - || !(wrappedTextarea instanceof Ci.nsIDOMHTMLTextAreaElement -- || wrappedTextarea instanceof Ci.nsIDOMHTMLInputElement && wrappedTextarea.type != "password")) { -+ || wrappedTextarea instanceof Ci.nsIDOMHTMLInputElement && -+ wrappedTextarea.type != "password" && wrappedTextarea.type != "file")) { - return false; // nothing to save - } - if (/^(?:\d+\|)+/.test(id)) { - // text could be restored into a subframe, so skip it (see bug 463206) - return false; - } - - if (!aPanel.__SS_text) { -@@ -1498,17 +1499,17 @@ SessionStoreService.prototype = { - - var textArray = this.__SS_restore_text ? this.__SS_restore_text.split(" ") : []; - function restoreTextData(aContent, aPrefix, aURL) { - textArray.forEach(function(aEntry) { - if (/^((?:\d+\|)*)(#?)([^\s=]+)=(.*)$/.test(aEntry) && - RegExp.$1 == aPrefix && hasExpectedURL(aContent.document, aURL)) { - var document = aContent.document; - var node = RegExp.$2 ? document.getElementById(RegExp.$3) : document.getElementsByName(RegExp.$3)[0] || null; -- if (node && "value" in node) { -+ if (node && "value" in node && node.type != "file") { - node.value = decodeURI(RegExp.$4); - - var event = document.createEvent("UIEvents"); - event.initUIEvent("input", true, true, aContent, 0); - node.dispatchEvent(event); - } - } - }); diff --git a/www/firefox36/files/patch-ff-473709 b/www/firefox36/files/patch-ff-473709 deleted file mode 100644 index 71a89f501b4c..000000000000 --- a/www/firefox36/files/patch-ff-473709 +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/js/src/jsregexp.c b/js/src/jsregexp.c ---- js/src/jsregexp.c -+++ js/src/jsregexp.c -@@ -4148,20 +4148,22 @@ js_NewRegExpObject(JSContext *cx, JSToke - JSString *str; - JSObject *obj; - JSRegExp *re; - JSTempValueRooter tvr; - - str = js_NewStringCopyN(cx, chars, length, 0); - if (!str) - return NULL; -+ JS_PUSH_TEMP_ROOT_STRING(cx, str, &tvr); - re = js_NewRegExp(cx, ts, str, flags, JS_FALSE); -- if (!re) -- return NULL; -- JS_PUSH_TEMP_ROOT_STRING(cx, str, &tvr); -+ if (!re) { -+ JS_POP_TEMP_ROOT(cx, &tvr); -+ return NULL; -+ } - obj = js_NewObject(cx, &js_RegExpClass, NULL, NULL); - if (!obj || !JS_SetPrivate(cx, obj, re)) { - js_DestroyRegExp(cx, re); - obj = NULL; - } - if (obj && !js_SetLastIndex(cx, obj, 0)) - obj = NULL; - JS_POP_TEMP_ROOT(cx, &tvr); diff --git a/www/firefox36/files/patch-ff-475136 b/www/firefox36/files/patch-ff-475136 deleted file mode 100644 index 67994f9c9b8a..000000000000 --- a/www/firefox36/files/patch-ff-475136 +++ /dev/null @@ -1,108 +0,0 @@ -diff -up mozilla/content/base/src/nsStyleLinkElement.cpp.475136 mozilla/content/base/src/nsStyleLinkElement.cpp ---- content/base/src/nsStyleLinkElement.cpp.475136 2005-04-19 03:27:09.000000000 +0200 -+++ content/base/src/nsStyleLinkElement.cpp 2009-02-17 18:01:21.000000000 +0100 -@@ -63,10 +63,7 @@ nsStyleLinkElement::nsStyleLinkElement() - - nsStyleLinkElement::~nsStyleLinkElement() - { -- nsCOMPtr<nsICSSStyleSheet> cssSheet = do_QueryInterface(mStyleSheet); -- if (cssSheet) { -- cssSheet->SetOwningNode(nsnull); -- } -+ nsStyleLinkElement::SetStyleSheet(nsnull); - } - - NS_IMETHODIMP -@@ -199,7 +196,7 @@ nsStyleLinkElement::UpdateStyleSheet(nsI - aOldDocument->BeginUpdate(UPDATE_STYLE); - aOldDocument->RemoveStyleSheet(mStyleSheet); - aOldDocument->EndUpdate(UPDATE_STYLE); -- mStyleSheet = nsnull; -+ nsStyleLinkElement::SetStyleSheet(nsnull); - } - - if (mDontLoadStyle || !mUpdatesEnabled) { -@@ -245,7 +242,7 @@ nsStyleLinkElement::UpdateStyleSheet(nsI - doc->BeginUpdate(UPDATE_STYLE); - doc->RemoveStyleSheet(mStyleSheet); - doc->EndUpdate(UPDATE_STYLE); -- mStyleSheet = nsnull; -+ nsStyleLinkElement::SetStyleSheet(nsnull); - } - - if (!uri && !isInline) { -diff -up mozilla/content/base/src/nsStyleLinkElement.h.475136 mozilla/content/base/src/nsStyleLinkElement.h ---- content/base/src/nsStyleLinkElement.h.475136 2004-09-09 19:32:34.000000000 +0200 -+++ content/base/src/nsStyleLinkElement.h 2009-02-17 18:12:08.000000000 +0100 -@@ -72,6 +72,7 @@ public: - - static void ParseLinkTypes(const nsAString& aTypes, nsStringArray& aResult); - -+ - protected: - virtual void GetStyleSheetURL(PRBool* aIsInline, - nsIURI** aURI) = 0; -@@ -79,13 +80,16 @@ protected: - nsAString& aType, - nsAString& aMedia, - PRBool* aIsAlternate) = 0; -+ nsIStyleSheet* GetStyleSheet() { return mStyleSheet; } - - -- nsCOMPtr<nsIStyleSheet> mStyleSheet; - nsCOMPtr<nsIParser> mParser; - PRPackedBool mDontLoadStyle; - PRPackedBool mUpdatesEnabled; - PRUint32 mLineNumber; -+ -+private: -+ nsCOMPtr<nsIStyleSheet> mStyleSheet; - }; - - #endif /* nsStyleLinkElement_h___ */ -diff -up mozilla/content/html/content/src/nsHTMLLinkElement.cpp.475136 mozilla/content/html/content/src/nsHTMLLinkElement.cpp ---- content/html/content/src/nsHTMLLinkElement.cpp.475136 2005-08-10 22:21:42.000000000 +0200 -+++ content/html/content/src/nsHTMLLinkElement.cpp 2009-02-17 18:14:51.000000000 +0100 -@@ -159,7 +159,7 @@ NS_IMPL_DOM_CLONENODE(nsHTMLLinkElement) - NS_IMETHODIMP - nsHTMLLinkElement::GetDisabled(PRBool* aDisabled) - { -- nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(mStyleSheet)); -+ nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(GetStyleSheet())); - nsresult result = NS_OK; - - if (ss) { -@@ -174,7 +174,7 @@ nsHTMLLinkElement::GetDisabled(PRBool* a - NS_IMETHODIMP - nsHTMLLinkElement::SetDisabled(PRBool aDisabled) - { -- nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(mStyleSheet)); -+ nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(GetStyleSheet())); - nsresult result = NS_OK; - - if (ss) { -diff -up mozilla/content/html/content/src/nsHTMLStyleElement.cpp.475136 mozilla/content/html/content/src/nsHTMLStyleElement.cpp ---- content/html/content/src/nsHTMLStyleElement.cpp.475136 2005-04-19 00:58:30.000000000 +0200 -+++ content/html/content/src/nsHTMLStyleElement.cpp 2009-02-17 18:01:21.000000000 +0100 -@@ -141,8 +141,8 @@ nsHTMLStyleElement::GetDisabled(PRBool* - { - nsresult result = NS_OK; - -- if (mStyleSheet) { -- nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(mStyleSheet)); -+ if (GetStyleSheet()) { -+ nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(GetStyleSheet())); - - if (ss) { - result = ss->GetDisabled(aDisabled); -@@ -160,8 +160,8 @@ nsHTMLStyleElement::SetDisabled(PRBool a - { - nsresult result = NS_OK; - -- if (mStyleSheet) { -- nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(mStyleSheet)); -+ if (GetStyleSheet()) { -+ nsCOMPtr<nsIDOMStyleSheet> ss(do_QueryInterface(GetStyleSheet())); - - if (ss) { - result = ss->SetDisabled(aDisabled); diff --git a/www/firefox36/files/patch-ff-485217 b/www/firefox36/files/patch-ff-485217 deleted file mode 100644 index 57b368857d9f..000000000000 --- a/www/firefox36/files/patch-ff-485217 +++ /dev/null @@ -1,27 +0,0 @@ -Bug 485217 - Pop the eval context before returning. r+sr=peterv - -diff --git a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp ---- extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp -+++ extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp -@@ -408,20 +408,19 @@ nsresult txXSLKey::testNode(const txXPat - if (key->matchPattern->matches(aNode, &aEs)) { - txSingleNodeContext evalContext(aNode, &aEs); - nsresult rv = aEs.pushEvalContext(&evalContext); - NS_ENSURE_SUCCESS(rv, rv); - - nsRefPtr<txAExprResult> exprResult; - rv = key->useExpr->evaluate(&evalContext, - getter_AddRefs(exprResult)); -+ aEs.popEvalContext(); - NS_ENSURE_SUCCESS(rv, rv); - -- aEs.popEvalContext(); -- - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult)); - PRInt32 i; - for (i = 0; i < res->size(); ++i) { - val.Truncate(); - txXPathNodeUtils::appendNodeValue(res->get(i), val); diff --git a/www/firefox36/files/patch-ff-485286 b/www/firefox36/files/patch-ff-485286 deleted file mode 100644 index 1ec049793617..000000000000 --- a/www/firefox36/files/patch-ff-485286 +++ /dev/null @@ -1,40 +0,0 @@ -Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking a=ss - -diff --git a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp ---- extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp -+++ extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp -@@ -401,26 +401,30 @@ nsresult txXSLKey::testNode(const txXPat - txExecutionState& aEs) - { - nsAutoString val; - txListIterator iter(&mKeys); - while (iter.hasNext()) - { - Key* key = (Key*)iter.next(); - if (key->matchPattern->matches(aNode, &aEs)) { -- txSingleNodeContext evalContext(aNode, &aEs); -- nsresult rv = aEs.pushEvalContext(&evalContext); -+ txSingleNodeContext *evalContext = -+ new txSingleNodeContext(aNode, &aEs); -+ NS_ENSURE_TRUE(evalContext, NS_ERROR_OUT_OF_MEMORY); -+ -+ nsresult rv = aEs.pushEvalContext(evalContext); - NS_ENSURE_SUCCESS(rv, rv); - - nsRefPtr<txAExprResult> exprResult; -- rv = key->useExpr->evaluate(&evalContext, -+ rv = key->useExpr->evaluate(evalContext, - getter_AddRefs(exprResult)); -- aEs.popEvalContext(); - NS_ENSURE_SUCCESS(rv, rv); - -+ delete aEs.popEvalContext(); -+ - if (exprResult->getResultType() == txAExprResult::NODESET) { - txNodeSet* res = NS_STATIC_CAST(txNodeSet*, - NS_STATIC_CAST(txAExprResult*, - exprResult)); - PRInt32 i; - for (i = 0; i < res->size(); ++i) { - val.Truncate(); - txXPathNodeUtils::appendNodeValue(res->get(i), val); diff --git a/www/firefox36/files/patch-js_src_Makefile.in b/www/firefox36/files/patch-js_src_Makefile.in deleted file mode 100644 index fb0bd7f1986b..000000000000 --- a/www/firefox36/files/patch-js_src_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006 -+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006 -@@ -244,6 +244,7 @@ - endif - - LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS)) -+LDFLAGS += -lc - - # BeOS and HP-UX do not require the extra linking of "-lm" - ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH))) diff --git a/www/firefox36/files/patch-js_src_jsnum.c b/www/firefox36/files/patch-js_src_jsnum.c deleted file mode 100644 index a3ef2769ab9c..000000000000 --- a/www/firefox36/files/patch-js_src_jsnum.c +++ /dev/null @@ -1,28 +0,0 @@ ---- js/src/jsnum.c.orig Sun Nov 5 18:37:07 2006 -+++ js/src/jsnum.c Sun Nov 5 18:42:31 2006 -@@ -45,6 +45,9 @@ - #if defined(XP_WIN) || defined(XP_OS2) - #include <float.h> - #endif -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #include <locale.h> - #include <limits.h> - #include <math.h> -@@ -532,7 +535,15 @@ static jsdouble NaN; - - #else - -+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 -+#include <fenv.h> -+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) -+ -+#else -+ - #define FIX_FPU() ((void)0) -+ -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ - - #endif - diff --git a/www/firefox36/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/firefox36/files/patch-js_src_liveconnect_nsISecureLiveconnect.h deleted file mode 100644 index a672de913dd6..000000000000 --- a/www/firefox36/files/patch-js_src_liveconnect_nsISecureLiveconnect.h +++ /dev/null @@ -1,14 +0,0 @@ ---- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 -+++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 -@@ -51,7 +51,11 @@ - #include "nsIFactory.h" - #include "jni.h" - -+#if JS_BYTES_PER_WORD == 8 -+typedef jlong jsobject; -+#else - typedef jint jsobject; -+#endif - - class nsISecureLiveconnect : public nsISupports { - public: diff --git a/www/firefox36/files/patch-libm b/www/firefox36/files/patch-libm deleted file mode 100644 index d9295c9068d4..000000000000 --- a/www/firefox36/files/patch-libm +++ /dev/null @@ -1,9 +0,0 @@ ---- js/Makefile.in Sun Mar 23 14:36:00 2003 -+++ js/Makefile.in Thu Aug 4 23:08:06 2005 -@@ -46,5 +46,5 @@ - # - --DIRS = src/fdlibm src -+DIRS = src - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox36/files/patch-modules_libpref_src_init_all.js b/www/firefox36/files/patch-modules_libpref_src_init_all.js deleted file mode 100644 index 1700380a53ec..000000000000 --- a/www/firefox36/files/patch-modules_libpref_src_init_all.js +++ /dev/null @@ -1,53 +0,0 @@ ---- modules/libpref/src/init/all.js.orig Mon Feb 13 22:58:15 2006 -+++ modules/libpref/src/init/all.js Tue May 2 00:32:55 2006 -@@ -1883,33 +1883,33 @@ - - // th - --pref("font.name.serif.tr", "Times"); --pref("font.name.sans-serif.tr", "Helvetica"); --pref("font.name.monospace.tr", "Courier"); -+pref("font.name.serif.tr", "serif"); -+pref("font.name.sans-serif.tr", "sans-serif"); -+pref("font.name.monospace.tr", "monospace"); - - pref("font.name.serif.x-baltic", "serif"); - pref("font.name.sans-serif.x-baltic", "sans-serif"); - pref("font.name.monospace.x-baltic", "monospace"); - --pref("font.name.serif.x-central-euro", "Times"); --pref("font.name.sans-serif.x-central-euro", "Helvetica"); --pref("font.name.monospace.x-central-euro", "Courier"); -+pref("font.name.serif.x-central-euro", "serif"); -+pref("font.name.sans-serif.x-central-euro", "sans-serif"); -+pref("font.name.monospace.x-central-euro", "monospace"); - - pref("font.name.serif.x-cyrillic", "serif"); - pref("font.name.sans-serif.x-cyrillic", "sans-serif"); - pref("font.name.monospace.x-cyrillic", "monospace"); - --pref("font.name.serif.x-unicode", "Times"); --pref("font.name.sans-serif.x-unicode", "Helvetica"); --pref("font.name.monospace.x-unicode", "Courier"); -- --pref("font.name.serif.x-user-def", "Times"); --pref("font.name.sans-serif.x-user-def", "Helvetica"); --pref("font.name.monospace.x-user-def", "Courier"); -- --pref("font.name.serif.x-western", "Times"); --pref("font.name.sans-serif.x-western", "Helvetica"); --pref("font.name.monospace.x-western", "Courier"); -+pref("font.name.serif.x-unicode", "serif"); -+pref("font.name.sans-serif.x-unicode", "sans-serif"); -+pref("font.name.monospace.x-unicode", "monospace"); -+ -+pref("font.name.serif.x-user-def", "serif"); -+pref("font.name.sans-serif.x-user-def", "sans-serif"); -+pref("font.name.monospace.x-user-def", "monospace"); -+ -+pref("font.name.serif.x-western", "serif"); -+pref("font.name.sans-serif.x-western", "sans-serif"); -+pref("font.name.monospace.x-western", "monospace"); - - pref("font.name.serif.zh-CN", "serif"); - pref("font.name.sans-serif.zh-CN", "sans-serif"); diff --git a/www/firefox36/files/patch-security-coreconf-FreeBSD.mk b/www/firefox36/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 0f7a04a0279f..000000000000 --- a/www/firefox36/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,24 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 -+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 -@@ -45,8 +45,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -73,7 +77,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif diff --git a/www/firefox36/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox36/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229ccd..000000000000 --- a/www/firefox36/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/firefox36/files/patch-storage_build_Makefile.in b/www/firefox36/files/patch-storage_build_Makefile.in deleted file mode 100644 index 18202a5a61d8..000000000000 --- a/www/firefox36/files/patch-storage_build_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 -+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 -@@ -77,6 +77,7 @@ - $(EXTRA_DSO_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ -+ %%PTHREAD_LIBS%% \ - $(NULL) - - include $(topsrcdir)/config/rules.mk diff --git a/www/firefox36/files/patch-sysnss b/www/firefox36/files/patch-sysnss deleted file mode 100644 index 3f8bf3538128..000000000000 --- a/www/firefox36/files/patch-sysnss +++ /dev/null @@ -1,182 +0,0 @@ ---- Makefile.in Tue Sep 14 16:59:40 2004 -+++ Makefile.in Tue Aug 2 08:26:55 2005 -@@ -102,6 +102,4 @@ - # tier 1 - 3rd party individual libraries - # --tier_1_dirs += dbm -- - ifndef MOZ_NATIVE_JPEG - tier_1_dirs += jpeg ---- security/manager/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk ---- security/manager/Makefile.in.orig 2008-05-23 19:45:26.000000000 -0400 -+++ security/manager/Makefile.in 2008-07-17 14:59:30.000000000 -0400 -@@ -54,22 +54,13 @@ PACKAGE_VARS += \ - SSL3_LIB \ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) -- --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) --SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) --SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) --SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk -- - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -218,11 +209,6 @@ export:: .nss.cleaned - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS - $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - touch $@ - endif - -@@ -249,55 +235,6 @@ else - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/nss/lib/util $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib $(DEFAULT_GMAKE_FLAGS) export -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/freebl $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/softoken $(DEFAULT_GMAKE_FLAGS) libs -- $(MAKE) -C $(topsrcdir)/security/nss-fips/lib/util $(DEFAULT_GMAKE_FLAGS) clean -- # In NSS 3.11.8-3.11.9, lib/ssl/derive.c includes cmd/lib/secutil.h. -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) export -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) DIRS="util base dev pki pki1 certdb certhigh pk11wrap cryptohi nss ssl pkcs12 pkcs7 smime crmf jar ckfw ckfw/builtins" --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -308,42 +245,6 @@ endif - - install:: - ifndef MOZ_NATIVE_NSS -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -360,12 +261,6 @@ ifdef MOZ_XUL - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean --ifndef SKIP_CHK -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean -- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean --endif - endif - - echo-requires-recursive:: diff --git a/www/firefox36/files/patch-toolkit_xre_nsXREDirProvider.cpp b/www/firefox36/files/patch-toolkit_xre_nsXREDirProvider.cpp deleted file mode 100644 index 0c5a07ab210d..000000000000 --- a/www/firefox36/files/patch-toolkit_xre_nsXREDirProvider.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- toolkit/xre/nsXREDirProvider.cpp.orig Tue Oct 4 11:46:26 2005 -+++ toolkit/xre/nsXREDirProvider.cpp Sun Feb 5 23:54:31 2006 -@@ -820,6 +820,7 @@ - - char* appNameFolder = nsnull; - char profileFolderName[MAXPATHLEN] = "."; -+ char temp[MAXPATHLEN]; - - // Offset 1 for the outermost folder to make it hidden (i.e. using the ".") - char* writing = profileFolderName + 1; -@@ -829,7 +830,6 @@ - rv = localDir->AppendNative(nsDependentCString(profileFolderName)); - NS_ENSURE_SUCCESS(rv, rv); - -- char temp[MAXPATHLEN]; - GetProfileFolderName(temp, gAppData->name); - appNameFolder = temp; - } - diff --git a/www/firefox36/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/firefox36/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/www/firefox36/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/firefox36/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox36/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4602..000000000000 --- a/www/firefox36/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a7a7..000000000000 --- a/www/firefox36/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/firefox36/files/patch-xptcall-alpha b/www/firefox36/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/www/firefox36/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/firefox36/files/patch-xptcall-sparc64 b/www/firefox36/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71336..000000000000 --- a/www/firefox36/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/www/firefox36/pkg-descr b/www/firefox36/pkg-descr deleted file mode 100644 index 166df46a0e53..000000000000 --- a/www/firefox36/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Firefox is an award winning, free, open-source web browser for many platforms -and is based on the Mozilla codebase. It is small, fast and easy to use, and -offers many advanced features: - o Popup Blocking - o Tabbed Browsing - o Live Bookmarks (ie. RSS) - o Extensions - o Themes - o FastFind - o Improved Security - -WWW: http://www.mozilla.com/firefox diff --git a/www/firefox36/pkg-message b/www/firefox36/pkg-message deleted file mode 100644 index a2f6c162d5e4..000000000000 --- a/www/firefox36/pkg-message +++ /dev/null @@ -1,32 +0,0 @@ -====================================================================== - -SMB issues: -Network group, machine, and share browsing does not work correctly. - -SFTP: -Only sftp access using public key authentication works. To easily -setup public key authentication to "remote_host": - -ssh-keygen -t dsa -cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" - -The SSH server on remote_host must allow pub key authentication. - -====================================================================== - -Any bug reports should be addressed to the maintainers at: - gnome@FreeBSD.org -You may also Cc: freebsd-ports@FreeBSD.org. Please do not send -bug reports to any other addresses. - -Please include the following information with any bug report: -* Output from 'uname -a'. -* Date/time stamp from www/firefox/Makefile. -* Where/when did the problem occur: configuring, building, or - running firefox -* How can you reproduce the problem? - -Thank you for your help in testing and reporting bugs, and we hope you -enjoy using Firefox. -The Maintainers (gnome@) -====================================================================== |