[xulrunner/f16] fix bug in npapi.h causing compile failures

[Tom Callaway]

commit 87370169344c81d3cfb684f0df096864b937e154
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Dec 6 14:46:03 2011 -0500

    fix bug in npapi.h causing compile failures

 xulrunner-8.0-fix-maemo-checks-in-npapi.patch |   21 +++++++++++++++++++++
 xulrunner.spec                                |    8 +++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/xulrunner-8.0-fix-maemo-checks-in-npapi.patch b/xulrunner-8.0-fix-maemo-checks-in-npapi.patch
new file mode 100644
index 0000000..99c9b7f
--- /dev/null
+++ b/xulrunner-8.0-fix-maemo-checks-in-npapi.patch
@@ -0,0 +1,21 @@
+diff -up mozilla-release/dom/plugins/base/npapi.h.BAD mozilla-release/dom/plugins/base/npapi.h
+--- mozilla-release/dom/plugins/base/npapi.h.BAD	2011-12-06 13:31:16.364405916 -0500
++++ mozilla-release/dom/plugins/base/npapi.h	2011-12-06 13:31:47.131109006 -0500
+@@ -379,7 +379,7 @@ typedef enum {
+   , NPPVpluginCoreAnimationLayer = 1003
+ #endif
+ 
+-#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
++#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
+   , NPPVpluginWindowlessLocalBool = 2002
+ #endif
+ } NPPVariable;
+@@ -432,7 +432,7 @@ typedef enum {
+   , NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
+                                                                CA model compositing */
+ #endif
+-#if (MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6)
++#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
+   , NPNVSupportsWindowlessLocal = 2002
+ #endif
+ } NPNVariable;
diff --git a/xulrunner.spec b/xulrunner.spec
index f5c4937..3097cbf 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -50,7 +50,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        8.0
-Release:        3%{?pre_tag}%{?dist}
+Release:        4%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -82,6 +82,8 @@ Patch35:        xulrunner-2.0-NetworkManager09.patch
 Patch36:        mozilla-670719.patch
 Patch37:        mozilla-686280.patch
 Patch38:        mozilla-696393.patch
+# https://bugzilla.mozilla.org/show_bug.cgi?id=707993
+Patch39:        xulrunner-8.0-fix-maemo-checks-in-npapi.patch
 
 
 # ---------------------------------------------------
@@ -208,6 +210,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch36 -p1 -b .670719
 %patch37 -p1 -b .686280
 %patch38 -p1 -b .696393
+%patch39 -p1 -b .707993
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -452,6 +455,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Dec  6 2011 Tom Callaway <spot at fedoraproject.org> 8.0-4
+- fix bug in npapi.h causing compile failures
+
 * Fri Nov 25 2011 Martin Stransky <stransky at redhat.com> 8.0-3
 - s390 build fixes