[gnash] Fix compile against new xulrunner

Daniel Drake dsd at fedoraproject.org
Mon Nov 21 22:10:06 UTC 2011


commit d622540b6468dae7f55c23415ecbb72e93d6d018
Author: Daniel Drake <dsd at laptop.org>
Date:   Mon Nov 21 15:52:21 2011 -0600

    Fix compile against new xulrunner

 gnash-0.8.9-xulrunner-headers.patch |   26 ++++++++++++++++++++++++++
 gnash.spec                          |    8 +++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/gnash-0.8.9-xulrunner-headers.patch b/gnash-0.8.9-xulrunner-headers.patch
new file mode 100644
index 0000000..0153dde
--- /dev/null
+++ b/gnash-0.8.9-xulrunner-headers.patch
@@ -0,0 +1,26 @@
+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();
+ }
+ 
+-char *
++const char *
+ NP_GetMIMEDescription(void)
+ {
+     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.
+-char*
++const char*
+ NPP_GetMIMEDescription(void)
+ {
+     return const_cast<char *>(MIME_TYPES_DESCRIPTION);
diff --git a/gnash.spec b/gnash.spec
index b9ea1ee..4ea1443 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -3,7 +3,7 @@
 
 Name:           gnash
 Version:        0.8.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Epoch:          1
 Summary:        GNU flash movie player
 
@@ -46,6 +46,8 @@ Patch1:         %{name}-%{version}-destroy-movieroot-before-clearing-moviefactor
 #               http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=48337fb
 Patch2:         %{name}-%{version}-scripting-support-fixes.patch
 
+Patch3:         gnash-0.8.9-xulrunner-headers.patch
+
 %description
 Gnash is capable of reading up to SWF v9 files and op-codes, but primarily
 supports SWF v7, with better SWF v8 and v9 support under heavy development.
@@ -140,6 +142,7 @@ to a MySQL database. The API is similar to the standard MySQL one.
 %patch0 -p1 -b .fix-handlers-vector-length
 %patch1 -p1 -b .destroy-movieroot-before-clearing-moviefactory
 %patch2 -p1 -b .scripting-support-fixes
+%patch3 -p1
 autoreconf -if
 
 %build
@@ -296,6 +299,9 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_libdir}/gnash/plugins/mysql.so
 
 %changelog
+* Mon Nov 21 2011 Daniel Drake <dsd at laptop.org> - 1:0.8.9-7
+- Add patch to fix compile with new xulrunner
+
 * Mon Nov 21 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 1:0.8.9-6
 - Rebuild for boost 1.48
 


More information about the scm-commits mailing list