sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-30 17:10:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions
ports/www/libxul/files/patch-bug713802
Florian Smeets 912a7b12e4 - Update www/firefox{,-i18n} to 16.0.2 
- Update seamonkey to 2.13.2
- Update ESR ports and libxul to 10.0.10
- Update nspr to 4.9.3
- Update nss to 3.14
- with GNOMEVFS2 option build its extension, too [1]
- make heap-committed and heap-dirty reporters work in about:memory
- properly mark QT4 as experimental (needs love upstream)
- *miscellaneous cleanups and fixups*

mail/thunderbird will be updated once the tarballs are available.

PR:		ports/173052 [1]
Security:	6b3b1b97-207c-11e2-a03f-c8600054b392
Feature safe:	yes
In collaboration with:	Jan Beich <jbeich@tormail.org>
2012-10-28 17:03:28 +00:00

163 lines
5.5 KiB
Text
Raw Blame History

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)
Reference in a new issue View git blame Copy permalink