www/seamoney Mozilla Bug 681026 upstream patch changes

jasperla · Sep 20, 2011 · 8a73ed9 · 8a73ed9
1 parent ac4fb58
commit 8a73ed9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/www/seamonkey/patches/patch-mozilla_widget_public_nsIGfxInfo_idl b/www/seamonkey/patches/patch-mozilla_widget_public_nsIGfxInfo_idl
@@ -1,12 +1,14 @@
 $OpenBSD$
---- mozilla/widget/public/nsIGfxInfo.idl.orig	Fri Aug 12 15:16:45 2011
-+++ mozilla/widget/public/nsIGfxInfo.idl	Fri Aug 26 15:38:17 2011
+Bug fix 681026
+
+--- mozilla/widget/public/nsIGfxInfo.idl.orig	Sat Sep  3 00:56:23 2011
++++ mozilla/widget/public/nsIGfxInfo.idl	Tue Sep 20 22:22:52 2011
 @@ -131,5 +131,8 @@ interface nsIGfxInfo : nsISupports
     * underlying GL impl that's used to implement WebGL.
     */
    DOMString getWebGLParameter(in DOMString aParam);
 +
 +  // only useful on X11
-+  [notxpcom] void GetData();
++  [noscript, notxpcom] void GetData();
  };
 
diff --git a/www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h b/www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoBase_h
@@ -1,13 +1,15 @@
 $OpenBSD$
---- mozilla/widget/src/xpwidgets/GfxInfoBase.h.orig	Fri Aug 12 15:16:46 2011
-+++ mozilla/widget/src/xpwidgets/GfxInfoBase.h	Fri Aug 26 15:38:17 2011
+Bug Fix 681026
+
+--- mozilla/widget/src/xpwidgets/GfxInfoBase.h.orig	Sat Sep  3 00:56:28 2011
++++ mozilla/widget/src/xpwidgets/GfxInfoBase.h	Tue Sep 20 22:24:19 2011
 @@ -84,6 +84,9 @@ class GfxInfoBase : public nsIGfxInfo, (public)
    // Ideally, Init() would be void-return, but the rules of
    // NS_GENERIC_FACTORY_CONSTRUCTOR_INIT require it be nsresult return.
    virtual nsresult Init();
 +  
 +  // only useful on X11
-+  virtual void GetData() {}
++  NS_IMETHOD_(void) GetData() { }
 
  protected:
 
diff --git a/www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h b/www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_GfxInfoX11_h
@@ -1,15 +1,17 @@
 $OpenBSD$
---- mozilla/widget/src/xpwidgets/GfxInfoX11.h.orig	Fri Aug 12 15:16:46 2011
-+++ mozilla/widget/src/xpwidgets/GfxInfoX11.h	Fri Aug 26 15:43:26 2011
-@@ -68,6 +68,8 @@ class GfxInfo : public GfxInfoBase (public)
+Bug Fix 681026
+
+--- mozilla/widget/src/xpwidgets/GfxInfoX11.h.orig	Sat Sep  3 00:56:28 2011
++++ mozilla/widget/src/xpwidgets/GfxInfoX11.h	Tue Sep 20 22:28:27 2011
+@@ -67,6 +67,8 @@ class GfxInfo : public GfxInfoBase (public)
+   using GfxInfoBase::GetWebGLParameter;
 
    virtual nsresult Init();
++  
++  NS_IMETHOD_(void) GetData();
 
-+  virtual void GetData();
-+
  protected:
 
-   virtual nsresult GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aSuggestedDriverVersion, GfxDriverInfo* aDriverInfo = nsnull);
 @@ -81,7 +83,6 @@ class GfxInfo : public GfxInfoBase (public)
    int mMajorVersion, mMinorVersion;
 

diff --git a/www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp b/www/seamonkey/patches/patch-mozilla_widget_src_xpwidgets_nsBaseWidget_cpp
@@ -1,4 +1,6 @@
 $OpenBSD$
+Bug Fix 681026
+
 --- mozilla/widget/src/xpwidgets/nsBaseWidget.cpp.orig	Fri Aug 12 15:16:46 2011
 +++ mozilla/widget/src/xpwidgets/nsBaseWidget.cpp	Fri Aug 26 15:38:17 2011
 @@ -828,21 +828,33 @@ nsBaseWidget::GetShouldAccelerate()