Date: Sat, 29 Sep 2012 06:08:13 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1042 - in trunk: mail/thunderbird3 www/firefox www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox/files www/firefox36 www/libxul/files www/libxul19 www/seamonkey www/seamonkey/files Message-ID: <201209290608.q8T68Dhp067626@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Sep 29 06:08:12 2012
New Revision: 1042
Log:
limit GIO to ports with gio extension
Added:
trunk/www/firefox-esr/files/patch-bug713802
trunk/www/firefox/files/patch-bug713802
trunk/www/libxul/files/patch-bug713802
trunk/www/seamonkey/files/patch-bug713802
Modified:
trunk/mail/thunderbird3/Makefile
trunk/www/firefox-esr/Makefile
trunk/www/firefox-esr/pkg-message
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/pkg-message
trunk/www/firefox/Makefile
trunk/www/firefox/Makefile.options
trunk/www/firefox/pkg-message
trunk/www/firefox36/Makefile
trunk/www/libxul19/Makefile
trunk/www/seamonkey/Makefile
Modified: trunk/mail/thunderbird3/Makefile
==============================================================================
--- trunk/mail/thunderbird3/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/mail/thunderbird3/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -51,7 +51,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO}
OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
.include <bsd.port.pre.mk>
Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox-esr/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -48,6 +48,7 @@
--enable-official-branding
OPTIONS_DEFINE= PGO
+OPTIONS_DEFAULT=GIO
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
Added: trunk/www/firefox-esr/files/patch-bug713802
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042)
@@ -0,0 +1,163 @@
+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 browser/confvars.sh browser/confvars.sh
+index 40ab494..eae5645 100755
+--- browser/confvars.sh
++++ 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.
+diff --git configure.in configure.in
+index 87a9391..2118651 100644
+--- configure.in
++++ 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 xulrunner/confvars.sh xulrunner/confvars.sh
+index 2fa6ead..5fe2c3d 100755
+--- xulrunner/confvars.sh
++++ 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
+
+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 configure.in configure.in
+index f2b4041..87a9391 100644
+--- configure.in
++++ 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 extensions/gio/Makefile.in extensions/gio/Makefile.in
+index 46412c4..ccf2846 100644
+--- extensions/gio/Makefile.in
++++ 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)
+
Modified: trunk/www/firefox-esr/pkg-message
==============================================================================
--- trunk/www/firefox-esr/pkg-message Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox-esr/pkg-message Sat Sep 29 06:08:12 2012 (r1042)
@@ -1,9 +1,9 @@
======================================================================
-smb:// issues (GNOMEVFS2 option):
+smb:// issues (Gvfs/GIO or GNOMEVFS2 option):
Network group, machine, and share browsing does not work correctly.
-sftp:// (GNOMEVFS2 option):
+sftp:// (Gvfs/GIO or GNOMEVFS2 option):
Only sftp access using public key authentication works. To easily
setup public key authentication to "remote_host":
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox-nightly/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -51,7 +51,7 @@
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
--enable-application=browser
-OPTIONS_DEFAULT=GSTREAMER
+OPTIONS_DEFAULT=GIO GSTREAMER
OPTIONS_DEFINE= GSTREAMER PGO
.if ${USE_MOZILLA:M-nss}
Modified: trunk/www/firefox-nightly/pkg-message
==============================================================================
--- trunk/www/firefox-nightly/pkg-message Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox-nightly/pkg-message Sat Sep 29 06:08:12 2012 (r1042)
@@ -1,9 +1,9 @@
======================================================================
-smb:// issues (GNOMEVFS2 option):
+smb:// issues (Gvfs/GIO or GNOMEVFS2 option):
Network group, machine, and share browsing does not work correctly.
-sftp:// (GNOMEVFS2 option):
+sftp:// (Gvfs/GIO or GNOMEVFS2 option):
Only sftp access using public key authentication works. To easily
setup public key authentication to "remote_host":
Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -49,6 +49,7 @@
--enable-official-branding
OPTIONS_DEFINE= GSTREAMER PGO
+OPTIONS_DEFAULT=GIO
.include "${.CURDIR}/../../www/firefox/Makefile.options"
Modified: trunk/www/firefox/Makefile.options
==============================================================================
--- trunk/www/firefox/Makefile.options Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox/Makefile.options Sat Sep 29 06:08:12 2012 (r1042)
@@ -2,7 +2,7 @@
OPTIONS_DEFINE+= DBUS DEBUG GCONF GIO GNOMEUI GNOMEVFS2 LIBPROXY \
LOGGING OPTIMIZED_CFLAGS
-OPTIONS_DEFAULT+= DBUS GIO GTK2 LOGGING OSS
+OPTIONS_DEFAULT+= DBUS GTK2 LOGGING OSS
OPTIONS_SINGLE+= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO
Added: trunk/www/firefox/files/patch-bug713802
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042)
@@ -0,0 +1,163 @@
+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 browser/confvars.sh browser/confvars.sh
+index 40ab494..eae5645 100755
+--- browser/confvars.sh
++++ 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.
+diff --git configure.in configure.in
+index 87a9391..2118651 100644
+--- configure.in
++++ 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 xulrunner/confvars.sh xulrunner/confvars.sh
+index 2fa6ead..5fe2c3d 100755
+--- xulrunner/confvars.sh
++++ 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
+
+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 configure.in configure.in
+index f2b4041..87a9391 100644
+--- configure.in
++++ 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 extensions/gio/Makefile.in extensions/gio/Makefile.in
+index 46412c4..ccf2846 100644
+--- extensions/gio/Makefile.in
++++ 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)
+
Modified: trunk/www/firefox/pkg-message
==============================================================================
--- trunk/www/firefox/pkg-message Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox/pkg-message Sat Sep 29 06:08:12 2012 (r1042)
@@ -1,9 +1,9 @@
======================================================================
-smb:// issues (GNOMEVFS2 option):
+smb:// issues (Gvfs/GIO or GNOMEVFS2 option):
Network group, machine, and share browsing does not work correctly.
-sftp:// (GNOMEVFS2 option):
+sftp:// (Gvfs/GIO or GNOMEVFS2 option):
Only sftp access using public key authentication works. To easily
setup public key authentication to "remote_host":
Modified: trunk/www/firefox36/Makefile
==============================================================================
--- trunk/www/firefox36/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/firefox36/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -48,7 +48,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO}
OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
.include <bsd.port.pre.mk>
Added: trunk/www/libxul/files/patch-bug713802
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042)
@@ -0,0 +1,163 @@
+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 browser/confvars.sh browser/confvars.sh
+index 40ab494..eae5645 100755
+--- browser/confvars.sh
++++ 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.
+diff --git configure.in configure.in
+index 87a9391..2118651 100644
+--- configure.in
++++ 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 xulrunner/confvars.sh xulrunner/confvars.sh
+index 2fa6ead..5fe2c3d 100755
+--- xulrunner/confvars.sh
++++ 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
+
+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 configure.in configure.in
+index f2b4041..87a9391 100644
+--- configure.in
++++ 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 extensions/gio/Makefile.in extensions/gio/Makefile.in
+index 46412c4..ccf2846 100644
+--- extensions/gio/Makefile.in
++++ 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)
+
Modified: trunk/www/libxul19/Makefile
==============================================================================
--- trunk/www/libxul19/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/libxul19/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -54,7 +54,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
+OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY:NGIO}
OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
.include <bsd.port.pre.mk>
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Sat Sep 29 06:08:00 2012 (r1041)
+++ trunk/www/seamonkey/Makefile Sat Sep 29 06:08:12 2012 (r1042)
@@ -49,7 +49,7 @@
NOT_FOR_ARCHS= ia64
OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL GSTREAMER LDAP LIGHTNING MAILNEWS
-OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP MAILNEWS
+OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL GIO LDAP MAILNEWS
CHATZILLA_DESC?=Chatzilla IRC module
COMPOSER_DESC?= HTML Composer module
Added: trunk/www/seamonkey/files/patch-bug713802
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug713802 Sat Sep 29 06:08:12 2012 (r1042)
@@ -0,0 +1,176 @@
+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.
+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
+
+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)
+
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209290608.q8T68Dhp067626>