diff options
author | Florian Smeets <flo@FreeBSD.org> | 2012-10-10 21:13:06 +0000 |
---|---|---|
committer | Florian Smeets <flo@FreeBSD.org> | 2012-10-10 21:13:06 +0000 |
commit | 98ff1f74fb3f09d69165fc711a54df23a7127a23 (patch) | |
tree | 16010259bfe88bdd615bd9a206f3377ee212913d /www/seamonkey/files/patch-bug713802 | |
parent | - Remove double quotes from *_DESC (diff) |
- Update firefox-esr, thunderbird-esr, linux-firefox and linux-thunderbird to 10.0.8
- Update firefox and thunderbird to 16.0
- Update seamonkey to 2.13
- Update all -i18n ports respectively
- switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better
latency during pause and seeking with HTML5 video
- remove fedisableexcept() hacks, obsolete since FreeBSD 4.0
- support system hunspell dictionaries [1]
- unbreak -esr ports with clang3.2 [2]
- unbreak nss build when CC contains full path [3]
- remove GNOME option grouping [4]
- integrate enigmail into thunderbird/seamonkey as an option [5]
- remove mail/enigmail* [6]
- enable ENIGMAIL, LIGHTNING and GIO options by default
- add more reporters in about:memory: page-faults-hard, page-faults-soft,
resident, vsize
- use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0,
only heap-allocated reporter works in about:memory (see bug 762445)
- use lrintf() instead of slow C cast in bundled libopus
- use libjpeg-turbo's faster color conversion if available during build
- record startup time for telemetry
- use -z origin instead of hardcoding path to gecko runtime
- fail early if incompatible libxul version is installed (in USE_GECKO)
- *miscellaneous cleanups and fixups*
PR: ports/171534 [1]
PR: ports/171566 [2]
PR: ports/172164 [3]
PR: ports/172201 [4]
Discussed with: ale, beat, Jan Beich [5]
Approved by: ale [6]
In collaboration with: Jan Beich <jbeich@tormail.org>
Security: 6e5a9afd-12d3-11e2-b47d-c8600054b392
Feature safe: yes
Approved by: portmgr (beat)
Notes
Notes:
svn path=/head/; revision=305684
Diffstat (limited to 'www/seamonkey/files/patch-bug713802')
-rw-r--r-- | www/seamonkey/files/patch-bug713802 | 201 |
1 files changed, 201 insertions, 0 deletions
diff --git a/www/seamonkey/files/patch-bug713802 b/www/seamonkey/files/patch-bug713802 new file mode 100644 index 000000000000..17e7226cd96d --- /dev/null +++ b/www/seamonkey/files/patch-bug713802 @@ -0,0 +1,201 @@ +commit 20586fa +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Thu Sep 27 18:35:06 2012 +1200 + + b=713802 default enable GIO support and disable GnomeVFS r=glandium + + --HG-- + extra : transplant_source : wk%ADr%CA%8EN%AE%C93p/p%0A%26%0E%1D0%F20 +--- + browser/confvars.sh | 2 +- + configure.in | 20 ++++++++++---------- + xulrunner/confvars.sh | 2 +- + 3 files changed, 12 insertions(+), 12 deletions(-) + +diff --git mozilla/browser/confvars.sh mozilla/browser/confvars.sh +index 40ab494..eae5645 100755 +--- mozilla/browser/confvars.sh ++++ mozilla/browser/confvars.sh +@@ -21,7 +21,7 @@ MOZ_SERVICES_AITC=1 + MOZ_SERVICES_NOTIFICATIONS=1 + MOZ_SERVICES_SYNC=1 + MOZ_APP_VERSION=$FIREFOX_VERSION +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh + # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, + # because branding dependencies are broken. +--- mozilla/browser/installer/package-manifest.in~ ++++ mozilla/browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif +diff --git mozilla/configure.in mozilla/configure.in +index 87a9391..2118651 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -4846,21 +4846,21 @@ dnl ======================================================== + + if test "$MOZ_X11" + then +- dnl build the gnomevfs extension by default only when the ++ dnl build the GIO extension by default only when the + dnl GTK2 toolkit is in use. + if test "$MOZ_ENABLE_GTK2" + then +- MOZ_ENABLE_GNOMEVFS=1 ++ MOZ_ENABLE_GIO=1 + MOZ_ENABLE_GCONF=1 + fi + + dnl ======================================================== + dnl = GnomeVFS support module + dnl ======================================================== +- MOZ_ARG_DISABLE_BOOL(gnomevfs, +- [ --disable-gnomevfs Disable GnomeVFS support ], +- MOZ_ENABLE_GNOMEVFS=, +- MOZ_ENABLE_GNOMEVFS=force) ++ MOZ_ARG_ENABLE_BOOL(gnomevfs, ++ [ --enable-gnomevfs Enable GnomeVFS support (default: disabled)], ++ MOZ_ENABLE_GNOMEVFS=force, ++ MOZ_ENABLE_GNOMEVFS=) + + if test "$MOZ_ENABLE_GNOMEVFS" + then +@@ -4884,10 +4884,10 @@ then + dnl ======================================================== + dnl = GIO support module + dnl ======================================================== +- MOZ_ARG_ENABLE_BOOL(gio, +- [ --enable-gio Enable GIO support (default: disabled)], +- MOZ_ENABLE_GIO=force, +- MOZ_ENABLE_GIO=) ++ MOZ_ARG_DISABLE_BOOL(gio, ++ [ --disable-gio Disable GIO support], ++ MOZ_ENABLE_GIO=, ++ MOZ_ENABLE_GIO=force) + + if test "$MOZ_ENABLE_GIO" -a "$MOZ_ENABLE_GTK2" + then +diff --git mozilla/xulrunner/confvars.sh mozilla/xulrunner/confvars.sh +index 2fa6ead..5fe2c3d 100755 +--- mozilla/xulrunner/confvars.sh ++++ mozilla/xulrunner/confvars.sh +@@ -10,5 +10,5 @@ MOZ_XULRUNNER=1 + MOZ_CHROME_FILE_FORMAT=omni + MOZ_APP_VERSION=$MOZILLA_VERSION + MOZ_PLACES=1 +-MOZ_EXTENSIONS_DEFAULT=" gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" gio" + MOZ_URL_CLASSIFIER=1 +diff --git suite/confvars.sh suite/confvars.sh +index 8c13a33..cdedd30 100755 +--- suite/confvars.sh ++++ suite/confvars.sh +@@ -15,7 +15,7 @@ MOZ_COMPOSER=1 + MOZ_SUITE=1 + MOZ_BRANDING_DIRECTORY=suite/branding/nightly + MOZ_OFFICIAL_BRANDING_DIRECTORY=suite/branding/nightly +-MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gnomevfs" ++MOZ_EXTENSIONS_DEFAULT=" venkman inspector irc gio" + MOZ_UPDATER=1 + # This should usually be the same as the value MAR_CHANNEL_ID. + # If more than one ID is needed, then you should use a comma separated list +--- suite/installer/package-manifest.in~ ++++ suite/installer/package-manifest.in +@@ -265,6 +265,9 @@ + @BINPATH@/components/necko_wifi.xpt + #endif + @BINPATH@/components/necko_wyciwyg.xpt ++#ifdef MOZ_ENABLE_GIO ++@BINPATH@/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif + #ifdef MOZ_ENABLE_GNOMEVFS + @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif + +commit d884d75 +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Thu Sep 27 18:34:44 2012 +1200 + + b=713802 disable gnomevfs extension without --enable-gnomevfs r=glandium + + --HG-- + extra : transplant_source : i%07%81%E9%90_%C1%05b%194%9B%1E%93%FC%03%279%F9%8A +--- + configure.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + +diff --git mozilla/configure.in mozilla/configure.in +index f2b4041..87a9391 100644 +--- mozilla/configure.in ++++ mozilla/configure.in +@@ -4875,12 +4875,6 @@ then + fi + MOZ_ENABLE_GNOMEVFS= + ]) +- else +- if test `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then +- PKG_CHECK_MODULES(MOZ_GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION,[ +- MOZ_GNOMEVFS_LIBS=`echo $MOZ_GNOMEVFS_LIBS | sed 's/-llinc\>//'` +- ]) +- fi + fi + + AC_SUBST(MOZ_ENABLE_GNOMEVFS) +@@ -5967,10 +5961,10 @@ MOZ_ARG_ENABLE_STRING(extensions, + done], + MOZ_EXTENSIONS="$MOZ_EXTENSIONS_DEFAULT") + +-if test -z "$MOZ_ENABLE_GNOMEVFS" -a -z "$MOZ_GNOMEVFS_LIBS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then ++if test -z "$MOZ_ENABLE_GNOMEVFS" -a `echo "$MOZ_EXTENSIONS" | grep -c gnomevfs` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gnomevfs without required libraries. Removing gnomevfs from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gnomevfs from MOZ_EXTENSIONS due to no --enable-gnomevfs.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gnomevfs||'` + fi +@@ -5983,7 +5977,7 @@ fi + if test -z "$MOZ_ENABLE_GIO" -a `echo "$MOZ_EXTENSIONS" | grep -c gio` -ne 0; then + # Suppress warning on non-X11 platforms + if test -n "$MOZ_X11"; then +- AC_MSG_WARN([Cannot build gio without required libraries. Removing gio from MOZ_EXTENSIONS.]) ++ AC_MSG_WARN([Removing gio from MOZ_EXTENSIONS due to --disable-gio.]) + fi + MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|gio||'` + fi + +commit ddedeea +Author: Karl Tomlinson <karlt+@karlt.net> +Date: Thu Sep 27 13:47:19 2012 +1200 + + b=713802 link gio extension against libxul for tracemalloc stack functions r=bsmedberg + + --HG-- + extra : transplant_source : %C8%A3o%BE%A0z%F7%C8%8A%E6%0E%D4s%7D%90%9C%D9%0F%06%7E +--- + extensions/gio/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git mozilla/extensions/gio/Makefile.in mozilla/extensions/gio/Makefile.in +index 46412c4..ccf2846 100644 +--- mozilla/extensions/gio/Makefile.in ++++ mozilla/extensions/gio/Makefile.in +@@ -23,7 +23,7 @@ LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) + + EXTRA_DSO_LDOPTS = \ + $(XPCOM_GLUE_LDOPTS) \ +- $(NSPR_LIBS) \ ++ $(MOZ_COMPONENT_LIBS) \ + $(MOZ_GIO_LIBS) \ + $(NULL) + |