From 1ea3eea4985f901bb6cf167b68ee9f26859fc2cf Mon Sep 17 00:00:00 2001 From: bernd Date: Tue, 20 Dec 2005 23:44:00 +0000 Subject: [PATCH] Update to Firefox 1.5. Team work by wilfried@, kurt@ and me. Tested by many. Thanks a lot! ok kurt@ krw@ jolan@ ian@ pvalchev@ --- www/mozilla-firefox/Makefile | 59 ++--- www/mozilla-firefox/distinfo | 8 +- www/mozilla-firefox/files/Extensions.rdf | 24 -- .../patches/patch-browser_app_mozilla_in | 12 +- ...er_locales_en-US_chrome_branding_brand_dtd | 11 + ...les_en-US_chrome_branding_brand_properties | 9 + .../patch-build_autoconf_altoptions_m4 | 8 +- .../patches/patch-config_autoconf_mk_in | 10 +- .../patches/patch-config_mkdepend_imakemdep_h | 8 +- .../patches/patch-config_rules_mk | 41 ++- .../patches/patch-configure_in | 36 ++- ...nsions_transformiix_source_base_Double_cpp | 8 +- .../patches/patch-gfx_idl_nsIFreeType2_idl | 47 ---- .../patch-gfx_src_freetype_nsFreeType_cpp | 60 ----- .../patch-gfx_src_freetype_nsFreeType_h | 39 --- ...patch-gfx_src_gtk_nsDeviceContextSpecG_cpp | 12 - .../patches/patch-gfx_src_gtk_nsScreenGtk_cpp | 12 - .../patch-gfx_src_ps_nsFontMetricsPS_cpp | 61 ----- .../patch-gfx_src_ps_nsFontMetricsPS_h | 21 -- ...patch-gfx_src_x11shared_nsFontFreeType_cpp | 74 ------ .../patch-gfx_src_x11shared_nsFontFreeType_h | 12 - .../patch-htmlparser_public_nsHTMLTagList_h | 19 -- .../patch-htmlparser_src_COtherElements_h | 19 -- .../patch-htmlparser_src_nsElementTable_cpp | 35 --- .../patch-htmlparser_src_nsHTMLTags_cpp | 30 --- .../patches/patch-htmlparser_tools_gentags_pl | 19 -- .../patch-modules_libpref_src_init_all_js | 8 +- ...patch-modules_plugin_base_public_nptypes_h | 31 ++- .../patches/patch-nsprpub_config_rules_mk | 8 +- .../patches/patch-nsprpub_configure_in | 8 +- .../patch-nsprpub_pr_include_md__openbsd_h | 8 +- .../patch-nsprpub_pr_include_private_primpl_h | 8 +- .../patches/patch-nsprpub_pr_src_io_prprf_c | 14 - .../patch-nsprpub_pr_src_misc_prdtoa_c | 12 +- .../patch-nsprpub_pr_src_misc_prinit_c | 12 +- .../patch-nsprpub_pr_src_misc_prnetdb_c | 8 +- .../patch-nsprpub_pr_src_pthreads_ptthread_c | 8 +- .../patch-security_coreconf_OpenBSD_mk | 12 +- .../patches/patch-security_coreconf_rules_mk | 8 +- .../patches/patch-widget_src_gtk2_nsSound_cpp | 8 +- .../patches/patch-widget_src_gtk_nsSound_cpp | 8 +- ...com_components_nsNativeComponentLoader_cpp | 8 +- .../patch-xpcom_glue_standalone_Makefile_in | 13 + .../patch-xpcom_io_nsNativeCharsetUtils_cpp | 15 -- ...om_reflect_xptcall_src_md_unix_Makefile_in | 14 +- .../patches/patch-xpcom_sample_Makefile_in | 12 - www/mozilla-firefox/pkg/PFRAG.shared | 16 +- www/mozilla-firefox/pkg/PLIST | 249 +++--------------- 48 files changed, 274 insertions(+), 908 deletions(-) delete mode 100644 www/mozilla-firefox/files/Extensions.rdf create mode 100644 www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_dtd create mode 100644 www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_properties delete mode 100644 www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_cpp delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_h delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_h delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_cpp delete mode 100644 www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_h delete mode 100644 www/mozilla-firefox/patches/patch-htmlparser_public_nsHTMLTagList_h delete mode 100644 www/mozilla-firefox/patches/patch-htmlparser_src_COtherElements_h delete mode 100644 www/mozilla-firefox/patches/patch-htmlparser_src_nsElementTable_cpp delete mode 100644 www/mozilla-firefox/patches/patch-htmlparser_src_nsHTMLTags_cpp delete mode 100644 www/mozilla-firefox/patches/patch-htmlparser_tools_gentags_pl delete mode 100644 www/mozilla-firefox/patches/patch-nsprpub_pr_src_io_prprf_c create mode 100644 www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in delete mode 100644 www/mozilla-firefox/patches/patch-xpcom_io_nsNativeCharsetUtils_cpp delete mode 100644 www/mozilla-firefox/patches/patch-xpcom_sample_Makefile_in diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile index 0b1aa0d009c..f2d3f4e47ad 100644 --- a/www/mozilla-firefox/Makefile +++ b/www/mozilla-firefox/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.41 2005/11/15 09:21:52 wilfried Exp $ +# $OpenBSD: Makefile,v 1.42 2005/12/20 23:44:00 bernd Exp $ ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64 COMMENT= "redesign of Mozilla's browser component" -VER= 1.0.7 +VER= 1.5 DISTNAME= mozilla -PKGNAME= mozilla-firefox-${VER}p5 -SO_VERSION= 7.0 +PKGNAME= mozilla-firefox-${VER} +SO_VERSION= 8.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. @@ -20,23 +20,21 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext Xft Xp Xrender Xt c cairo fontconfig freetype \ - atk-1.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \ - jpeg m pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 \ - png pthread z +WANTLIB= X11 Xft Xrender Xinerama Xt c fontconfig freetype m pthread z \ + atk-1.0.0.0 cairo glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \ + jpeg pango-1.0.0.0 pangoft2-1.0.0.0 pangocairo-1.0.0.0 png .if empty(MACHINE_ARCH:Malpha) -WANTLIB+= stdc++ +WANTLIB+= stdc++ .endif MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/ \ http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/ DISTFILES= firefox-${VER}-source.tar.bz2 -MODULES= gcc3 devel/gettext +MODULES= gcc3 gettext MODGCC3_ARCHES= alpha MODGCC3_LANGS= C++ RUN_DEPENDS= :esound-*:audio/esound - BUILD_DEPENDS= :libIDL-*:devel/libIDL \ :zip->=2.3:archivers/zip \ :pkgconfig-*:devel/pkgconfig @@ -67,36 +65,34 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \ --disable-tests \ --disable-pedantic \ --disable-installer \ - --disable-gnomevfs + --disable-updater \ + --disable-gnomeui \ + --disable-gnomevfs \ + --enable-xinerama \ + --enable-svg \ + --enable-svg-renderer=cairo \ + --enable-system-cairo \ + --enable-canvas # from browser/config/mozconfig -CONFIGURE_ARGS+=--disable-ldap \ - --disable-mailnews \ - --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,negotiateauth \ - --enable-crypto \ - --disable-composer \ - --enable-single-profile \ - --disable-profilesharing +CONFIGURE_ARGS+=--enable-application=browser -CONFIGURE_ENV= MOZ_PHOENIX=1 \ - PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" \ - BUILD_OFFICIAL=1 \ - MOZILLA_OFFICIAL=1 \ - SO_VERSION="${SO_VERSION}" -MAKE_ENV= MOZ_PHOENIX=1 \ +MAKE_ENV= MOZ_CO_PROJECT=browser \ LD_LIBRARY_PATH="${WRKSRC}/dist/bin" \ BUILD_OFFICIAL=1 \ MOZILLA_OFFICIAL=1 \ SO_VERSION="${SO_VERSION}" +CONFIGURE_ENV= ${MAKE_ENV} \ + PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig" MOB= ${WRKSRC}/dist/bin MOZ= ${PREFIX}/mozilla-firefox -MAGIC= {972ce4c6-7e08-4474-a285-3208198ce6fd} post-extract: @cp ${FILESDIR}/xptc* ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix/ pre-configure: + @cd ${WRKSRC}/browser/base/branding/ && cp aboutCredits.png about.png @cd ${WRKSRC}/nsprpub && ${SETENV} ${AUTOCONF_ENV} ${AUTOCONF} @perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g; s|_X11BASE_|${X11BASE}|g' \ ${WRKSRC}/browser/app/mozilla.in @@ -105,7 +101,7 @@ pre-configure: ${WRKSRC}/xpcom/components/nsNativeComponentLoader.cpp do-install: -.for dir in chrome components defaults greprefs res searchplugins +.for dir in chrome components defaults extensions greprefs res searchplugins ${INSTALL_DATA_DIR} ${MOZ}/${dir} @cd ${MOB} && ${TAR} -chf - ${dir} | \ ${TAR} -xf - -C ${MOZ} @@ -114,17 +110,12 @@ do-install: ${TAR} -xf - -C ${MOZ} @chmod 444 ${MOZ}/*.so.?.? ${MOZ}/components/*.so.?.? ${MOZ}/components/*.js ${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ} + ${INSTALL_DATA} ${WRKSRC}/browser/app/mozicon16.xpm ${WRKSRC}/browser/app/mozicon50.xpm ${MOZ} ${INSTALL_SCRIPT} ${MOB}/firefox ${MOB}/firefox-config ${PREFIX}/bin/ ln -f ${PREFIX}/bin/firefox ${PREFIX}/bin/mozilla-firefox ${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ} - ${INSTALL_PROGRAM} ${MOB}/regchrome ${MOB}/regxpcom ${MOB}/firefox-bin ${MOB}/mozilla-xremote-client ${MOZ} + ${INSTALL_PROGRAM} ${MOB}/regxpcom ${MOB}/firefox-bin ${MOB}/mozilla-xremote-client ${MOZ} ln -f ${MOZ}/firefox-bin ${MOZ}/mozilla-firefox-bin - ${INSTALL_DATA_DIR} ${MOZ}/extensions - ${INSTALL_DATA} ${FILESDIR}/Extensions.rdf ${MOZ}/extensions/ - ${INSTALL_DATA_DIR} ${MOZ}/extensions/${MAGIC} - ${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/installed-extensions.txt ${MOZ}/extensions/installed-extensions-processed.txt - ${INSTALL_DATA} ${MOZ}/defaults/profile/extensions/${MAGIC}/install.rdf ${MOZ}/extensions/${MAGIC}/ - .include diff --git a/www/mozilla-firefox/distinfo b/www/mozilla-firefox/distinfo index b11e65f284d..187eae39a2a 100644 --- a/www/mozilla-firefox/distinfo +++ b/www/mozilla-firefox/distinfo @@ -1,4 +1,4 @@ -MD5 (firefox-1.0.7-source.tar.bz2) = 5704a8c36de84b408e069afb0c5bc1df -RMD160 (firefox-1.0.7-source.tar.bz2) = 8afafa2d772cabeacde5bad6dc053f9a0ee9a588 -SHA1 (firefox-1.0.7-source.tar.bz2) = ac7549f609db8dbea6db33b2ffb3ae546eea64df -SIZE (firefox-1.0.7-source.tar.bz2) = 32793876 +MD5 (firefox-1.5-source.tar.bz2) = fa915ddcadecda30ed3e13694f26a779 +RMD160 (firefox-1.5-source.tar.bz2) = 5e7475846e9c92e36167a384e1e8a3d699b0b62f +SHA1 (firefox-1.5-source.tar.bz2) = 7437c6a351787ec8762e598ae1852e22bcca3220 +SIZE (firefox-1.5-source.tar.bz2) = 34491496 diff --git a/www/mozilla-firefox/files/Extensions.rdf b/www/mozilla-firefox/files/Extensions.rdf deleted file mode 100644 index d45eae695e9..00000000000 --- a/www/mozilla-firefox/files/Extensions.rdf +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - diff --git a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in index 5cff6a1306b..529add99c42 100644 --- a/www/mozilla-firefox/patches/patch-browser_app_mozilla_in +++ b/www/mozilla-firefox/patches/patch-browser_app_mozilla_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-browser_app_mozilla_in,v 1.4 2005/10/13 04:32:41 bernd Exp $ ---- browser/app/mozilla.in.orig Tue Sep 20 23:10:28 2005 -+++ browser/app/mozilla.in Wed Oct 12 13:06:37 2005 -@@ -73,6 +73,7 @@ moz_pis_startstop_scripts() +$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 +@@ -93,6 +93,7 @@ moz_pis_startstop_scripts() #set -x moz_libdir=%MOZAPPDIR% @@ -9,7 +9,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.4 2005/10/13 04:32:41 bernd Exp $ MRE_HOME=%MREDIR% # Use run-mozilla.sh in the current dir if it exists -@@ -110,6 +111,7 @@ if [ $found = 0 ]; then +@@ -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" @@ -17,7 +17,7 @@ $OpenBSD: patch-browser_app_mozilla_in,v 1.4 2005/10/13 04:32:41 bernd Exp $ else echo "Cannot find mozilla runtime directory. Exiting." exit 1 -@@ -217,7 +219,11 @@ do +@@ -171,7 +173,11 @@ do esac done 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 new file mode 100644 index 00000000000..05b2f609af0 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_dtd @@ -0,0 +1,11 @@ +$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_dtd,v 1.1 2005/12/20 23:44:00 bernd Exp $ +--- browser/locales/en-US/chrome/branding/brand.dtd.orig Thu Dec 1 18:34:19 2005 ++++ browser/locales/en-US/chrome/branding/brand.dtd Thu Dec 1 18:35:24 2005 +@@ -1,5 +1,5 @@ +- +- ++ ++ + + + 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 new file mode 100644 index 00000000000..ec48df34e3a --- /dev/null +++ b/www/mozilla-firefox/patches/patch-browser_locales_en-US_chrome_branding_brand_properties @@ -0,0 +1,9 @@ +$OpenBSD: patch-browser_locales_en-US_chrome_branding_brand_properties,v 1.1 2005/12/20 23:44:00 bernd Exp $ +--- browser/locales/en-US/chrome/branding/brand.properties.orig Fri Dec 2 14:42:57 2005 ++++ browser/locales/en-US/chrome/branding/brand.properties Fri Dec 2 14:43:20 2005 +@@ -1,3 +1,3 @@ +-brandShortName=Deer Park +-brandFullName=Deer Park ++brandShortName=Firefox Community Edition ++brandFullName=Firefox Community Edition + vendorShortName=Mozilla diff --git a/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 b/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 index df4849ac7ac..1d24858301b 100644 --- a/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 +++ b/www/mozilla-firefox/patches/patch-build_autoconf_altoptions_m4 @@ -1,7 +1,7 @@ -$OpenBSD: patch-build_autoconf_altoptions_m4,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $ ---- build/autoconf/altoptions.m4.orig 2001-10-29 23:59:28.000000000 +0100 -+++ build/autoconf/altoptions.m4 2003-12-12 12:41:29.000000000 +0100 -@@ -127,14 +127,3 @@ echo " +$OpenBSD: patch-build_autoconf_altoptions_m4,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- build/autoconf/altoptions.m4.orig Sun Apr 18 16:17:09 2004 ++++ build/autoconf/altoptions.m4 Sat Sep 10 09:47:31 2005 +@@ -143,14 +143,3 @@ echo " [$3] fi ]) diff --git a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in index 0384a799448..f5e13b507ba 100644 --- a/www/mozilla-firefox/patches/patch-config_autoconf_mk_in +++ b/www/mozilla-firefox/patches/patch-config_autoconf_mk_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_autoconf_mk_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- config/autoconf.mk.in.orig Sun Oct 31 05:29:54 2004 -+++ config/autoconf.mk.in Tue Nov 9 15:14:16 2004 -@@ -32,13 +32,13 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA +$OpenBSD: patch-config_autoconf_mk_in,v 1.3 2005/12/20 23:44:00 bernd Exp $ +--- config/autoconf.mk.in.orig Wed Aug 17 19:17:17 2005 ++++ config/autoconf.mk.in Sat Sep 10 09:47:31 2005 +@@ -54,13 +54,13 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -17,7 +17,7 @@ $OpenBSD: patch-config_autoconf_mk_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) mrelibdir = $(mredir)/lib -@@ -195,7 +195,7 @@ OS_LDFLAGS = @LDFLAGS@ +@@ -240,7 +240,7 @@ OS_LDFLAGS = @LDFLAGS@ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ diff --git a/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h b/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h index f5d81896078..0593e77a71a 100644 --- a/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h +++ b/www/mozilla-firefox/patches/patch-config_mkdepend_imakemdep_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-config_mkdepend_imakemdep_h,v 1.1 2004/03/01 07:14:48 pvalchev Exp $ ---- config/mkdepend/imakemdep.h.orig 1998-09-05 06:22:25.000000000 +0200 -+++ config/mkdepend/imakemdep.h 2004-02-28 00:46:55.000000000 +0100 -@@ -277,6 +277,9 @@ char *cpp_argv[ARGUMENTS] = { +$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 diff --git a/www/mozilla-firefox/patches/patch-config_rules_mk b/www/mozilla-firefox/patches/patch-config_rules_mk index f71fac0e2fb..51f00b8ae1f 100644 --- a/www/mozilla-firefox/patches/patch-config_rules_mk +++ b/www/mozilla-firefox/patches/patch-config_rules_mk @@ -1,6 +1,6 @@ -$OpenBSD: patch-config_rules_mk,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- config/rules.mk.orig 2004-06-10 07:50:09.000000000 +0200 -+++ config/rules.mk 2004-06-16 13:05:25.000000000 +0200 +$OpenBSD: patch-config_rules_mk,v 1.3 2005/12/20 23:44:00 bernd Exp $ +--- config/rules.mk.orig Tue Oct 11 01:16:39 2005 ++++ config/rules.mk Thu Nov 3 10:44:13 2005 @@ -667,7 +667,7 @@ ifdef SHARED_LIBRARY ifdef IS_COMPONENT ifdef GRE_MODULE @@ -10,21 +10,16 @@ $OpenBSD: patch-config_rules_mk,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ $(ELF_DYNSTR_GC) $(GRE_DIST)/components/$(SHARED_LIBRARY) ifdef BEOS_ADDON_WORKAROUND ( cd $(GRE_DIST)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) -@@ -677,11 +677,11 @@ endif # GRE_MODULE - ifeq ($(OS_ARCH),OS2) - $(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib/components - else -- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib/components -+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib/components - $(ELF_DYNSTR_GC) $(DIST)/lib/components/$(SHARED_LIBRARY) +@@ -675,7 +675,7 @@ endif endif + endif # GRE_MODULE ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin/components -+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/bin/components - $(ELF_DYNSTR_GC) $(DIST)/bin/components/$(SHARED_LIBRARY) +- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET)/components ++ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET)/components + $(ELF_DYNSTR_GC) $(FINAL_TARGET)/components/$(SHARED_LIBRARY) ifdef BEOS_ADDON_WORKAROUND - ( cd $(DIST)/bin/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) -@@ -690,7 +690,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL + ( cd $(FINAL_TARGET)/components && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) +@@ -684,7 +684,7 @@ endif # ! _SKIP_OLD_GRE_INSTALL else # ! IS_COMPONENT ifdef GRE_MODULE ifndef DISABLE_DIST_GRE @@ -33,20 +28,20 @@ $OpenBSD: patch-config_rules_mk,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ifdef BEOS_ADDON_WORKAROUND ( cd $(GRE_DIST) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) endif -@@ -699,10 +699,10 @@ endif # GRE_MODULE - ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) +@@ -694,10 +694,10 @@ endif # GRE_MODULE + ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH))) $(INSTALL) $(IFLAGS2) $(IMPORT_LIBRARY) $(DIST)/lib else - $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/lib + $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/lib endif ifndef _SKIP_OLD_GRE_INSTALL -- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DIST)/bin -+ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(DIST)/bin +- $(INSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(FINAL_TARGET) ++ $(INSTALL) $(IFLAGS1) $(SHARED_LIBRARY) $(FINAL_TARGET) ifdef BEOS_ADDON_WORKAROUND - ( cd $(DIST)/bin && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) + ( cd $(FINAL_TARGET) && $(CC) -nostart -o $(SHARED_LIBRARY).stub $(SHARED_LIBRARY) ) endif -@@ -766,15 +766,15 @@ ifndef NO_INSTALL +@@ -765,15 +765,15 @@ ifndef NO_INSTALL ifdef SHARED_LIBRARY ifdef IS_COMPONENT ifdef MRE_DIST @@ -66,9 +61,9 @@ $OpenBSD: patch-config_rules_mk,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ endif endif endif # SHARED_LIBRARY -@@ -1023,7 +1023,6 @@ endif # NO_LD_ARCHIVE_FLAGS +@@ -1043,7 +1043,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) + $(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 diff --git a/www/mozilla-firefox/patches/patch-configure_in b/www/mozilla-firefox/patches/patch-configure_in index 33b02f4f686..3df7f4c2ea1 100644 --- a/www/mozilla-firefox/patches/patch-configure_in +++ b/www/mozilla-firefox/patches/patch-configure_in @@ -1,7 +1,20 @@ -$OpenBSD: patch-configure_in,v 1.4 2005/04/09 15:43:47 wilfried Exp $ ---- configure.in.orig Sun Oct 31 08:17:58 2004 -+++ configure.in Wed Apr 6 19:06:20 2005 -@@ -1349,7 +1349,7 @@ case "$target" in +$OpenBSD: patch-configure_in,v 1.5 2005/12/20 23:44:00 bernd Exp $ +--- configure.in.orig Tue Oct 4 07:53:49 2005 ++++ configure.in Thu Dec 1 18:37:21 2005 +@@ -1225,9 +1225,9 @@ 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` +-SEAMONKEY_VERSION=`cat $topsrcdir/xpfe/bootstrap/version.txt` ++FIREFOX_VERSION=`cat ./browser/config/version.txt` ++THUNDERBIRD_VERSION=`cat ./mail/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) +@@ -1801,7 +1801,7 @@ case "$target" in ;; *-openbsd*) @@ -10,16 +23,16 @@ $OpenBSD: patch-configure_in,v 1.4 2005/04/09 15:43:47 wilfried Exp $ DSO_CFLAGS='' DSO_PIC_CFLAGS='-fPIC' DSO_LDOPTS='-shared -fPIC' -@@ -3103,7 +3103,7 @@ _SAVE_LIBS=$LIBS +@@ -3582,7 +3582,7 @@ _SAVE_LIBS=$LIBS CFLAGS="$ZLIB_CFLAGS $CFLAGS" LDFLAGS="$ZLIB_LIBS -lz $LDFLAGS" - if test -n "${PNG_DIR}"; then + if test -n "${PNG_DIR}" -a "${PNG_DIR}" != "yes"; then - CFLAGS="-I${PNG_DIR}/include $CFLAGS" + CFLAGS="-I${PNG_DIR}/include/libpng $CFLAGS" LDFLAGS="-L${PNG_DIR}/lib $LDFLAGS" fi if test -z "$PNG_DIR" -o "$PNG_DIR" = no; then -@@ -3133,7 +3133,7 @@ LDFLAGS=$_SAVE_LDFLAGS +@@ -3612,7 +3612,7 @@ LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then @@ -28,3 +41,12 @@ $OpenBSD: patch-configure_in,v 1.4 2005/04/09 15:43:47 wilfried Exp $ PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}" fi +@@ -4013,7 +4013,7 @@ suite) + + browser) + MOZ_APP_NAME=firefox +- MOZ_APP_DISPLAYNAME=DeerPark ++ MOZ_APP_DISPLAYNAME=FirefoxCommunityEdition + MOZ_XUL_APP=1 + MOZ_PHOENIX=1 + MOZ_APP_VERSION=$FIREFOX_VERSION diff --git a/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp b/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp index 22e43acbd7c..1146ebc25f3 100644 --- a/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp +++ b/www/mozilla-firefox/patches/patch-extensions_transformiix_source_base_Double_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 22:23:18.000000000 +0100 -+++ extensions/transformiix/source/base/Double.cpp 2004-06-16 09:50:16.000000000 +0200 -@@ -114,17 +114,19 @@ typedef union txdpun { +$OpenBSD: patch-extensions_transformiix_source_base_Double_cpp,v 1.3 2005/12/20 23:44:00 bernd Exp $ +--- extensions/transformiix/source/base/Double.cpp.orig Thu Jun 17 02:12:42 2004 ++++ extensions/transformiix/source/base/Double.cpp Sat Sep 10 09:47:31 2005 +@@ -115,17 +115,19 @@ typedef union txdpun { #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 #define TX_DOUBLE_HI32_MANTMASK 0x000fffff diff --git a/www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl b/www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl deleted file mode 100644 index 2fd24b2f8f7..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_idl_nsIFreeType2_idl +++ /dev/null @@ -1,47 +0,0 @@ -$OpenBSD: patch-gfx_idl_nsIFreeType2_idl,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/idl/nsIFreeType2.idl.orig Fri Apr 16 03:09:33 2004 -+++ gfx/idl/nsIFreeType2.idl Sat Nov 6 03:43:33 2004 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); diff --git a/www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_cpp b/www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_cpp deleted file mode 100644 index 18ae9577af5..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_cpp +++ /dev/null @@ -1,60 +0,0 @@ -$OpenBSD: patch-gfx_src_freetype_nsFreeType_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/src/freetype/nsFreeType.cpp.orig Sat Feb 7 16:22:30 2004 -+++ gfx/src/freetype/nsFreeType.cpp Sat Nov 6 02:13:33 2004 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; diff --git a/www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_h b/www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_h deleted file mode 100644 index a87b9fbdd93..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_freetype_nsFreeType_h +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-gfx_src_freetype_nsFreeType_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/src/freetype/nsFreeType.h.orig Fri Apr 16 23:31:42 2004 -+++ gfx/src/freetype/nsFreeType.h Sat Nov 6 02:11:14 2004 -@@ -104,13 +104,15 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Lookup_Size_t) - (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -165,7 +167,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -213,7 +215,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; diff --git a/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp b/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp deleted file mode 100644 index aff065f5d32..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsDeviceContextSpecG_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gfx_src_gtk_nsDeviceContextSpecG_cpp,v 1.2 2005/10/14 04:00:38 kurt Exp $ ---- gfx/src/gtk/nsDeviceContextSpecG.cpp.orig Thu Feb 17 16:24:34 2005 -+++ gfx/src/gtk/nsDeviceContextSpecG.cpp Sun Oct 2 01:11:12 2005 -@@ -1133,7 +1133,7 @@ nsresult GlobalPrinters::InitializeGloba - free(printerList); - } else { - /* Try to use CUPS */ -- PRLibrary *clib = PR_LoadLibrary("libcups.so.2"); -+ PRLibrary *clib = PR_LoadLibrary("libcups.so"); - if (clib) { - CupsGetDestsType CupsGetDests; - CupsGetDestType CupsGetDest; diff --git a/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp b/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp deleted file mode 100644 index bdc72849607..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_gtk_nsScreenGtk_cpp +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gfx_src_gtk_nsScreenGtk_cpp,v 1.2 2005/09/24 16:19:29 bernd Exp $ ---- gfx/src/gtk/nsScreenGtk.cpp.orig Tue Apr 20 19:35:51 2004 -+++ gfx/src/gtk/nsScreenGtk.cpp Thu Sep 22 10:16:43 2005 -@@ -143,7 +143,7 @@ nsScreenGtk :: Init () - if (!gdk_property_get(root_window, - gdk_atom_intern ("_NET_WORKAREA", FALSE), - cardinal_atom, -- 0, G_MAXLONG, FALSE, -+ 0, G_MAXLONG - 3, FALSE, - &type_returned, - &format_returned, - &length_returned, diff --git a/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp b/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp deleted file mode 100644 index 7b3c142e58d..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_cpp +++ /dev/null @@ -1,61 +0,0 @@ -$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/src/ps/nsFontMetricsPS.cpp.orig Thu Feb 5 02:57:05 2004 -+++ gfx/src/ps/nsFontMetricsPS.cpp Sat Nov 6 02:00:00 2004 -@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - diff --git a/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_h b/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_h deleted file mode 100644 index f40132c1567..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_ps_nsFontMetricsPS_h +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-gfx_src_ps_nsFontMetricsPS_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/src/ps/nsFontMetricsPS.h.orig Tue Apr 22 18:25:09 2003 -+++ gfx/src/ps/nsFontMetricsPS.h Sat Nov 6 02:00:00 2004 -@@ -320,7 +320,7 @@ protected: - nsCOMPtr mFaceID; - nsCOMPtr mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ public: - protected: - nsCOMPtr mEntry; - nsCOMPtr mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - diff --git a/www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_cpp b/www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_cpp deleted file mode 100644 index 43e532071e9..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_cpp +++ /dev/null @@ -1,74 +0,0 @@ -$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_cpp,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/src/x11shared/nsFontFreeType.cpp.orig Thu Dec 25 09:24:52 2003 -+++ gfx/src/x11shared/nsFontFreeType.cpp Sat Nov 6 02:00:00 2004 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; diff --git a/www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_h b/www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_h deleted file mode 100644 index e9da4101fe9..00000000000 --- a/www/mozilla-firefox/patches/patch-gfx_src_x11shared_nsFontFreeType_h +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-gfx_src_x11shared_nsFontFreeType_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- gfx/src/x11shared/nsFontFreeType.h.orig Tue Apr 22 18:25:13 2003 -+++ gfx/src/x11shared/nsFontFreeType.h Sat Nov 6 02:00:00 2004 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr mFt2; - }; - diff --git a/www/mozilla-firefox/patches/patch-htmlparser_public_nsHTMLTagList_h b/www/mozilla-firefox/patches/patch-htmlparser_public_nsHTMLTagList_h deleted file mode 100644 index 38207061caf..00000000000 --- a/www/mozilla-firefox/patches/patch-htmlparser_public_nsHTMLTagList_h +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-htmlparser_public_nsHTMLTagList_h,v 1.1 2005/10/19 13:08:12 naddy Exp $ ---- htmlparser/public/nsHTMLTagList.h.orig Wed Jun 9 14:35:01 2004 -+++ htmlparser/public/nsHTMLTagList.h Tue Oct 18 16:17:58 2005 -@@ -141,7 +141,6 @@ HTML_TAG(optgroup, OptGroup) - HTML_TAG(option, Option) - HTML_TAG(p, Paragraph) - HTML_TAG(param, SharedLeaf) --HTML_TAG(parsererror, Div) - HTML_TAG(plaintext, Span) - HTML_TAG(pre, Pre) - HTML_TAG(q, Quote) -@@ -152,7 +151,6 @@ HTML_TAG(select, Select) - HTML_TAG(server, Span) - HTML_TAG(small, Span) - HTML_TAG(sound, Span) --HTML_TAG(sourcetext, Div) - HTML_TAG(spacer, SharedLeaf) - HTML_TAG(span, Span) - HTML_TAG(strike, Span) diff --git a/www/mozilla-firefox/patches/patch-htmlparser_src_COtherElements_h b/www/mozilla-firefox/patches/patch-htmlparser_src_COtherElements_h deleted file mode 100644 index 5a862428e0c..00000000000 --- a/www/mozilla-firefox/patches/patch-htmlparser_src_COtherElements_h +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-htmlparser_src_COtherElements_h,v 1.1 2005/10/19 13:08:12 naddy Exp $ ---- htmlparser/src/COtherElements.h.orig Wed Jul 2 00:21:20 2003 -+++ htmlparser/src/COtherElements.h Tue Oct 18 16:16:55 2005 -@@ -2346,7 +2346,6 @@ void CElementTable::InitializeElements() - mDfltElements[eHTMLTag_p].mContainsGroups.mBits.mSelf=0; - - CElement::InitializeLeaf( mDfltElements[eHTMLTag_param], eHTMLTag_param, CElement::GetEmptyGroup(), CLeafElement::GetContainedGroups()); -- CBlockElement::Initialize( mDfltElements[eHTMLTag_parsererror],eHTMLTag_parsererror); - CElement::Initialize( mDfltElements[eHTMLTag_plaintext], eHTMLTag_plaintext); - CBlockElement::Initialize( mDfltElements[eHTMLTag_pre], eHTMLTag_pre); - mDfltElements[eHTMLTag_pre].mExcludeKids=kPreExcludeKids; -@@ -2366,7 +2365,6 @@ void CElementTable::InitializeElements() - - CElement::Initialize( mDfltElements[eHTMLTag_server], eHTMLTag_server); - CFontStyleElement::Initialize( mDfltElements[eHTMLTag_small], eHTMLTag_small); -- CElement::Initialize( mDfltElements[eHTMLTag_sourcetext], eHTMLTag_sourcetext); - CElement::Initialize( mDfltElements[eHTMLTag_spacer], eHTMLTag_spacer); - CSpecialElement::Initialize( mDfltElements[eHTMLTag_span], eHTMLTag_span); - CFontStyleElement::Initialize( mDfltElements[eHTMLTag_strike], eHTMLTag_strike); diff --git a/www/mozilla-firefox/patches/patch-htmlparser_src_nsElementTable_cpp b/www/mozilla-firefox/patches/patch-htmlparser_src_nsElementTable_cpp deleted file mode 100644 index 441f8dfad3a..00000000000 --- a/www/mozilla-firefox/patches/patch-htmlparser_src_nsElementTable_cpp +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-htmlparser_src_nsElementTable_cpp,v 1.1 2005/10/19 13:08:12 naddy Exp $ ---- htmlparser/src/nsElementTable.cpp.orig Sat Apr 10 06:08:26 2004 -+++ htmlparser/src/nsElementTable.cpp Tue Oct 18 16:16:55 2005 -@@ -934,15 +934,6 @@ void InitializeElementTable(void) { - /*special parents,kids,skip*/ &gParamParents,0,eHTMLTag_unknown); - - Initialize( -- /*tag*/ eHTMLTag_parsererror, -- /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, -- /*rootnodes,endrootnodes*/ &gRootTags,&gRootTags, -- /*autoclose starttags and endtags*/ &gDivAutoClose,0,0,0, -- /*parent,incl,exclgroups*/ kNone, (kSelf|kFlowEntity), kNone, -- /*special props, prop-range*/ 0, kNoPropRange, -- /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown); -- -- Initialize( - /*tag*/ eHTMLTag_plaintext, - /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, - /*rootnodes,endrootnodes*/ &gRootTags,&gRootTags, -@@ -1031,15 +1022,6 @@ void InitializeElementTable(void) { - /*autoclose starttags and endtags*/ 0,0,0,0, - /*parent,incl,exclgroups*/ (kFlowEntity|kHeadContent), kNone, kNone, // Added kFlowEntity|kHeadContent & kNonContainer in - /*special props, prop-range*/ kNonContainer,kDefaultPropRange, // Ref. to Bug 25749 -- /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown); -- -- Initialize( -- /*tag*/ eHTMLTag_sourcetext, -- /*req-parent excl-parent*/ eHTMLTag_unknown,eHTMLTag_unknown, -- /*rootnodes,endrootnodes*/ &gRootTags,&gRootTags, -- /*autoclose starttags and endtags*/ &gDivAutoClose,0,0,0, -- /*parent,incl,exclgroups*/ kNone, (kSelf|kFlowEntity), kNone, -- /*special props, prop-range*/ 0,kDefaultPropRange, - /*special parents,kids,skip*/ 0,0,eHTMLTag_unknown); - - Initialize( diff --git a/www/mozilla-firefox/patches/patch-htmlparser_src_nsHTMLTags_cpp b/www/mozilla-firefox/patches/patch-htmlparser_src_nsHTMLTags_cpp deleted file mode 100644 index f965c765d88..00000000000 --- a/www/mozilla-firefox/patches/patch-htmlparser_src_nsHTMLTags_cpp +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-htmlparser_src_nsHTMLTags_cpp,v 1.1 2005/10/19 13:08:12 naddy Exp $ ---- htmlparser/src/nsHTMLTags.cpp.orig Wed Feb 18 01:15:49 2004 -+++ htmlparser/src/nsHTMLTags.cpp Tue Oct 18 16:16:55 2005 -@@ -200,8 +200,6 @@ static const PRUnichar sHTMLTagUnicodeNa - {'p', '\0'}; - static const PRUnichar sHTMLTagUnicodeName_param[] = - {'p', 'a', 'r', 'a', 'm', '\0'}; --static const PRUnichar sHTMLTagUnicodeName_parsererror[] = -- {'p', 'a', 'r', 's', 'e', 'r', 'e', 'r', 'r', 'o', 'r', '\0'}; - static const PRUnichar sHTMLTagUnicodeName_plaintext[] = - {'p', 'l', 'a', 'i', 'n', 't', 'e', 'x', 't', '\0'}; - static const PRUnichar sHTMLTagUnicodeName_pre[] = -@@ -222,8 +220,6 @@ static const PRUnichar sHTMLTagUnicodeNa - {'s', 'm', 'a', 'l', 'l', '\0'}; - static const PRUnichar sHTMLTagUnicodeName_sound[] = - {'s', 'o', 'u', 'n', 'd', '\0'}; --static const PRUnichar sHTMLTagUnicodeName_sourcetext[] = -- {'s', 'o', 'u', 'r', 'c', 'e', 't', 'e', 'x', 't', '\0'}; - static const PRUnichar sHTMLTagUnicodeName_spacer[] = - {'s', 'p', 'a', 'c', 'e', 'r', '\0'}; - static const PRUnichar sHTMLTagUnicodeName_span[] = -@@ -311,7 +307,7 @@ HTMLTagsKeyCompareUCPtr(const void *key1 - - - static PRUint32 sMaxTagNameLength; --#define NS_HTMLTAG_NAME_MAX_LENGTH 11 -+#define NS_HTMLTAG_NAME_MAX_LENGTH 10 - - // static - nsresult diff --git a/www/mozilla-firefox/patches/patch-htmlparser_tools_gentags_pl b/www/mozilla-firefox/patches/patch-htmlparser_tools_gentags_pl deleted file mode 100644 index 7aa0dd3f32a..00000000000 --- a/www/mozilla-firefox/patches/patch-htmlparser_tools_gentags_pl +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-htmlparser_tools_gentags_pl,v 1.1 2005/10/19 13:08:12 naddy Exp $ ---- htmlparser/tools/gentags.pl.orig Tue Oct 23 03:36:53 2001 -+++ htmlparser/tools/gentags.pl Tue Oct 18 16:16:55 2005 -@@ -104,7 +104,6 @@ $tags[$i++] = "optgroup"; - $tags[$i++] = "option"; - $tags[$i++] = "p"; - $tags[$i++] = "param"; --$tags[$i++] = "parsererror"; - $tags[$i++] = "plaintext"; - $tags[$i++] = "pre"; - $tags[$i++] = "q"; -@@ -115,7 +114,6 @@ $tags[$i++] = "select"; - $tags[$i++] = "server"; - $tags[$i++] = "small"; - $tags[$i++] = "sound"; --$tags[$i++] = "sourcetext"; - $tags[$i++] = "spacer"; - $tags[$i++] = "span"; - $tags[$i++] = "strike"; 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 40130a7e699..0e3b9ece7df 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.1 2005/04/04 21:24:00 kurt Exp $ ---- modules/libpref/src/init/all.js.orig Fri Apr 1 14:46:10 2005 -+++ modules/libpref/src/init/all.js Fri Apr 1 14:46:45 2005 -@@ -1673,7 +1673,7 @@ pref("font.scale.outline.min", 6); +$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- modules/libpref/src/init/all.js.orig Fri Nov 4 16:22:25 2005 ++++ modules/libpref/src/init/all.js Fri Nov 11 21:46:51 2005 +@@ -2035,7 +2035,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 1491452f173..dc1ed224fb1 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,13 +1,24 @@ -$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.1 2004/11/26 18:29:15 pvalchev Exp $ ---- modules/plugin/base/public/nptypes.h.orig Wed Sep 1 18:59:55 2004 -+++ modules/plugin/base/public/nptypes.h Fri Sep 17 18:43:21 2004 -@@ -78,7 +78,9 @@ - typedef int bool; - #endif - #else /* OPENBSD is defined, so use its bool */ -+ #if !defined(__cplusplus) - #include -+ #endif +$OpenBSD: patch-modules_plugin_base_public_nptypes_h,v 1.2 2005/12/20 23:44:00 bernd 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 @@ + + /* + * BSD/OS ships no header that defines uint32_t, nor bool (for C) +- * OpenBSD ships no header that defines uint32_t and using its bool macro is +- * unsafe. + */ +- #if defined(bsdi) || defined(OPENBSD) ++ #if defined(bsdi) + typedef u_int32_t uint32_t; + + #if !defined(__cplusplus) +@@ -78,7 +76,7 @@ #endif #else /* +- * FreeBSD defines uint32_t and bool. ++ * FreeBSD, and OpenBSD defines uint32_t and bool. + */ + #include + #include diff --git a/www/mozilla-firefox/patches/patch-nsprpub_config_rules_mk b/www/mozilla-firefox/patches/patch-nsprpub_config_rules_mk index 790a63cc3db..9afe4eadcc3 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_config_rules_mk +++ b/www/mozilla-firefox/patches/patch-nsprpub_config_rules_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_config_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $ ---- nsprpub/config/rules.mk.orig 2004-02-15 11:04:44.000000000 +0100 -+++ nsprpub/config/rules.mk 2004-02-15 11:11:33.000000000 +0100 -@@ -222,7 +222,7 @@ ifdef RELEASE_HEADERS +$OpenBSD: patch-nsprpub_config_rules_mk,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/config/rules.mk.orig Thu Apr 14 00:57:55 2005 ++++ nsprpub/config/rules.mk Sat Sep 10 09:47:32 2005 +@@ -231,7 +231,7 @@ ifdef RELEASE_HEADERS $(NSINSTALL) -t -m 0644 $(RELEASE_HEADERS) $(DESTDIR)$(includedir)/$(include_subdir) endif ifdef RELEASE_LIBS diff --git a/www/mozilla-firefox/patches/patch-nsprpub_configure_in b/www/mozilla-firefox/patches/patch-nsprpub_configure_in index 62242849e84..ab1b90a6424 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_configure_in +++ b/www/mozilla-firefox/patches/patch-nsprpub_configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_configure_in,v 1.3 2005/04/09 15:43:47 wilfried Exp $ ---- nsprpub/configure.in.orig Tue Sep 14 22:59:41 2004 -+++ nsprpub/configure.in Wed Apr 6 19:06:48 2005 -@@ -1493,9 +1493,11 @@ mips-sony-newsos*) +$OpenBSD: patch-nsprpub_configure_in,v 1.4 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/configure.in.orig Thu Aug 25 01:19:59 2005 ++++ nsprpub/configure.in Sat Sep 10 09:47:32 2005 +@@ -1620,9 +1620,11 @@ mips-sony-newsos*) AC_DEFINE(OPENBSD) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h index 0de082c9b12..283cf7ed822 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h +++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_md__openbsd_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.7 2005/04/09 15:43:47 wilfried Exp $ ---- nsprpub/pr/include/md/_openbsd.h.orig Wed Mar 10 08:51:37 2004 -+++ nsprpub/pr/include/md/_openbsd.h Wed Apr 6 22:38:21 2005 -@@ -53,7 +53,7 @@ +$OpenBSD: patch-nsprpub_pr_include_md__openbsd_h,v 1.8 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/pr/include/md/_openbsd.h.orig Wed Apr 28 02:33:44 2004 ++++ nsprpub/pr/include/md/_openbsd.h Sat Sep 10 19:45:17 2005 +@@ -56,7 +56,7 @@ #define _PR_SI_ARCHITECTURE "sparc" #endif diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_private_primpl_h b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_private_primpl_h index 0099f05f85f..5f165a1ba9d 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_include_private_primpl_h +++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_include_private_primpl_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- nsprpub/pr/include/private/primpl.h.orig 2004-04-14 22:36:59.000000000 +0200 -+++ nsprpub/pr/include/private/primpl.h 2004-06-16 09:50:16.000000000 +0200 -@@ -1861,6 +1861,7 @@ extern void _PR_DestroyZones(void); +$OpenBSD: patch-nsprpub_pr_include_private_primpl_h,v 1.3 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/pr/include/private/primpl.h.orig Thu Aug 18 19:24:29 2005 ++++ nsprpub/pr/include/private/primpl.h Sat Sep 10 09:47:32 2005 +@@ -1867,6 +1867,7 @@ extern void _PR_DestroyZones(void); && !defined(DARWIN) \ && !defined(NEXTSTEP) \ && !defined(QNX) \ diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_io_prprf_c b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_io_prprf_c deleted file mode 100644 index effddf9b659..00000000000 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_io_prprf_c +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- nsprpub/pr/src/io/prprf.c.orig 2004-03-09 04:18:19.000000000 +0100 -+++ nsprpub/pr/src/io/prprf.c 2004-06-16 13:12:05.000000000 +0200 -@@ -51,7 +51,9 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__x86_64__)) -+#if defined(va_copy) -+#define VARARGS_ASSIGN(foo, bar) va_copy(foo,bar) -+#elif (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prdtoa_c b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prdtoa_c index c5ebad7fba9..eebc80444a0 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prdtoa_c +++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prdtoa_c @@ -1,12 +1,12 @@ -$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ ---- nsprpub/pr/src/misc/prdtoa.c.orig Fri Oct 28 10:21:12 2005 -+++ nsprpub/pr/src/misc/prdtoa.c Fri Oct 28 10:22:01 2005 -@@ -617,7 +617,7 @@ static Bigint *mult(CONST Bigint *a, CON +$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/pr/src/misc/prdtoa.c.orig Thu Aug 18 19:24:37 2005 ++++ nsprpub/pr/src/misc/prdtoa.c Thu Nov 3 10:46:07 2005 +@@ -855,7 +855,7 @@ mult wc = wa + wb; if (wc > a->maxwds) k++; - c = Balloc(k); + c = Balloc(k+2); - for(xc = c->x, xce = xc + wc; xc < xce; xc++) - *xc = 0; + for(x = c->x, xa = x + wc; x < xa; x++) + *x = 0; xa = a->x; diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prinit_c b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prinit_c index f5a9f0f5feb..0b2057990d4 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prinit_c +++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prinit_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $ ---- nsprpub/pr/src/misc/prinit.c.orig 2003-01-20 21:13:09.000000000 +0100 -+++ nsprpub/pr/src/misc/prinit.c 2003-12-12 12:41:30.000000000 +0100 -@@ -430,6 +430,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +$OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/pr/src/misc/prinit.c.orig Wed Apr 28 02:34:07 2004 ++++ nsprpub/pr/src/misc/prinit.c Sat Sep 10 09:47:32 2005 +@@ -433,6 +433,12 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() _PR_LogCleanup(); /* @@ -14,7 +14,7 @@ $OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.1.1.1 2004/02/15 19:37:25 wilfr * This part should look like the end of _PR_NativeRunThread * and _PR_UserRunThread. */ -@@ -441,6 +447,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +@@ -444,6 +450,7 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() PR_DELETE(me->stack); PR_DELETE(me); } @@ -22,7 +22,7 @@ $OpenBSD: patch-nsprpub_pr_src_misc_prinit_c,v 1.1.1.1 2004/02/15 19:37:25 wilfr /* * XXX: We are freeing the heap memory here so that Purify won't -@@ -449,8 +456,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() +@@ -452,8 +459,6 @@ PR_IMPLEMENT(PRStatus) PR_Cleanup() * Ideally, for each _PR_InitXXX(), there should be a corresponding * _PR_XXXCleanup() that we can call here. */ diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c index 3050c12c429..2f8e320d7b5 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c +++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_misc_prnetdb_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.3 2004/11/26 18:29:15 pvalchev Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 01:07:28 2004 -+++ nsprpub/pr/src/misc/prnetdb.c Fri Sep 17 18:36:11 2004 -@@ -2098,7 +2098,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +$OpenBSD: patch-nsprpub_pr_src_misc_prnetdb_c,v 1.4 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/pr/src/misc/prnetdb.c.orig Thu Aug 18 19:24:38 2005 ++++ nsprpub/pr/src/misc/prnetdb.c Sat Sep 10 09:47:32 2005 +@@ -2110,7 +2110,12 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; diff --git a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_pthreads_ptthread_c b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_pthreads_ptthread_c index bd5e0bb2647..9d4dedc2d50 100644 --- a/www/mozilla-firefox/patches/patch-nsprpub_pr_src_pthreads_ptthread_c +++ b/www/mozilla-firefox/patches/patch-nsprpub_pr_src_pthreads_ptthread_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.1 2005/03/26 19:04:14 wilfried Exp $ ---- nsprpub/pr/src/pthreads/ptthread.c.orig Wed Aug 28 16:42:52 2002 -+++ nsprpub/pr/src/pthreads/ptthread.c Sun Mar 20 08:53:15 2005 -@@ -48,6 +48,7 @@ +$OpenBSD: patch-nsprpub_pr_src_pthreads_ptthread_c,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- nsprpub/pr/src/pthreads/ptthread.c.orig Thu Aug 18 19:24:38 2005 ++++ nsprpub/pr/src/pthreads/ptthread.c Sat Sep 10 09:47:32 2005 +@@ -51,6 +51,7 @@ #include #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 0459851b22c..11d091d0c57 100644 --- a/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk +++ b/www/mozilla-firefox/patches/patch-security_coreconf_OpenBSD_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.3 2005/04/09 15:43:47 wilfried Exp $ ---- security/coreconf/OpenBSD.mk.orig Tue Sep 16 22:50:50 2003 -+++ security/coreconf/OpenBSD.mk Wed Apr 6 21:19:25 2005 -@@ -35,12 +35,12 @@ +$OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.4 2005/12/20 23:44:00 bernd Exp $ +--- security/coreconf/OpenBSD.mk.orig Sun Apr 25 17:02:17 2004 ++++ security/coreconf/OpenBSD.mk Sat Sep 10 09:47:32 2005 +@@ -37,12 +37,12 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk @@ -18,7 +18,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.3 2005/04/09 15:43:47 wilfried ifeq ($(CPU_ARCH),i386) OS_REL_CFLAGS = -Di386 CPU_ARCH = x86 -@@ -53,7 +53,7 @@ OS_LIBS += -pthread +@@ -55,7 +55,7 @@ OS_LIBS += -pthread DSO_LDOPTS += -pthread endif @@ -27,7 +27,7 @@ $OpenBSD: patch-security_coreconf_OpenBSD_mk,v 1.3 2005/04/09 15:43:47 wilfried OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DOPENBSD -@@ -62,7 +62,7 @@ OS_LIBS = +@@ -64,7 +64,7 @@ OS_LIBS = ARCH = openbsd DSO_CFLAGS = -fPIC -DPIC diff --git a/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk b/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk index 63075f5c81b..0b311926203 100644 --- a/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk +++ b/www/mozilla-firefox/patches/patch-security_coreconf_rules_mk @@ -1,7 +1,7 @@ -$OpenBSD: patch-security_coreconf_rules_mk,v 1.1.1.1 2004/02/15 19:37:25 wilfried Exp $ ---- security/coreconf/rules.mk.orig 2004-02-15 14:43:58.000000000 +0100 -+++ security/coreconf/rules.mk 2004-02-15 15:23:12.000000000 +0100 -@@ -348,7 +348,6 @@ ifdef XP_OS2_VACPP +$OpenBSD: patch-security_coreconf_rules_mk,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- security/coreconf/rules.mk.orig Fri Apr 15 02:36:28 2005 ++++ security/coreconf/rules.mk Sat Sep 10 09:47:32 2005 +@@ -352,7 +352,6 @@ ifdef XP_OS2_VACPP else $(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) endif diff --git a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp index eed94c9a7c9..f228e492f87 100644 --- a/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp +++ b/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.1 2005/01/04 21:27:28 wilfried Exp $ ---- widget/src/gtk2/nsSound.cpp.orig Sun Mar 7 20:12:21 2004 -+++ widget/src/gtk2/nsSound.cpp Tue Jan 4 22:05:32 2005 -@@ -91,7 +91,7 @@ nsSound::Init() +$OpenBSD: patch-widget_src_gtk2_nsSound_cpp,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- widget/src/gtk2/nsSound.cpp.orig Wed Nov 3 10:13:04 2004 ++++ widget/src/gtk2/nsSound.cpp Sat Sep 10 09:47:32 2005 +@@ -110,7 +110,7 @@ nsSound::Init() EsdOpenSoundType EsdOpenSound; diff --git a/www/mozilla-firefox/patches/patch-widget_src_gtk_nsSound_cpp b/www/mozilla-firefox/patches/patch-widget_src_gtk_nsSound_cpp index 11fa66d17ae..60c50342f71 100644 --- a/www/mozilla-firefox/patches/patch-widget_src_gtk_nsSound_cpp +++ b/www/mozilla-firefox/patches/patch-widget_src_gtk_nsSound_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-widget_src_gtk_nsSound_cpp,v 1.1 2005/01/04 21:27:28 wilfried Exp $ ---- widget/src/gtk/nsSound.cpp.orig Sun Mar 7 20:12:02 2004 -+++ widget/src/gtk/nsSound.cpp Tue Jan 4 11:24:01 2005 -@@ -86,7 +86,7 @@ nsSound::Init() +$OpenBSD: patch-widget_src_gtk_nsSound_cpp,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- widget/src/gtk/nsSound.cpp.orig Wed Nov 3 10:13:04 2004 ++++ widget/src/gtk/nsSound.cpp Sat Sep 10 09:47:32 2005 +@@ -106,7 +106,7 @@ nsSound::Init() EsdOpenSoundType EsdOpenSound; diff --git a/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp b/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp index a5f5020943e..d508b450dde 100644 --- a/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp +++ b/www/mozilla-firefox/patches/patch-xpcom_components_nsNativeComponentLoader_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.1 2005/04/09 15:43:47 wilfried Exp $ ---- xpcom/components/nsNativeComponentLoader.cpp.orig Mon Jun 7 19:12:08 2004 -+++ xpcom/components/nsNativeComponentLoader.cpp Wed Apr 6 22:50:29 2005 -@@ -656,7 +656,7 @@ nsNativeComponentLoader::AutoRegisterCom +$OpenBSD: patch-xpcom_components_nsNativeComponentLoader_cpp,v 1.2 2005/12/20 23:44:00 bernd Exp $ +--- xpcom/components/nsNativeComponentLoader.cpp.orig Thu Jul 14 20:42:57 2005 ++++ xpcom/components/nsNativeComponentLoader.cpp Sat Sep 10 19:45:17 2005 +@@ -668,7 +668,7 @@ nsNativeComponentLoader::AutoRegisterCom ".shlb", /* Mac ? */ ".dso", /* Unix ? */ ".dylib", /* Unix: Mach */ diff --git a/www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in b/www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in new file mode 100644 index 00000000000..41c34137523 --- /dev/null +++ b/www/mozilla-firefox/patches/patch-xpcom_glue_standalone_Makefile_in @@ -0,0 +1,13 @@ +$OpenBSD: patch-xpcom_glue_standalone_Makefile_in,v 1.1 2005/12/20 23:44:00 bernd Exp $ +--- xpcom/glue/standalone/Makefile.in.orig Tue Oct 11 00:01:54 2005 ++++ xpcom/glue/standalone/Makefile.in Thu Nov 3 10:44:14 2005 +@@ -62,6 +62,9 @@ endif + ifneq (,$(filter AIX DragonFly FreeBSD Linux NetBSD OpenBSD,$(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_io_nsNativeCharsetUtils_cpp b/www/mozilla-firefox/patches/patch-xpcom_io_nsNativeCharsetUtils_cpp deleted file mode 100644 index ea2b00d6eb5..00000000000 --- a/www/mozilla-firefox/patches/patch-xpcom_io_nsNativeCharsetUtils_cpp +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-xpcom_io_nsNativeCharsetUtils_cpp,v 1.3 2005/03/02 19:30:18 naddy Exp $ ---- xpcom/io/nsNativeCharsetUtils.cpp.orig Tue Nov 9 21:46:03 2004 -+++ xpcom/io/nsNativeCharsetUtils.cpp Fri Feb 25 21:09:20 2005 -@@ -329,7 +329,11 @@ nsNativeCharsetConverter::LazyInit() - { - const char *blank_list[] = { "", NULL }; - const char **native_charset_list = blank_list; -+#ifdef CODESET - const char *native_charset = nl_langinfo(CODESET); -+#else -+ const char *native_charset = nsnull; -+#endif - if (native_charset == nsnull) { - NS_ERROR("native charset is unknown"); - // fallback to ISO-8859-1 diff --git a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in index aa0f967565b..b280c92d6ca 100644 --- a/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in +++ b/www/mozilla-firefox/patches/patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2004/11/26 18:29:15 pvalchev Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Apr 22 22:50:05 2004 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Fri Sep 17 18:36:23 2004 -@@ -51,6 +51,12 @@ CPPSRCS := xptcinvoke_unixish_x86.cpp x +$OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.5 2005/12/20 23:44:00 bernd Exp $ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Wed Jun 15 10:32:21 2005 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sat Sep 10 09:48:07 2005 +@@ -67,6 +67,12 @@ CPPSRCS := xptcinvoke_unixish_x86.cpp x endif endif # @@ -14,7 +14,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2004/11/26 1 # New code for Linux, et. al., with gcc # Migrate other platforms here after testing # -@@ -111,6 +117,12 @@ CPPSRCS := xptcinvoke_osf1_alpha.cpp xp +@@ -128,6 +134,12 @@ CPPSRCS := xptcinvoke_osf1_alpha.cpp xp ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -27,7 +27,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2004/11/26 1 # Linux/Alpha # ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -@@ -260,6 +272,14 @@ ASFILES := xptcinvoke_asm_ppc_netbsd.s +@@ -277,6 +289,14 @@ ASFILES := xptcinvoke_asm_ppc_netbsd.s endif # @@ -42,7 +42,7 @@ $OpenBSD: patch-xpcom_reflect_xptcall_src_md_unix_Makefile_in,v 1.4 2004/11/26 1 # Darwin/PPC # ifeq ($(OS_ARCH),Darwin) -@@ -331,6 +351,20 @@ endif +@@ -348,6 +368,20 @@ endif endif endif diff --git a/www/mozilla-firefox/patches/patch-xpcom_sample_Makefile_in b/www/mozilla-firefox/patches/patch-xpcom_sample_Makefile_in deleted file mode 100644 index 02fdf6bf28e..00000000000 --- a/www/mozilla-firefox/patches/patch-xpcom_sample_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-xpcom_sample_Makefile_in,v 1.2 2004/11/26 18:29:15 pvalchev Exp $ ---- xpcom/sample/Makefile.in.orig 2004-02-19 03:43:46.000000000 +0100 -+++ xpcom/sample/Makefile.in 2004-06-16 09:50:16.000000000 +0200 -@@ -52,7 +52,7 @@ XPIDLSRCS = nsISample.idl - - TESTCPPSRCS = nsTestSample.cpp - --CPPSRCS += $(TESTCPPSRCS) -+#CPPSRCS += $(TESTCPPSRCS) - - SIMPLE_PROGRAMS = $(TESTCPPSRCS:.cpp=$(BIN_SUFFIX)) - diff --git a/www/mozilla-firefox/pkg/PFRAG.shared b/www/mozilla-firefox/pkg/PFRAG.shared index b74acf22d0b..9c13cad15f7 100644 --- a/www/mozilla-firefox/pkg/PFRAG.shared +++ b/www/mozilla-firefox/pkg/PFRAG.shared @@ -1,10 +1,13 @@ -@comment $OpenBSD: PFRAG.shared,v 1.7 2005/09/08 12:48:39 kurt Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/20 23:44:00 bernd Exp $ @lib mozilla-firefox/components/libaccessibility.so.${SO_VERSION} @lib mozilla-firefox/components/libappcomps.so.${SO_VERSION} +@lib mozilla-firefox/components/libauth.so.${SO_VERSION} @lib mozilla-firefox/components/libautoconfig.so.${SO_VERSION} @lib mozilla-firefox/components/libbrowsercomps.so.${SO_VERSION} +@lib mozilla-firefox/components/libbrowserdirprovider.so.${SO_VERSION} @lib mozilla-firefox/components/libcaps.so.${SO_VERSION} @lib mozilla-firefox/components/libchrome.so.${SO_VERSION} +@lib mozilla-firefox/components/libcommandlines.so.${SO_VERSION} @lib mozilla-firefox/components/libcomposer.so.${SO_VERSION} @lib mozilla-firefox/components/libcookie.so.${SO_VERSION} @lib mozilla-firefox/components/libdocshell.so.${SO_VERSION} @@ -13,13 +16,11 @@ @lib mozilla-firefox/components/libfileview.so.${SO_VERSION} @lib mozilla-firefox/components/libgfx_gtk.so.${SO_VERSION} @lib mozilla-firefox/components/libgfxps.so.${SO_VERSION} -@lib mozilla-firefox/components/libgfxxprint.so.${SO_VERSION} @lib mozilla-firefox/components/libgklayout.so.${SO_VERSION} @lib mozilla-firefox/components/libgkplugin.so.${SO_VERSION} @lib mozilla-firefox/components/libhtmlpars.so.${SO_VERSION} @lib mozilla-firefox/components/libi18n.so.${SO_VERSION} @lib mozilla-firefox/components/libimglib2.so.${SO_VERSION} -@lib mozilla-firefox/components/libinspector.so.${SO_VERSION} @lib mozilla-firefox/components/libjar50.so.${SO_VERSION} @lib mozilla-firefox/components/libjsd.so.${SO_VERSION} @lib mozilla-firefox/components/libmork.so.${SO_VERSION} @@ -28,11 +29,14 @@ @lib mozilla-firefox/components/libnecko2.so.${SO_VERSION} @lib mozilla-firefox/components/libnsappshell.so.${SO_VERSION} @lib mozilla-firefox/components/liboji.so.${SO_VERSION} +@lib mozilla-firefox/components/libpermissions.so.${SO_VERSION} @lib mozilla-firefox/components/libpipboot.so.${SO_VERSION} @lib mozilla-firefox/components/libpipnss.so.${SO_VERSION} @lib mozilla-firefox/components/libpippki.so.${SO_VERSION} @lib mozilla-firefox/components/libpref.so.${SO_VERSION} @lib mozilla-firefox/components/librdf.so.${SO_VERSION} +@lib mozilla-firefox/components/libremoteservice.so.${SO_VERSION} +@lib mozilla-firefox/components/libsearchservice.so.${SO_VERSION} @lib mozilla-firefox/components/libsystem-pref.so.${SO_VERSION} @lib mozilla-firefox/components/libtoolkitcomps.so.${SO_VERSION} @lib mozilla-firefox/components/libtransformiix.so.${SO_VERSION} @@ -47,8 +51,8 @@ @lib mozilla-firefox/components/libxpcom_compat_c.so.${SO_VERSION} @lib mozilla-firefox/components/libxpconnect.so.${SO_VERSION} @lib mozilla-firefox/components/libxpinstall.so.${SO_VERSION} -@lib mozilla-firefox/components/libxremote_client.so.${SO_VERSION} -@lib mozilla-firefox/components/libxremoteservice.so.${SO_VERSION} +@lib mozilla-firefox/extensions/inspector@mozilla.org/components/libinspector.so.${SO_VERSION} +@lib mozilla-firefox/libgfxpsshar.so.${SO_VERSION} @lib mozilla-firefox/libgkgfx.so.${SO_VERSION} @lib mozilla-firefox/libgtkembedmoz.so.${SO_VERSION} @lib mozilla-firefox/libgtkxtbin.so.${SO_VERSION} @@ -62,7 +66,7 @@ @lib mozilla-firefox/libsmime3.so.${SO_VERSION} @lib mozilla-firefox/libsoftokn3.so.${SO_VERSION} @lib mozilla-firefox/libssl3.so.${SO_VERSION} -@lib mozilla-firefox/libxlibrgb.so.${SO_VERSION} @lib mozilla-firefox/libxpcom.so.${SO_VERSION} @lib mozilla-firefox/libxpcom_compat.so.${SO_VERSION} +@lib mozilla-firefox/libxpcom_core.so.${SO_VERSION} @lib mozilla-firefox/libxpistub.so.${SO_VERSION} diff --git a/www/mozilla-firefox/pkg/PLIST b/www/mozilla-firefox/pkg/PLIST index 33fd006a3dc..110036c1a08 100644 --- a/www/mozilla-firefox/pkg/PLIST +++ b/www/mozilla-firefox/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2005/09/24 16:19:29 bernd Exp $ +@comment $OpenBSD: PLIST,v 1.14 2005/12/20 23:44:00 bernd Exp $ @conflict mozilla-firebird-* %%SHARED%% bin/firefox @@ -7,215 +7,52 @@ bin/mozilla-firefox mozilla-firefox/ mozilla-firefox/LICENSE mozilla-firefox/chrome/ -mozilla-firefox/chrome/browser/ mozilla-firefox/chrome/browser.jar -mozilla-firefox/chrome/browser/content/ -mozilla-firefox/chrome/browser/content/browser/ -mozilla-firefox/chrome/browser/content/browser-region/ -mozilla-firefox/chrome/browser/content/browser/bookmarks/ -mozilla-firefox/chrome/browser/content/browser/cookieviewer/ -mozilla-firefox/chrome/browser/content/browser/history/ -mozilla-firefox/chrome/browser/content/browser/migration/ -mozilla-firefox/chrome/browser/content/browser/pref/ +mozilla-firefox/chrome/browser.manifest mozilla-firefox/chrome/chromelist.txt -mozilla-firefox/chrome/classic/ mozilla-firefox/chrome/classic.jar -mozilla-firefox/chrome/classic/skin/ -mozilla-firefox/chrome/classic/skin/classic/ -mozilla-firefox/chrome/classic/skin/classic/browser/ -mozilla-firefox/chrome/classic/skin/classic/browser/bookmarks/ -mozilla-firefox/chrome/classic/skin/classic/browser/pref/ -mozilla-firefox/chrome/classic/skin/classic/communicator/ -mozilla-firefox/chrome/classic/skin/classic/communicator/cookie/ -mozilla-firefox/chrome/classic/skin/classic/global/ -mozilla-firefox/chrome/classic/skin/classic/global/alerts/ -mozilla-firefox/chrome/classic/skin/classic/global/arrow/ -mozilla-firefox/chrome/classic/skin/classic/global/checkbox/ -mozilla-firefox/chrome/classic/skin/classic/global/console/ -mozilla-firefox/chrome/classic/skin/classic/global/icons/ -mozilla-firefox/chrome/classic/skin/classic/global/menu/ -mozilla-firefox/chrome/classic/skin/classic/global/radio/ -mozilla-firefox/chrome/classic/skin/classic/global/scrollbar/ -mozilla-firefox/chrome/classic/skin/classic/global/throbber/ -mozilla-firefox/chrome/classic/skin/classic/global/toolbar/ -mozilla-firefox/chrome/classic/skin/classic/global/tree/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/downloads/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/extensions/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/plugins/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/pref/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/profile/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/shared/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/update/ -mozilla-firefox/chrome/classic/skin/classic/mozapps/xpinstall/ -mozilla-firefox/chrome/comm/ +mozilla-firefox/chrome/classic.manifest mozilla-firefox/chrome/comm.jar -mozilla-firefox/chrome/comm/content/ -mozilla-firefox/chrome/comm/content/autoconfig/ -mozilla-firefox/chrome/comm/content/communicator/ -mozilla-firefox/chrome/comm/content/cookie/ -mozilla-firefox/chrome/comm/content/necko/ -mozilla-firefox/chrome/comm/content/xbl-marquee/ -mozilla-firefox/chrome/embed-sample/ -mozilla-firefox/chrome/embed-sample.jar -mozilla-firefox/chrome/embed-sample/content/ -mozilla-firefox/chrome/embed-sample/content/embed/ -mozilla-firefox/chrome/embed-sample/locale/ -mozilla-firefox/chrome/embed-sample/locale/en-US/ -mozilla-firefox/chrome/embed-sample/locale/en-US/embed/ -mozilla-firefox/chrome/embed-sample/skin/ -mozilla-firefox/chrome/embed-sample/skin/classic/ -mozilla-firefox/chrome/embed-sample/skin/classic/embed/ -mozilla-firefox/chrome/en-US/ +mozilla-firefox/chrome/comm.manifest mozilla-firefox/chrome/en-US.jar -mozilla-firefox/chrome/en-US/locale/ -mozilla-firefox/chrome/en-US/locale/browser/ -mozilla-firefox/chrome/en-US/locale/browser-region/ -mozilla-firefox/chrome/en-US/locale/browser/bookmarks/ -mozilla-firefox/chrome/en-US/locale/browser/cookieviewer/ -mozilla-firefox/chrome/en-US/locale/browser/history/ -mozilla-firefox/chrome/en-US/locale/browser/migration/ -mozilla-firefox/chrome/en-US/locale/browser/pref/ -mozilla-firefox/chrome/en-US/locale/browser/sidebar/ -mozilla-firefox/chrome/en-US/locale/cookie/ -mozilla-firefox/chrome/en-US/locale/global/ -mozilla-firefox/chrome/en-US/locale/global-platform/ -mozilla-firefox/chrome/en-US/locale/global-platform/mac/ -mozilla-firefox/chrome/en-US/locale/global-platform/unix/ -mozilla-firefox/chrome/en-US/locale/global-platform/win/ -mozilla-firefox/chrome/en-US/locale/global-region/ -mozilla-firefox/chrome/en-US/locale/global/dom/ -mozilla-firefox/chrome/en-US/locale/global/history/ -mozilla-firefox/chrome/en-US/locale/global/layout/ -mozilla-firefox/chrome/en-US/locale/global/security/ -mozilla-firefox/chrome/en-US/locale/global/webservices/ -mozilla-firefox/chrome/en-US/locale/global/xml/ -mozilla-firefox/chrome/en-US/locale/global/xpinstall/ -mozilla-firefox/chrome/en-US/locale/mozapps/ -mozilla-firefox/chrome/en-US/locale/mozapps/downloads/ -mozilla-firefox/chrome/en-US/locale/mozapps/extensions/ -mozilla-firefox/chrome/en-US/locale/mozapps/plugins/ -mozilla-firefox/chrome/en-US/locale/mozapps/profile/ -mozilla-firefox/chrome/en-US/locale/mozapps/update/ -mozilla-firefox/chrome/en-US/locale/mozapps/xpinstall/ -mozilla-firefox/chrome/en-US/locale/necko/ -mozilla-firefox/chrome/en-US/locale/passwordmgr/ -mozilla-firefox/chrome/en-US/locale/pipnss/ -mozilla-firefox/chrome/en-US/locale/pippki/ -mozilla-firefox/chrome/help/ -mozilla-firefox/chrome/help.jar -mozilla-firefox/chrome/help/content/ -mozilla-firefox/chrome/help/content/help/ -mozilla-firefox/chrome/help/locale/ -mozilla-firefox/chrome/help/locale/en-US/ -mozilla-firefox/chrome/help/locale/en-US/help/ -mozilla-firefox/chrome/help/skin/ -mozilla-firefox/chrome/help/skin/classic/ -mozilla-firefox/chrome/help/skin/classic/help/ +mozilla-firefox/chrome/en-US.manifest mozilla-firefox/chrome/icons/ mozilla-firefox/chrome/icons/default/ mozilla-firefox/chrome/icons/default/default.xpm -mozilla-firefox/chrome/inspector/ -mozilla-firefox/chrome/inspector.jar -mozilla-firefox/chrome/inspector/content/ -mozilla-firefox/chrome/inspector/content/inspector/ -mozilla-firefox/chrome/inspector/content/inspector/extensions/ -mozilla-firefox/chrome/inspector/content/inspector/jsutil/ -mozilla-firefox/chrome/inspector/content/inspector/jsutil/events/ -mozilla-firefox/chrome/inspector/content/inspector/jsutil/rdf/ -mozilla-firefox/chrome/inspector/content/inspector/jsutil/system/ -mozilla-firefox/chrome/inspector/content/inspector/jsutil/xpcom/ -mozilla-firefox/chrome/inspector/content/inspector/jsutil/xul/ -mozilla-firefox/chrome/inspector/content/inspector/prefs/ -mozilla-firefox/chrome/inspector/content/inspector/search/ -mozilla-firefox/chrome/inspector/content/inspector/search/modules/ -mozilla-firefox/chrome/inspector/content/inspector/search/modules/findFiles/ -mozilla-firefox/chrome/inspector/content/inspector/search/modules/junkImgs/ -mozilla-firefox/chrome/inspector/content/inspector/tests/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/boxModel/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/computedStyle/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/dom/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/domNode/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/jsObject/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/styleRules/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/stylesheets/ -mozilla-firefox/chrome/inspector/content/inspector/viewers/xblBindings/ -mozilla-firefox/chrome/inspector/locale/ -mozilla-firefox/chrome/inspector/locale/en-US/ -mozilla-firefox/chrome/inspector/locale/en-US/inspector/ -mozilla-firefox/chrome/inspector/locale/en-US/inspector/search/ -mozilla-firefox/chrome/inspector/locale/en-US/inspector/viewers/ -mozilla-firefox/chrome/inspector/skin/ -mozilla-firefox/chrome/inspector/skin/classic/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/boxModel/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/dom/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/domNode/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/styleRules/ -mozilla-firefox/chrome/inspector/skin/classic/inspector/viewers/xblBindings/ -mozilla-firefox/chrome/inspector/skin/modern/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/boxModel/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/dom/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/domNode/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/styleRules/ -mozilla-firefox/chrome/inspector/skin/modern/inspector/viewers/xblBindings/ -mozilla-firefox/chrome/installed-chrome.txt -mozilla-firefox/chrome/modern/ -mozilla-firefox/chrome/modern.jar -mozilla-firefox/chrome/modern/skin/ -mozilla-firefox/chrome/modern/skin/modern/ -mozilla-firefox/chrome/modern/skin/modern/communicator/ -mozilla-firefox/chrome/modern/skin/modern/communicator/cookie/ -mozilla-firefox/chrome/pipnss/ -mozilla-firefox/chrome/pipnss.jar -mozilla-firefox/chrome/pipnss/content/ -mozilla-firefox/chrome/pipnss/content/pipnss/ -mozilla-firefox/chrome/pippki/ mozilla-firefox/chrome/pippki.jar -mozilla-firefox/chrome/pippki/content/ -mozilla-firefox/chrome/pippki/content/pippki/ -mozilla-firefox/chrome/toolkit/ +mozilla-firefox/chrome/pippki.manifest +mozilla-firefox/chrome/reporter.jar +mozilla-firefox/chrome/reporter.manifest mozilla-firefox/chrome/toolkit.jar -mozilla-firefox/chrome/toolkit/content/ -mozilla-firefox/chrome/toolkit/content/global/ -mozilla-firefox/chrome/toolkit/content/global-platform/ -mozilla-firefox/chrome/toolkit/content/global-region/ -mozilla-firefox/chrome/toolkit/content/global/bindings/ -mozilla-firefox/chrome/toolkit/content/global/xml/ -mozilla-firefox/chrome/toolkit/content/mozapps/ -mozilla-firefox/chrome/toolkit/content/mozapps/downloads/ -mozilla-firefox/chrome/toolkit/content/mozapps/extensions/ -mozilla-firefox/chrome/toolkit/content/mozapps/plugins/ -mozilla-firefox/chrome/toolkit/content/mozapps/profile/ -mozilla-firefox/chrome/toolkit/content/mozapps/shared/ -mozilla-firefox/chrome/toolkit/content/mozapps/update/ -mozilla-firefox/chrome/toolkit/content/mozapps/xpinstall/ -mozilla-firefox/chrome/toolkit/content/passwordmgr/ +mozilla-firefox/chrome/toolkit.manifest mozilla-firefox/components/ mozilla-firefox/components/accessibility-atk.xpt mozilla-firefox/components/accessibility.xpt +mozilla-firefox/components/alerts.xpt mozilla-firefox/components/appshell.xpt +mozilla-firefox/components/appstartup.xpt mozilla-firefox/components/autocomplete.xpt mozilla-firefox/components/autoconfig.xpt mozilla-firefox/components/bookmarks.xpt +mozilla-firefox/components/browsercompsbase.xpt mozilla-firefox/components/caps.xpt mozilla-firefox/components/chardet.xpt +mozilla-firefox/components/chrome.xpt mozilla-firefox/components/commandhandler.xpt +mozilla-firefox/components/commandlines.xpt mozilla-firefox/components/composer.xpt mozilla-firefox/components/content_base.xpt mozilla-firefox/components/content_html.xpt mozilla-firefox/components/content_htmldoc.xpt mozilla-firefox/components/content_xmldoc.xpt mozilla-firefox/components/content_xslt.xpt +mozilla-firefox/components/content_xtf.xpt mozilla-firefox/components/cookie.xpt mozilla-firefox/components/directory.xpt mozilla-firefox/components/docshell.xpt mozilla-firefox/components/dom.xpt mozilla-firefox/components/dom_base.xpt +mozilla-firefox/components/dom_canvas.xpt mozilla-firefox/components/dom_core.xpt mozilla-firefox/components/dom_css.xpt mozilla-firefox/components/dom_events.xpt @@ -223,6 +60,7 @@ mozilla-firefox/components/dom_html.xpt mozilla-firefox/components/dom_loadsave.xpt mozilla-firefox/components/dom_range.xpt mozilla-firefox/components/dom_stylesheets.xpt +mozilla-firefox/components/dom_svg.xpt mozilla-firefox/components/dom_traversal.xpt mozilla-firefox/components/dom_views.xpt mozilla-firefox/components/dom_xbl.xpt @@ -237,19 +75,17 @@ mozilla-firefox/components/fastfind.xpt mozilla-firefox/components/filepicker.xpt mozilla-firefox/components/find.xpt mozilla-firefox/components/gfx.xpt -mozilla-firefox/components/helperAppDlg.xpt +mozilla-firefox/components/gksvgrenderer.xpt mozilla-firefox/components/history.xpt mozilla-firefox/components/htmlparser.xpt mozilla-firefox/components/imglib2.xpt -mozilla-firefox/components/inspector-cmdline.js -mozilla-firefox/components/inspector.xpt mozilla-firefox/components/intl.xpt mozilla-firefox/components/jar.xpt mozilla-firefox/components/jsconsole-clhandler.js mozilla-firefox/components/jsconsole.xpt mozilla-firefox/components/jsdservice.xpt -mozilla-firefox/components/jsurl.xpt mozilla-firefox/components/layout_base.xpt +mozilla-firefox/components/layout_printing.xpt mozilla-firefox/components/layout_xul.xpt mozilla-firefox/components/layout_xul_tree.xpt mozilla-firefox/components/locale.xpt @@ -268,12 +104,14 @@ mozilla-firefox/components/necko_dns.xpt mozilla-firefox/components/necko_file.xpt mozilla-firefox/components/necko_ftp.xpt mozilla-firefox/components/necko_http.xpt -mozilla-firefox/components/necko_jar.xpt mozilla-firefox/components/necko_res.xpt mozilla-firefox/components/necko_socket.xpt mozilla-firefox/components/necko_strconv.xpt mozilla-firefox/components/necko_viewsource.xpt +mozilla-firefox/components/nsBrowserContentHandler.js +mozilla-firefox/components/nsBrowserGlue.js mozilla-firefox/components/nsCloseAllWindows.js +mozilla-firefox/components/nsDefaultCLH.js mozilla-firefox/components/nsDictionary.js mozilla-firefox/components/nsExtensionManager.js mozilla-firefox/components/nsFilePicker.js @@ -305,6 +143,7 @@ mozilla-firefox/components/shellservice.xpt mozilla-firefox/components/shistory.xpt mozilla-firefox/components/sidebar.xpt mozilla-firefox/components/toolkitprofile.xpt +mozilla-firefox/components/toolkitremote.xpt mozilla-firefox/components/txmgr.xpt mozilla-firefox/components/txtsvc.xpt mozilla-firefox/components/uconv.xpt @@ -329,7 +168,7 @@ mozilla-firefox/components/xpcom_threads.xpt mozilla-firefox/components/xpcom_xpti.xpt mozilla-firefox/components/xpconnect.xpt mozilla-firefox/components/xpinstall.xpt -mozilla-firefox/components/xremoteservice.xpt +mozilla-firefox/components/xulapp.xpt mozilla-firefox/components/xuldoc.xpt mozilla-firefox/components/xultmpl.xpt mozilla-firefox/defaults/ @@ -337,26 +176,32 @@ mozilla-firefox/defaults/autoconfig/ mozilla-firefox/defaults/autoconfig/platform.js mozilla-firefox/defaults/autoconfig/prefcalls.js mozilla-firefox/defaults/pref/ +mozilla-firefox/defaults/pref/channel-prefs.js mozilla-firefox/defaults/pref/firefox-l10n.js mozilla-firefox/defaults/pref/firefox.js -mozilla-firefox/defaults/pref/inspector.js +mozilla-firefox/defaults/pref/reporter.js mozilla-firefox/defaults/profile/ mozilla-firefox/defaults/profile/bookmarks.html mozilla-firefox/defaults/profile/chrome/ mozilla-firefox/defaults/profile/chrome/userChrome-example.css mozilla-firefox/defaults/profile/chrome/userContent-example.css -mozilla-firefox/defaults/profile/extensions/ -mozilla-firefox/defaults/profile/extensions/Extensions.rdf -mozilla-firefox/defaults/profile/extensions/installed-extensions.txt -mozilla-firefox/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/ -mozilla-firefox/defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf mozilla-firefox/defaults/profile/localstore.rdf mozilla-firefox/defaults/profile/mimeTypes.rdf mozilla-firefox/defaults/profile/prefs.js mozilla-firefox/defaults/profile/search.rdf mozilla-firefox/extensions/ -mozilla-firefox/extensions/Extensions.rdf -mozilla-firefox/extensions/installed-extensions-processed.txt +mozilla-firefox/extensions/inspector@mozilla.org/ +mozilla-firefox/extensions/inspector@mozilla.org/chrome/ +mozilla-firefox/extensions/inspector@mozilla.org/chrome.manifest +mozilla-firefox/extensions/inspector@mozilla.org/chrome/chromelist.txt +mozilla-firefox/extensions/inspector@mozilla.org/chrome/inspector.jar +mozilla-firefox/extensions/inspector@mozilla.org/components/ +mozilla-firefox/extensions/inspector@mozilla.org/components/inspector-cmdline.js +mozilla-firefox/extensions/inspector@mozilla.org/components/inspector.xpt +mozilla-firefox/extensions/inspector@mozilla.org/defaults/ +mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/ +mozilla-firefox/extensions/inspector@mozilla.org/defaults/preferences/inspector.js +mozilla-firefox/extensions/inspector@mozilla.org/install.rdf mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/ mozilla-firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf mozilla-firefox/firefox-bin @@ -368,7 +213,6 @@ mozilla-firefox/mozicon16.xpm mozilla-firefox/mozicon50.xpm mozilla-firefox/mozilla-firefox-bin mozilla-firefox/mozilla-xremote-client -mozilla-firefox/regchrome mozilla-firefox/regxpcom mozilla-firefox/res/ mozilla-firefox/res/EditorOverride.css @@ -400,6 +244,7 @@ mozilla-firefox/res/fonts/mathfontMath2.properties mozilla-firefox/res/fonts/mathfontMath4.properties mozilla-firefox/res/fonts/mathfontPUA.properties mozilla-firefox/res/fonts/mathfontSymbol.properties +mozilla-firefox/res/fonts/pangoFontEncoding.properties mozilla-firefox/res/forms.css mozilla-firefox/res/grabber.gif mozilla-firefox/res/hiddenWindow.html @@ -415,21 +260,11 @@ mozilla-firefox/res/html/gopher-sound.gif mozilla-firefox/res/html/gopher-telnet.gif mozilla-firefox/res/html/gopher-text.gif mozilla-firefox/res/html/gopher-unknown.gif -mozilla-firefox/res/inspector/ -mozilla-firefox/res/inspector/search-registry.rdf -mozilla-firefox/res/inspector/viewer-registry.rdf mozilla-firefox/res/langGroups.properties mozilla-firefox/res/language.properties mozilla-firefox/res/loading-image.gif mozilla-firefox/res/mathml.css -mozilla-firefox/res/platform-forms.css mozilla-firefox/res/quirk.css -mozilla-firefox/res/rdf/ -mozilla-firefox/res/rdf/dom-test-4.css -mozilla-firefox/res/rdf/folder-closed.gif -mozilla-firefox/res/rdf/folder-open.gif -mozilla-firefox/res/rdf/ignore-test.xul -mozilla-firefox/res/rdf/loading.gif mozilla-firefox/res/sample.unixpsfonts.properties mozilla-firefox/res/samples/ mozilla-firefox/res/samples/Anieyes.gif @@ -486,6 +321,7 @@ mozilla-firefox/res/samples/toolbarTest1.xul mozilla-firefox/res/samples/treeTest1.css mozilla-firefox/res/samples/treeTest1.xul mozilla-firefox/res/samples/xulTest.css +mozilla-firefox/res/svg.css mozilla-firefox/res/table-add-column-after-active.gif mozilla-firefox/res/table-add-column-after-hover.gif mozilla-firefox/res/table-add-column-after.gif @@ -544,10 +380,10 @@ mozilla-firefox/run-mozilla.sh mozilla-firefox/searchplugins/ mozilla-firefox/searchplugins/amazondotcom.png mozilla-firefox/searchplugins/amazondotcom.src +mozilla-firefox/searchplugins/answers.png +mozilla-firefox/searchplugins/answers.src mozilla-firefox/searchplugins/creativecommons.png mozilla-firefox/searchplugins/creativecommons.src -mozilla-firefox/searchplugins/dictionary.png -mozilla-firefox/searchplugins/dictionary.src mozilla-firefox/searchplugins/eBay.gif mozilla-firefox/searchplugins/eBay.src mozilla-firefox/searchplugins/google.gif @@ -557,7 +393,6 @@ mozilla-firefox/searchplugins/yahoo.src @cwd ${LOCALBASE}/mozilla-firefox @exec rm -rf /tmp/.mozilla @exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regxpcom -@exec cd %D && env HOME=/tmp LD_LIBRARY_PATH=%D ./regchrome @exec rm -rf /tmp/.mozilla @unexec rm -f %D/components/compreg.dat @unexec rm -f %D/components/xpti.dat