From 1f2e10143f83bf6379d7f7d5ae5780f4c6fb8f75 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 28 Oct 2008 14:41:02 +0000 Subject: [PATCH] - Apply a couple of patches from upstream to fix development filtering and installing the web plugin. --- PackageKit.spec | 7 ++++++- pk-fix-browser-plugin.patch | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pk-fix-browser-plugin.patch diff --git a/PackageKit.spec b/PackageKit.spec index 6b64f60..1016304 100644 --- a/PackageKit.spec +++ b/PackageKit.spec @@ -22,6 +22,9 @@ Patch0: PackageKit-0.3.8-Fedora-Vendor.conf.patch # upstream, 99f995788473f4627acb7447aa467a61bc61893a Patch1: pk-yum-fix-devel-filtering.patch +# upstream, 211b538cd0d6e420f288af49f7bb106cf99b4ce6 +Patch2: pk-fix-browser-plugin.patch + Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Requires: PackageKit-glib = %{version}-%{release} @@ -204,6 +207,7 @@ codecs from configured repositories using PackageKit. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --enable-yum --enable-smart --with-default-backend=yum --disable-local @@ -377,7 +381,8 @@ update-mime-database %{_datadir}/mime &> /dev/null || : %changelog * Tue Oct 28 2008 Richard Hughes - 0.3.9-2 -- Apply a patch from upstream to fix development filtering. +- Apply a couple of patches from upstream to fix development filtering + and installing the web plugin. * Mon Oct 27 2008 Richard Hughes - 0.3.9-1 - New upstream version diff --git a/pk-fix-browser-plugin.patch b/pk-fix-browser-plugin.patch new file mode 100644 index 0000000..f2c150b --- /dev/null +++ b/pk-fix-browser-plugin.patch @@ -0,0 +1,19 @@ +commit 211b538cd0d6e420f288af49f7bb106cf99b4ce6 +Author: Richard Hughes +Date: Tue Oct 28 14:29:02 2008 +0000 + + bugfix: use the correct session interface in the browser plugin + +diff --git a/contrib/packagekit-plugin/src/contents.cpp b/contrib/packagekit-plugin/src/contents.cpp +index bd0d69f..2c16e92 100644 +--- a/contrib/packagekit-plugin/src/contents.cpp ++++ b/contrib/packagekit-plugin/src/contents.cpp +@@ -662,6 +662,8 @@ PkpContents::installPackage (Time time) + this, + (GDestroyNotify)0, + 24 * 60 * 1000 * 1000, /* one day */ ++ G_TYPE_UINT, 0, /* xid */ ++ G_TYPE_UINT, 0, /* timespec */ + G_TYPE_STRING, mAvailablePackageName.c_str(), + G_TYPE_INVALID, + G_TYPE_INVALID);