diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index 1f88fa6ccb6..12c9fe4129a 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,15 +1,15 @@ -# $OpenBSD: Makefile,v 1.67 2007/02/26 14:21:26 robert Exp $ +# $OpenBSD: Makefile,v 1.68 2007/03/01 22:46:06 robert Exp $ ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc sparc64 COMMENT-main= "redesign of Mozilla's browser component" COMMENT-devel= "devel files for Gecko" -VER= 2.0.0.1 +VER= 2.0.0.2 DISTNAME= mozilla PKGNAME= mozilla-firefox-${VER} -PKGNAME-main= mozilla-firefox-${VER}p3 -PKGNAME-devel= mozilla-firefox-devel-${VER}p2 +PKGNAME-main= mozilla-firefox-${VER}p0 +PKGNAME-devel= mozilla-firefox-devel-${VER}p0 SO_VERSION= 19.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. @@ -52,10 +52,9 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss WANTLIB= X11 Xext Xrender atk-1.0 c cairo fontconfig freetype \ glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ - pangox-1.0 \ pangocairo-1.0 pangoft2-1.0 png pthread stdc++ z -WANTLIB-main= ${WANTLIB} Xft Xinerama Xt jpeg +WANTLIB-main= ${WANTLIB} Xft Xinerama Xt jpeg pangox-1.0 LIB_DEPENDS-devel= ${MODGETTEXT_LIB_DEPENDS} IDL-2::devel/libIDL \ mozilla-firefox/gtkembedmoz,mozilla-firefox/mozjs,mozilla-firefox/xpcom,mozilla-firefox/xpcom_core:${PKGNAME-main}:www/mozilla-firefox,-main @@ -94,7 +93,8 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \ --enable-svg \ --enable-svg-renderer=cairo \ --enable-system-cairo \ - --enable-canvas + --enable-canvas \ + --enable-official-branding # from browser/config/mozconfig CONFIGURE_ARGS+=--enable-application=browser @@ -107,11 +107,11 @@ MAKE_ENV= MOZ_CO_PROJECT=browser \ LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \ BUILD_OFFICIAL=1 \ MOZILLA_OFFICIAL=1 \ - SO_VERSION="${SO_VERSION}" \ - NSS_ENABLE_ECC=1 + SO_VERSION="${SO_VERSION}" CONFIGURE_ENV= ${MAKE_ENV} \ PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \ - MOZ_ENABLE_COREXFONTS=1 + MOZ_ENABLE_COREXFONTS=1 \ + topsrcdir=${WRKSRC} MOB= ${WRKSRC}/dist/bin MOZ= ${PREFIX}/mozilla-firefox @@ -120,7 +120,6 @@ post-extract: @cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/ pre-configure: - @cd ${WRKSRC}/browser/base/branding && cp aboutCredits.png about.png @perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \ ${WRKSRC}/browser/app/mozilla.in @perl -pi -e 's|_SO_VERSION_|${SO_VERSION}|g' \ @@ -140,17 +139,11 @@ do-install: ${INSTALL_DATA_DIR} ${MOZ}/${dir} @cd ${MOB} && ${TAR} -chf - ${dir}/ | \ ${TAR} -xf - -C ${MOZ} + @find ${MOZ} -type f -exec chmod 444 {} \; .endfor - @cd ${MOB} && ${TAR} -chf - *.so.${SO_VERSION} | \ - ${TAR} -xf - -C ${MOZ} - @chmod 444 ${MOZ}/*.so.${SO_VERSION} \ - ${MOZ}/components/*.so.${SO_VERSION} \ - ${MOZ}/components/*.js \ - ${MOZ}/plugins/*.so.${SO_VERSION} + ${INSTALL_DATA} ${MOB}/*.so.${SO_VERSION} ${MOZ} chown -R ${SHAREOWN}:${SHAREGRP} ${MOZ} - ${INSTALL_DATA} ${WRKSRC}/LICENSE \ - ${MOB}/bloaturls.txt \ - ${MOB}/browserconfig.properties ${MOZ} + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ} ${INSTALL_SCRIPT} ${MOB}/firefox \ ${MOB}/firefox-config ${PREFIX}/bin ln -f ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox diff --git a/www/mozilla-firefox/distinfo b/www/mozilla-firefox/distinfo index 9fbab3bdcb4..94417489c8b 100644 --- a/www/mozilla-firefox/distinfo +++ b/www/mozilla-firefox/distinfo @@ -1,5 +1,5 @@ -MD5 (firefox-2.0.0.1-source.tar.bz2) = 7a1fc804ed735c5b7e9b1498bac8b5db -RMD160 (firefox-2.0.0.1-source.tar.bz2) = ce86c30f1e2038d2af05c7119fdab5609c21d12d -SHA1 (firefox-2.0.0.1-source.tar.bz2) = 52728b8f1fba8ab7d51962f6d021b31f02585e3f -SHA256 (firefox-2.0.0.1-source.tar.bz2) = b7db1a7d7ee37707dd5736a656982d1deaea7b29654f49564c2aa54c59ba1e24 -SIZE (firefox-2.0.0.1-source.tar.bz2) = 37056207 +MD5 (firefox-2.0.0.2-source.tar.bz2) = d7db87b76c1e78a229b662d7dd642265 +RMD160 (firefox-2.0.0.2-source.tar.bz2) = 489cd55a5e772f5be2605dc998572a1256d07a8e +SHA1 (firefox-2.0.0.2-source.tar.bz2) = bfe17b8b9eacd4f5329f252f1d136c7c932c70d8 +SHA256 (firefox-2.0.0.2-source.tar.bz2) = dca8c47792904f11425f5ddc80f311dfb94f38a88d8ebc3c3783dcb5cfa2a091 +SIZE (firefox-2.0.0.2-source.tar.bz2) = 37137694 diff --git a/www/mozilla-firefox/patches/patch-browser_app_Makefile_in b/www/mozilla-firefox/patches/patch-browser_app_Makefile_in deleted file mode 100644 index 5f2831ac062..00000000000 --- a/www/mozilla-firefox/patches/patch-browser_app_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-browser_app_Makefile_in,v 1.1 2007/01/12 21:46:17 kurt Exp $ ---- browser/app/Makefile.in.orig Tue Aug 29 05:03:07 2006 -+++ browser/app/Makefile.in Fri Nov 3 22:36:08 2006 -@@ -178,7 +178,7 @@ endif - - APP_VERSION = $(shell cat $(srcdir)/../config/version.txt) - DEFINES += -DAPP_VERSION="$(APP_VERSION)" --APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g') -+APP_UA_NAME = Firefox - DEFINES += -DAPP_UA_NAME="$(APP_UA_NAME)" - - ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) diff --git a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in index 529add99c42..d7de2b4e95c 100644 --- a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in +++ b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-browser_app_mozilla_in,v 1.5 2005/12/20 23:44:00 bernd Exp $ ---- browser/app/mozilla.in.orig Tue Sep 20 23:13:03 2005 -+++ browser/app/mozilla.in Fri Oct 21 21:19:52 2005 +$OpenBSD: patch-browser_app_mozilla_in,v 1.6 2007/03/01 22:46:06 robert Exp $ +--- browser/app/mozilla.in.orig Wed Sep 21 00:13:03 2005 ++++ browser/app/mozilla.in Sat Feb 24 18:46:11 2007 @@ -93,6 +93,7 @@ moz_pis_startstop_scripts() #set -x @@ -9,21 +9,13 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.5 2005/12/20 23:44:00 bernd Exp $ MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists -@@ -130,6 +131,7 @@ if [ $found = 0 ]; then - # Check default compile-time libdir - if [ -x "$moz_libdir/run-mozilla.sh" ]; then - dist_bin="$moz_libdir" -+ run_moz="$dist_bin/run-mozilla.sh" - else - echo "Cannot find mozilla runtime directory. Exiting." - exit 1 -@@ -171,7 +173,11 @@ do +@@ -171,7 +172,11 @@ do esac done -export MRE_HOME -+if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ] -+then export GDK_USE_XFT=0 ++if [ `_X11BASE_/bin/fc-list | wc -l` -eq 0 ]; then ++ export GDK_USE_XFT=0 +fi + +export MOZ_PLUGIN_PATH MRE_HOME diff --git a/www/mozilla-firefox/patches/patch-browser_base_content_browser_js b/www/mozilla-firefox/patches/patch-browser_base_content_browser_js new file mode 100644 index 00000000000..7ddc4b3be7d --- /dev/null +++ b/www/mozilla-firefox/patches/patch-browser_base_content_browser_js @@ -0,0 +1,49 @@ +$OpenBSD: patch-browser_base_content_browser_js,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- browser/base/content/browser.js.orig Fri Jan 26 01:05:54 2007 ++++ browser/base/content/browser.js Tue Feb 27 20:32:02 2007 +@@ -1745,6 +1745,26 @@ function addBookmarkAs(aBrowser, aBookma + if ((!browsers || browsers.length == 1) && aBookmarkAllTabs) + return; + ++ if (aBookmarkAllTabs) { ++ for (var i = 0; i < browsers.length; ++i) { ++ try { ++ var url = browsers[i].webNavigation.currentURI.spec; ++ urlSecurityCheck(url, url, ++ nsCI.nsIScriptSecurityManager.DISALLOW_SCRIPT_OR_DATA); ++ } catch (ex) { ++ return; // doesn't pass security check ++ } ++ } ++ } else { ++ try { ++ var url = aBrowser.webNavigation.currentURI.spec; ++ urlSecurityCheck(url, url, ++ nsCI.nsIScriptSecurityManager.DISALLOW_SCRIPT_OR_DATA); ++ } catch (ex) { ++ return; // doesn't pass security check ++ } ++ } ++ + if (browsers && browsers.length > 1) + addBookmarkForTabBrowser(aBrowser, aBookmarkAllTabs); + else +@@ -2279,7 +2299,7 @@ function handleURLBarRevert() + // don't revert to last valid url unless page is NOT loading + // and user is NOT key-scrolling through autocomplete list + if ((!throbberElement || !throbberElement.hasAttribute("busy")) && !isScrolling) { +- if (url != "about:blank") { ++ if (url != "about:blank" || content.opener) { + gURLBar.value = url; + gURLBar.select(); + SetPageProxyState("valid"); +@@ -3851,7 +3871,8 @@ nsBrowserStatusHandler.prototype = + + var location = aLocation.spec; + +- if (location == "about:blank" || location == "") { //second condition is for new tabs, otherwise ++ if ((location == "about:blank" && !content.opener) ++ || location == "") { //second condition is for new tabs, otherwise + location = ""; //reload function is enabled until tab is refreshed + this.reloadCommand.setAttribute("disabled", "true"); + this.reloadSkipCacheCommand.setAttribute("disabled", "true"); diff --git a/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_dtd b/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_dtd deleted file mode 100644 index f247d4af269..00000000000 --- a/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_dtd +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_dtd,v 1.2 2007/01/12 21:46:17 kurt Exp $ ---- browser/locales/en-US/chrome/branding/brand.dtd.orig Fri Aug 25 03:02:37 2006 -+++ browser/locales/en-US/chrome/branding/brand.dtd Mon Oct 30 18:18:43 2006 -@@ -1,3 +1,3 @@ -- -- -+ -+ - diff --git a/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_properties b/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_properties deleted file mode 100644 index f55aa436dd3..00000000000 --- a/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_properties +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_properties,v 1.2 2007/01/12 21:46:17 kurt Exp $ ---- browser/locales/en-US/chrome/branding/brand.properties.orig Fri Mar 17 06:17:56 2006 -+++ browser/locales/en-US/chrome/branding/brand.properties Fri Oct 27 11:55:48 2006 -@@ -1,3 +1,3 @@ --brandShortName=Bon Echo --brandFullName=Bon Echo -+brandShortName=Firefox Community Edition -+brandFullName=Firefox Community Edition - vendorShortName=Mozilla diff --git a/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_browser_aboutDialog_dtd b/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_browser_aboutDialog_dtd deleted file mode 100644 index 63b8980a8e7..00000000000 --- a/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_browser_aboutDialog_dtd +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-browser_locales_en-US_chrome_browser_aboutDialog_dtd,v 1.1 2007/01/12 21:46:17 kurt Exp $ ---- browser/locales/en-US/chrome/browser/aboutDialog.dtd.orig Mon May 15 23:26:11 2006 -+++ browser/locales/en-US/chrome/browser/aboutDialog.dtd Mon Oct 30 18:18:43 2006 -@@ -1,6 +1,6 @@ - - -- -+ - - - - -- -+ - - - diff --git a/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 b/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 deleted file mode 100644 index 2746f6a4740..00000000000 --- a/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-build_autoconf_altoptions_m4,v 1.3 2007/01/12 21:46:17 kurt Exp $ ---- build/autoconf/altoptions.m4.orig Sun Apr 18 17:17:09 2004 -+++ build/autoconf/altoptions.m4 Fri Nov 3 22:35:39 2006 -@@ -143,14 +143,3 @@ echo " - [$3] - fi - ]) -- --dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file --AC_DEFUN(MOZ_READ_MOZCONFIG, --[AC_REQUIRE([AC_INIT_BINSH])dnl --# Read in '.mozconfig' script to set the initial options. --# See the mozconfig2configure script for more details. --_AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf --. $_AUTOCONF_TOOLS_DIR/mozconfig2configure]) -- --dnl This gets inserted at the top of the configure script --MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR) diff --git a/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h b/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h deleted file mode 100644 index 0593e77a71a..00000000000 --- a/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-config_mkdepend_imakemdep_h,v 1.2 2005/12/20 23:44:00 bernd Exp $ ---- config/mkdepend/imakemdep.h.orig Tue Apr 20 23:38:14 2004 -+++ config/mkdepend/imakemdep.h Sat Sep 10 09:47:31 2005 -@@ -440,6 +440,9 @@ char *cpp_argv[ARGUMENTS] = { - # ifdef __i386__ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", - # endif diff --git a/www/mozilla-firefox/patches/patch-config_rules_mk b/www/mozilla-firefox/patches/patch-config_rules_mk deleted file mode 100644 index 7ead22df71b..00000000000 --- a/www/mozilla-firefox/patches/patch-config_rules_mk +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-config_rules_mk,v 1.4 2007/01/12 21:46:17 kurt Exp $ ---- config/rules.mk.orig Tue Nov 28 19:03:37 2006 -+++ config/rules.mk Mon Dec 11 15:50:49 2006 -@@ -1014,7 +1014,6 @@ endif # NO_LD_ARCHIVE_FLAGS - else # os2 vacpp - $(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) - endif # !os2 vacpp -- chmod +x $@ - ifndef NO_COMPONENT_LINK_MAP - ifndef MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS - ifndef MOZ_DEBUG diff --git a/www/mozilla-firefox/patches/patch-configure_in b/www/mozilla-firefox/patches/patch-configure_in index 2959e8eeb61..5e3ce578b7c 100644 --- a/www/mozilla-firefox/patches/patch-configure_in +++ b/www/mozilla-firefox/patches/patch-configure_in @@ -1,21 +1,6 @@ -$OpenBSD: patch-configure_in,v 1.8 2007/01/12 21:46:17 kurt Exp $ +$OpenBSD: patch-configure_in,v 1.9 2007/03/01 22:46:06 robert Exp $ --- configure.in.orig Fri Sep 15 16:13:01 2006 +++ configure.in Fri Nov 3 22:36:05 2006 -@@ -1317,10 +1317,10 @@ dnl Get mozilla version from central mil - MOZILLA_VERSION=`$PERL $srcdir/config/milestone.pl -topsrcdir $srcdir` - - dnl Get version of various core apps from the version files. --FIREFOX_VERSION=`cat $topsrcdir/browser/config/version.txt` --THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt` --SUNBIRD_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt` --SEAMONKEY_VERSION=`cat $topsrcdir/xpfe/bootstrap/version.txt` -+FIREFOX_VERSION=`cat ./browser/config/version.txt` -+THUNDERBIRD_VERSION=`cat ./mail/config/version.txt` -+SUNBIRD_VERSION=`cat ./calendar/sunbird/config/version.txt` -+SEAMONKEY_VERSION=`cat ./xpfe/bootstrap/version.txt` - - AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION") - AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION) @@ -1931,7 +1931,7 @@ case "$target" in ;; @@ -43,12 +28,3 @@ $OpenBSD: patch-configure_in,v 1.8 2007/01/12 21:46:17 kurt Exp $ PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" fi -@@ -4243,7 +4243,7 @@ suite) - - browser) - MOZ_APP_NAME=firefox -- MOZ_APP_DISPLAYNAME=BonEcho -+ MOZ_APP_DISPLAYNAME=FirefoxCommunityEdition - MOZ_XUL_APP=1 - MOZ_PHOENIX=1 - MOZ_SAFE_BROWSING=1 diff --git a/www/mozilla-firefox/patches/patch-js_src_js_c b/www/mozilla-firefox/patches/patch-js_src_js_c new file mode 100644 index 00000000000..ec2be10af16 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-js_src_js_c @@ -0,0 +1,11 @@ +$OpenBSD: patch-js_src_js_c,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- js/src/js.c.orig Thu Dec 21 04:24:08 2006 ++++ js/src/js.c Wed Feb 28 17:55:24 2007 +@@ -1116,7 +1116,6 @@ Disassemble(JSContext *cx, JSObject *obj + SHOW_FLAG(THISP_STRING); + SHOW_FLAG(THISP_NUMBER); + SHOW_FLAG(THISP_BOOLEAN); +- SHOW_FLAG(BLOCKLOCALFUN); + SHOW_FLAG(INTERPRETED); + + #undef SHOW_FLAG diff --git a/www/mozilla-firefox/patches/patch-js_src_jsemit_c b/www/mozilla-firefox/patches/patch-js_src_jsemit_c new file mode 100644 index 00000000000..e1c258a279a --- /dev/null +++ b/www/mozilla-firefox/patches/patch-js_src_jsemit_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-js_src_jsemit_c,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- js/src/jsemit.c.orig Wed Jan 17 01:07:07 2007 ++++ js/src/jsemit.c Wed Feb 28 17:56:46 2007 +@@ -1324,7 +1324,9 @@ EmitNonLocalJumpFixup(JSContext *cx, JSC + JS_ASSERT(*returnop == JSOP_RETURN); + for (stmt = cg->treeContext.topStmt; stmt != toStmt; + stmt = stmt->down) { +- if (stmt->type == STMT_FINALLY) { ++ if (stmt->type == STMT_FINALLY || ++ ((cg->treeContext.flags & TCF_FUN_HEAVYWEIGHT) && ++ STMT_MAYBE_SCOPE(stmt))) { + if (js_Emit1(cx, cg, JSOP_SETRVAL) < 0) + return JS_FALSE; + *returnop = JSOP_RETRVAL; +@@ -4000,7 +4002,9 @@ js_EmitTree(JSContext *cx, JSCodeGenerat + if (stmt && stmt->type == STMT_BLOCK && + stmt->down && stmt->down->type == STMT_BLOCK && + (stmt->down->flags & SIF_SCOPE)) { +- cg->treeContext.flags |= TCF_HAS_BLOCKLOCALFUN; ++ obj = ATOM_TO_OBJECT(stmt->down->atom); ++ JS_ASSERT(LOCKED_OBJ_GET_CLASS(obj) == &js_BlockClass); ++ OBJ_SET_PARENT(cx, fun->object, obj); + } + + if (atomIndex >= JS_BIT(16)) { diff --git a/www/mozilla-firefox/patches/patch-js_src_jsemit_h b/www/mozilla-firefox/patches/patch-js_src_jsemit_h new file mode 100644 index 00000000000..ad6b757e984 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-js_src_jsemit_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-js_src_jsemit_h,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- js/src/jsemit.h.orig Tue Nov 21 23:07:45 2006 ++++ js/src/jsemit.h Wed Feb 28 17:55:24 2007 +@@ -183,8 +183,6 @@ struct JSTreeContext { /* t + #define TCF_FUN_FLAGS 0x1E0 /* flags to propagate from FunctionBody */ + #define TCF_HAS_DEFXMLNS 0x200 /* default xml namespace = ...; parsed */ + #define TCF_HAS_FUNCTION_STMT 0x400 /* block contains a function statement */ +-#define TCF_HAS_BLOCKLOCALFUN 0x800 /* inner function declared in let-bearing +- outer function body */ + + #define TREE_CONTEXT_INIT(tc) \ + ((tc)->flags = (tc)->numGlobalVars = 0, \ diff --git a/www/mozilla-firefox/patches/patch-js_src_jsfun_h b/www/mozilla-firefox/patches/patch-js_src_jsfun_h new file mode 100644 index 00000000000..bcc32d988d2 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-js_src_jsfun_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-js_src_jsfun_h,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- js/src/jsfun.h.orig Tue Nov 21 23:07:45 2006 ++++ js/src/jsfun.h Wed Feb 28 17:55:24 2007 +@@ -68,8 +68,6 @@ struct JSFunction { + }; + + #define JSFUN_INTERPRETED 0x8000 /* use u.i if set, u.n if unset */ +-#define JSFUN_BLOCKLOCALFUN 0x4000 /* has body block containing both let vars +- and local function declarations */ + + #define FUN_INTERPRETED(fun) ((fun)->flags & JSFUN_INTERPRETED) + #define FUN_NATIVE(fun) (FUN_INTERPRETED(fun) ? NULL : (fun)->u.n.native) diff --git a/www/mozilla-firefox/patches/patch-js_src_jsinterp_c b/www/mozilla-firefox/patches/patch-js_src_jsinterp_c new file mode 100644 index 00000000000..df7981f9c5f --- /dev/null +++ b/www/mozilla-firefox/patches/patch-js_src_jsinterp_c @@ -0,0 +1,82 @@ +$OpenBSD: patch-js_src_jsinterp_c,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- js/src/jsinterp.c.orig Sat Jan 20 04:46:50 2007 ++++ js/src/jsinterp.c Wed Feb 28 18:20:01 2007 +@@ -4889,33 +4889,28 @@ interrupt: + * here captures the let variables. + */ + JS_ASSERT(!fp->blockChain); +- if (fp->fun && (fp->fun->flags & JSFUN_BLOCKLOCALFUN)) { +- jsatomid aid; +- +- obj2 = NULL; +- for (aid = 0; aid < script->atomMap.length; aid++) { +- if (ATOM_IS_OBJECT(script->atomMap.vector[aid])) { +- obj2 = ATOM_TO_OBJECT(script->atomMap.vector[aid]); +- if (OBJ_GET_CLASS(cx, obj2) == &js_BlockClass) +- break; +- } +- } +- fp->blockChain = obj2; ++ if (!(fp->flags & JSFRAME_POP_BLOCKS)) { ++ parent = OBJ_GET_PARENT(cx, obj); ++ if (OBJ_GET_CLASS(cx, parent) == &js_BlockClass) ++ fp->blockChain = parent; ++ parent = js_GetScopeChain(cx, fp); ++ } else { ++ parent = fp->scopeChain; ++ JS_ASSERT(OBJ_GET_CLASS(cx, parent) == &js_BlockClass); ++ JS_ASSERT(OBJ_GET_PROTO(cx, parent) == OBJ_GET_PARENT(cx, obj)); ++ JS_ASSERT(OBJ_GET_CLASS(cx, OBJ_GET_PARENT(cx, parent)) ++ == &js_CallClass); + } + + /* If re-parenting, store a clone of the function object. */ +- obj2 = fp->scopeChain; +- parent = js_GetScopeChain(cx, fp); + if (OBJ_GET_PARENT(cx, obj) != parent) { + SAVE_SP_AND_PC(fp); + obj = js_CloneFunctionObject(cx, obj, parent); +- if (!obj) ++ if (!obj) { + ok = JS_FALSE; ++ goto out; ++ } + } +- fp->blockChain = NULL; +- fp->scopeChain = obj2; +- if (!ok) +- goto out; + fp->vars[slot] = OBJECT_TO_JSVAL(obj); + END_LITOPX_CASE(JSOP_DEFLOCALFUN) + +@@ -5814,6 +5809,7 @@ interrupt: + END_LITOPX_CASE(JSOP_SETMETHOD) + + BEGIN_CASE(JSOP_GETFUNNS) ++ SAVE_SP_AND_PC(fp); + ok = js_GetFunctionNamespace(cx, &rval); + if (!ok) + goto out; +@@ -5842,12 +5838,17 @@ interrupt: + */ + if (fp->flags & JSFRAME_POP_BLOCKS) { + JS_ASSERT(!fp->blockChain); +- obj = js_CloneBlockObject(cx, obj, fp->scopeChain, fp); +- if (!obj) { +- ok = JS_FALSE; +- goto out; ++ parent = fp->scopeChain; ++ if (OBJ_GET_PROTO(cx, parent) == obj) { ++ JS_ASSERT(OBJ_GET_CLASS(cx, parent) == &js_BlockClass); ++ } else { ++ obj = js_CloneBlockObject(cx, obj, parent, fp); ++ if (!obj) { ++ ok = JS_FALSE; ++ goto out; ++ } ++ fp->scopeChain = obj; + } +- fp->scopeChain = obj; + } else { + JS_ASSERT(!fp->blockChain || + OBJ_GET_PARENT(cx, obj) == fp->blockChain); diff --git a/www/mozilla-firefox/patches/patch-js_src_jsscript_c b/www/mozilla-firefox/patches/patch-js_src_jsscript_c new file mode 100644 index 00000000000..24e127105f5 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-js_src_jsscript_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-js_src_jsscript_c,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- js/src/jsscript.c.orig Mon Jan 29 10:33:15 2007 ++++ js/src/jsscript.c Wed Feb 28 17:55:24 2007 +@@ -1354,8 +1354,6 @@ js_NewScriptFromCG(JSContext *cx, JSCode + fun->u.i.script = script; + if (cg->treeContext.flags & TCF_FUN_HEAVYWEIGHT) + fun->flags |= JSFUN_HEAVYWEIGHT; +- if (cg->treeContext.flags & TCF_HAS_BLOCKLOCALFUN) +- fun->flags |= JSFUN_BLOCKLOCALFUN; + } + + /* Tell the debugger about this compiled script. */ diff --git a/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js b/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js index f1e154335c7..d99a8221c6d 100644 --- a/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js +++ b/www/mozilla-firefox/patches/patch-modules_libpref_src_init_all_js @@ -1,7 +1,7 @@ -$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.6 2007/01/12 21:46:17 kurt Exp $ ---- modules/libpref/src/init/all.js.orig Sat Aug 19 08:56:14 2006 -+++ modules/libpref/src/init/all.js Fri Nov 3 22:35:40 2006 -@@ -1931,33 +1931,33 @@ pref("font.name.monospace.ko", "monospac +$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.7 2007/03/01 22:46:06 robert Exp $ +--- modules/libpref/src/init/all.js.orig Fri Jan 5 03:04:33 2007 ++++ modules/libpref/src/init/all.js Fri Feb 23 21:41:00 2007 +@@ -1932,33 +1932,33 @@ pref("font.name.monospace.ko", "monospac // th @@ -50,7 +50,7 @@ $OpenBSD: patch-modules_libpref_src_init_all_js,v 1.6 2007/01/12 21:46:17 kurt E pref("font.name.serif.zh-CN", "serif"); pref("font.name.sans-serif.zh-CN", "sans-serif"); -@@ -2097,7 +2097,7 @@ pref("font.scale.outline.min", 6); +@@ -2098,7 +2098,7 @@ pref("font.scale.outline.min", 6); // TrueType pref("font.FreeType2.enable", false); diff --git a/www/mozilla-firefox/patches/patch-modules_plugin_base_public_nptypes_h b/www/mozilla-firefox/patches/patch-modules_plugin_base_public_nptypes_h index dc1ed224fb1..65cbbf565b4 100644 --- a/www/mozilla-firefox/patches/patch-modules_plugin_base_public_nptypes_h +++ b/www/mozilla-firefox/patches/patch-modules_plugin_base_public_nptypes_h @@ -1,4 +1,4 @@ -$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.2 2005/12/20 23:44:00 bernd Exp $ +$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.3 2007/03/01 22:46:06 robert Exp $ --- modules/plugin/base/public/nptypes.h.orig Thu May 19 23:49:42 2005 +++ modules/plugin/base/public/nptypes.h Sat Sep 10 09:27:13 2005 @@ -67,10 +67,8 @@ @@ -18,7 +18,7 @@ $OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.2 2005/12/20 23:44:00 b #else /* - * FreeBSD defines uint32_t and bool. -+ * FreeBSD, and OpenBSD defines uint32_t and bool. ++ * FreeBSD and OpenBSD define uint32_t and bool. */ #include #include diff --git a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk index 97b857e7a21..4c7b3f555ef 100644 --- a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk +++ b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk @@ -1,16 +1,8 @@ -$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.6 2007/01/12 21:46:17 kurt Exp $ +$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.7 2007/03/01 22:46:06 robert Exp $ --- security/coreconf/OpenBSD.mk.orig Sun Apr 25 18:02:17 2004 -+++ security/coreconf/OpenBSD.mk Fri Nov 3 22:38:43 2006 -@@ -37,12 +37,12 @@ - - include $(CORE_DEPTH)/coreconf/UNIX.mk - --DEFAULT_COMPILER = gcc --CC = gcc --CCC = g++ -+DEFAULT_COMPILER = ${CC} -+#CC = ${CC} -+CCC = ${CXX} ++++ security/coreconf/OpenBSD.mk Fri Feb 23 21:56:45 2007 +@@ -42,7 +42,7 @@ CC = gcc + CCC = g++ RANLIB = ranlib -CPU_ARCH := $(shell uname -p) diff --git a/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk b/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk deleted file mode 100644 index 76a41528d29..00000000000 --- a/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-security_coreconf_rules_mk,v 1.3 2007/01/12 21:46:17 kurt Exp $ ---- security/coreconf/rules.mk.orig Mon Oct 2 08:18:13 2006 -+++ security/coreconf/rules.mk Mon Dec 11 15:49:56 2006 -@@ -348,7 +348,6 @@ ifdef XP_OS2_VACPP - else - $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) - endif -- chmod +x $@ - ifeq ($(OS_TARGET),Darwin) - ifdef MAPFILE - nmedit -s $(MAPFILE) $@ diff --git a/www/mozilla-firefox/patches/patch-security_manager_boot_src_nsSecureBrowserUIImpl_cpp b/www/mozilla-firefox/patches/patch-security_manager_boot_src_nsSecureBrowserUIImpl_cpp new file mode 100644 index 00000000000..8796ce77181 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-security_manager_boot_src_nsSecureBrowserUIImpl_cpp @@ -0,0 +1,18 @@ +$OpenBSD: patch-security_manager_boot_src_nsSecureBrowserUIImpl_cpp,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- security/manager/boot/src/nsSecureBrowserUIImpl.cpp.orig Tue Jun 13 22:13:18 2006 ++++ security/manager/boot/src/nsSecureBrowserUIImpl.cpp Tue Feb 27 15:05:04 2007 +@@ -861,6 +861,14 @@ nsSecureBrowserUIImpl::OnStateChange(nsI + } + } + ++ if (loadFlags & nsIChannel::LOAD_RETARGETED_DOCUMENT_URI) ++ { ++ // The original consumer (this) is no longer the target of the load. ++ // Ignore any events with this flag, do not allow them to update ++ // our secure UI state. ++ return NS_OK; ++ } ++ + if (aProgressStateFlags & STATE_START + && + aProgressStateFlags & STATE_IS_REQUEST diff --git a/www/mozilla-firefox/patches/patch-toolkit_content_widgets_tabbrowser_xml b/www/mozilla-firefox/patches/patch-toolkit_content_widgets_tabbrowser_xml new file mode 100644 index 00000000000..c85523de52a --- /dev/null +++ b/www/mozilla-firefox/patches/patch-toolkit_content_widgets_tabbrowser_xml @@ -0,0 +1,19 @@ +$OpenBSD: patch-toolkit_content_widgets_tabbrowser_xml,v 1.1 2007/03/01 22:46:06 robert Exp $ +--- toolkit/content/widgets/tabbrowser.xml.orig Sun Sep 24 00:27:25 2006 ++++ toolkit/content/widgets/tabbrowser.xml Tue Feb 27 15:05:14 2007 +@@ -599,12 +599,13 @@ + // If location bar is hidden and the URL type supports a host, + // add the scheme and host to the title to prevent spoofing. + // XXX https://bugzilla.mozilla.org/show_bug.cgi?id=22183#c239 +- // (only for schemes that support a host) + try { + if (docElement.getAttribute("chromehidden").indexOf("location") != -1) { + var uri = this.mURIFixup.createExposableURI( + this.mCurrentBrowser.currentURI); +- if (uri.host) ++ if (uri.scheme == "about") ++ newTitle = uri.spec + sep + newTitle; ++ else + newTitle = uri.prePath + sep + newTitle; + } + } catch (e) {} diff --git a/www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in b/www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in deleted file mode 100644 index f351baae252..00000000000 --- a/www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-xpcom_glue_standalone_Makefile_in,v 1.2 2006/05/05 10:14:21 bernd Exp $ ---- xpcom/glue/standalone/Makefile.in.orig Thu Jan 5 20:35:20 2006 -+++ xpcom/glue/standalone/Makefile.in Wed May 3 13:26:43 2006 -@@ -62,6 +62,9 @@ endif - ifneq (,$(filter AIX DragonFly FreeBSD Linux NetBSD OpenBSD SunOS,$(OS_ARCH))) - LINKSRC = nsGlueLinkingDlopen.cpp - endif -+ifeq (OpenBSD,$(OS_ARCH)) -+LINKSRC = nsGlueLinkingDlopen.cpp -+endif - ifeq (OS2,$(OS_ARCH)) - LINKSRC = nsGlueLinkingOS2.cpp - endif diff --git a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h index f3c0def2c35..505bde720b8 100644 --- a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h +++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h @@ -1,14 +1,15 @@ -$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.3 2005/01/04 21:14:23 wilfried Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig Thu Jan 8 19:17:07 2004 -+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Fri Nov 12 21:09:52 2004 +$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86_h,v 1.4 2007/03/01 22:46:06 robert Exp $ +--- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig Thu Feb 23 21:37:11 2006 ++++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Sun Feb 18 11:28:45 2007 @@ -107,12 +107,16 @@ #define THUNK_BASED_THIS_ADJUST #elif defined(__OpenBSD__) +-/* OpenBSD instroduces GCC 2.95.x in late May 1999 */ +#if __GNUC__ >= 3 +#define THUNK_BASED_THIS_ADJUST +#else - /* OpenBSD instroduces GCC 2.95.x in late May 1999 */ ++/* OpenBSD introduces GCC 2.95.x in late May 1999 */ #include #if OpenBSD <= 199905 #define THUNK_BASED_THIS_ADJUST diff --git a/www/mozilla-firefox/pkg/PLIST-main b/www/mozilla-firefox/pkg/PLIST-main index bc625e7f730..959d3561dc8 100644 --- a/www/mozilla-firefox/pkg/PLIST-main +++ b/www/mozilla-firefox/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.2 2007/02/14 22:44:32 naddy Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2007/03/01 22:46:06 robert Exp $ @conflict mozilla-firebird-* @pkgpath www/mozilla-firefox %%SHARED%% @@ -9,8 +9,6 @@ bin/mozilla-firefox mozilla-firefox/ mozilla-firefox/LICENSE mozilla-firefox/README.OpenBSD -mozilla-firefox/bloaturls.txt -mozilla-firefox/browserconfig.properties mozilla-firefox/chrome/ mozilla-firefox/chrome/browser.jar mozilla-firefox/chrome/browser.manifest @@ -90,7 +88,6 @@ mozilla-firefox/components/filepicker.xpt mozilla-firefox/components/find.xpt mozilla-firefox/components/gfx.xpt mozilla-firefox/components/gksvgrenderer.xpt -mozilla-firefox/components/globalstore.js mozilla-firefox/components/history.xpt mozilla-firefox/components/htmlparser.xpt mozilla-firefox/components/imglib2.xpt