[freewrl] fix build against firefox8 headers

Tom Callaway spot at fedoraproject.org
Tue Dec 6 19:53:46 UTC 2011


commit bed1268772c79903354cb80128bcab3aa1c94380
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Dec 6 14:53:39 2011 -0500

    fix build against firefox8 headers

 freewrl-1.22.12_pre2-firefox8.patch |   24 ++++++++++++++++++++++++
 freewrl.spec                        |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/freewrl-1.22.12_pre2-firefox8.patch b/freewrl-1.22.12_pre2-firefox8.patch
new file mode 100644
index 0000000..5a4ab1b
--- /dev/null
+++ b/freewrl-1.22.12_pre2-firefox8.patch
@@ -0,0 +1,24 @@
+diff -up freewrl-1.22.12_pre2/src/plugin/npunix.c.ff8 freewrl-1.22.12_pre2/src/plugin/npunix.c
+--- freewrl-1.22.12_pre2/src/plugin/npunix.c.ff8	2011-07-07 16:51:27.000000000 -0400
++++ freewrl-1.22.12_pre2/src/plugin/npunix.c	2011-12-06 14:51:50.456232858 -0500
+@@ -788,7 +788,7 @@ Private_GetJavaClass(void)
+  *  - Netscape uses the return value to identify when an object instance
+  *    of this plugin should be created.
+  */
+-char *
++const char *
+ NP_GetMIMEDescription(void)
+ {
+         return NPP_GetMIMEDescription();
+diff -up freewrl-1.22.12_pre2/src/plugin/plugin_main.c.ff8 freewrl-1.22.12_pre2/src/plugin/plugin_main.c
+--- freewrl-1.22.12_pre2/src/plugin/plugin_main.c.ff8	2011-07-15 13:15:57.000000000 -0400
++++ freewrl-1.22.12_pre2/src/plugin/plugin_main.c	2011-12-06 14:52:13.310017096 -0500
+@@ -668,7 +668,7 @@ int Run (NPP instance)
+ 
+ /*******************************************************************************
+  ******************************************************************************/
+-/*const*/ char* NPP_GetMIMEDescription(void)
++const char* NPP_GetMIMEDescription(void)
+ {
+         static const char mime_types[] =
+                 "x-world/x-vrml:wrl:FreeWRL VRML Browser;"
diff --git a/freewrl.spec b/freewrl.spec
index 1a30efa..efee72f 100644
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -2,13 +2,15 @@
 
 Name:		freewrl
 Version:	1.22.12
-Release:	0.4.%{pretag}%{?dist}
+Release:	0.5.%{pretag}%{?dist}
 Summary:	X3D / VRML visualization program
 Group:		Applications/Internet
 License:	LGPLv3+
 URL:		http://freewrl.sourceforge.net
 Source0:	http://sourceforge.net/projects/freewrl/files/freewrl-linux/1.22/%{name}-%{version}_%{pretag}.tar.bz2
 Source1:	README.FreeWRL.java
+# Fix build against firefox 8
+Patch0:		freewrl-1.22.12_pre2-firefox8.patch
 BuildRequires:	zlib-devel, freetype-devel, fontconfig-devel 
 BuildRequires:	imlib2-devel, nspr-devel, xulrunner-devel
 BuildRequires:	expat-devel, libXxf86vm-devel, libX11-devel, libXext-devel
@@ -70,6 +72,7 @@ browser plugin for Firefox (and other xulrunner compatible browsers).
 %prep
 %setup -q -n %{name}-%{version}_%{pretag}
 cp %{SOURCE1} .
+%patch0 -p1 -b .ff8
 # Don't need it.
 rm -rf appleOSX/
 
@@ -142,6 +145,9 @@ chrpath --delete %{buildroot}%{_libdir}/libFreeWRLEAI.so.*
 %{_libdir}/mozilla/plugins/libFreeWRLplugin.so
 
 %changelog
+* Tue Dec  6 2011 Tom Callaway <spot at fedoraproject.org> - 1.22.12-0.5.pre2
+- fix build against firefox8 
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.22.12-0.4.pre2
 - Rebuild for new libpng
 


More information about the scm-commits mailing list