[PackageKit/f15] Backport FTBFS fix of browser plugin with newer xulrunner from 0.6.21

[Kevin Kofler]

commit 2dcaf25ab0afa905b953490db56aa573907197ab
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Apr 23 18:07:17 2012 +0200

    Backport FTBFS fix of browser plugin with newer xulrunner from 0.6.21

 PackageKit-0.6.17-xulrunner.patch |   27 +++++++++++++++++++++++++++
 PackageKit.spec                   |   12 +++++++++---
 2 files changed, 36 insertions(+), 3 deletions(-)
---
diff --git a/PackageKit-0.6.17-xulrunner.patch b/PackageKit-0.6.17-xulrunner.patch
new file mode 100644
index 0000000..645c5cb
--- /dev/null
+++ b/PackageKit-0.6.17-xulrunner.patch
@@ -0,0 +1,27 @@
+From a74d58a2adf03b520fcd1ce3f134ef8fdc1d1fc2 Mon Sep 17 00:00:00 2001
+Message-Id: <a74d58a2adf03b520fcd1ce3f134ef8fdc1d1fc2.1335197025.git.kevin.kofler at chello.at>
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 5 Dec 2011 10:24:28 +0000
+Subject: [PATCH] Make the browser plugin compile with newer versions of
+ xulrunner
+
+---
+ contrib/browser-plugin/pk-main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/contrib/browser-plugin/pk-main.c b/contrib/browser-plugin/pk-main.c
+index 072a576..7d35f51 100644
+--- a/contrib/browser-plugin/pk-main.c
++++ b/contrib/browser-plugin/pk-main.c
+@@ -543,7 +543,7 @@ NP_Shutdown ()
+ /**
+  * NP_GetMIMEDescription:
+  **/
+-char *
++const char *
+ NP_GetMIMEDescription (void)
+ {
+ 	pk_debug ("NP_GetMIMEDescription");
+-- 
+1.7.6.5
+
diff --git a/PackageKit.spec b/PackageKit.spec
index a7c9294..28b0174 100644
--- a/PackageKit.spec
+++ b/PackageKit.spec
@@ -15,8 +15,12 @@ Patch0:    PackageKit-0.3.8-Fedora-Vendor.conf.patch
 Patch1:    PackageKit-0.4.4-Fedora-turn-off-time.conf.patch
 
 ## upstream patches
+# backport "Make the browser plugin compile with newer versions of xulrunner"
+# from 0.6.21 (fixes FTBFS)
+Patch100:  PackageKit-0.6.17-xulrunner.patch
+
 # backport "python: Speed up get_package_list()" from 0.6.22 (#748790)
-Patch100:  PackageKit-0.6.17-python-Speed-up-get_package_list.patch
+Patch101:  PackageKit-0.6.17-python-Speed-up-get_package_list.patch
 
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-backend
@@ -254,7 +258,8 @@ user to restart the computer or remove and re-insert the device.
 %setup -q
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .no-time
-%patch100 -p1 -b .python-speedup
+%patch100 -p1 -b .xulrunner
+%patch101 -p1 -b .python-speedup
 
 %build
 %configure \
@@ -470,7 +475,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %changelog
 * Mon Apr 23 2012 Kevin Kofler  <Kevin at tigcc.ticalc.org> - 0.6.17-2
-- backport "python: Speed up get_package_list()" from 0.6.22 (#748790)
+- Backport FTBFS fix of browser plugin with newer xulrunner from 0.6.21
+- Backport "python: Speed up get_package_list()" from 0.6.22 (#748790)
 
 * Mon Aug 01 2011 Richard Hughes  <rhughes at redhat.com> - 0.6.17-1
 - New upstream release.