[gnash] Revert xulrunner headers patch commit

Hicham HAOUARI hicham at fedoraproject.org
Thu Jan 26 10:22:14 UTC 2012


commit a25f538008754c3ed941b16100848087bbe43676
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Thu Jan 26 10:22:03 2012 +0000

    Revert xulrunner headers patch commit

 gnash-0.8.9-xulrunner-headers.patch |   47 ++++++++++++-----------------------
 1 files changed, 16 insertions(+), 31 deletions(-)
---
diff --git a/gnash-0.8.9-xulrunner-headers.patch b/gnash-0.8.9-xulrunner-headers.patch
index 6dabecd..0153dde 100644
--- a/gnash-0.8.9-xulrunner-headers.patch
+++ b/gnash-0.8.9-xulrunner-headers.patch
@@ -1,41 +1,26 @@
-From 35dde18b987210a6c138e89987379db1cbfc1928 Mon Sep 17 00:00:00 2001
-From: Rob Savoye <rob at welcomehome.org>
-Date: Thu, 24 Nov 2011 08:57:58 -0700
-Subject: [PATCH] const is needed for some of the NPAPI functions for Oneiric with firefox-dev
-
----
- plugin/npapi/mozilla-sdk/np_entry.cpp |    3 +++
- plugin/npapi/plugin.cpp               |    3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/plugin/npapi/mozilla-sdk/np_entry.cpp b/plugin/npapi/mozilla-sdk/np_entry.cpp
-index 5c00038..d58e47d 100644
---- a/plugin/npapi/mozilla-sdk/np_entry.cpp
-+++ b/plugin/npapi/mozilla-sdk/np_entry.cpp
-@@ -238,6 +238,9 @@ NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
+Index: gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp
+===================================================================
+--- gnash-0.8.9.orig/plugin/npapi/mozilla-sdk/np_entry.cpp
++++ gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp
+@@ -238,7 +238,7 @@ NP_Initialize(NPNetscapeFuncs* aNPNFuncs
      return NS_PluginInitialize();
  }
  
-+#ifdef NPAPI_CONST
-+const
-+#endif
- char *
+-char *
++const char *
  NP_GetMIMEDescription(void)
  {
-diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
-index 04950e6..2272fd8 100644
---- a/plugin/npapi/plugin.cpp
-+++ b/plugin/npapi/plugin.cpp
-@@ -129,6 +129,9 @@ NPBool plugInitialized = FALSE;
+     return NPP_GetMIMEDescription();
+Index: gnash-0.8.9/plugin/npapi/plugin.cpp
+===================================================================
+--- gnash-0.8.9.orig/plugin/npapi/plugin.cpp
++++ gnash-0.8.9/plugin/npapi/plugin.cpp
+@@ -128,7 +128,7 @@ NPBool plugInitialized = FALSE;
  }
  
  /// \brief Return the MIME Type description for this plugin.
-+#ifdef NPAPI_CONST
-+const
-+#endif
- char*
+-char*
++const char*
  NPP_GetMIMEDescription(void)
  {
--- 
-1.7.2.5
-
+     return const_cast<char *>(MIME_TYPES_DESCRIPTION);


More information about the scm-commits mailing list