Changeset 82858

Timestamp:

08/20/11 20:18:24 (4 years ago)

Author:

jeremyhu@…

Message:

firefox-x11: Bump to 6.0

Location:

trunk/dports/www/firefox-x11

Files:

• Portfile (modified) (4 diffs)
• files/PR-623797.patch (deleted)
• files/plugin-instance-nococoa.patch (modified) (17 diffs)

trunk/dports/www/firefox-x11/Portfile

@@ -8 +8 @@
 set component   firefox
 categories      www x11
-version         5.0.1
+version         6.0
 platforms       darwin
 maintainers     jeremyhu openmaintainer
@@ -27 +27 @@
 use_bzip2       yes
 
-checksums           md5     6d1f43e402cec84459a3d7f950bd5192 \
-                    sha1    c93b3513e160d87535a9d61c5e06a6a701e9cd3e \
-                    rmd160  d80a2d64a4a712e530b6f91661eae41f6d1e491e
+checksums           sha1    abcb3cc3907d5217726f457085d00b3995fb469b \
+                    rmd160  b1f586d4e9889f3b5449c00e4bf3340d3dcca0da \
+                    sha256  cc3fb554ca02358e000502a1023d5ba01e6d18ae30c719f5a3b1ce1ad8334973
 
 worksrcdir      mozilla-release
@@ -180 +180 @@
 
     # Don't use the system X11
-    reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
+    reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/dom/plugins/base/nsPluginsDirUnix.cpp
+    reinplace "s/libXt.so.6:libXext.so/libXt.dylib:libXext.dylib/" ${worksrcpath}/dom/plugins/base/nsPluginsDirUnix.cpp
 
     # Set the right install_name on the libs
@@ -219 +220 @@
     reinplace "s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
 
-    reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/dom/plugins/PluginModuleChild.cpp
-
     reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/qt/nsIdleServiceQt.cpp
     reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/qt/nsSound.cpp

trunk/dports/www/firefox-x11/files/plugin-instance-nococoa.patch

@@ -1 @@
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.cpp mozilla-central/dom/plugins/PluginInstanceChild.cpp
---- 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
+--- dom/plugins/base/nsNPAPIPlugin.cpp  2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/base/nsNPAPIPlugin.cpp  2011-08-16 09:43:33.000000000 -0400
+@@ -76,17 +76,17 @@ 
+ #include "nsIPrincipal.h"
+ #include "nsWildCard.h"
+ 
+ #include "nsIXPConnect.h"
+ 
+ #include "nsIObserverService.h"
+ #include <prinrval.h>
+ 
+-#ifdef XP_MACOSX
++#ifdef MOZ_WIDGET_COCOA
+ #include <Carbon/Carbon.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <OpenGL/OpenGL.h>
+ #endif
+ 
+ // needed for nppdf plugin
+ #ifdef MOZ_WIDGET_GTK2
+ #include <gdk/gdk.h>
+--- dom/plugins/ipc/PluginInstanceChild.cpp     2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginInstanceChild.cpp     2011-08-16 10:18:22.000000000 -0400
+@@ -123,17 +123,17 @@ 
+     , mPluginWndProc(0)
+     , mPluginParentHWND(0)
+     , mCachedWinlessPluginHWND(0)
+     , mWinlessPopupSurrogateHWND(0)
+     , mWinlessThrottleOldWndProc(0)
      , mWinlessHiddenMsgHWND(0)
  #endif // OS_WIN
@@ -11 +36 @@
      , mEventModel(NPEventModelCarbon)
  #endif
