rpms/epiphany/devel build-fixes.patch, NONE, 1.1 epiphany.spec, 1.221, 1.222

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4055

Modified Files:
	epiphany.spec 
Added Files:
	build-fixes.patch 
Log Message:
fix th ebuild


build-fixes.patch:

--- NEW FILE build-fixes.patch ---
diff -up epiphany-2.25.91/plugins/desktop-file/plugin.cpp.gcc44 epiphany-2.25.91/plugins/desktop-file/plugin.cpp
--- epiphany-2.25.91/plugins/desktop-file/plugin.cpp.gcc44	2009-02-26 23:26:32.338482892 -0500
+++ epiphany-2.25.91/plugins/desktop-file/plugin.cpp	2009-02-26 23:27:40.358486454 -0500
@@ -472,7 +472,7 @@ NP_GetValue (void *future,
 	return plugin_get_value (NULL, variable, value);
 }
 
-char *
+const char *
 NP_GetMIMEDescription (void)
 {
 	return DESKTOP_FILE_MIME_TYPE ":desktop:desktop link file;"
@@ -534,7 +534,6 @@ NP_Initialize (NPNetscapeFuncs *moz_func
 
 	plugin_funcs->size = sizeof (NPPluginFuncs);
 	plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-	plugin_funcs->newp = NewNPP_NewProc (plugin_new_instance);
 
         /* FUCK YOU, MOZILLA! */
 #if HAVE_GECKO_1_9_1
@@ -553,6 +552,7 @@ NP_Initialize (NPNetscapeFuncs *moz_func
 	plugin_funcs->getvalue = NPP_GetValueProcPtr (plugin_get_value);
 	plugin_funcs->setvalue = NPP_SetValueProcPtr (NULL);
 #else
+	plugin_funcs->newp = NewNPP_NewProc (plugin_new_instance);
 	plugin_funcs->destroy = NewNPP_DestroyProc (plugin_destroy_instance);
 	plugin_funcs->setwindow = NewNPP_SetWindowProc (NULL);
 	plugin_funcs->newstream = NewNPP_NewStreamProc (plugin_new_stream);


Index: epiphany.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- epiphany.spec	24 Feb 2009 15:14:50 -0000	1.221
+++ epiphany.spec	27 Feb 2009 04:33:23 -0000	1.222
@@ -8,7 +8,7 @@
 Summary: Web browser for GNOME
 Name: epiphany
 Version: 2.25.91
-Release: 2%{?dist}
+Release: 3%{?dist}
 %define major_version 2.24
 Provides: epiphany(abi) = %{major_version}
 License: GPLv2+ and GFDL
@@ -54,6 +54,7 @@
 Patch2: epiphany-2.18.1-default-bookmarks.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=334751
 Patch3: epiphany-2.20.1-wrapped-plugins.patch
+Patch4: build-fixes.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -101,6 +102,7 @@
 %patch1 -p1 -b .use-pango
 %patch2 -p1 -b .default-bookmarks
 %patch3 -p1 -b .wrapped-plugins
+%patch4 -p1 -b .build-fixes
 # Fedora Epiphany version
 cat >> data/default-prefs-common.js << EOF
 pref("general.useragent.vendor", "Fedora");
@@ -254,6 +256,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Thu Feb 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.91-3
+- Fix the build
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.91-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild