[74571] trunk/dports/www/firefox-x11-devel

22 Dec 2010

Revision: 74571
          http://trac.macports.org/changeset/74571
Author:   jeremyhu@macports.org
Date:     2010-12-21 19:06:16 -0800 (Tue, 21 Dec 2010)
Log Message:
-----------
firefox-x11-devel: Bump to 4.0b8

+internal_dependencies is required for now due to:
https://bugzilla.mozilla.org/show_bug.cgi?id=620788

Modified Paths:
--------------
    trunk/dports/www/firefox-x11-devel/Portfile
    trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch

Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================

--- trunk/dports/www/firefox-x11-devel/Portfile	2010-12-22 01:32:33 UTC (rev 74570)
+++ trunk/dports/www/firefox-x11-devel/Portfile	2010-12-22 03:06:16 UTC (rev 74571)
@@ -7,8 +7,7 @@
 name            firefox-x11-devel
 set component   firefox
 categories      www x11
-version         4.0b7
-revision        1
+version         4.0b8
 platforms       darwin
 maintainers     jeremyhu openmaintainer
 description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -27,9 +26,9 @@
 
 use_bzip2       yes
 
-checksums           md5     d2ab9b7eefcbbaedf45189b8662b3e3c \
-                    sha1    57d4a079e639289ffd09a5779a5514c09889a6b8 \
-                    rmd160  dc74a11272e9bdb1b94e3f42cd2e50fdace141c1
+checksums           md5     665ffbf8571e713d5da8f98e3d971e9d \
+                    sha1    40ba6915d736d69e3bcc64365002eedf4a02c8d3 \
+                    rmd160  b2d2faed1a3b71a1e0a605e66dbf63df0180b8c3
 
 worksrcdir      mozilla-central
 

Modified: trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch	2010-12-22 01:32:33 UTC (rev 74570)
+++ trunk/dports/www/firefox-x11-devel/files/plugin-instance-nococoa.patch	2010-12-22 03:06:16 UTC (rev 74571)
@@ -1,7 +1,7 @@
 diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.cpp mozilla-central/dom/plugins/PluginInstanceChild.cpp
---- dom/plugins/PluginInstanceChild.cpp	2010-11-04 16:05:43.000000000 -0400
-+++ dom/plugins/PluginInstanceChild.cpp	2010-11-27 11:39:06.000000000 -0500
-@@ -123,7 +123,7 @@ PluginInstanceChild::PluginInstanceChild
+--- dom/plugins/PluginInstanceChild.cpp	2010-12-14 17:02:43.000000000 -0800
++++ dom/plugins/PluginInstanceChild.cpp	2010-12-21 14:04:20.000000000 -0800
+@@ -126,7 +126,7 @@ PluginInstanceChild::PluginInstanceChild
      , mWinlessHiddenMsgHWND(0)
  #endif // OS_WIN
      , mAsyncCallMutex("PluginInstanceChild::mAsyncCallMutex")
@@ -10,9 +10,9 @@
  #if defined(__i386__)
      , mEventModel(NPEventModelCarbon)
  #endif
-@@ -179,7 +179,7 @@ PluginInstanceChild::~PluginInstanceChil
+@@ -180,7 +180,7 @@ PluginInstanceChild::~PluginInstanceChil
  #if defined(OS_WIN)
-   DestroyPluginWindow();
+     NS_ASSERTION(!mPluginWindowHWND, "Destroying PluginInstanceChild without NPP_Destroy?");
  #endif
 -#if defined(OS_MACOSX)
 +#if defined(MOZ_WIDGET_COCOA)
@@ -20,8 +20,8 @@
          ::CGColorSpaceRelease(mShColorSpace);
      }
 diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.h mozilla-central/dom/plugins/PluginInstanceChild.h
---- dom/plugins/PluginInstanceChild.h	2010-11-04 16:05:43.000000000 -0400
-+++ dom/plugins/PluginInstanceChild.h	2010-11-27 11:39:06.000000000 -0500
+--- dom/plugins/PluginInstanceChild.h	2010-12-14 17:02:43.000000000 -0800
++++ dom/plugins/PluginInstanceChild.h	2010-12-21 14:04:20.000000000 -0800
 @@ -44,7 +44,7 @@
  #include "mozilla/plugins/StreamNotifyChild.h"
  #if defined(OS_WIN)
@@ -31,7 +31,7 @@
  #include "nsCoreAnimationSupport.h"
  #include "base/timer.h"
  #endif
-@@ -388,7 +388,7 @@ private:
+@@ -370,7 +370,7 @@ private:
        HBITMAP         bmp;
      } mAlphaExtract;
  #endif // defined(OS_WIN)
@@ -41,9 +41,9 @@
  #if defined(__i386__)
      NPEventModel          mEventModel;
 diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceParent.cpp mozilla-central/dom/plugins/PluginInstanceParent.cpp
---- dom/plugins/PluginInstanceParent.cpp	2010-11-04 16:05:43.000000000 -0400
-+++ dom/plugins/PluginInstanceParent.cpp	2010-11-27 11:40:26.000000000 -0500
-@@ -106,7 +106,7 @@ PluginInstanceParent::PluginInstancePare
+--- dom/plugins/PluginInstanceParent.cpp	2010-12-14 17:02:43.000000000 -0800
++++ dom/plugins/PluginInstanceParent.cpp	2010-12-21 14:04:20.000000000 -0800
+@@ -108,7 +108,7 @@ PluginInstanceParent::PluginInstancePare
  void
  PluginInstanceParent::InitQuirksModes(const nsCString& aMimeType)
  {
@@ -52,7 +52,7 @@
      NS_NAMED_LITERAL_CSTRING(flash, "application/x-shockwave-flash");
      // Flash sends us Invalidate events so we will use those
      // instead of the refresh timer.
-@@ -125,7 +125,7 @@ PluginInstanceParent::~PluginInstancePar
+@@ -127,7 +127,7 @@ PluginInstanceParent::~PluginInstancePar
      NS_ASSERTION(!(mPluginHWND || mPluginWndProc),
          "Subclass was not reset correctly before the dtor was reached!");
  #endif
@@ -61,7 +61,7 @@
      if (mShWidth != 0 && mShHeight != 0) {
          DeallocShmem(mShSurface);
      }
-@@ -1437,7 +1437,7 @@ PluginInstanceParent::AnswerPluginFocusC
+@@ -1427,7 +1427,7 @@ PluginInstanceParent::AnswerPluginFocusC
  #endif
  }
  