-@@ -180,7 +180,7 @@ PluginInstanceChild::~PluginInstanceChil
+     , mShColorSpace(nsnull)
+     , mShContext(nsnull)
+     , mDrawingModel(NPDrawingModelCoreGraphics)
+     , mCurrentEvent(nsnull)
+ #endif
+@@ -171,17 +171,17 @@ 
+ #endif // OS_WIN
+ }
+ 
+ PluginInstanceChild::~PluginInstanceChild()
+ {
  #if defined(OS_WIN)
      NS_ASSERTION(!mPluginWindowHWND, "Destroying PluginInstanceChild without NPP_Destroy?");
@@ -20 +55 @@
          ::CGColorSpaceRelease(mShColorSpace);
      }
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceChild.h mozilla-central/dom/plugins/PluginInstanceChild.h
---- 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 @@
+     if (mShContext) {
+         ::CGContextRelease(mShContext);
+     }
+ #endif
+ }
+--- dom/plugins/ipc/PluginInstanceChild.h       2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginInstanceChild.h       2011-08-16 10:12:11.000000000 -0400
+@@ -40,17 +40,17 @@ 
+ #define dom_plugins_PluginInstanceChild_h 1
+ 
+ #include "mozilla/plugins/PPluginInstanceChild.h"
+ #include "mozilla/plugins/PluginScriptableObjectChild.h"
  #include "mozilla/plugins/StreamNotifyChild.h"
+ #include "mozilla/plugins/PPluginSurfaceChild.h"
  #if defined(OS_WIN)
  #include "mozilla/gfx/SharedDIBWin.h"
@@ -32 +76 @@
  #include "base/timer.h"
  #endif
-@@ -370,7 +370,7 @@ private:
+ 
+ #include "npfunctions.h"
+ #include "nsAutoPtr.h"
+ #include "nsTArray.h"
+ #include "ChildAsyncCall.h"
+@@ -402,17 +402,17 @@ 
+     };
+     gfx::SharedDIBWin mSharedSurfaceDib;
+     struct {
+       PRUint16        doublePass;
+       HDC             hdc;
        HBITMAP         bmp;
      } mAlphaExtract;
@@ -41 +95 @@
  #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-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)
+ #endif
+     CGColorSpaceRef       mShColorSpace;
+     CGContextRef          mShContext;
+     int16_t               mDrawingModel;
+     nsCARenderer          mCARenderer;
+--- dom/plugins/ipc/PluginInstanceParent.cpp    2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginInstanceParent.cpp    2011-08-16 10:20:36.000000000 -0400
+@@ -126,17 +126,17 @@ 
  {
--#ifdef OS_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
-     NS_NAMED_LITERAL_CSTRING(flash, "application/x-shockwave-flash");
-     // Flash sends us Invalidate events so we will use those
-     // instead of the refresh timer.
-@@ -127,7 +127,7 @@ PluginInstanceParent::~PluginInstancePar
+     if (mNPP)
+         mNPP->pdata = NULL;
+ 
+ #if defined(OS_WIN)
      NS_ASSERTION(!(mPluginHWND || mPluginWndProc),
          "Subclass was not reset correctly before the dtor was reached!");
@@ -62 +116 @@
          DeallocShmem(mShSurface);
      }
-@@ -1427,7 +1427,7 @@ PluginInstanceParent::AnswerPluginFocusC
+     if (mShColorSpace)
+         ::CGColorSpaceRelease(mShColorSpace);
+     delete mIOSurface;
+     if (mDrawingModel == NPDrawingModelCoreAnimation) {
+         mParent->RemoveFromRefreshTimer(this);
+@@ -1762,16 +1762,16 @@ 
+     ::SendMessage(mPluginHWND, gOOPPPluginFocusEvent, gotFocus ? 1 : 0, 0);
+     return true;
+ #else
+     NS_NOTREACHED("PluginInstanceParent::AnswerPluginFocusChange not implemented!");
+     return false;
  #endif
  }
@@ -71 +135 @@
  PluginInstanceParent::Invalidate()
  {
-diff -Naurp mozilla-central.orig/dom/plugins/PluginInstanceParent.h mozilla-central/dom/plugins/PluginInstanceParent.h
---- 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 @@
+     NPRect windowRect = {0, 0, mShHeight, mShWidth};
+     RecvNPN_InvalidateRect(windowRect);
+ }
+ #endif
+--- dom/plugins/ipc/PluginInstanceParent.h      2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginInstanceParent.h      2011-08-16 10:07:11.000000000 -0400
+@@ -38,17 +38,17 @@ 
+ 
+ #ifndef dom_plugins_PluginInstanceParent_h
+ #define dom_plugins_PluginInstanceParent_h 1
+ 
+ #include "mozilla/plugins/PPluginInstanceParent.h"
  #include "mozilla/plugins/PluginScriptableObjectParent.h"
  #if defined(OS_WIN)
@@ -83 +155 @@
  #endif
  
-@@ -256,9 +256,9 @@ public:
+ #include "npfunctions.h"
+ #include "nsAutoPtr.h"
+ #include "nsDataHashtable.h"
+ #include "nsHashKeys.h"
+ #include "nsRect.h"
+@@ -270,19 +270,19 @@ 
+     GetNPP()
+     {
+       return mNPP;
+     }
+ 
      virtual bool
      AnswerPluginFocusChange(const bool& gotFocus);
  
 -#if defined(OS_MACOSX)
-+#ifdef MOZ_WIDGET_COCOA
++#if defined(MOZ_WIDGET_COCOA)
      void Invalidate();
 -#endif // definied(OS_MACOSX)
@@ -94 +176 @@
  
      nsresult AsyncSetWindow(NPWindow* window);
-     nsresult GetSurface(gfxASurface** aSurface);
-@@ -308,7 +308,7 @@ private:
+     nsresult GetImage(mozilla::layers::ImageContainer* aContainer, mozilla::layers::Image** aImage);
+     nsresult GetImageSize(nsIntSize* aSize);
+ #ifdef XP_MACOSX
+     nsresult IsRemoteDrawingCoreAnimation(PRBool *aDrawing);
+ #endif
+     nsresult SetBackgroundUnknown();
+@@ -345,25 +345,25 @@ 
+ private:
+     gfx::SharedDIBWin  mSharedSurfaceDib;
+     nsIntRect          mPluginPort;
+     nsIntRect          mSharedSize;
+     HWND               mPluginHWND;
      WNDPROC            mPluginWndProc;
      bool               mNestedEventState;
@@ -104 +196 @@
      Shmem              mShSurface; 
      size_t             mShWidth;
-@@ -316,7 +316,7 @@ private:
+     size_t             mShHeight;
      CGColorSpaceRef    mShColorSpace;
      int16_t            mDrawingModel;
@@ -113 +205 @@
      // 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-12-14 17:02:43.000000000 -0800
-+++ dom/plugins/PluginModuleChild.cpp   2010-12-21 14:04:20.000000000 -0800
-@@ -73,7 +73,7 @@
+     // For windowless+transparent instances, this surface contains a
+     // "pretty recent" copy of the pixels under its <object> frame.
+     // On the plugin side, we use this surface to avoid doing alpha
+     // recovery when possible.  This surface is created and owned by
+     // the browser, but a "read-only" reference is sent to the plugin.
+--- dom/plugins/ipc/PluginModuleChild.cpp       2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginModuleChild.cpp       2011-08-16 10:24:51.000000000 -0400
+@@ -68,17 +68,17 @@ 
+ 
+ #include "nsNPAPIPlugin.h"
+ 
+ #ifdef XP_WIN
+ #include "COMMessageFilter.h"
  #include "nsWindowsDllInterceptor.h"
  #endif
@@ -125 +226 @@
  #include "PluginUtilsOSX.h"
  #endif
-@@ -1556,7 +1556,7 @@ _popupcontextmenu(NPP instance, NPMenu* 
+ 
+ using namespace mozilla::plugins;
+ 
+ #if defined(XP_WIN)
+ const PRUnichar * kFlashFullscreenClass = L"ShockwaveFlashFullScreen";
+@@ -1636,17 +1636,17 @@ 
+ #endif
+ 
+ NPError NP_CALLBACK
+ _popupcontextmenu(NPP instance, NPMenu* menu)
+ {
      PLUGIN_LOG_DEBUG_FUNCTION;
      AssertPluginThread();
@@ -134 +245 @@
      double screenX, screenY;
  
-@@ -2191,7 +2191,7 @@ PluginModuleChild::ResetEventHooks()
- }
- #endif
+     const NPCocoaEvent* currentEvent = InstCast(instance)->getCurrentEvent();
+     if (!currentEvent) {
+         return NPERR_GENERIC_ERROR;
+     }
+ 
+@@ -2305,14 +2305,14 @@ 
+     return true;
+ #else
+     NS_RUNTIMEABORT(
+         "PluginModuleChild::RecvProcessNativeEventsInRPCCall not implemented!");
+     return false;
+ #endif
+ }
  
 -#ifdef OS_MACOSX
