[spice-xpi/f15] fix compiler error
Peter Hatina
phatina at fedoraproject.org
Mon Nov 21 11:44:02 UTC 2011
commit 6156ab79165dbe5081fea11108e7304327f96fa0
Author: Peter Hatina <phatina at redhat.com>
Date: Mon Nov 21 12:40:09 2011 +0100
fix compiler error
spice-xpi-02-xulrunner-compile.patch | 26 ++++++++++++++++++++++++++
spice-xpi.spec | 7 ++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/spice-xpi-02-xulrunner-compile.patch b/spice-xpi-02-xulrunner-compile.patch
new file mode 100644
index 0000000..1d42134
--- /dev/null
+++ b/spice-xpi-02-xulrunner-compile.patch
@@ -0,0 +1,26 @@
+diff --git a/SpiceXPI/src/plugin/np_entry.cpp b/SpiceXPI/src/plugin/np_entry.cpp
+index 4af8944..021694c 100644
+--- a/SpiceXPI/src/plugin/np_entry.cpp
++++ b/SpiceXPI/src/plugin/np_entry.cpp
+@@ -209,7 +209,7 @@ NPError NP_Initialize(NPNetscapeFuncs *aNPNFuncs, NPPluginFuncs *aNPPFuncs)
+ return NS_PluginInitialize();
+ }
+
+-char *NP_GetMIMEDescription()
++const char *NP_GetMIMEDescription()
+ {
+ return NPP_GetMIMEDescription();
+ }
+diff --git a/SpiceXPI/src/plugin/plugin.cpp b/SpiceXPI/src/plugin/plugin.cpp
+index e7ea27a..2dada12 100644
+--- a/SpiceXPI/src/plugin/plugin.cpp
++++ b/SpiceXPI/src/plugin/plugin.cpp
+@@ -106,7 +106,7 @@ namespace {
+ }
+ }
+
+-char *NPP_GetMIMEDescription(void)
++const char *NPP_GetMIMEDescription(void)
+ {
+ return const_cast<char *>(MIME_TYPES_DESCRIPTION.c_str());
+ }
diff --git a/spice-xpi.spec b/spice-xpi.spec
index cc5e155..c184aca 100644
--- a/spice-xpi.spec
+++ b/spice-xpi.spec
@@ -1,6 +1,6 @@
Name: spice-xpi
Version: 2.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: SPICE extension for Mozilla
Group: Applications/Internet
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -8,6 +8,7 @@ URL: http://spice-space.org
Source0: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2
Patch0: spice-xpi-01-connect.patch
+Patch1: spice-xpi-02-xulrunner-compile.patch
BuildRequires: libX11-devel
BuildRequires: log4cpp-devel
@@ -27,6 +28,7 @@ Spice extension for Mozilla allows the client to be used from a web browser.
%setup -q -n %{name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
@@ -46,6 +48,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%exclude %{_libdir}/mozilla/plugins/*.la
%changelog
+* Mon Nov 21 2011 Peter Hatina <phatina at redhat.com> 2.5-4
+- Fixed compile error
+
* Tue Aug 30 2011 Peter Hatina <phatina at redhat.com> 2.5-3
- Fixed invalid socket descriptor on reconnect
More information about the scm-commits
mailing list