aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/Makefile2
-rw-r--r--www/firefox35-i18n/Makefile88
-rw-r--r--www/firefox35-i18n/Makefile.lang242
-rw-r--r--www/firefox35-i18n/Makefile.option80
-rw-r--r--www/firefox35-i18n/distinfo148
-rw-r--r--www/firefox35-i18n/pkg-descr3
-rw-r--r--www/firefox35/Makefile122
-rw-r--r--www/firefox35/distinfo2
-rw-r--r--www/firefox35/files/firefox.desktop.in191
-rw-r--r--www/firefox35/files/libsydney_oss16
-rw-r--r--www/firefox35/files/patch-bugzilla-5226351445
-rw-r--r--www/firefox35/files/patch-build_unix_run-mozilla.sh12
-rw-r--r--www/firefox35/files/patch-config_autoconf.mk.in30
-rw-r--r--www/firefox35/files/patch-config_mkdepend_Makefile.in10
-rw-r--r--www/firefox35/files/patch-content-xslt-public-txDouble.h11
-rw-r--r--www/firefox35/files/patch-db_sqlite3_src_Makefile.in11
-rw-r--r--www/firefox35/files/patch-js-src-Makefile.in11
-rw-r--r--www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in11
-rw-r--r--www/firefox35/files/patch-js-src-config_config.mk11
-rw-r--r--www/firefox35/files/patch-js-src-configure13
-rw-r--r--www/firefox35/files/patch-js_src_jsnum.cpp29
-rw-r--r--www/firefox35/files/patch-layout_generic_Makefile.in14
-rw-r--r--www/firefox35/files/patch-media_liboggplay_audio_sydney_audio.h11
-rw-r--r--www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h11
-rw-r--r--www/firefox35/files/patch-security-coreconf-FreeBSD.mk40
-rw-r--r--www/firefox35/files/patch-security_manager_ssl_src_nsNSSComponent.cpp10
-rw-r--r--www/firefox35/files/patch-storage_build_Makefile.in10
-rw-r--r--www/firefox35/files/patch-toolkit_library_Makefile.in11
-rw-r--r--www/firefox35/files/patch-toolkit_mozapps_installer_packager.mk11
-rw-r--r--www/firefox35/files/patch-toolkit_xre_Makefile.in8
-rw-r--r--www/firefox35/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc11
-rw-r--r--www/firefox35/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h20
-rw-r--r--www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp11
-rw-r--r--www/firefox35/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in76
-rw-r--r--www/firefox35/files/releng6_pulseaudio34
-rw-r--r--www/firefox35/pkg-descr13
-rw-r--r--www/firefox35/pkg-message48
37 files changed, 0 insertions, 2827 deletions
diff --git a/www/Makefile b/www/Makefile
index 80a452c0a106..bca98b148445 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -235,8 +235,6 @@
SUBDIR += firefox-i18n
SUBDIR += firefox-remote
SUBDIR += firefox-sync
- SUBDIR += firefox35
- SUBDIR += firefox35-i18n
SUBDIR += firefox36
SUBDIR += firefox36-i18n
SUBDIR += flashplugin-mozilla
diff --git a/www/firefox35-i18n/Makefile b/www/firefox35-i18n/Makefile
deleted file mode 100644
index 58e976dc1c99..000000000000
--- a/www/firefox35-i18n/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# New ports collection makefile for: firefox3-i18n
-# Date created: 28 May 2006
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= firefox35-i18n
-PORTVERSION= 3.5.19
-CATEGORIES= www
-MASTER_SITE_SUBDIR= firefox/releases/${PORTVERSION}/linux-i686/xpi
-PKGNAMEPREFIX=
-DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/}
-DIST_SUBDIR= xpi/${DISTNAME}
-
-MAINTAINER= gecko@FreeBSD.org
-COMMENT= Localized interface for Firefox3.5
-
-USE_FIREFOX= 35
-USE_XPI= *firefox3
-
-USE_SUBMAKE= yes
-
-WDIR= langpack3-*@firefox.mozilla.org
-
-XPI_DISTNAMES= ${FIREFOX_I18N_}
-
-.include "${.CURDIR}/Makefile.option"
-.include <bsd.port.pre.mk>
-
-.ifndef WITHOUT_SWITCHER
-RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher
-.endif
-
-.include "${.CURDIR}/Makefile.lang"
-
-FIREFOX_I18N_?= ${FIREFOX_I18N}
-
-.for dist in ${XPI_DISTNAMES}
-XPI_ID_${dist}= langpack3-${dist}@firefox.mozilla.org
-XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar
-XPI_DIRS_${dist}= chrome
-.endfor
-
-pre-everything::
- @${ECHO_CMD}
- @${ECHO_CMD} "Please define FIREFOX_I18N_ALL to install all languages."
- @${ECHO_CMD}
- @${MKDIR} ${WRKSRC}
-
-do-extract:
- @for lang in ${FIREFOX_I18N_}; do \
- if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack3-$$lang@firefox.mozilla.org);\
- then \
- exit 1; \
- fi \
- done
-
-.if !exists(${OPTIONSFILE}) && !defined(PACKAGE_BUILDING)
-pre-configure: config
-.endif
-
-do-install:
- @${INSTALL} -d ${XPI_LIBDIR} ${XPI_SLDIRS_ALL}
- @${CP} -R ${WRKSRC}/ ${XPI_LIBDIR}/
- @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${WDIR}/
- @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${WDIR}/
- @for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q} ; }
- @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
- @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \
- ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A}
- @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A}
-
- @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A}
-
-post-patch:
- ${FIND} ${WRKSRC} -name install.rdf -print0 | \
- ${XARGS} -0L1 ${REINPLACE_CMD} -i '' -e '/<?xml/,$$!d' \
- -e 's/\(langpack\)/\13/'
-
-List-Langs:
- @fetch -o- "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PORTVERSION}/linux-i686/xpi"|\
- ${PERL} -ne 'if(/.*href="([a-zA-Z-]+).xpi.*/){print "$$1\n"}' |\
- ${AWK} 'BEGIN{ORS=" "}{print $1}END{printf "\nNumber of languages: %d\n",NR}'
-
-.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
-
-.include <bsd.port.post.mk>
diff --git a/www/firefox35-i18n/Makefile.lang b/www/firefox35-i18n/Makefile.lang
deleted file mode 100644
index 3fb291bbbe97..000000000000
--- a/www/firefox35-i18n/Makefile.lang
+++ /dev/null
@@ -1,242 +0,0 @@
-# New ports collection makefile.lang for: firefox3-i18n
-# Date created: 30 Nov 2008
-# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
-# $FreeBSD$
-#
-# Currently, the following 74 languages are supported.
-#
-FIREFOX_I18N_ALL_= af ar as be bg bn-BD bn-IN ca cs cy da de el \
- en-GB eo es-AR es-CL es-ES es-MX et eu fa fi \
- fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id is \
- it ja ka kk kn ko ku lt lv mk ml mn mr nb-NO \
- nl nn-NO oc or pa-IN pl pt-BR pt-PT rm ro ru \
- si sk sl sq sr sv-SE ta-LK ta te th tr uk vi \
- zh-CN zh-TW
-
-.if defined(FIREFOX_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package)
-FIREFOX_I18N= ${FIREFOX_I18N_ALL_}
-.else
-.ifndef WITHOUT_LANG_AF
-FIREFOX_I18N+= af
-.endif
-.ifndef WITHOUT_LANG_AR
-FIREFOX_I18N+= ar
-.endif
-.ifndef WITHOUT_LANG_AS
-FIREFOX_I18N+= as
-.endif
-.ifndef WITHOUT_LANG_BE
-FIREFOX_I18N+= be
-.endif
-.ifndef WITHOUT_LANG_BG
-FIREFOX_I18N+= bg
-.endif
-.ifndef WITHOUT_LANG_BB
-FIREFOX_I18N+= bn-BD
-.endif
-.ifndef WITHOUT_LANG_BN
-FIREFOX_I18N+= bn-IN
-.endif
-.ifndef WITHOUT_LANG_CA
-FIREFOX_I18N+= ca
-.endif
-.ifndef WITHOUT_LANG_CS
-FIREFOX_I18N+= cs
-.endif
-.ifndef WITHOUT_LANG_CY
-FIREFOX_I18N+= cy
-.endif
-.ifndef WITHOUT_LANG_DA
-FIREFOX_I18N+= da
-.endif
-.ifndef WITHOUT_LANG_DE
-FIREFOX_I18N+= de
-.endif
-.ifndef WITHOUT_LANG_EL
-FIREFOX_I18N+= el
-.endif
-.ifndef WITHOUT_LANG_GB
-FIREFOX_I18N+= en-GB
-.endif
-.ifndef WITHOUT_LANG_EO
-FIREFOX_I18N+= eo
-.endif
-.ifndef WITHOUT_LANG_SA
-FIREFOX_I18N+= es-AR
-.endif
-.ifndef WITHOUT_LANG_SC
-FIREFOX_I18N+= es-CL
-.endif
-.ifndef WITHOUT_LANG_ES
-FIREFOX_I18N+= es-ES
-.endif
-.ifndef WITHOUT_LANG_SM
-FIREFOX_I18N+= es-MX
-.endif
-.ifndef WITHOUT_LANG_ET
-FIREFOX_I18N+= et
-.endif
-.ifndef WITHOUT_LANG_EU
-FIREFOX_I18N+= eu
-.endif
-.ifndef WITHOUT_LANG_FA
-FIREFOX_I18N+= fa
-.endif
-.ifndef WITHOUT_LANG_FI
-FIREFOX_I18N+= fi
-.endif
-.ifndef WITHOUT_LANG_FR
-FIREFOX_I18N+= fr
-.endif
-.ifndef WITHOUT_LANG_FY
-FIREFOX_I18N+= fy-NL
-.endif
-.ifndef WITHOUT_LANG_GA
-FIREFOX_I18N+= ga-IE
-.endif
-.ifndef WITHOUT_LANG_GL
-FIREFOX_I18N+= gl
-.endif
-.ifndef WITHOUT_LANG_GU
-FIREFOX_I18N+= gu-IN
-.endif
-.ifndef WITHOUT_LANG_HE
-FIREFOX_I18N+= he
-.endif
-.ifndef WITHOUT_LANG_HI
-FIREFOX_I18N+= hi-IN
-.endif
-.ifndef WITHOUT_LANG_HR
-FIREFOX_I18N+= hr
-.endif
-.ifndef WITHOUT_LANG_HU
-FIREFOX_I18N+= hu
-.endif
-.ifndef WITHOUT_LANG_ID
-FIREFOX_I18N+= id
-.endif
-.ifndef WITHOUT_LANG_IS
-FIREFOX_I18N+= is
-.endif
-.ifndef WITHOUT_LANG_IT
-FIREFOX_I18N+= it
-.endif
-.ifndef WITHOUT_LANG_JA
-FIREFOX_I18N+= ja
-.endif
-.ifndef WITHOUT_LANG_KA
-FIREFOX_I18N+= ka
-.endif
-.ifndef WITHOUT_LANG_KK
-FIREFOX_I18N+= kk
-.endif
-.ifndef WITHOUT_LANG_KN
-FIREFOX_I18N+= kn
-.endif
-.ifndef WITHOUT_LANG_KO
-FIREFOX_I18N+= ko
-.endif
-.ifndef WITHOUT_LANG_KU
-FIREFOX_I18N+= ku
-.endif
-.ifndef WITHOUT_LANG_LT
-FIREFOX_I18N+= lt
-.endif
-.ifndef WITHOUT_LANG_LV
-FIREFOX_I18N+= lv
-.endif
-.ifndef WITHOUT_LANG_MK
-FIREFOX_I18N+= mk
-.endif
-.ifndef WITHOUT_LANG_ML
-FIREFOX_I18N+= ml
-.endif
-.ifndef WITHOUT_LANG_MN
-FIREFOX_I18N+= mn
-.endif
-.ifndef WITHOUT_LANG_MR
-FIREFOX_I18N+= mr
-.endif
-.ifndef WITHOUT_LANG_NB
-FIREFOX_I18N+= nb-NO
-.endif
-.ifndef WITHOUT_LANG_NL
-FIREFOX_I18N+= nl
-.endif
-.ifndef WITHOUT_LANG_NN
-FIREFOX_I18N+= nn-NO
-.endif
-.ifndef WITHOUT_LANG_OC
-FIREFOX_I18N+= oc
-.endif
-.ifndef WITHOUT_LANG_OR
-FIREFOX_I18N+= or
-.endif
-.ifndef WITHOUT_LANG_PA
-FIREFOX_I18N+= pa-IN
-.endif
-.ifndef WITHOUT_LANG_PL
-FIREFOX_I18N+= pl
-.endif
-.ifndef WITHOUT_LANG_BR
-FIREFOX_I18N+= pt-BR
-.endif
-.ifndef WITHOUT_LANG_PT
-FIREFOX_I18N+= pt-PT
-.endif
-.ifndef WITHOUT_LANG_RM
-FIREFOX_I18N+= rm
-.endif
-.ifndef WITHOUT_LANG_RO
-FIREFOX_I18N+= ro
-.endif
-.ifndef WITHOUT_LANG_RU
-FIREFOX_I18N+= ru
-.endif
-.ifndef WITHOUT_LANG_SI
-FIREFOX_I18N+= si
-.endif
-.ifndef WITHOUT_LANG_SK
-FIREFOX_I18N+= sk
-.endif
-.ifndef WITHOUT_LANG_SL
-FIREFOX_I18N+= sl
-.endif
-.ifndef WITHOUT_LANG_SQ
-FIREFOX_I18N+= sq
-.endif
-.ifndef WITHOUT_LANG_SR
-FIREFOX_I18N+= sr
-.endif
-.ifndef WITHOUT_LANG_SV
-FIREFOX_I18N+= sv-SE
-.endif
-.ifndef WITHOUT_LANG_TL
-FIREFOX_I18N+= tl
-.endif
-.ifndef WITHOUT_LANG_TA
-FIREFOX_I18N+= ta
-.endif
-.ifndef WITHOUT_LANG_TE
-FIREFOX_I18N+= te
-.endif
-.ifndef WITHOUT_LANG_TH
-FIREFOX_I18N+= th
-.endif
-.ifndef WITHOUT_LANG_TR
-FIREFOX_I18N+= tr
-.endif
-.ifndef WITHOUT_LANG_UK
-FIREFOX_I18N+= uk
-.endif
-.ifndef WITHOUT_LANG_VI
-FIREFOX_I18N+= vi
-.endif
-.ifndef WITHOUT_LANG_CN
-FIREFOX_I18N+= zh-CN
-.endif
-.ifndef WITHOUT_LANG_TW
-FIREFOX_I18N+= zh-TW
-.endif
-.endif
diff --git a/www/firefox35-i18n/Makefile.option b/www/firefox35-i18n/Makefile.option
deleted file mode 100644
index fc3ded935e6f..000000000000
--- a/www/firefox35-i18n/Makefile.option
+++ /dev/null
@@ -1,80 +0,0 @@
-# New ports collection makefile.option for: firefox3-i18n
-# Date created: 30 Nov 2008
-# Whom: Koji Yokota <yokota@res.otaru-uc.ac.jp>
-#
-# $FreeBSD$
-#
-OPTIONS= LANG_AF "Africaans" off \
- LANG_SQ "Albanian" off \
- LANG_AR "Arabic" on \
- LANG_AS "Assamese" off \
- LANG_EU "Basque" off \
- LANG_BN "Bengali" on \
- LANG_BB "Bengali (Bangladesh)" off \
- LANG_BG "Bulgarian" off \
- LANG_BE "Byelorussian" off \
- LANG_CA "Catalan" off \
- LANG_CN "Chinese" on \
- LANG_CS "Czech" off \
- LANG_DA "Danish" off \
- LANG_NL "Dutch" off \
- LANG_GB "English (UK)" off \
- LANG_EO "Esperanto" off \
- LANG_ET "Estonian" off \
- LANG_GL "Galician" off \
- LANG_KA "Georgian" off \
- LANG_DE "German" on \
- LANG_EL "Greek" off \
- LANG_GU "Gujarati" off \
- LANG_FI "Finnish" off \
- LANG_FR "French" on \
- LANG_FY "Frisian" off \
- LANG_GA "Irish" off \
- LANG_HE "Hebrew" off \
- LANG_HI "Hindi" on \
- LANG_HR "Hrvatski" off \
- LANG_HU "Hungarian" off \
- LANG_IS "Icelandic" off \
- LANG_ID "Indonesian" off \
- LANG_IT "Italian" on \
- LANG_JA "Japanese" on \
- LANG_KN "Kannada" off \
- LANG_KK "Kazakh" off \
- LANG_KO "Korean" on \
- LANG_KU "Kurdish" off \
- LANG_LV "Latvian" off \
- LANG_LT "Lithuanian" off \
- LANG_MK "Macedonian" off \
- LANG_ML "Malayalam" off \
- LANG_MR "Marathi" on \
- LANG_MN "Mongolian" off \
- LANG_NB "Norwegian" off \
- LANG_NN "Norwegian Nynorsk" off \
- LANG_OC "Occitan" off \
- LANG_OR "Oriya" off \
- LANG_FA "Persian" off \
- LANG_PL "Polish" off \
- LANG_PT "Portuguese" off \
- LANG_BR "Portuguese (Brazil)" on \
- LANG_PA "Punjabi" on \
- LANG_RO "Romanian" off \
- LANG_RM "Romansh" off \
- LANG_RU "Russian" on \
- LANG_SR "Serbian" off \
- LANG_ES "Spanish" on \
- LANG_SA "Spanish (Argentina)" off \
- LANG_SC "Spanish (Chile)" off \
- LANG_SM "Spanish (Mexico)" off \
- LANG_SI "Singhalese" off \
- LANG_SK "Slovak" off \
- LANG_SL "Slovenian" off \
- LANG_SV "Swedish" off \
- LANG_TW "Taiwanese" off \
- LANG_TA "Tamil" off \
- LANG_TL "Tamil (Sri Lanka)" off \
- LANG_TE "Telugu" on \
- LANG_TH "Thai" off \
- LANG_TR "Turkish" off \
- LANG_UK "Ukrainian" off \
- LANG_VI "Vietnamese" off \
- LANG_CY "Welsh" off
diff --git a/www/firefox35-i18n/distinfo b/www/firefox35-i18n/distinfo
deleted file mode 100644
index 3457119f2991..000000000000
--- a/www/firefox35-i18n/distinfo
+++ /dev/null
@@ -1,148 +0,0 @@
-SHA256 (xpi/firefox35-i18n-3.5.19/af.xpi) = e72c5e6ebfc62656e9bc1edba4cc797ab4aa589d5a40cb92ef2542ef56589337
-SIZE (xpi/firefox35-i18n-3.5.19/af.xpi) = 121084
-SHA256 (xpi/firefox35-i18n-3.5.19/ar.xpi) = 8c1c1e596747120a7e2a565ade4cfc95f88e3f0574608314457b1d89e6956e52
-SIZE (xpi/firefox35-i18n-3.5.19/ar.xpi) = 131419
-SHA256 (xpi/firefox35-i18n-3.5.19/as.xpi) = b197e1c3fd2adc63b144c1eb2299691b02e1411fe6403dfce58b7408ab3de08e
-SIZE (xpi/firefox35-i18n-3.5.19/as.xpi) = 134194
-SHA256 (xpi/firefox35-i18n-3.5.19/be.xpi) = 746ce1744688effe10b1bc2c2350c97e60bf911cb2b158fbfec3cd535a1b45b9
-SIZE (xpi/firefox35-i18n-3.5.19/be.xpi) = 122007
-SHA256 (xpi/firefox35-i18n-3.5.19/bg.xpi) = 03054ae8369edbf6e784d09f71106b455a036d7e8854f5c12d401a3b334dfdfd
-SIZE (xpi/firefox35-i18n-3.5.19/bg.xpi) = 133825
-SHA256 (xpi/firefox35-i18n-3.5.19/bn-BD.xpi) = 33727835e6692a369f14ee1fbaaba10a673e8e114f4115f1e324ae330cd04c44
-SIZE (xpi/firefox35-i18n-3.5.19/bn-BD.xpi) = 140337
-SHA256 (xpi/firefox35-i18n-3.5.19/bn-IN.xpi) = 029621ab6f172dc297e9e355598d79a74cb716ee03771f7c080ad0f9aa65fcbd
-SIZE (xpi/firefox35-i18n-3.5.19/bn-IN.xpi) = 157741
-SHA256 (xpi/firefox35-i18n-3.5.19/ca.xpi) = 9ac546a5abc2ba5632d1e15e30a37d026489e3cc314ea2a005b13f8045674979
-SIZE (xpi/firefox35-i18n-3.5.19/ca.xpi) = 127175
-SHA256 (xpi/firefox35-i18n-3.5.19/cs.xpi) = e94b62fb2105d853f3c587bae1f62a3a822078d458447ee48448d785db468662
-SIZE (xpi/firefox35-i18n-3.5.19/cs.xpi) = 125815
-SHA256 (xpi/firefox35-i18n-3.5.19/cy.xpi) = b1818c09bd8b40d86e8841162488192f293fdecdc9e0704612e4c321df1bd5e9
-SIZE (xpi/firefox35-i18n-3.5.19/cy.xpi) = 121805
-SHA256 (xpi/firefox35-i18n-3.5.19/da.xpi) = 717e885593aba1fdaaa7fe99297c04f0525ab07bbc840f0578c57ff3d7141e58
-SIZE (xpi/firefox35-i18n-3.5.19/da.xpi) = 124921
-SHA256 (xpi/firefox35-i18n-3.5.19/de.xpi) = e3947b8368c55d296c43fb88e39cd74ea8492ff0ef9e8e417028fd77cecf5a59
-SIZE (xpi/firefox35-i18n-3.5.19/de.xpi) = 128411
-SHA256 (xpi/firefox35-i18n-3.5.19/el.xpi) = bc7c312debae58259ca0e0c39da859ac0f3881ec469308c4810f229893a88d5f
-SIZE (xpi/firefox35-i18n-3.5.19/el.xpi) = 134691
-SHA256 (xpi/firefox35-i18n-3.5.19/en-GB.xpi) = 80f55882ebe32a886858db768cadd7e9d7203fe141cab8ec334ca47be80c692d
-SIZE (xpi/firefox35-i18n-3.5.19/en-GB.xpi) = 118764
-SHA256 (xpi/firefox35-i18n-3.5.19/eo.xpi) = c4320af562ef9fc321f0e7ad17384cf9085baefecacfe1fd0dc4979de8229bda
-SIZE (xpi/firefox35-i18n-3.5.19/eo.xpi) = 121451
-SHA256 (xpi/firefox35-i18n-3.5.19/es-AR.xpi) = 8e105d050274f2f7de6e2cf7aafb3ec0fb7f68d4c558fa4cb96ceef171a8f79d
-SIZE (xpi/firefox35-i18n-3.5.19/es-AR.xpi) = 127211
-SHA256 (xpi/firefox35-i18n-3.5.19/es-CL.xpi) = 07c7d30018abc1d7d15ac5cd76b0aec2ae306fe4756ab38d5bf0a2b6d7a3d334
-SIZE (xpi/firefox35-i18n-3.5.19/es-CL.xpi) = 128914
-SHA256 (xpi/firefox35-i18n-3.5.19/es-ES.xpi) = 3574e41d42d78c041230c5fc667d7f85ba465600655f30bc048f055d28ca67f0
-SIZE (xpi/firefox35-i18n-3.5.19/es-ES.xpi) = 108469
-SHA256 (xpi/firefox35-i18n-3.5.19/es-MX.xpi) = 6967d874bd0a60c2e3a57042fe32c10e60c1f98b0c68d0ba4ec5d09d45d13456
-SIZE (xpi/firefox35-i18n-3.5.19/es-MX.xpi) = 127350
-SHA256 (xpi/firefox35-i18n-3.5.19/et.xpi) = 73e5c33245c34497803edf838df1465bb039b7f3ec2f60137c22deb6e31428bd
-SIZE (xpi/firefox35-i18n-3.5.19/et.xpi) = 126524
-SHA256 (xpi/firefox35-i18n-3.5.19/eu.xpi) = 10603dbfa0e5c42b8cc55355fa9b38a495f9ea80d90ab15df89c637c5b6c5b41
-SIZE (xpi/firefox35-i18n-3.5.19/eu.xpi) = 121350
-SHA256 (xpi/firefox35-i18n-3.5.19/fa.xpi) = 73f425fb843c5e905f500032a88dc7f9e75dd6b49cba5be6ba6d2132b3abf798
-SIZE (xpi/firefox35-i18n-3.5.19/fa.xpi) = 137600
-SHA256 (xpi/firefox35-i18n-3.5.19/fi.xpi) = adaab1a8670d7f2ea014d0ec9389df019660333977be8c184f410ce58811084f
-SIZE (xpi/firefox35-i18n-3.5.19/fi.xpi) = 126035
-SHA256 (xpi/firefox35-i18n-3.5.19/fr.xpi) = 86304251bc7c9035d2074500c7df8f3b06c5802ddb3837ba38dae0d546ed8fae
-SIZE (xpi/firefox35-i18n-3.5.19/fr.xpi) = 128208
-SHA256 (xpi/firefox35-i18n-3.5.19/fy-NL.xpi) = 19f4f7345f5400c955d6a899f49f8fce93a554bb5862085558dd849c562730be
-SIZE (xpi/firefox35-i18n-3.5.19/fy-NL.xpi) = 128314
-SHA256 (xpi/firefox35-i18n-3.5.19/ga-IE.xpi) = bdf7ab4da8d21985599a292add0f3ce8e9be609af328a123ac6652f596722915
-SIZE (xpi/firefox35-i18n-3.5.19/ga-IE.xpi) = 127179
-SHA256 (xpi/firefox35-i18n-3.5.19/gl.xpi) = f72913c10561e66649a40800f16f66df1318cc4a6f27caa7077259ea3de7ce2a
-SIZE (xpi/firefox35-i18n-3.5.19/gl.xpi) = 123969
-SHA256 (xpi/firefox35-i18n-3.5.19/gu-IN.xpi) = 6e9a4d7518f9715f09d2bdb7b5ce239a826d649107a6f9a074d5b6dd2415a21f
-SIZE (xpi/firefox35-i18n-3.5.19/gu-IN.xpi) = 145338
-SHA256 (xpi/firefox35-i18n-3.5.19/he.xpi) = b11afe72c0cb0f34749d12282712b1995fcdc8f9ca5d494097cf4159095cb1bc
-SIZE (xpi/firefox35-i18n-3.5.19/he.xpi) = 121474
-SHA256 (xpi/firefox35-i18n-3.5.19/hi-IN.xpi) = bb40e467204b28d433efe504fc2cf0b92a0e2d8ed8529db350a620987dbed750
-SIZE (xpi/firefox35-i18n-3.5.19/hi-IN.xpi) = 141276
-SHA256 (xpi/firefox35-i18n-3.5.19/hr.xpi) = 8b82f1207f691bcd74f99f18a3909ba4a6616b3519ba4be61d4bddd993a2e934
-SIZE (xpi/firefox35-i18n-3.5.19/hr.xpi) = 126932
-SHA256 (xpi/firefox35-i18n-3.5.19/hu.xpi) = 8d8653e26521b7a98156e879cbc276570f4cf8f992f652d2a85e4d567a16de1d
-SIZE (xpi/firefox35-i18n-3.5.19/hu.xpi) = 130937
-SHA256 (xpi/firefox35-i18n-3.5.19/id.xpi) = f8bfd8b1a17ac4c3b7db14a9d78498bf7155fb971e1877618dd7c929f658dd25
-SIZE (xpi/firefox35-i18n-3.5.19/id.xpi) = 103770
-SHA256 (xpi/firefox35-i18n-3.5.19/is.xpi) = fc9023cc9a7e089229722ae546acbf7ba46e175563c9e667d1c40ec8f5248380
-SIZE (xpi/firefox35-i18n-3.5.19/is.xpi) = 122658
-SHA256 (xpi/firefox35-i18n-3.5.19/it.xpi) = cb6d5473af522ebdff94c09c3f661aadadea414f202138e2956550926b9e7951
-SIZE (xpi/firefox35-i18n-3.5.19/it.xpi) = 108031
-SHA256 (xpi/firefox35-i18n-3.5.19/ja.xpi) = 2a9af1e82ae8bb11882718e119675b6712ecc235efe4b3289c89a3692c83e514
-SIZE (xpi/firefox35-i18n-3.5.19/ja.xpi) = 136159
-SHA256 (xpi/firefox35-i18n-3.5.19/ka.xpi) = 8c4e329bc765b960ba78149d9789cb796d675c61fb4962ab49bd217d81e26cab
-SIZE (xpi/firefox35-i18n-3.5.19/ka.xpi) = 153928
-SHA256 (xpi/firefox35-i18n-3.5.19/kk.xpi) = 0b1cf7743553dd395ad432d381b6f50ec74fb1febf3077ba5d48e6e4b7b873ff
-SIZE (xpi/firefox35-i18n-3.5.19/kk.xpi) = 137332
-SHA256 (xpi/firefox35-i18n-3.5.19/kn.xpi) = 9a330d4be2456fd969da39c3dc66994948339dd5955912a06ecd1c22f087d584
-SIZE (xpi/firefox35-i18n-3.5.19/kn.xpi) = 148554
-SHA256 (xpi/firefox35-i18n-3.5.19/ko.xpi) = 0d4edf0f2deb4f81adf0ca7cc337da6faf8f36670845b4644c442a8ced290d90
-SIZE (xpi/firefox35-i18n-3.5.19/ko.xpi) = 115299
-SHA256 (xpi/firefox35-i18n-3.5.19/ku.xpi) = fdf7fd2ede98382560e7f681373ec38034fdf6cd1cb4ce2fa23245610db39e36
-SIZE (xpi/firefox35-i18n-3.5.19/ku.xpi) = 129320
-SHA256 (xpi/firefox35-i18n-3.5.19/lt.xpi) = 1161eaba1cad676781996ec67b6ad027d1bdaac6e12e04f19095449ccd6ebd12
-SIZE (xpi/firefox35-i18n-3.5.19/lt.xpi) = 139077
-SHA256 (xpi/firefox35-i18n-3.5.19/lv.xpi) = 58dc360be03cd39178e40d31f47102ddf3cbb7995d688b5a6628f39ccc167adb
-SIZE (xpi/firefox35-i18n-3.5.19/lv.xpi) = 124454
-SHA256 (xpi/firefox35-i18n-3.5.19/mk.xpi) = d4c5649b00b8cfee558c7e7f3d5880aa2b652e987d9e8b7a3d4110eafbc76374
-SIZE (xpi/firefox35-i18n-3.5.19/mk.xpi) = 127135
-SHA256 (xpi/firefox35-i18n-3.5.19/ml.xpi) = f83dae0deb6304cd61945a3a922b49ba91b578dde90c877c92a778e02addbbce
-SIZE (xpi/firefox35-i18n-3.5.19/ml.xpi) = 151084
-SHA256 (xpi/firefox35-i18n-3.5.19/mn.xpi) = a3e2eef8c48a7993fba1609db92d244bbcb4d0ad1c08542619dd279614eb222f
-SIZE (xpi/firefox35-i18n-3.5.19/mn.xpi) = 132803
-SHA256 (xpi/firefox35-i18n-3.5.19/mr.xpi) = b8356050e5a3f394f98e289a14a0a260cf15ed6528fe02aafa9e0a069a32160c
-SIZE (xpi/firefox35-i18n-3.5.19/mr.xpi) = 139477
-SHA256 (xpi/firefox35-i18n-3.5.19/nb-NO.xpi) = e39125b4294fe2082e27051b8dd7d612ff0e09b1c6f94dbecbc16139ef91bd52
-SIZE (xpi/firefox35-i18n-3.5.19/nb-NO.xpi) = 123337
-SHA256 (xpi/firefox35-i18n-3.5.19/nl.xpi) = 43572f52eacc3f0af1347f221c0076e1876e41b5321c1917fe0dfb1007d38842
-SIZE (xpi/firefox35-i18n-3.5.19/nl.xpi) = 125951
-SHA256 (xpi/firefox35-i18n-3.5.19/nn-NO.xpi) = 938faabf4b3e35a41cad18d8e1b0bce10f71bbf1623efa8c5c72954faf88e68c
-SIZE (xpi/firefox35-i18n-3.5.19/nn-NO.xpi) = 124698
-SHA256 (xpi/firefox35-i18n-3.5.19/oc.xpi) = 026916590bf77e62b7af115c6dc8e9e8ddea5c719814a17ceaa0dcdce9735ac2
-SIZE (xpi/firefox35-i18n-3.5.19/oc.xpi) = 108052
-SHA256 (xpi/firefox35-i18n-3.5.19/or.xpi) = 4dc04629cffcef3608f24fc7a5f52579b02b3c462defd827910219592d0a23f2
-SIZE (xpi/firefox35-i18n-3.5.19/or.xpi) = 141759
-SHA256 (xpi/firefox35-i18n-3.5.19/pa-IN.xpi) = 47b6310ba621a571faf55ad3b918c6209535148b0e0854f28b2d7770e11fbd3d
-SIZE (xpi/firefox35-i18n-3.5.19/pa-IN.xpi) = 141470
-SHA256 (xpi/firefox35-i18n-3.5.19/pl.xpi) = fd540d652acac8b48e47d367dfa68a277e9b1bddb93e16fb62da8618c66a4d10
-SIZE (xpi/firefox35-i18n-3.5.19/pl.xpi) = 130214
-SHA256 (xpi/firefox35-i18n-3.5.19/pt-BR.xpi) = c1ea64f4649bfaec57ab1ffae6ebac612075fec5bea1978a63bcc63cb000c508
-SIZE (xpi/firefox35-i18n-3.5.19/pt-BR.xpi) = 124455
-SHA256 (xpi/firefox35-i18n-3.5.19/pt-PT.xpi) = 45193273fb78c5503ea6adb2821b0bfdab69426b8819329403c5acd03f06a6cf
-SIZE (xpi/firefox35-i18n-3.5.19/pt-PT.xpi) = 124501
-SHA256 (xpi/firefox35-i18n-3.5.19/rm.xpi) = 53ac1c9494869be8c9042f0aa0c99e766ad5a1cdd1dc47d0e2ee88cdc6e1248f
-SIZE (xpi/firefox35-i18n-3.5.19/rm.xpi) = 126813
-SHA256 (xpi/firefox35-i18n-3.5.19/ro.xpi) = 7a4a797bc745d5943afbaa5aa5f39f9a64d0278a57c1c7da3e07f102e3fde4dd
-SIZE (xpi/firefox35-i18n-3.5.19/ro.xpi) = 128429
-SHA256 (xpi/firefox35-i18n-3.5.19/ru.xpi) = f9220c78bd4e709119531f806b98ed8a5e7f5462b5da91b3453e07721e2d433b
-SIZE (xpi/firefox35-i18n-3.5.19/ru.xpi) = 124504
-SHA256 (xpi/firefox35-i18n-3.5.19/si.xpi) = ec11de9904df9365d93896cabeffc09457566e618e9b50ce7805d20161d2c6ff
-SIZE (xpi/firefox35-i18n-3.5.19/si.xpi) = 141813
-SHA256 (xpi/firefox35-i18n-3.5.19/sk.xpi) = 73d3e6cde656e9d576b7104a56649d8dd145cc07b74cc6ec55ceb36273a09cf0
-SIZE (xpi/firefox35-i18n-3.5.19/sk.xpi) = 130124
-SHA256 (xpi/firefox35-i18n-3.5.19/sl.xpi) = 61c0b567712bc6d05b2a12d7790196be7fb1c40256a1685b8261ec297908abad
-SIZE (xpi/firefox35-i18n-3.5.19/sl.xpi) = 123326
-SHA256 (xpi/firefox35-i18n-3.5.19/sq.xpi) = ea9a4235e94af1188fb6d3097f851eae49d56ac3a4a764d69736bf0ab40d6d7d
-SIZE (xpi/firefox35-i18n-3.5.19/sq.xpi) = 120636
-SHA256 (xpi/firefox35-i18n-3.5.19/sr.xpi) = 28aead32149c884cc5558ab06a93a9207e90725df5ef3b2c84f4a3a3ec489f4d
-SIZE (xpi/firefox35-i18n-3.5.19/sr.xpi) = 136206
-SHA256 (xpi/firefox35-i18n-3.5.19/sv-SE.xpi) = 9ea2e8da1aebb64181989e2976698ad18ca2b7deb3e86cfba969ba58478808db
-SIZE (xpi/firefox35-i18n-3.5.19/sv-SE.xpi) = 128154
-SHA256 (xpi/firefox35-i18n-3.5.19/ta-LK.xpi) = 4c2578f0d1f6b5f7c837ff5e3239c9fe91f5677d2a505ec0611a7da4ead8522b
-SIZE (xpi/firefox35-i18n-3.5.19/ta-LK.xpi) = 148032
-SHA256 (xpi/firefox35-i18n-3.5.19/ta.xpi) = a1f345fc82a7c9cb0e7f042e1b24407833dda1f7fecf80b4858aff0d49a4465a
-SIZE (xpi/firefox35-i18n-3.5.19/ta.xpi) = 136497
-SHA256 (xpi/firefox35-i18n-3.5.19/te.xpi) = 5c7d157354cc80ebd7cb3d973025a787e81b805cebb07f19047625ac6870f664
-SIZE (xpi/firefox35-i18n-3.5.19/te.xpi) = 147167
-SHA256 (xpi/firefox35-i18n-3.5.19/th.xpi) = d435c3e1a586650bcbd6f272204b3c94db55892772ea92719878abc9afd7257d
-SIZE (xpi/firefox35-i18n-3.5.19/th.xpi) = 133715
-SHA256 (xpi/firefox35-i18n-3.5.19/tr.xpi) = 9060f5ecad6fece94820d21ac0532c76c3d516fc09a408b1af18348b1b3cfdde
-SIZE (xpi/firefox35-i18n-3.5.19/tr.xpi) = 124805
-SHA256 (xpi/firefox35-i18n-3.5.19/uk.xpi) = eadd006d2bcc9cb2ceafa8ac364e9809be8594ce9abe72189e8459fb40ea9ee8
-SIZE (xpi/firefox35-i18n-3.5.19/uk.xpi) = 142436
-SHA256 (xpi/firefox35-i18n-3.5.19/vi.xpi) = d900b41a64acbc4c3587a3d1faccbcb9502bfb777651cc5ce97e821d62a9f822
-SIZE (xpi/firefox35-i18n-3.5.19/vi.xpi) = 128575
-SHA256 (xpi/firefox35-i18n-3.5.19/zh-CN.xpi) = e2dd6507a920ec4b51a2f1b8ef89eb756c198fcfdb8bff7ea1991a73d8552fe2
-SIZE (xpi/firefox35-i18n-3.5.19/zh-CN.xpi) = 126602
-SHA256 (xpi/firefox35-i18n-3.5.19/zh-TW.xpi) = b3eece1f99b61699c49ca73f4abeb4bc9ebc9eee18cc19032733817983f676d6
-SIZE (xpi/firefox35-i18n-3.5.19/zh-TW.xpi) = 127834
diff --git a/www/firefox35-i18n/pkg-descr b/www/firefox35-i18n/pkg-descr
deleted file mode 100644
index af5aeb0935b9..000000000000
--- a/www/firefox35-i18n/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Language packs for Firefox 3.5
-
-WWW: https://wiki.mozilla.org/L10n
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
deleted file mode 100644
index 2e7f694f23fa..000000000000
--- a/www/firefox35/Makefile
+++ /dev/null
@@ -1,122 +0,0 @@
-# New ports collection makefile for: phoenix
-# Date created: 2002/10/21
-# Whom: Alan Eldridge <alane@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= firefox
-DISTVERSION= 3.5.19
-PORTEPOCH= 1
-CATEGORIES= www ipv6
-MASTER_SITES= ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME= ${PORTNAME}-${DISTVERSION}.source
-
-MAINTAINER= gecko@FreeBSD.org
-COMMENT= Web browser based on the browser portion of Mozilla
-
-BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
-
-DEPRECATED= Upstream support dropped. Please consider using www/firefox instead.
-EXPIRATION_DATE= 2011-08-01
-FORBIDDEN= several security vulnerabilities
-
-USE_AUTOTOOLS= autoconf213:env
-LATEST_LINK= firefox35
-USE_GECKO= gecko
-MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= -png -nss -dbm -jpeg -xft
-MOZILLA_NAME= Firefox${MOZILLA_SUFX}
-MOZILLA_SUFX= 3
-MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
-MOZ_TOOLKIT= cairo-gtk2
-GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
- lib/${MOZILLA}/include lib/${MOZILLA}/lib \
- lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include
-
-MAKE_JOBS_SAFE= yes
-WANT_GNOME= yes
-ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-EXTRA_CFLAGS= -O2
-HAS_CONFIGURE= yes
-USE_BZIP2= yes
-USE_GMAKE= yes
-NO_MOZPKGINSTALL=yes
-CONFLICTS_INSTALL= firefox-3.6*
-
-FIREFOX_ICON= ${MOZILLA}.png
-FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
-MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --enable-svg --enable-svg-renderer=cairo \
- --enable-application=browser \
- --enable-official-branding \
- --enable-canvas --enable-libxul
-
-OPTIONS= DBUS "Enable D-BUS support" on \
- SMB "Enable smb:// URI support using gnomevfs" off
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 700000
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio
-.else
-EXTRA_PATCHES= ${FILESDIR}/libsydney_oss
-.endif
-
-WRKSRC:= ${WRKSRC}-1.9.1
-
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{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 defined(WITHOUT_DBUS)
-MOZ_OPTIONS+= --disable-dbus
-.else
-LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-.endif
-
-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 \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
- ${WRKSRC}/js/src/config/config.mk
- @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
- s|-lpthread|${PTHREAD_LIBS}|g ; \
- s|echo aout|echo elf|g ; \
- s|/usr/X11R6|${LOCALBASE}|g' \
- ${WRKSRC}/js/src/configure
-
-pre-configure:
- @(cd ${WRKSRC} && ${AUTOCONF})
-
-port-pre-install:
-# ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib
- ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF}
- ${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD}
- ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF}
-
-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}/share/pixmaps/${FIREFOX_ICON}
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/www/firefox35/distinfo b/www/firefox35/distinfo
deleted file mode 100644
index 89bbda370091..000000000000
--- a/www/firefox35/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (firefox-3.5.19.source.tar.bz2) = 5811682464eced37a1d73652dd8931c30c44331e3003e95ebad191e3d41cd8e7
-SIZE (firefox-3.5.19.source.tar.bz2) = 47580375
diff --git a/www/firefox35/files/firefox.desktop.in b/www/firefox35/files/firefox.desktop.in
deleted file mode 100644
index d72090e1aabf..000000000000
--- a/www/firefox35/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/firefox35/files/libsydney_oss b/www/firefox35/files/libsydney_oss
deleted file mode 100644
index 7dfcc33cde9f..000000000000
--- a/www/firefox35/files/libsydney_oss
+++ /dev/null
@@ -1,16 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_oss.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
-
diff --git a/www/firefox35/files/patch-bugzilla-522635 b/www/firefox35/files/patch-bugzilla-522635
deleted file mode 100644
index 5e9e413d3b3b..000000000000
--- a/www/firefox35/files/patch-bugzilla-522635
+++ /dev/null
@@ -1,1445 +0,0 @@
-diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
-index 0df722e..39654b1 100644
---- widget/src/gtk2/Makefile.in
-+++ widget/src/gtk2/Makefile.in
-@@ -78,7 +78,6 @@ endif
-
- CSRCS = \
- mozcontainer.c \
-- mozdrawingarea.c \
- keysym2ucs.c \
- nsPrintdGTK.c \
- $(NULL)
-@@ -152,7 +151,6 @@ endif
- EXPORTS = \
- nsGTKToolkit.h \
- nsIImageToPixbuf.h \
-- mozdrawingarea.h \
- mozcontainer.h \
- $(NULL)
-
-diff --git a/widget/src/gtk2/mozcontainer.c b/widget/src/gtk2/mozcontainer.c
-index 71b425f..89731a3 100644
---- widget/src/gtk2/mozcontainer.c
-+++ widget/src/gtk2/mozcontainer.c
-@@ -294,8 +294,15 @@ moz_container_realize (GtkWidget *widget)
-
- /* create the shell window */
-
-- attributes.event_mask = gtk_widget_get_events (widget);
-- attributes.event_mask |= (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK);
-+ attributes.event_mask = (gtk_widget_get_events (widget) |
-+ GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
-+ GDK_VISIBILITY_NOTIFY_MASK |
-+ GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-+#ifdef HAVE_GTK_MOTION_HINTS
-+ GDK_POINTER_MOTION_HINT_MASK |
-+#endif
-+ GDK_POINTER_MOTION_MASK);
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
-diff --git a/widget/src/gtk2/mozcontainer.h b/widget/src/gtk2/mozcontainer.h
-index 8f1d2f0..51850ea 100644
---- widget/src/gtk2/mozcontainer.h
-+++ widget/src/gtk2/mozcontainer.h
-@@ -40,6 +40,7 @@
- #define __MOZ_CONTAINER_H__
-
- #include <gtk/gtkcontainer.h>
-+#include <gtk/gtkversion.h>
-
- #ifdef __cplusplus
- extern "C" {
-@@ -83,6 +84,11 @@ extern "C" {
- #define IS_MOZ_CONTAINER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), MOZ_CONTAINER_TYPE))
- #define MOZ_CONAINTER_GET_CLASS(obj) (GTK_CHECK_GET_CLASS ((obj), MOZ_CONTAINER_TYPE, MozContainerClass))
-
-+#if (GTK_CHECK_VERSION(2, 12, 0) || \
-+ (GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_HILDON)))
-+#define HAVE_GTK_MOTION_HINTS
-+#endif
-+
- typedef struct _MozContainer MozContainer;
- typedef struct _MozContainerClass MozContainerClass;
-
-diff --git a/widget/src/gtk2/mozdrawingarea.c b/widget/src/gtk2/mozdrawingarea.c
-deleted file mode 100644
-index 5b7cf99..0000000
---- widget/src/gtk2/mozdrawingarea.c
-+++ /dev/null
-@@ -1,241 +0,0 @@
--/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
--/* vim:expandtab:shiftwidth=4:tabstop=4:
-- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * 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 Christopher Blizzard
-- * <blizzard@mozilla.org>. Portions created by the Initial Developer
-- * are Copyright (C) 2001 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 MPL, 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 MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#include "mozdrawingarea.h"
--
--/* init methods */
--static void moz_drawingarea_class_init (MozDrawingareaClass *klass);
--static void moz_drawingarea_init (MozDrawingarea *drawingarea);
--
--/* static methods */
--static void moz_drawingarea_create_windows (MozDrawingarea *drawingarea,
-- GdkWindow *parent,
-- GtkWidget *widget,
-- GdkVisual *visual);
--
--static void moz_drawingarea_finalize (GObject *object);
--
--static GObjectClass *parent_class = NULL;
--
--GtkType
--moz_drawingarea_get_type(void)
--{
-- static GtkType moz_drawingarea_type = 0;
--
-- if (!moz_drawingarea_type) {
-- static GTypeInfo moz_drawingarea_info = {
-- sizeof(MozDrawingareaClass), /* class size */
-- NULL, /* base_init */
-- NULL, /* base_finalize */
-- (GClassInitFunc) moz_drawingarea_class_init, /* class_init */
-- NULL, /* class_destroy */
-- NULL, /* class_data */
-- sizeof(MozDrawingarea), /* instance_size */
-- 0, /* n_preallocs */
-- (GInstanceInitFunc) moz_drawingarea_init, /* instance_init */
-- NULL, /* value_table */
-- };
-- moz_drawingarea_type =
-- g_type_register_static (G_TYPE_OBJECT,
-- "MozDrawingarea",
-- &moz_drawingarea_info, 0);
-- }
--
-- return moz_drawingarea_type;
--}
--
--MozDrawingarea *
--moz_drawingarea_new (MozDrawingarea *parent, MozContainer *widget_parent,
-- GdkVisual *visual)
--{
-- MozDrawingarea *drawingarea;
--
-- drawingarea = g_object_new(MOZ_DRAWINGAREA_TYPE, NULL);
--
-- if (!parent)
-- moz_drawingarea_create_windows(drawingarea,
-- GTK_WIDGET(widget_parent)->window,
-- GTK_WIDGET(widget_parent),
-- visual);
-- else
-- moz_drawingarea_create_windows(drawingarea,
-- parent->inner_window,
-- GTK_WIDGET(widget_parent),
-- visual);
--
-- return drawingarea;
--}
--
--void
--moz_drawingarea_class_init (MozDrawingareaClass *klass)
--{
-- GObjectClass *object_class = G_OBJECT_CLASS (klass);
--
-- object_class->finalize = moz_drawingarea_finalize;
--
-- parent_class = g_type_class_peek_parent(klass);
--}
--
--void
--moz_drawingarea_init (MozDrawingarea *drawingarea)
--{
--
--}
--
--void
--moz_drawingarea_reparent (MozDrawingarea *drawingarea, GdkWindow *aNewParent)
--{
-- gdk_window_reparent(drawingarea->clip_window,
-- aNewParent, 0, 0);
--}
--
--void
--moz_drawingarea_create_windows (MozDrawingarea *drawingarea, GdkWindow *parent,
-- GtkWidget *widget, GdkVisual *visual)
--{
-- GdkWindowAttr attributes;
-- gint attributes_mask = 0;
--
-- /* create the clipping window */
-- attributes.event_mask = 0;
-- attributes.x = 0;
-- attributes.y = 0;
-- attributes.width = 1;
-- attributes.height = 1;
-- attributes.wclass = GDK_INPUT_OUTPUT;
-- attributes.window_type = GDK_WINDOW_CHILD;
-- if (!visual) {
-- attributes.visual = gtk_widget_get_visual (widget);
-- attributes.colormap = gtk_widget_get_colormap (widget);
-- } else {
-- attributes.visual = visual;
-- attributes.colormap = gdk_colormap_new(visual, 0);
-- }
--
-- attributes_mask |= GDK_WA_VISUAL | GDK_WA_COLORMAP |
-- GDK_WA_X | GDK_WA_Y;
--
-- drawingarea->clip_window = gdk_window_new (parent, &attributes,
-- attributes_mask);
-- gdk_window_set_user_data(drawingarea->clip_window, widget);
--
-- /* set the default pixmap to None so that you don't end up with the
-- gtk default which is BlackPixel. */
-- gdk_window_set_back_pixmap(drawingarea->clip_window, NULL, FALSE);
--
-- attributes.event_mask = (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
-- GDK_VISIBILITY_NOTIFY_MASK |
-- GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
--#ifdef HAVE_GTK_MOTION_HINTS
-- GDK_POINTER_MOTION_HINT_MASK |
--#endif
-- GDK_POINTER_MOTION_MASK);
-- /* create the inner window */
-- drawingarea->inner_window = gdk_window_new (drawingarea->clip_window,
-- &attributes, attributes_mask);
-- gdk_window_set_user_data(drawingarea->inner_window, widget);
--
-- /* set the default pixmap to None so that you don't end up with the
-- gtk default which is BlackPixel. */
-- gdk_window_set_back_pixmap(drawingarea->inner_window, NULL, FALSE);
--
-- if (visual) {
-- g_object_unref(attributes.colormap);
-- }
--}
--
--void
--moz_drawingarea_finalize (GObject *object)
--{
-- MozDrawingarea *drawingarea;
-- gpointer user_data;
--
-- g_return_if_fail(IS_MOZ_DRAWINGAREA(object));
--
-- drawingarea = MOZ_DRAWINGAREA(object);
--
-- gdk_window_destroy(drawingarea->inner_window);
-- gdk_window_destroy(drawingarea->clip_window);
--
-- (* parent_class->finalize) (object);
--}
--
--void
--moz_drawingarea_move (MozDrawingarea *drawingarea,
-- gint x, gint y)
--{
-- gdk_window_move(drawingarea->clip_window, x, y);
--}
--
--void
--moz_drawingarea_resize (MozDrawingarea *drawingarea,
-- gint width, gint height)
--{
-- gdk_window_resize(drawingarea->clip_window, width, height);
-- gdk_window_resize(drawingarea->inner_window, width, height);
--}
--
--void
--moz_drawingarea_move_resize (MozDrawingarea *drawingarea,
-- gint x, gint y, gint width, gint height)
--{
-- gdk_window_resize(drawingarea->inner_window, width, height);
-- gdk_window_move_resize(drawingarea->clip_window, x, y, width, height);
--}
--
--void
--moz_drawingarea_set_visibility (MozDrawingarea *drawingarea,
-- gboolean visibility)
--{
-- if (visibility) {
-- gdk_window_show_unraised(drawingarea->inner_window);
-- gdk_window_show_unraised(drawingarea->clip_window);
-- }
-- else {
-- gdk_window_hide(drawingarea->clip_window);
-- gdk_window_hide(drawingarea->inner_window);
-- }
--}
--
--void
--moz_drawingarea_scroll (MozDrawingarea *drawingarea,
-- gint x, gint y)
--{
-- gdk_window_scroll(drawingarea->inner_window, x, y);
--}
-diff --git a/widget/src/gtk2/mozdrawingarea.h b/widget/src/gtk2/mozdrawingarea.h
-deleted file mode 100644
-index bdcc6d3..0000000
---- widget/src/gtk2/mozdrawingarea.h
-+++ /dev/null
-@@ -1,101 +0,0 @@
--/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
--/* vim:expandtab:shiftwidth=4:tabstop=4:
-- */
--/* ***** BEGIN LICENSE BLOCK *****
-- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-- *
-- * 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 Christopher Blizzard
-- * <blizzard@mozilla.org>. Portions created by the Initial Developer
-- * are Copyright (C) 2001 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 MPL, 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 MPL, the GPL or the LGPL.
-- *
-- * ***** END LICENSE BLOCK ***** */
--
--#ifndef __MOZ_DRAWINGAREA_H__
--#define __MOZ_DRAWINGAREA_H__
--
--#include <gdk/gdkwindow.h>
--#include <gtk/gtkversion.h>
--#include "mozcontainer.h"
--
--#ifdef __cplusplus
--extern "C" {
--#endif /* __cplusplus */
--
--#define MOZ_DRAWINGAREA_TYPE (moz_drawingarea_get_type())
--#define MOZ_DRAWINGAREA(obj) (GTK_CHECK_CAST((obj), MOZ_DRAWINGAREA_TYPE, MozDrawingarea))
--#define MOZ_DRAWINGAREA_CLASS(klass) (GTK_CHECK_CLASS_CAST((klass), MOZ_DRAWINGAREA_TYPE, MozDrawingareaClass))
--#define IS_MOZ_DRAWINGAREA(obj) (GTK_CHECK_TYPE((obj), MOZ_DRAWINGAREA_TYPE))
--#define IS_MOZ_DRAWINGAREA_CLASS(klass) (GTK_CHECK_CLASS_TYPE((klass), MOZ_DRAWINGAREA_TYPE))
--#define MOZ_DRAWINGAREA_GET_CLASS(obj) (GTK_CHECK_GET_CLASS((obj), MOZ_DRAWINGAREA_TYPE, MozDrawingareaClass))
--
--#if (GTK_CHECK_VERSION(2, 12, 0) || \
-- (GTK_CHECK_VERSION(2, 10, 0) && defined(MOZ_PLATFORM_HILDON)))
--#define HAVE_GTK_MOTION_HINTS
--#endif
--
--typedef struct _MozDrawingarea MozDrawingarea;
--typedef struct _MozDrawingareaClass MozDrawingareaClass;
--
--struct _MozDrawingarea
--{
-- GObject parent_instance;
-- /* AFAIK this clip_window (and thus this whole class) exists solely to
-- * make gdk_window_scroll() smooth for nsIWidget::Scroll(). */
-- GdkWindow *clip_window;
-- GdkWindow *inner_window;
--};
--
--struct _MozDrawingareaClass
--{
-- GObjectClass parent_class;
--};
--
--GtkType moz_drawingarea_get_type (void);
--MozDrawingarea *moz_drawingarea_new (MozDrawingarea *parent,
-- MozContainer *widget_parent,
-- GdkVisual *visual);
--void moz_drawingarea_reparent (MozDrawingarea *drawingarea,
-- GdkWindow *aNewParent);
--void moz_drawingarea_move (MozDrawingarea *drawingarea,
-- gint x, gint y);
--void moz_drawingarea_resize (MozDrawingarea *drawingarea,
-- gint width, gint height);
--void moz_drawingarea_move_resize (MozDrawingarea *drawingarea,
-- gint x, gint y,
-- gint width, gint height);
--void moz_drawingarea_set_visibility (MozDrawingarea *drawingarea,
-- gboolean visibility);
--void moz_drawingarea_scroll (MozDrawingarea *drawingarea,
-- gint x, gint y);
--
--#ifdef __cplusplus
--}
--#endif /* __cplusplus */
--
--#endif /* __MOZ_DRAWINGAREA_H__ */
-diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp
-index b9cca02..b00bcdf 100644
---- widget/src/gtk2/nsWindow.cpp
-+++ widget/src/gtk2/nsWindow.cpp
-@@ -368,7 +368,7 @@ nsWindow::nsWindow()
- mPreferredWidth = 0;
- mPreferredHeight = 0;
- mContainer = nsnull;
-- mDrawingarea = nsnull;
-+ mGdkWindow = nsnull;
- mShell = nsnull;
- mWindowGroup = nsnull;
- mContainerGotFocus = PR_FALSE;
-@@ -673,9 +673,7 @@ CheckDestroyInvisibleContainer()
-
- // Change the containing GtkWidget on a sub-hierarchy of GdkWindows belonging
- // to aOldWidget and rooted at aWindow, and reparent any child GtkWidgets of
--// the GdkWindow hierarchy. If aNewWidget is NULL, the reference to
--// aOldWidget is removed from its GdkWindows, and child GtkWidgets are
--// destroyed.
-+// the GdkWindow hierarchy to aNewWidget.
- static void
- SetWidgetForHierarchy(GdkWindow *aWindow,
- GtkWidget *aOldWidget,
-@@ -694,13 +692,7 @@ SetWidgetForHierarchy(GdkWindow *aWindow,
-
- // This window belongs to a child widget, which will no longer be a
- // child of aOldWidget.
-- if (aNewWidget) {
-- gtk_widget_reparent(widget, aNewWidget);
-- } else {
-- // aNewWidget == NULL indicates that the window is about to be
-- // destroyed.
-- gtk_widget_destroy(widget);
-- }
-+ gtk_widget_reparent(widget, aNewWidget);
-
- return;
- }
-@@ -714,6 +706,30 @@ SetWidgetForHierarchy(GdkWindow *aWindow,
- gdk_window_set_user_data(aWindow, aNewWidget);
- }
-
-+// Walk the list of child windows and call destroy on them.
-+void
-+nsWindow::DestroyChildWindows()
-+{
-+ if (!mGdkWindow)
-+ return;
-+
-+ while (GList *children = gdk_window_peek_children(mGdkWindow)) {
-+ GdkWindow *child = GDK_WINDOW(children->data);
-+ nsWindow *kid = get_window_for_gdk_window(child);
-+ if (kid) {
-+ kid->Destroy();
-+ } else {
-+ // This child is not an nsWindow.
-+ // Destroy the child GtkWidget.
-+ gpointer data;
-+ gdk_window_get_user_data(child, &data);
-+ if (GTK_IS_WIDGET(data)) {
-+ gtk_widget_destroy(static_cast<GtkWidget*>(data));
-+ }
-+ }
-+ }
-+}
-+
- NS_IMETHODIMP
- nsWindow::Destroy(void)
- {
-@@ -751,15 +767,6 @@ nsWindow::Destroy(void)
-
- NativeShow(PR_FALSE);
-
-- // walk the list of children and call destroy on them. Have to be
-- // careful, though -- calling destroy on a kid may actually remove
-- // it from our child list, losing its sibling links.
-- for (nsIWidget* kid = mFirstChild; kid; ) {
-- nsIWidget* next = kid->GetNextSibling();
-- kid->Destroy();
-- kid = next;
-- }
--
- #ifdef USE_XIM
- IMEDestroyContext();
- #endif
-@@ -796,35 +803,26 @@ nsWindow::Destroy(void)
- gtk_widget_destroy(mShell);
- mShell = nsnull;
- mContainer = nsnull;
-+ NS_ABORT_IF_FALSE(!mGdkWindow,
-+ "mGdkWindow should be NULL when mContainer is destroyed");
- }
- else if (mContainer) {
- gtk_widget_destroy(GTK_WIDGET(mContainer));
- mContainer = nsnull;
-+ NS_ABORT_IF_FALSE(!mGdkWindow,
-+ "mGdkWindow should be NULL when mContainer is destroyed");
- }
-- else if (owningWidget) {
-- // Remove references from GdkWindows back to their container
-- // widget while the GdkWindow hierarchy is still available.
-- // (OnContainerUnrealize does this when the MozContainer widget is
-- // destroyed.)
-- SetWidgetForHierarchy(mDrawingarea->clip_window, owningWidget, NULL);
-- }
--
-- if (mDrawingarea) {
-- g_object_set_data(G_OBJECT(mDrawingarea->clip_window),
-- "nsWindow", NULL);
-- g_object_set_data(G_OBJECT(mDrawingarea->inner_window),
-- "nsWindow", NULL);
--
-- g_object_set_data(G_OBJECT(mDrawingarea->clip_window),
-- "mozdrawingarea", NULL);
-- g_object_set_data(G_OBJECT(mDrawingarea->inner_window),
-- "mozdrawingarea", NULL);
--
-- NS_ASSERTION(!get_gtk_widget_for_gdk_window(mDrawingarea->inner_window),
-- "widget reference not removed");
-+ else if (mGdkWindow) {
-+ // Destroy child windows to ensure that their mThebesSurfaces are
-+ // released and to remove references from GdkWindows back to their
-+ // container widget. (OnContainerUnrealize() does this when the
-+ // MozContainer widget is destroyed.)
-+ DestroyChildWindows();
-
-- g_object_unref(mDrawingarea);
-- mDrawingarea = nsnull;
-+ gdk_window_set_user_data(mGdkWindow, NULL);
-+ g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", NULL);
-+ gdk_window_destroy(mGdkWindow);
-+ mGdkWindow = nsnull;
- }
-
- if (gInvisibleContainer && owningWidget == gInvisibleContainer) {
-@@ -851,7 +849,7 @@ nsWindow::GetParent(void)
- NS_IMETHODIMP
- nsWindow::SetParent(nsIWidget *aNewParent)
- {
-- if (mContainer || !mDrawingarea || !mParent) {
-+ if (mContainer || !mGdkWindow || !mParent) {
- NS_NOTREACHED("nsWindow::SetParent - reparenting a non-child window");
- return NS_ERROR_NOT_IMPLEMENTED;
- }
-@@ -866,12 +864,12 @@ nsWindow::SetParent(nsIWidget *aNewParent)
- if (!oldContainer) {
- // The GdkWindows have been destroyed so there is nothing else to
- // reparent.
-- NS_ABORT_IF_FALSE(GDK_WINDOW_OBJECT(mDrawingarea->inner_window)->destroyed,
-+ NS_ABORT_IF_FALSE(GDK_WINDOW_OBJECT(mGdkWindow)->destroyed,
- "live GdkWindow with no widget");
- return NS_OK;
- }
-
-- NS_ABORT_IF_FALSE(!GDK_WINDOW_OBJECT(mDrawingarea->inner_window)->destroyed,
-+ NS_ABORT_IF_FALSE(!GDK_WINDOW_OBJECT(mGdkWindow)->destroyed,
- "destroyed GdkWindow with widget");
-
- GdkWindow* newParentWindow = NULL;
-@@ -901,11 +899,10 @@ nsWindow::SetParent(nsIWidget *aNewParent)
- if (newContainer != oldContainer) {
- NS_ABORT_IF_FALSE(!GDK_WINDOW_OBJECT(newParentWindow)->destroyed,
- "destroyed GdkWindow with widget");
-- SetWidgetForHierarchy(mDrawingarea->clip_window, oldContainer,
-- newContainer);
-+ SetWidgetForHierarchy(mGdkWindow, oldContainer, newContainer);
- }
-
-- moz_drawingarea_reparent(mDrawingarea, newParentWindow);
-+ gdk_window_reparent(mGdkWindow, newParentWindow, 0, 0);
- }
-
- return NS_OK;
-@@ -1216,8 +1213,8 @@ nsWindow::Move(PRInt32 aX, PRInt32 aY)
- if (mIsTopLevel) {
- gtk_window_move(GTK_WINDOW(mShell), aX, aY);
- }
-- else if (mDrawingarea) {
-- moz_drawingarea_move(mDrawingarea, aX, aY);
-+ else if (mGdkWindow) {
-+ gdk_window_move(mGdkWindow, aX, aY);
- }
-
- return NS_OK;
-@@ -1244,19 +1241,19 @@ nsWindow::SetZIndex(PRInt32 aZIndex)
-
- NS_ASSERTION(!mContainer, "Expected Mozilla child widget");
-
-- // We skip the nsWindows that don't have mDrawingareas.
-+ // We skip the nsWindows that don't have mGdkWindows.
- // These are probably in the process of being destroyed.
-
- if (!GetNextSibling()) {
- // We're to be on top.
-- if (mDrawingarea)
-- gdk_window_raise(mDrawingarea->clip_window);
-+ if (mGdkWindow)
-+ gdk_window_raise(mGdkWindow);
- } else {
- // All the siblings before us need to be below our widget.
- for (nsWindow* w = this; w;
- w = static_cast<nsWindow*>(w->GetPrevSibling())) {
-- if (w->mDrawingarea)
-- gdk_window_lower(w->mDrawingarea->clip_window);
-+ if (w->mGdkWindow)
-+ gdk_window_lower(w->mGdkWindow);
- }
- }
- return NS_OK;
-@@ -1500,7 +1497,7 @@ nsWindow::SetCursor(nsCursor aCursor)
- {
- // if we're not the toplevel window pass up the cursor request to
- // the toplevel window to handle it.
-- if (!mContainer && mDrawingarea) {
-+ if (!mContainer && mGdkWindow) {
- nsWindow *window = GetContainerWindow();
- if (!window)
- return NS_ERROR_FAILURE;
-@@ -1583,7 +1580,7 @@ nsWindow::SetCursor(imgIContainer* aCursor,
- {
- // if we're not the toplevel window pass up the cursor request to
- // the toplevel window to handle it.
-- if (!mContainer && mDrawingarea) {
-+ if (!mContainer && mGdkWindow) {
- nsWindow *window = GetContainerWindow();
- if (!window)
- return NS_ERROR_FAILURE;
-@@ -1710,10 +1707,10 @@ nsWindow::Validate()
- {
- // Get the update for this window and, well, just drop it on the
- // floor.
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NS_OK;
-
-- GdkRegion *region = gdk_window_get_update_area(mDrawingarea->inner_window);
-+ GdkRegion *region = gdk_window_get_update_area(mGdkWindow);
-
- if (region)
- gdk_region_destroy(region);
-@@ -1724,6 +1721,9 @@ nsWindow::Validate()
- NS_IMETHODIMP
- nsWindow::Invalidate(PRBool aIsSynchronous)
- {
-+ if (!mGdkWindow)
-+ return NS_OK;
-+
- GdkRectangle rect;
-
- rect.x = mBounds.x;
-@@ -1734,13 +1734,9 @@ nsWindow::Invalidate(PRBool aIsSynchronous)
- LOGDRAW(("Invalidate (all) [%p]: %d %d %d %d\n", (void *)this,
- rect.x, rect.y, rect.width, rect.height));
-
-- if (!mDrawingarea)
-- return NS_OK;
--
-- gdk_window_invalidate_rect(mDrawingarea->inner_window,
-- &rect, FALSE);
-+ gdk_window_invalidate_rect(mGdkWindow, &rect, FALSE);
- if (aIsSynchronous)
-- gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-+ gdk_window_process_updates(mGdkWindow, FALSE);
-
- return NS_OK;
- }
-@@ -1749,6 +1745,9 @@ NS_IMETHODIMP
- nsWindow::Invalidate(const nsRect &aRect,
- PRBool aIsSynchronous)
- {
-+ if (!mGdkWindow)
-+ return NS_OK;
-+
- GdkRectangle rect;
-
- rect.x = aRect.x;
-@@ -1759,13 +1758,9 @@ nsWindow::Invalidate(const nsRect &aRect,
- LOGDRAW(("Invalidate (rect) [%p]: %d %d %d %d (sync: %d)\n", (void *)this,
- rect.x, rect.y, rect.width, rect.height, aIsSynchronous));
-
-- if (!mDrawingarea)
-- return NS_OK;
--
-- gdk_window_invalidate_rect(mDrawingarea->inner_window,
-- &rect, FALSE);
-+ gdk_window_invalidate_rect(mGdkWindow, &rect, FALSE);
- if (aIsSynchronous)
-- gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-+ gdk_window_process_updates(mGdkWindow, FALSE);
-
- return NS_OK;
- }
-@@ -1777,7 +1772,7 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
- GdkRegion *region = nsnull;
- aRegion->GetNativeRegion((void *&)region);
-
-- if (region && mDrawingarea) {
-+ if (region && mGdkWindow) {
- GdkRectangle rect;
- gdk_region_get_clipbox(region, &rect);
-
-@@ -1785,7 +1780,7 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
- (void *)this,
- rect.x, rect.y, rect.width, rect.height, aIsSynchronous));
-
-- gdk_window_invalidate_region(mDrawingarea->inner_window,
-+ gdk_window_invalidate_region(mGdkWindow,
- region, FALSE);
- }
- else {
-@@ -1799,10 +1794,10 @@ nsWindow::InvalidateRegion(const nsIRegion* aRegion,
- NS_IMETHODIMP
- nsWindow::Update()
- {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NS_OK;
-
-- gdk_window_process_updates(mDrawingarea->inner_window, FALSE);
-+ gdk_window_process_updates(mGdkWindow, FALSE);
- return NS_OK;
- }
-
-@@ -1817,7 +1812,7 @@ nsWindow::Scroll(PRInt32 aDx,
- PRInt32 aDy,
- nsRect *aClipRect)
- {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NS_OK;
-
- D_DEBUG_AT( ns_Window, "%s( %4d,%4d )\n", __FUNCTION__, aDx, aDy );
-@@ -1827,7 +1822,7 @@ nsWindow::Scroll(PRInt32 aDx,
- aClipRect->x, aClipRect->y, aClipRect->width, aClipRect->height );
- }
-
-- moz_drawingarea_scroll(mDrawingarea, aDx, aDy);
-+ gdk_window_scroll(mGdkWindow, aDx, aDy);
-
- // Update bounds on our child windows
- for (nsIWidget* kid = mFirstChild; kid; kid = kid->GetNextSibling()) {
-@@ -1847,10 +1842,10 @@ NS_IMETHODIMP
- nsWindow::ScrollWidgets(PRInt32 aDx,
- PRInt32 aDy)
- {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NS_OK;
-
-- moz_drawingarea_scroll(mDrawingarea, aDx, aDy);
-+ gdk_window_scroll(mGdkWindow, aDx, aDy);
- return NS_OK;
- }
-
-@@ -1868,10 +1863,10 @@ nsWindow::GetNativeData(PRUint32 aDataType)
- switch (aDataType) {
- case NS_NATIVE_WINDOW:
- case NS_NATIVE_WIDGET: {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return nsnull;
-
-- return mDrawingarea->inner_window;
-+ return mGdkWindow;
- break;
- }
-
-@@ -1991,8 +1986,8 @@ nsWindow::WidgetToScreen(const nsRect& aOldRect, nsRect& aNewRect)
- &x, &y);
- LOG(("WidgetToScreen (container) %d %d\n", x, y));
- }
-- else if (mDrawingarea) {
-- gdk_window_get_origin(mDrawingarea->inner_window, &x, &y);
-+ else if (mGdkWindow) {
-+ gdk_window_get_origin(mGdkWindow, &x, &y);
- LOG(("WidgetToScreen (drawing) %d %d\n", x, y));
- }
-
-@@ -2013,8 +2008,8 @@ nsWindow::ScreenToWidget(const nsRect& aOldRect, nsRect& aNewRect)
- gdk_window_get_root_origin(GTK_WIDGET(mContainer)->window,
- &x, &y);
- }
-- else if (mDrawingarea) {
-- gdk_window_get_origin(mDrawingarea->inner_window, &x, &y);
-+ else if (mGdkWindow) {
-+ gdk_window_get_origin(mGdkWindow, &x, &y);
- }
-
- aNewRect.x = aOldRect.x - x;
-@@ -2065,7 +2060,7 @@ nsWindow::CaptureMouse(PRBool aCapture)
- {
- LOG(("CaptureMouse %p\n", (void *)this));
-
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NS_OK;
-
- GtkWidget *widget = GetMozContainerWidget();
-@@ -2089,7 +2084,7 @@ nsWindow::CaptureRollupEvents(nsIRollupListener *aListener,
- PRBool aDoCapture,
- PRBool aConsumeRollupEvent)
- {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NS_OK;
-
- GtkWidget *widget = GetMozContainerWidget();
-@@ -2271,11 +2266,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
- return FALSE;
- }
-
-- if (!mDrawingarea)
-- return FALSE;
--
-- // handle exposes for the inner window only
-- if (aEvent->window != mDrawingarea->inner_window)
-+ if (!mGdkWindow)
- return FALSE;
-
- static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
-@@ -2320,7 +2311,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
- nsRefPtr<gfxContext> ctx = rc->ThebesContext();
-
- gfxPlatformGtk::GetPlatform()->SetGdkDrawable(ctx->OriginalSurface(),
-- GDK_DRAWABLE(mDrawingarea->inner_window));
-+ GDK_DRAWABLE(mGdkWindow));
-
- // clip to the update region
- ctx->Save();
-@@ -2381,7 +2372,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
- if (gForce24bpp) {
- depth = 24; // 24 always
- } else {
-- depth = gdk_drawable_get_depth(GDK_DRAWABLE(mDrawingarea->inner_window));
-+ depth = gdk_drawable_get_depth(GDK_DRAWABLE(mGdkWindow));
- }
-
- if (!gUseBufferPixmap ||
-@@ -2390,7 +2381,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
- {
- // create a one-off always if we're not using the global pixmap
- // if gUseBufferPixmap == TRUE, who's redrawing an area bigger than the screen?
-- bufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mDrawingarea->inner_window),
-+ bufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mGdkWindow),
- boundsRect.width, boundsRect.height,
- depth);
- bufferPixmapSize.width = boundsRect.width;
-@@ -2405,7 +2396,7 @@ nsWindow::OnExposeEvent(GtkWidget *aWidget, GdkEventExpose *aEvent)
- gBufferPixmapSize.width = PR_MAX(gBufferPixmapSize.width, boundsRect.width);
- gBufferPixmapSize.height = PR_MAX(gBufferPixmapSize.height, boundsRect.height);
-
-- gBufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mDrawingarea->inner_window),
-+ gBufferPixmap = gdk_pixmap_new(GDK_DRAWABLE(mGdkWindow),
- gBufferPixmapSize.width, gBufferPixmapSize.height,
- depth);
-
-@@ -2575,8 +2566,11 @@ nsWindow::OnContainerUnrealize(GtkWidget *aWidget)
- NS_ASSERTION(mContainer == MOZ_CONTAINER(aWidget),
- "unexpected \"unrealize\" signal");
-
-- if (mDrawingarea) {
-- SetWidgetForHierarchy(mDrawingarea->clip_window, aWidget, NULL);
-+ if (mGdkWindow) {
-+ DestroyChildWindows();
-+
-+ g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", NULL);
-+ mGdkWindow = NULL;
- }
- }
-
-@@ -2595,11 +2589,9 @@ nsWindow::OnSizeAllocate(GtkWidget *aWidget, GtkAllocation *aAllocation)
- mBounds.width = rect.width;
- mBounds.height = rect.height;
-
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return;
-
-- moz_drawingarea_resize (mDrawingarea, rect.width, rect.height);
--
- if (mTransparencyBitmap) {
- ApplyTransparencyBitmap();
- }
-@@ -2668,7 +2660,7 @@ nsWindow::OnLeaveNotifyEvent(GtkWidget *aWidget, GdkEventCrossing *aEvent)
-
- event.time = aEvent->time;
-
-- event.exit = is_top_level_mouse_exit(mDrawingarea->inner_window, aEvent)
-+ event.exit = is_top_level_mouse_exit(mGdkWindow, aEvent)
- ? nsMouseEvent::eTopLevel : nsMouseEvent::eChild;
-
- LOG(("OnLeaveNotify: %p\n", (void *)this));
-@@ -2797,7 +2789,7 @@ nsWindow::OnMotionNotifyEvent(GtkWidget *aWidget, GdkEventMotion *aEvent)
- }
- else {
- // XXX see OnScrollEvent()
-- if (aEvent->window == mDrawingarea->inner_window) {
-+ if (aEvent->window == mGdkWindow) {
- event.refPoint.x = nscoord(aEvent->x);
- event.refPoint.y = nscoord(aEvent->y);
- } else {
-@@ -2828,7 +2820,7 @@ nsWindow::InitButtonEvent(nsMouseEvent &aEvent,
- GdkEventButton *aGdkEvent)
- {
- // XXX see OnScrollEvent()
-- if (aGdkEvent->window == mDrawingarea->inner_window) {
-+ if (aGdkEvent->window == mGdkWindow) {
- aEvent.refPoint.x = nscoord(aGdkEvent->x);
- aEvent.refPoint.y = nscoord(aGdkEvent->y);
- } else {
-@@ -3373,7 +3365,7 @@ nsWindow::OnScrollEvent(GtkWidget *aWidget, GdkEventScroll *aEvent)
- break;
- }
-
-- if (aEvent->window == mDrawingarea->inner_window) {
-+ if (aEvent->window == mGdkWindow) {
- // we are the window that the event happened on so no need for expensive ScreenToWidget
- event.refPoint.x = nscoord(aEvent->x);
- event.refPoint.y = nscoord(aEvent->y);
-@@ -3469,12 +3461,12 @@ nsWindow::ThemeChanged()
- nsEventStatus status = nsEventStatus_eIgnore;
- DispatchEvent(&event, status);
-
-- if (!mDrawingarea || NS_UNLIKELY(mIsDestroyed))
-+ if (!mGdkWindow || NS_UNLIKELY(mIsDestroyed))
- return;
-
- // Dispatch NS_THEMECHANGED to all child windows
- GList *children =
-- gdk_window_peek_children(mDrawingarea->inner_window);
-+ gdk_window_peek_children(mGdkWindow);
- while (children) {
- GdkWindow *gdkWin = GDK_WINDOW(children->data);
-
-@@ -3823,6 +3815,38 @@ GetBrandName(nsXPIDLString& brandName)
- brandName.Assign(NS_LITERAL_STRING("Mozilla"));
- }
-
-+static GdkWindow *
-+CreateGdkWindow(GdkWindow *parent, GtkWidget *widget)
-+{
-+ GdkWindowAttr attributes;
-+ gint attributes_mask = GDK_WA_VISUAL | GDK_WA_COLORMAP;
-+
-+ attributes.event_mask = (GDK_EXPOSURE_MASK | GDK_STRUCTURE_MASK |
-+ GDK_VISIBILITY_NOTIFY_MASK |
-+ GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
-+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
-+#ifdef HAVE_GTK_MOTION_HINTS
-+ GDK_POINTER_MOTION_HINT_MASK |
-+#endif
-+ GDK_POINTER_MOTION_MASK);
-+
-+ attributes.width = 1;
-+ attributes.height = 1;
-+ attributes.wclass = GDK_INPUT_OUTPUT;
-+ attributes.visual = gtk_widget_get_visual(widget);
-+ attributes.colormap = gtk_widget_get_colormap(widget);
-+ attributes.window_type = GDK_WINDOW_CHILD;
-+
-+ GdkWindow *window = gdk_window_new(parent, &attributes, attributes_mask);
-+ gdk_window_set_user_data(window, widget);
-+
-+ /* set the default pixmap to None so that you don't end up with the
-+ gtk default which is BlackPixel. */
-+ gdk_window_set_back_pixmap(window, NULL, FALSE);
-+
-+ return window;
-+}
-+
- nsresult
- nsWindow::NativeCreate(nsIWidget *aParent,
- nsNativeWidget aNativeParent,
-@@ -3866,8 +3890,7 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- }
-
- // figure out our parent window
-- MozDrawingarea *parentArea = nsnull;
-- MozContainer *parentMozContainer = nsnull;
-+ GtkWidget *parentMozContainer = nsnull;
- GtkContainer *parentGtkContainer = nsnull;
- GdkWindow *parentGdkWindow = nsnull;
- GtkWindow *topLevelParent = nsnull;
-@@ -3880,28 +3903,10 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- parentGtkContainer = GTK_CONTAINER(aNativeParent);
-
- if (parentGdkWindow) {
-- // find the mozarea on that window
-- gpointer user_data = nsnull;
-- user_data = g_object_get_data(G_OBJECT(parentGdkWindow),
-- "mozdrawingarea");
-- parentArea = MOZ_DRAWINGAREA(user_data);
--
-- NS_ASSERTION(parentArea, "no drawingarea for parent widget!\n");
-- if (!parentArea)
-- return NS_ERROR_FAILURE;
--
-- // get the user data for the widget - it should be a container
-- user_data = nsnull;
-- gdk_window_get_user_data(parentArea->inner_window, &user_data);
-- NS_ASSERTION(user_data, "no user data for parentArea\n");
-- if (!user_data)
-- return NS_ERROR_FAILURE;
-+ // get the widget for the window - it should be a moz container
-+ parentMozContainer = get_gtk_widget_for_gdk_window(parentGdkWindow);
-
-- // Get the parent moz container
-- parentMozContainer = MOZ_CONTAINER(user_data);
-- NS_ASSERTION(parentMozContainer,
-- "owning widget is not a mozcontainer!\n");
-- if (!parentMozContainer)
-+ if (!IS_MOZ_CONTAINER(parentMozContainer))
- return NS_ERROR_FAILURE;
-
- // get the toplevel window just in case someone needs to use it
-@@ -3910,8 +3915,6 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(parentMozContainer)));
- }
-
-- GdkVisual* visual = nsnull;
--
- // ok, create our windows
- switch (mWindowType) {
- case eWindowType_dialog:
-@@ -3939,11 +3942,11 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- GdkWindow* dialoglead = mShell->window;
- gdk_window_set_group(dialoglead, dialoglead);
- }
-- if (parentArea) {
-+ if (parentGdkWindow) {
- nsWindow *parentnsWindow =
-- get_window_for_gdk_window(parentArea->inner_window);
-+ get_window_for_gdk_window(parentGdkWindow);
- NS_ASSERTION(parentnsWindow,
-- "no nsWindow for parentArea!");
-+ "no nsWindow for parentGdkWindow!");
- if (parentnsWindow && parentnsWindow->mWindowGroup) {
- gtk_window_group_add_window(parentnsWindow->mWindowGroup,
- GTK_WINDOW(mShell));
-@@ -4009,15 +4012,16 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- }
-
- // create our container
-- mContainer = MOZ_CONTAINER(moz_container_new());
-- gtk_container_add(GTK_CONTAINER(mShell), GTK_WIDGET(mContainer));
-- gtk_widget_realize(GTK_WIDGET(mContainer));
-+ GtkWidget *container = moz_container_new();
-+ mContainer = MOZ_CONTAINER(container);
-+ gtk_container_add(GTK_CONTAINER(mShell), container);
-+ gtk_widget_realize(container);
-
- // make sure this is the focus widget in the container
-- gtk_window_set_focus(GTK_WINDOW(mShell), GTK_WIDGET(mContainer));
-+ gtk_window_set_focus(GTK_WINDOW(mShell), container);
-
- // and the drawing area
-- mDrawingarea = moz_drawingarea_new(nsnull, mContainer, visual);
-+ mGdkWindow = container->window;
-
- if (mWindowType == eWindowType_popup) {
- // gdk does not automatically set the cursor for "temporary"
-@@ -4033,14 +4037,15 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- break;
- case eWindowType_child: {
- if (parentMozContainer) {
-- mDrawingarea = moz_drawingarea_new(parentArea, parentMozContainer, visual);
-+ mGdkWindow = CreateGdkWindow(parentGdkWindow, parentMozContainer);
- }
- else if (parentGtkContainer) {
-- mContainer = MOZ_CONTAINER(moz_container_new());
-- gtk_container_add(parentGtkContainer, GTK_WIDGET(mContainer));
-- gtk_widget_realize(GTK_WIDGET(mContainer));
-+ GtkWidget *container = moz_container_new();
-+ mContainer = MOZ_CONTAINER(container);
-+ gtk_container_add(parentGtkContainer, container);
-+ gtk_widget_realize(container);
-
-- mDrawingarea = moz_drawingarea_new(nsnull, mContainer, visual);
-+ mGdkWindow = container->window;
- }
- else {
- NS_WARNING("Warning: tried to create a new child widget with no parent!");
-@@ -4061,17 +4066,8 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- gtk_widget_set_double_buffered (GTK_WIDGET(mContainer),FALSE);
- #endif
-
-- // label the drawing area with this object so we can find our way
-- // home
-- g_object_set_data(G_OBJECT(mDrawingarea->clip_window), "nsWindow",
-- this);
-- g_object_set_data(G_OBJECT(mDrawingarea->inner_window), "nsWindow",
-- this);
--
-- g_object_set_data(G_OBJECT(mDrawingarea->clip_window), "mozdrawingarea",
-- mDrawingarea);
-- g_object_set_data(G_OBJECT(mDrawingarea->inner_window), "mozdrawingarea",
-- mDrawingarea);
-+ // label the drawing window with this object so we can find our way home
-+ g_object_set_data(G_OBJECT(mGdkWindow), "nsWindow", this);
-
- if (mContainer)
- g_object_set_data(G_OBJECT(mContainer), "nsWindow", this);
-@@ -4161,13 +4157,9 @@ nsWindow::NativeCreate(nsIWidget *aParent,
- (void *)GTK_WIDGET(mContainer)->window,
- GDK_WINDOW_XWINDOW(GTK_WIDGET(mContainer)->window)));
- }
--
-- if (mDrawingarea) {
-- LOG(("\tmDrawingarea %p %p %p %lx %lx\n", (void *)mDrawingarea,
-- (void *)mDrawingarea->clip_window,
-- (void *)mDrawingarea->inner_window,
-- GDK_WINDOW_XWINDOW(mDrawingarea->clip_window),
-- GDK_WINDOW_XWINDOW(mDrawingarea->inner_window)));
-+ else if (mGdkWindow) {
-+ LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow,
-+ GDK_WINDOW_XWINDOW(mGdkWindow)));
- }
-
- // resize so that everything is set to the right dimensions
-@@ -4325,16 +4317,16 @@ nsWindow::NativeResize(PRInt32 aWidth, PRInt32 aHeight, PRBool aRepaint)
- gtk_window_resize(GTK_WINDOW(mShell), aWidth, aHeight);
- }
- else if (mContainer) {
-+ GtkWidget *widget = GTK_WIDGET(mContainer);
- GtkAllocation allocation;
-- allocation.x = 0;
-- allocation.y = 0;
-+ allocation.x = widget->allocation.x;
-+ allocation.y = widget->allocation.y;
- allocation.width = aWidth;
- allocation.height = aHeight;
-- gtk_widget_size_allocate(GTK_WIDGET(mContainer), &allocation);
-+ gtk_widget_size_allocate(widget, &allocation);
- }
--
-- if (mDrawingarea) {
-- moz_drawingarea_resize (mDrawingarea, aWidth, aHeight);
-+ else if (mGdkWindow) {
-+ gdk_window_resize(mGdkWindow, aWidth, aHeight);
- }
- }
-
-@@ -4360,19 +4352,18 @@ nsWindow::NativeResize(PRInt32 aX, PRInt32 aY,
- gtk_window_move(GTK_WINDOW(mShell), aX, aY);
-
- gtk_window_resize(GTK_WINDOW(mShell), aWidth, aHeight);
-- moz_drawingarea_resize(mDrawingarea, aWidth, aHeight);
-+ gdk_window_resize(mGdkWindow, aWidth, aHeight);
- }
- else if (mContainer) {
- GtkAllocation allocation;
-- allocation.x = 0;
-- allocation.y = 0;
-+ allocation.x = aX;
-+ allocation.y = aY;
- allocation.width = aWidth;
- allocation.height = aHeight;
- gtk_widget_size_allocate(GTK_WIDGET(mContainer), &allocation);
-- moz_drawingarea_move_resize(mDrawingarea, aX, aY, aWidth, aHeight);
- }
-- else if (mDrawingarea) {
-- moz_drawingarea_move_resize(mDrawingarea, aX, aY, aWidth, aHeight);
-+ else if (mGdkWindow) {
-+ gdk_window_move_resize(mGdkWindow, aX, aY, aWidth, aHeight);
- }
- }
-
-@@ -4401,16 +4392,14 @@ nsWindow::NativeShow (PRBool aAction)
- SetUserTimeAndStartupIDForActivatedWindow(mShell);
- }
-
-- moz_drawingarea_set_visibility(mDrawingarea, aAction);
- gtk_widget_show(GTK_WIDGET(mContainer));
- gtk_widget_show(mShell);
- }
- else if (mContainer) {
-- moz_drawingarea_set_visibility(mDrawingarea, TRUE);
- gtk_widget_show(GTK_WIDGET(mContainer));
- }
-- else if (mDrawingarea) {
-- moz_drawingarea_set_visibility(mDrawingarea, TRUE);
-+ else if (mGdkWindow) {
-+ gdk_window_show_unraised(mGdkWindow);
- }
- }
- else {
-@@ -4420,10 +4409,9 @@ nsWindow::NativeShow (PRBool aAction)
- }
- else if (mContainer) {
- gtk_widget_hide(GTK_WIDGET(mContainer));
-- moz_drawingarea_set_visibility(mDrawingarea, FALSE);
- }
-- if (mDrawingarea) {
-- moz_drawingarea_set_visibility(mDrawingarea, FALSE);
-+ else if (mGdkWindow) {
-+ gdk_window_hide(mGdkWindow);
- }
- }
- }
-@@ -4684,11 +4672,11 @@ nsWindow::GrabPointer(void)
- return;
- }
-
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return;
-
- gint retval;
-- retval = gdk_pointer_grab(mDrawingarea->inner_window, TRUE,
-+ retval = gdk_pointer_grab(mGdkWindow, TRUE,
- (GdkEventMask)(GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_ENTER_NOTIFY_MASK |
-@@ -4730,8 +4718,8 @@ nsWindow::GrabKeyboard(void)
-
- if (mTransientParent)
- grabWindow = GTK_WIDGET(mTransientParent)->window;
-- else if (mDrawingarea)
-- grabWindow = mDrawingarea->inner_window;
-+ else if (mGdkWindow)
-+ grabWindow = mGdkWindow;
- else
- return;
-
-@@ -4777,11 +4765,11 @@ nsWindow::GetToplevelWidget(GtkWidget **aWidget)
- GtkWidget *
- nsWindow::GetMozContainerWidget()
- {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return NULL;
-
- GtkWidget *owningWidget =
-- get_gtk_widget_for_gdk_window(mDrawingarea->inner_window);
-+ get_gtk_widget_for_gdk_window(mGdkWindow);
- return owningWidget;
- }
-
-@@ -4821,10 +4809,10 @@ nsWindow::SetUrgencyHint(GtkWidget *top_window, PRBool state)
- void *
- nsWindow::SetupPluginPort(void)
- {
-- if (!mDrawingarea)
-+ if (!mGdkWindow)
- return nsnull;
-
-- if (GDK_WINDOW_OBJECT(mDrawingarea->inner_window)->destroyed == TRUE)
-+ if (GDK_WINDOW_OBJECT(mGdkWindow)->destroyed == TRUE)
- return nsnull;
-
- // we have to flush the X queue here so that any plugins that
-@@ -4832,22 +4820,19 @@ nsWindow::SetupPluginPort(void)
- // this window in case it was just created
- #ifdef MOZ_X11
- XWindowAttributes xattrs;
-- XGetWindowAttributes(GDK_DISPLAY (),
-- GDK_WINDOW_XWINDOW(mDrawingarea->inner_window),
-+ XGetWindowAttributes(GDK_DISPLAY(), GDK_WINDOW_XWINDOW(mGdkWindow),
- &xattrs);
- XSelectInput (GDK_DISPLAY (),
-- GDK_WINDOW_XWINDOW(mDrawingarea->inner_window),
-+ GDK_WINDOW_XWINDOW(mGdkWindow),
- xattrs.your_event_mask |
- SubstructureNotifyMask);
-
-- gdk_window_add_filter(mDrawingarea->inner_window,
-- plugin_window_filter_func,
-- this);
-+ gdk_window_add_filter(mGdkWindow, plugin_window_filter_func, this);
-
- XSync(GDK_DISPLAY(), False);
- #endif /* MOZ_X11 */
-
-- return (void *)GDK_WINDOW_XWINDOW(mDrawingarea->inner_window);
-+ return (void *)GDK_WINDOW_XWINDOW(mGdkWindow);
- }
-
- nsresult
-@@ -4907,14 +4892,13 @@ nsWindow::SetNonXEmbedPluginFocus()
- Window curFocusWindow;
- int focusState;
-
-- XGetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+ XGetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
- &curFocusWindow,
- &focusState);
-
- LOGFOCUS(("\t curFocusWindow=%p\n", curFocusWindow));
-
-- GdkWindow* toplevel = gdk_window_get_toplevel
-- (mDrawingarea->inner_window);
-+ GdkWindow* toplevel = gdk_window_get_toplevel(mGdkWindow);
- GdkWindow *gdkfocuswin = gdk_window_lookup(curFocusWindow);
-
- // lookup with the focus proxy window is supposed to get the
-@@ -4926,11 +4910,11 @@ nsWindow::SetNonXEmbedPluginFocus()
-
- // switch the focus from the focus proxy to the plugin window
- mOldFocusWindow = curFocusWindow;
-- XRaiseWindow(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-- GDK_WINDOW_XWINDOW(mDrawingarea->inner_window));
-+ XRaiseWindow(GDK_WINDOW_XDISPLAY(mGdkWindow),
-+ GDK_WINDOW_XWINDOW(mGdkWindow));
- gdk_error_trap_push();
-- XSetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-- GDK_WINDOW_XWINDOW(mDrawingarea->inner_window),
-+ XSetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
-+ GDK_WINDOW_XWINDOW(mGdkWindow),
- RevertToNone,
- CurrentTime);
- gdk_flush();
-@@ -4939,8 +4923,7 @@ nsWindow::SetNonXEmbedPluginFocus()
- gdk_window_add_filter(NULL, plugin_client_message_filter, this);
-
- LOGFOCUS(("nsWindow::SetNonXEmbedPluginFocus oldfocus=%p new=%p\n",
-- mOldFocusWindow,
-- GDK_WINDOW_XWINDOW(mDrawingarea->inner_window)));
-+ mOldFocusWindow, GDK_WINDOW_XWINDOW(mGdkWindow)));
- }
-
- void
-@@ -4957,7 +4940,7 @@ nsWindow::LoseNonXEmbedPluginFocus()
- Window curFocusWindow;
- int focusState;
-
-- XGetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+ XGetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
- &curFocusWindow,
- &focusState);
-
-@@ -4966,12 +4949,12 @@ nsWindow::LoseNonXEmbedPluginFocus()
- // event filter that blocks the WM_TAKE_FOCUS is enough. WM and gtk2
- // will take care of the focus later.
- if (!curFocusWindow ||
-- curFocusWindow == GDK_WINDOW_XWINDOW(mDrawingarea->inner_window)) {
-+ curFocusWindow == GDK_WINDOW_XWINDOW(mGdkWindow)) {
-
- gdk_error_trap_push();
-- XRaiseWindow(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+ XRaiseWindow(GDK_WINDOW_XDISPLAY(mGdkWindow),
- mOldFocusWindow);
-- XSetInputFocus(GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+ XSetInputFocus(GDK_WINDOW_XDISPLAY(mGdkWindow),
- mOldFocusWindow,
- RevertToParent,
- CurrentTime);
-@@ -6655,13 +6638,11 @@ nsWindow::IMESetCursorPosition(const nsTextEventReply& aReply)
-
- // Get the position of the refWindow in screen.
- gint refX, refY;
-- gdk_window_get_origin(refWindow->mDrawingarea->inner_window,
-- &refX, &refY);
-+ gdk_window_get_origin(refWindow->mGdkWindow, &refX, &refY);
-
- // Get the position of IM context owner window in screen.
- gint ownerX, ownerY;
-- gdk_window_get_origin(ownerWindow->mDrawingarea->inner_window,
-- &ownerX, &ownerY);
-+ gdk_window_get_origin(ownerWindow->mGdkWindow, &ownerX, &ownerY);
-
- // Compute the caret position in the IM owner window.
- GdkRectangle area;
-@@ -6807,7 +6788,7 @@ nsWindow::GetToggledKeyState(PRUint32 aKeyCode, PRBool* aLEDState)
- GdkModifierType modifiers = gdk_keyboard_get_modifiers();
- PRUint32 capsLockMask, numLockMask, scrollLockMask;
- PRBool foundMasks = gdk_keyboard_get_modmap_masks(
-- GDK_WINDOW_XDISPLAY(mDrawingarea->inner_window),
-+ GDK_WINDOW_XDISPLAY(mGdkWindow),
- &capsLockMask, &numLockMask, &scrollLockMask);
- if (!foundMasks)
- return NS_ERROR_NOT_IMPLEMENTED;
-@@ -7138,10 +7119,12 @@ nsWindow::GetSurfaceForGdkDrawable(GdkDrawable* aDrawable,
- gfxASurface*
- nsWindow::GetThebesSurface()
- {
-+ if (!mGdkWindow)
-+ return nsnull;
-+
- GdkDrawable* d;
- gint x_offset, y_offset;
-- gdk_window_get_internal_paint_info(mDrawingarea->inner_window,
-- &d, &x_offset, &y_offset);
-+ gdk_window_get_internal_paint_info(mGdkWindow, &d, &x_offset, &y_offset);
-
- #ifdef MOZ_X11
- gint width, height;
-@@ -7217,7 +7200,7 @@ nsWindow::BeginResizeDrag(nsGUIEvent* aEvent, PRInt32 aHorizontal, PRInt32 aVert
- }
-
- // get the gdk window for this widget
-- GdkWindow* gdk_window = mDrawingarea->inner_window;
-+ GdkWindow* gdk_window = mGdkWindow;
- if (!GDK_IS_WINDOW(gdk_window)) {
- return NS_ERROR_FAILURE;
- }
-diff --git a/widget/src/gtk2/nsWindow.h b/widget/src/gtk2/nsWindow.h
-index 23aa482..277c82c 100644
---- widget/src/gtk2/nsWindow.h
-+++ widget/src/gtk2/nsWindow.h
-@@ -43,7 +43,6 @@
- #include "nsAutoPtr.h"
-
- #include "mozcontainer.h"
--#include "mozdrawingarea.h"
- #include "nsWeakReference.h"
-
- #include "nsIDragService.h"
-@@ -480,6 +479,7 @@ protected:
- PRUint32 mPreferredHeight;
-
- private:
-+ void DestroyChildWindows();
- void GetToplevelWidget(GtkWidget **aWidget);
- GtkWidget *GetMozContainerWidget();
- nsWindow *GetContainerWindow();
-@@ -492,7 +492,7 @@ private:
-
- GtkWidget *mShell;
- MozContainer *mContainer;
-- MozDrawingarea *mDrawingarea;
-+ GdkWindow *mGdkWindow;
-
- GtkWindowGroup *mWindowGroup;
-
diff --git a/www/firefox35/files/patch-build_unix_run-mozilla.sh b/www/firefox35/files/patch-build_unix_run-mozilla.sh
deleted file mode 100644
index 92777d76a378..000000000000
--- a/www/firefox35/files/patch-build_unix_run-mozilla.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006
-+++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006
-@@ -443,6 +443,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/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3
-+export MOZ_PLUGIN_PATH
-+
- if [ $moz_debug -eq 1 ]
- then
- moz_debug_program ${1+"$@"}
diff --git a/www/firefox35/files/patch-config_autoconf.mk.in b/www/firefox35/files/patch-config_autoconf.mk.in
deleted file mode 100644
index 0c6127366c69..000000000000
--- a/www/firefox35/files/patch-config_autoconf.mk.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200
-+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200
-@@ -57,14 +57,14 @@
- 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)
-+idldir = $(datadir)/idl/%%MOZILLA%%
-
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/%%MOZILLA%%
-+sdkdir = $(libdir)/%%MOZILLA%%
-
- DIST = $(DEPTH)/dist
- LIBXUL_SDK = @LIBXUL_SDK@
-@@ -275,7 +275,7 @@
- OS_CPPFLAGS = @CPPFLAGS@
- OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@
- OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@
--OS_LDFLAGS = @LDFLAGS@
-+OS_LDFLAGS = @LDFLAGS@ -lc
-
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
diff --git a/www/firefox35/files/patch-config_mkdepend_Makefile.in b/www/firefox35/files/patch-config_mkdepend_Makefile.in
deleted file mode 100644
index 5f341b26d09c..000000000000
--- a/www/firefox35/files/patch-config_mkdepend_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- config/mkdepend/Makefile.in.orig 2009-04-28 08:07:48.532396203 +0000
-+++ config/mkdepend/Makefile.in 2009-04-28 08:08:07.342398592 +0000
-@@ -73,6 +73,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/firefox35/files/patch-content-xslt-public-txDouble.h b/www/firefox35/files/patch-content-xslt-public-txDouble.h
deleted file mode 100644
index cd4acfc534bf..000000000000
--- a/www/firefox35/files/patch-content-xslt-public-txDouble.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/xslt/public/txDouble.h.orig 2009-08-16 21:46:27.000000000 +0200
-+++ content/xslt/public/txDouble.h 2009-08-16 21:49:53.000000000 +0200
-@@ -43,7 +43,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
diff --git a/www/firefox35/files/patch-db_sqlite3_src_Makefile.in b/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
deleted file mode 100644
index e52ba517e14a..000000000000
--- a/www/firefox35/files/patch-db_sqlite3_src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
-+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%% -lc
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
diff --git a/www/firefox35/files/patch-js-src-Makefile.in b/www/firefox35/files/patch-js-src-Makefile.in
deleted file mode 100644
index 751596240adf..000000000000
--- a/www/firefox35/files/patch-js-src-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- js/src/Makefile.in.orig 2009-05-11 15:21:19.000000000 +0200
-+++ js/src/Makefile.in 2009-05-11 15:21:34.000000000 +0200
-@@ -427,7 +427,7 @@
- endif # WINNT
-
- ifeq ($(OS_ARCH),FreeBSD)
--EXTRA_LIBS += -pthread
-+EXTRA_LIBS += -pthread -lc
- endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
diff --git a/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in
deleted file mode 100644
index 6c25c71ce6c6..000000000000
--- a/www/firefox35/files/patch-js-src-config-mkdepend_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- js/src/config/mkdepend/Makefile.in.orig 2009-04-28 08:17:55.069074748 +0000
-+++ js/src/config/mkdepend/Makefile.in 2009-04-28 08:18:44.897081100 +0000
-@@ -72,7 +72,7 @@
-
- include $(topsrcdir)/config/rules.mk
-
--HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
-
- ifdef GNU_CC
- _GCCDIR = $(shell $(CC) -print-file-name=include)
diff --git a/www/firefox35/files/patch-js-src-config_config.mk b/www/firefox35/files/patch-js-src-config_config.mk
deleted file mode 100644
index 4120407a7789..000000000000
--- a/www/firefox35/files/patch-js-src-config_config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- js/src/config/config.mk.orig 2009-04-28 11:14:01.760089946 +0000
-+++ js/src/config/config.mk 2009-04-28 11:14:30.311093216 +0000
-@@ -490,7 +490,7 @@
- INCLUDES = $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
-
- ifndef MOZILLA_INTERNAL_API
--INCLUDES += -I$(LIBXUL_DIST)/sdk/include
-+INCLUDES += -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
- endif
-
- include $(topsrcdir)/config/static-checking-config.mk
diff --git a/www/firefox35/files/patch-js-src-configure b/www/firefox35/files/patch-js-src-configure
deleted file mode 100644
index 175d8ac6a4c3..000000000000
--- a/www/firefox35/files/patch-js-src-configure
+++ /dev/null
@@ -1,13 +0,0 @@
---- js/src/configure.orig 2009-06-23 23:44:34.000000000 +0200
-+++ js/src/configure 2009-06-23 23:44:46.000000000 +0200
-@@ -6916,10 +6916,6 @@
- ENABLE_JIT=1
- NANOJIT_ARCH=ARM
- ;;
--sparc*-*)
-- ENABLE_JIT=1
-- NANOJIT_ARCH=Sparc
-- ;;
- esac
-
- # Check whether --enable-jit or --disable-jit was given.
diff --git a/www/firefox35/files/patch-js_src_jsnum.cpp b/www/firefox35/files/patch-js_src_jsnum.cpp
deleted file mode 100644
index b4024468f8e9..000000000000
--- a/www/firefox35/files/patch-js_src_jsnum.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- js/src/jsnum.cpp.orig 2009-04-28 11:19:57.888134991 +0000
-+++ js/src/jsnum.cpp 2009-04-28 11:21:35.786147448 +0000
-@@ -45,6 +45,9 @@
- #if defined(XP_WIN) || defined(XP_OS2)
- #include <float.h>
- #endif
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- #ifdef XP_OS2
- #define _PC_53 PC_53
- #define _MCW_EM MCW_EM
-@@ -659,8 +662,16 @@
-
- #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
-
- JSBool
diff --git a/www/firefox35/files/patch-layout_generic_Makefile.in b/www/firefox35/files/patch-layout_generic_Makefile.in
deleted file mode 100644
index da29a9e18759..000000000000
--- a/www/firefox35/files/patch-layout_generic_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- layout/generic/Makefile.in.orig 2009-04-28 11:16:16.059107000 +0000
-+++ layout/generic/Makefile.in 2009-04-28 11:16:41.171110062 +0000
-@@ -188,9 +188,10 @@
- -I$(srcdir)/../../content/base/src \
- -I$(srcdir)/../../content/html/content/src \
- -I$(srcdir)/../../dom/src/base \
-- $(MOZ_CAIRO_CFLAGS) \
- $(NULL)
-
-+CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
-+
- ifdef MOZ_ENABLE_GTK2
- CXXFLAGS += $(MOZ_GTK2_CFLAGS)
- endif
diff --git a/www/firefox35/files/patch-media_liboggplay_audio_sydney_audio.h b/www/firefox35/files/patch-media_liboggplay_audio_sydney_audio.h
deleted file mode 100644
index d8e318e9bcb2..000000000000
--- a/www/firefox35/files/patch-media_liboggplay_audio_sydney_audio.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200
-+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200
-@@ -73,7 +73,7 @@
- # endif
- #elif defined(WIN32)
- # define SA_LITTLE_ENDIAN 1
--#elif defined(__APPLE__)
-+#elif defined(__APPLE__) || defined(__FreeBSD__)
- # if defined(__BIG_ENDIAN__)
- # define SA_BIG_ENDIAN 1
- # else
diff --git a/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h b/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
deleted file mode 100644
index 60d8988b9f17..000000000000
--- a/www/firefox35/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200
-@@ -59,7 +59,7 @@
-
- #include <sys/types.h>
-
--#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__)
- typedef off_t oggz_off_t;
- #else
- typedef loff_t oggz_off_t;
diff --git a/www/firefox35/files/patch-security-coreconf-FreeBSD.mk b/www/firefox35/files/patch-security-coreconf-FreeBSD.mk
deleted file mode 100644
index e5340ae55f5c..000000000000
--- a/www/firefox35/files/patch-security-coreconf-FreeBSD.mk
+++ /dev/null
@@ -1,40 +0,0 @@
---- security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000
-+++ security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000
-@@ -49,8 +49,20 @@
- ifeq ($(CPU_ARCH),pc98)
- CPU_ARCH = x86
- endif
--ifeq ($(CPU_ARCH),amd64)
--CPU_ARCH = x86_64
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH = alpha
-+endif
-+ifeq ($(OS_TEST),amd64)
-+CPU_ARCH = amd64
-+endif
-+ifeq ($(OS_TEST),ia64)
-+CPU_ARCH = ia64
-+endif
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH = powerpc
-+endif
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH = sparc64
- endif
-
- OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -78,7 +90,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
-@@ -87,4 +99,4 @@
-
- G++INCLUDES = -I/usr/include/g++
-
--INCLUDES += -I/usr/X11R6/include
-+#INCLUDES += -I/usr/local/include
diff --git a/www/firefox35/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox35/files/patch-security_manager_ssl_src_nsNSSComponent.cpp
deleted file mode 100644
index f30d12229ccd..000000000000
--- a/www/firefox35/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/firefox35/files/patch-storage_build_Makefile.in b/www/firefox35/files/patch-storage_build_Makefile.in
deleted file mode 100644
index 18202a5a61d8..000000000000
--- a/www/firefox35/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/firefox35/files/patch-toolkit_library_Makefile.in b/www/firefox35/files/patch-toolkit_library_Makefile.in
deleted file mode 100644
index 5a6726c3bef7..000000000000
--- a/www/firefox35/files/patch-toolkit_library_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- toolkit/library/Makefile.in.orig 2010-01-11 23:57:11.000000000 -0500
-+++ toolkit/library/Makefile.in 2010-01-11 23:58:08.000000000 -0500
-@@ -181,7 +181,7 @@
- export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS)
- $(INSTALL) $^ .
-
--EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += -Wl,--warn-unresolved-symbols -Wl,--as-needed $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-
- ifdef MOZ_ENABLE_LIBXUL
- include $(srcdir)/libxul-rules.mk
diff --git a/www/firefox35/files/patch-toolkit_mozapps_installer_packager.mk b/www/firefox35/files/patch-toolkit_mozapps_installer_packager.mk
deleted file mode 100644
index 7995ab6aea56..000000000000
--- a/www/firefox35/files/patch-toolkit_mozapps_installer_packager.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- toolkit/mozapps/installer/packager.mk.orig 2007-09-26 13:45:01.000000000 -0400
-+++ toolkit/mozapps/installer/packager.mk 2007-09-26 13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
-- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+ find -L $(DIST)/include -name system_wrappers\* -prune -or -type f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable
- $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
diff --git a/www/firefox35/files/patch-toolkit_xre_Makefile.in b/www/firefox35/files/patch-toolkit_xre_Makefile.in
deleted file mode 100644
index 4a9c8533a2f8..000000000000
--- a/www/firefox35/files/patch-toolkit_xre_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400
-+++ toolkit/xre/Makefile.in 2007-09-10 10:35:00.000000000 -0400
-@@ -263,5 +263,3 @@
- libs:: platform.ini
- $(INSTALL) $^ $(DIST)/bin
-
--install::
-- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
diff --git a/www/firefox35/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox35/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc
deleted file mode 100644
index 9a41bbfc4602..000000000000
--- a/www/firefox35/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/firefox35/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h b/www/firefox35/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
deleted file mode 100644
index 0440ce0a263f..000000000000
--- a/www/firefox35/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800
-+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800
-@@ -45,7 +45,7 @@
-
- class xptiInterfaceEntry;
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
-@@ -62,7 +62,7 @@
- #undef STUB_ENTRY
- #undef SENTINEL_ENTRY
-
--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
-+#if !defined(__ia64)
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
- #else
- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
diff --git a/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp b/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp
deleted file mode 100644
index c51d22aad3c3..000000000000
--- a/www/firefox35/files/patch-xpcom_base_nsStackWalk.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- xpcom/base/nsStackWalk.cpp.orig 2010-01-11 23:06:47.000000000 -0500
-+++ xpcom/base/nsStackWalk.cpp 2010-01-11 23:07:29.000000000 -0500
-@@ -1124,7 +1124,7 @@
- #define __USE_GNU
- #endif
-
--#if defined(HAVE_LIBDL) || defined(XP_MACOSX)
-+#if defined(HAVE_LIBDL) || defined(XP_MACOSX) || defined(__FreeBSD__)
- #include <dlfcn.h>
- #endif
-
diff --git a/www/firefox35/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/firefox35/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
deleted file mode 100644
index 3681d9b80f73..000000000000
--- a/www/firefox35/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
+++ /dev/null
@@ -1,76 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-03-05 22:32:55.000000000 +0100
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-04-21 14:15:46.135700268 +0200
-@@ -70,6 +70,9 @@
- ifeq (Darwin,$(OS_ARCH))
- DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED
- endif
-+ifeq (x86_64,$(OS_TEST))
-+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-+endif
- endif
- endif
- #
-@@ -87,7 +90,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
-@@ -100,6 +103,12 @@
- CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
- endif
- #
-+# FreeBSD/amd64
-+#
-+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
-+CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
-+endif
-+#
- # BeOS/Intel (uses the same unixish_x86 code)
- #
- ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -150,9 +159,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
- #
-@@ -307,7 +322,7 @@
- #
- # Linux/PPC
- #
--ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
-+ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
- CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
- ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
- AS := $(CC) -c -x assembler-with-cpp
-@@ -385,6 +400,15 @@
- 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_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
-+endif
-+endif
-+#
- # OpenBSD/SPARC
- #
- ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
diff --git a/www/firefox35/files/releng6_pulseaudio b/www/firefox35/files/releng6_pulseaudio
deleted file mode 100644
index 1f600320f362..000000000000
--- a/www/firefox35/files/releng6_pulseaudio
+++ /dev/null
@@ -1,34 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME = sydneyaudio
- FORCE_STATIC_LIB= 1
-
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS = \
-+ sydney_audio_pulseaudio.c \
-+ $(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS = \
- sydney_audio_alsa.c \
-
---- toolkit/library/Makefile.in.orig 2009-04-24 03:47:06.000000000 +0200
-+++ toolkit/library/Makefile.in 2009-05-11 11:05:23.000000000 +0200
-@@ -228,12 +228,12 @@
- endif
-
- ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
- ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
- EXTRA_DSO_LDOPTS += $(FT2_LIBS)
- endif
-
-
diff --git a/www/firefox35/pkg-descr b/www/firefox35/pkg-descr
deleted file mode 100644
index 4bdeb911815f..000000000000
--- a/www/firefox35/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Mozilla Firefox is a free and open source web browser descended from the
-Mozilla Application Suite.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/firefox35/pkg-message b/www/firefox35/pkg-message
deleted file mode 100644
index 00bd82c0da31..000000000000
--- a/www/firefox35/pkg-message
+++ /dev/null
@@ -1,48 +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 sever on remote_host must allow pub key authentication.
-
-======================================================================
-
-Firefox 3.5 and HTML5
-
-Certain functions used to display HTML5 elements need the sem module.
-
-If your Firefox crashes with the following message while viewing a
-HTML5 page:
-"Bad system call (core dumped)"
-
-you need to load the sem module (kldload sem).
-
-To load sem on every boot put the following into your
-/boot/loader.conf:
-sem_load="YES"
-
-======================================================================
-
-Any bug reports should be addressed to the maintainers at:
- gecko@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/firefox35/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 (gecko@)
-======================================================================