@@ -143 +264 @@
  PluginModuleChild::ProcessNativeEvents() {
      CallProcessSomeEvents();    
-diff -Naurp mozilla-central.orig/dom/plugins/PluginModuleChild.h mozilla-central/dom/plugins/PluginModuleChild.h
---- 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:
+ }
+ #endif
+--- dom/plugins/ipc/PluginModuleChild.h 2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginModuleChild.h 2011-08-16 10:16:25.000000000 -0400
+@@ -50,17 +50,17 @@ 
+ #include "npapi.h"
+ #include "npfunctions.h"
+ 
+ #include "nsAutoPtr.h"
+ #include "nsDataHashtable.h"
+ #include "nsTHashtable.h"
+ #include "nsHashKeys.h"
+ 
+-#ifdef OS_MACOSX
++#ifdef MOZ_WIDGET_COCOA
+ #include "PluginInterposeOSX.h"
+ #endif
+ 
+ #include "mozilla/plugins/PPluginModuleChild.h"
+ #include "mozilla/plugins/PluginInstanceChild.h"
+ #include "mozilla/plugins/PluginIdentifierChild.h"
+ 
+ // NOTE: stolen from nsNPAPIPlugin.h
+@@ -213,17 +213,17 @@ 
+     static void NP_CALLBACK NPN_GetStringIdentifiers(const NPUTF8** aNames,
+                                                      int32_t aNameCount,
+                                                      NPIdentifier* aIdentifiers);
+     static NPIdentifier NP_CALLBACK NPN_GetIntIdentifier(int32_t aIntId);
+     static bool NP_CALLBACK NPN_IdentifierIsString(NPIdentifier aIdentifier);
      static NPUTF8* NP_CALLBACK NPN_UTF8FromIdentifier(NPIdentifier aIdentifier);
      static int32_t NP_CALLBACK NPN_IntFromIdentifier(NPIdentifier aIdentifier);
@@ -155 +301 @@
      
      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
+         SendPluginShowWindow(window_id, modal, r.origin.x, r.origin.y, r.size.width, r.size.height);
+     }
+ 
+     void PluginHideWindow(uint32_t window_id) {
+         SendPluginHideWindow(window_id);
+--- dom/plugins/ipc/PluginModuleParent.cpp      2011-08-11 17:40:55.000000000 -0400
++++ dom/plugins/ipc/PluginModuleParent.cpp      2011-08-16 10:55:23.000000000 -0400
+@@ -1131,19 +1131,21 @@ 
+ #ifdef OS_MACOSX
+ #define DEFAULT_REFRESH_MS 20 // CoreAnimation: 50 FPS
+ 
+ void
+ CAUpdate(nsITimer *aTimer, void *aClosure) {
      nsTObserverArray<PluginInstanceParent*> *ips =
          static_cast<nsTObserverArray<PluginInstanceParent*> *>(aClosure);
@@ -170 +325 @@
  
  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-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>
- 
--#ifdef XP_MACOSX
-+#ifdef MOZ_WIDGET_COCOA
- #include <Carbon/Carbon.h>
- #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-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 += \
+ PluginModuleParent::AddToRefreshTimer(PluginInstanceParent *aInstance) {
+     if (mCATimerTargets.Contains(aInstance)) {
+         return;
+     }
+ 
+--- toolkit/library/Makefile.in 
++++ toolkit/library/Makefile.in 
+@@ -189,16 +189,19 @@ endif
+ 
+ ifeq ($(OS_ARCH),Darwin)
+ ifdef MOZ_SYDNEYAUDIO
+ EXTRA_DSO_LDOPTS += \
+        -framework Carbon \
         -framework CoreAudio \
         -framework AudioToolbox \
@@ -195 +347 @@
  endif
  endif
+ 
+ ifneq (,$(filter GNU GNU_% NetBSD OpenBSD,$(OS_ARCH)))
+ ifdef MOZ_SYDNEYAUDIO
+ EXTRA_DSO_LDOPTS += -lossaudio
+ endif