@@ -71,8 +71,8 @@
  PluginInstanceParent::Invalidate()
  {
 diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceParent.h mozilla-central/dom/plugins/PluginInstanceParent.h
---- dom/plugins/PluginInstanceParent.h	2010-11-04 16:05:43.000000000 -0400
-+++ dom/plugins/PluginInstanceParent.h	2010-11-27 11:41:54.000000000 -0500
+--- dom/plugins/PluginInstanceParent.h	2010-12-14 17:02:43.000000000 -0800
++++ dom/plugins/PluginInstanceParent.h	2010-12-21 14:04:20.000000000 -0800
 @@ -43,7 +43,7 @@
  #include "mozilla/plugins/PluginScriptableObjectParent.h"
  #if defined(OS_WIN)
@@ -93,8 +93,8 @@
 +#endif // definied(MOZ_WIDGET_COCOA)
  
      nsresult AsyncSetWindow(NPWindow* window);
-     nsresult NotifyPainted(void);
-@@ -310,7 +310,7 @@ private:
+     nsresult GetSurface(gfxASurface** aSurface);
+@@ -308,7 +308,7 @@ private:
      WNDPROC            mPluginWndProc;
      bool               mNestedEventState;
  #endif // defined(XP_WIN)
@@ -103,7 +103,7 @@
  private:
      Shmem              mShSurface; 
      size_t             mShWidth;
-@@ -318,7 +318,7 @@ private:
+@@ -316,7 +316,7 @@ private:
      CGColorSpaceRef    mShColorSpace;
      int16_t            mDrawingModel;
      nsIOSurface       *mIOSurface;
@@ -113,10 +113,10 @@
      // ObjectFrame layer wrapper
      nsRefPtr<gfxASurface>    mFrontSurface;
 diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleChild.cpp mozilla-central/dom/plugins/PluginModuleChild.cpp
---- dom/plugins/PluginModuleChild.cpp	2010-11-04 16:05:43.000000000 -0400
-+++ dom/plugins/PluginModuleChild.cpp	2010-11-27 11:39:06.000000000 -0500
-@@ -69,7 +69,7 @@
- #include "COMMessageFilter.h"
+--- dom/plugins/PluginModuleChild.cpp	2010-12-14 17:02:43.000000000 -0800
++++ dom/plugins/PluginModuleChild.cpp	2010-12-21 14:04:20.000000000 -0800
+@@ -73,7 +73,7 @@
+ #include "nsWindowsDllInterceptor.h"
  #endif
  
 -#ifdef OS_MACOSX
@@ -124,7 +124,7 @@
  #include "PluginInterposeOSX.h"
  #include "PluginUtilsOSX.h"
  #endif
-@@ -1541,7 +1541,7 @@ _popupcontextmenu(NPP instance, NPMenu* 
+@@ -1556,7 +1556,7 @@ _popupcontextmenu(NPP instance, NPMenu* 
      PLUGIN_LOG_DEBUG_FUNCTION;
      AssertPluginThread();
  
@@ -133,7 +133,7 @@
      double pluginX, pluginY; 
      double screenX, screenY;
  
-@@ -2101,7 +2101,7 @@ PluginModuleChild::ResetEventHooks()
+@@ -2191,7 +2191,7 @@ PluginModuleChild::ResetEventHooks()
  }
  #endif
  
@@ -143,8 +143,8 @@
  PluginModuleChild::ProcessNativeEvents() {
      CallProcessSomeEvents();    
 diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleChild.h mozilla-central/dom/plugins/PluginModuleChild.h
---- dom/plugins/PluginModuleChild.h	2010-11-04 16:05:43.000000000 -0400
-+++ dom/plugins/PluginModuleChild.h	2010-11-27 11:39:06.000000000 -0500
+--- dom/plugins/PluginModuleChild.h	2010-12-14 17:02:43.000000000 -0800
++++ dom/plugins/PluginModuleChild.h	2010-12-21 14:04:20.000000000 -0800
 @@ -193,7 +193,7 @@ public:
      static NPUTF8* NP_CALLBACK NPN_UTF8FromIdentifier(NPIdentifier aIdentifier);
      static int32_t NP_CALLBACK NPN_IntFromIdentifier(NPIdentifier aIdentifier);
@@ -154,9 +154,24 @@
      void ProcessNativeEvents();
      
      void PluginShowWindow(uint32_t window_id, bool modal, CGRect r) {
+diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleParent.cpp mozilla-central/dom/plugins/PluginModuleParent.cpp
+--- dom/plugins/PluginModuleParent.cpp	2010-12-14 17:02:44.000000000 -0800
++++ dom/plugins/PluginModuleParent.cpp	2010-12-21 14:04:20.000000000 -0800
+@@ -915,9 +915,11 @@ CAUpdate(nsITimer *aTimer, void *aClosur
+     nsTObserverArray<PluginInstanceParent*> *ips =
+         static_cast<nsTObserverArray<PluginInstanceParent*> *>(aClosure);
+     nsTObserverArray<PluginInstanceParent*>::ForwardIterator iter(*ips);
++#ifdef MOZ_WIDGET_COCOA
+     while (iter.HasMore()) {
+         iter.GetNext()->Invalidate();
+     }
++#endif // MOZ_WIDGET_COCOA
+ }
+ 
+ void
 diff -Naurp mozilla-central.orig/modules/plugin/base/src/nsNPAPIPlugin.cpp mozilla-central/modules/plugin/base/src/nsNPAPIPlugin.cpp
---- modules/plugin/base/src/nsNPAPIPlugin.cpp	2010-11-04 16:06:43.000000000 -0400
-+++ modules/plugin/base/src/nsNPAPIPlugin.cpp	2010-11-27 11:39:06.000000000 -0500
+--- modules/plugin/base/src/nsNPAPIPlugin.cpp	2010-12-14 17:03:31.000000000 -0800
++++ modules/plugin/base/src/nsNPAPIPlugin.cpp	2010-12-21 14:04:20.000000000 -0800
 @@ -83,7 +83,7 @@
  #include "nsIObserverService.h"
  #include <prinrval.h>
@@ -167,8 +182,8 @@
  #include <ApplicationServices/ApplicationServices.h>
  #include <OpenGL/OpenGL.h>
 diff -Naurp mozilla-central.orig/toolkit/library/Makefile.in mozilla-central/toolkit/library/Makefile.in
---- toolkit/library/Makefile.in	2010-11-04 16:06:54.000000000 -0400
-+++ toolkit/library/Makefile.in	2010-11-27 11:39:06.000000000 -0500
+--- toolkit/library/Makefile.in	2010-12-14 17:03:37.000000000 -0800
++++ toolkit/library/Makefile.in	2010-12-21 14:04:20.000000000 -0800
 @@ -194,6 +194,9 @@ EXTRA_DSO_LDOPTS += \
  	-framework CoreAudio \
  	-framework AudioToolbox \
@@ -179,17 +194,3 @@
  	$(NULL)
  endif
  endif
---- dom/plugins/PluginModuleParent.cpp.orig	2010-11-27 13:28:49.000000000 -0500
-+++ dom/plugins/PluginModuleParent.cpp	2010-11-27 13:29:21.000000000 -0500
-@@ -923,9 +923,11 @@ CAUpdate(nsITimer *aTimer, void *aClosur
-     nsTObserverArray<PluginInstanceParent*> *ips =
-         static_cast<nsTObserverArray<PluginInstanceParent*> *>(aClosure);
-     nsTObserverArray<PluginInstanceParent*>::ForwardIterator iter(*ips);
-+#ifdef MOZ_WIDGET_COCOA
-     while (iter.HasMore()) {
-         iter.GetNext()->Invalidate();
-     }
-+#endif // MOZ_WIDGET_COCOA
- }
- 
- void

    

[74571] trunk/dports/www/firefox-x11-devel

jeremyhu＠macports.org