[SVN-Commit] r1044 - in trunk/www: firefox-esr/files libxul libxul/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Sep 29 16:19:18 2012
New Revision: 1044

Log:
- unbreak GIO extension on -esr
- enable GIO by default on libxul

Added:
   trunk/www/firefox-esr/files/patch-bug696030
   trunk/www/libxul/files/patch-bug696030
Modified:
   trunk/www/libxul/Makefile

Added: trunk/www/firefox-esr/files/patch-bug696030
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug696030	Sat Sep 29 16:19:18 2012	(r1044)
@@ -0,0 +1,34 @@
+commit 5e354b9
+Author: Chris Coulson <chris.coulson at canonical.com>
+Date:   Thu Jan 5 11:19:50 2012 +1300
+
+    Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt
+    
+    --HG--
+    extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
+---
+ extensions/gio/nsGIOProtocolHandler.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp
+index 9347b6e..e8f153d 100644
+--- extensions/gio/nsGIOProtocolHandler.cpp
++++ extensions/gio/nsGIOProtocolHandler.cpp
+@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream
+ void
+ nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
+ {
+-  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
++  mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
+   mMountRes = result;
+   mMountErrorCode = error_code;
+   mon.Notify();
+@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() {
+                                 NULL,
+                                 mount_enclosing_volume_finished,
+                                 this);
+-  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
++  mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
+   /* Waiting for finish of mount operation thread */  
+   while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
+     mon.Wait();

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Sat Sep 29 06:08:20 2012	(r1043)
+++ trunk/www/libxul/Makefile	Sat Sep 29 16:19:18 2012	(r1044)
@@ -49,6 +49,8 @@
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js \
 			mozilla-plugin
 
+OPTIONS_DEFAULT=GIO
+
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 

Added: trunk/www/libxul/files/patch-bug696030
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/libxul/files/patch-bug696030	Sat Sep 29 16:19:18 2012	(r1044)
@@ -0,0 +1,34 @@
+commit 5e354b9
+Author: Chris Coulson <chris.coulson at canonical.com>
+Date:   Thu Jan 5 11:19:50 2012 +1300
+
+    Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt
+    
+    --HG--
+    extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
+---
+ extensions/gio/nsGIOProtocolHandler.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp
+index 9347b6e..e8f153d 100644
+--- extensions/gio/nsGIOProtocolHandler.cpp
++++ extensions/gio/nsGIOProtocolHandler.cpp
+@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream
+ void
+ nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
+ {
+-  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
++  mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
+   mMountRes = result;
+   mMountErrorCode = error_code;
+   mon.Notify();
+@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() {
+                                 NULL,
+                                 mount_enclosing_volume_finished,
+                                 this);
+-  mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
++  mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
+   /* Waiting for finish of mount operation thread */  
+   while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
+     mon.Wait();