[gnash] Add unistd header to klash_part.cpp and replace xulrunner headers patch

[Hicham HAOUARI]

commit 70871c3f5cd8abc89e59b70b524f265282f6bec7
Author: Hicham HAOUARI <hicham.haouari at gmail.com>
Date:   Thu Jan 26 09:58:58 2012 +0000

    Add unistd header to klash_part.cpp and replace xulrunner headers patch

 gnash-0.8.9-xulrunner-headers.patch |   47 +++++++++++++++++++++++------------
 gnash.spec                          |   16 +++++++++--
 2 files changed, 44 insertions(+), 19 deletions(-)
---
diff --git a/gnash-0.8.9-xulrunner-headers.patch b/gnash-0.8.9-xulrunner-headers.patch
index 0153dde..6dabecd 100644
--- a/gnash-0.8.9-xulrunner-headers.patch
+++ b/gnash-0.8.9-xulrunner-headers.patch
@@ -1,26 +1,41 @@
-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
+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)
      return NS_PluginInitialize();
  }
  
--char *
-+const char *
++#ifdef NPAPI_CONST
++const
++#endif
+ 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;
+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;
  }
  
  /// \brief Return the MIME Type description for this plugin.
--char*
-+const char*
++#ifdef NPAPI_CONST
++const
++#endif
+ char*
  NPP_GetMIMEDescription(void)
  {
-     return const_cast<char *>(MIME_TYPES_DESCRIPTION);
+-- 
+1.7.2.5
+
diff --git a/gnash.spec b/gnash.spec
index 5a4d973..3255a38 100644
--- a/gnash.spec
+++ b/gnash.spec
@@ -3,7 +3,7 @@
 
 Name:           gnash
 Version:        0.8.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          1
 Summary:        GNU flash movie player
 
@@ -46,7 +46,11 @@ 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
+# http://git.savannah.gnu.org/gitweb/?p=gnash.git;a=commit;h=35dde18
+Patch3:         %{name}-%{version}-xulrunner-headers.patch
+
+# Patch4 :      http://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg338792.html
+Patch4:         %{name}-%{version}-add-unistd-header.patch
 
 %description
 Gnash is capable of reading up to SWF v9 files and op-codes, but primarily
@@ -142,7 +146,8 @@ 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
+%patch3 -p1 -b .npapi-const
+%patch4 -p1 -b .unistd-header
 autoreconf -if
 
 %build
@@ -299,6 +304,11 @@ touch --no-create %{_datadir}/icons/hicolor
 %{_libdir}/gnash/plugins/mysql.so
 
 %changelog
+* Thu Jan 26 2012 Hicham HAOUARI <hicham.haouari at gmail.com> - 1:0.8.9-9
+- Add unistd.h header ( http://www.mail-archive.com/gcc-bugs@gcc.gnu.org/msg338792.html )
+- Backport patch from upstream that replaces xulrunner-headers patch 
+  ( http://git.savannah.gnu.org/gitweb/?p=gnash.git;a=commit;h=35dde18 )
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.8.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild