rpms/f-spot/F-10 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE, 1.1 f-spot.spec, 1.86, 1.87

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21954

Modified Files:
	f-spot.spec 
Added Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Sat Oct 03 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
  was not installed (BZ 526563)


0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch:
 SoftFocus.cs |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch ---
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..a85e48c 100644
--- a/src/SoftFocus.cs
+++ b/src/SoftFocus.cs
@@ -14,9 +14,6 @@ namespace FSpot.Widgets {
 
 	public class SoftFocus {
 
-		[DllImport ("cairo")]
-		internal static extern int cairo_version ();
-
 		ImageInfo info;
 		double radius;
 		double amount;
@@ -108,7 +105,7 @@ namespace FSpot.Widgets {
 			RadialGradient circle;
 
 			// FIXME ugh cairo 1.0.2 is so broken why are we still shipping it.
-			if (cairo_version () > (1 * 10000 + 2 * 100 + 0)) {
+			if (Cairo.CairoAPI.Version > (1 * 10000 + 2 * 100 + 0)) {
 				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
 							     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-- 
1.6.0.6



Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- f-spot.spec	27 Sep 2009 10:55:03 -0000	1.86
+++ f-spot.spec	3 Oct 2009 09:24:57 -0000	1.87
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -18,8 +18,9 @@ Patch4:         f-spot-0.6.0.0-gtk-depre
 # upstream patch to fix crash in facebook exporter:
 # commit 807dab4344ecdadc7e46793369821de8b49692e5
 # commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch5:         facebook-exporter-duplicate-label-fix.patch        
-
+Patch5:         facebook-exporter-duplicate-label-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=596922
+Patch6:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -77,6 +78,7 @@ photo collection in a slideshow as a scr
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
 %patch5 -p1 -b .faceboox-exporter-crash
+%patch6 -p1 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -150,6 +152,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Sat Oct 03 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
+- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
+  was not installed (BZ 526563)
+
 * Fri Sep 25 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
 - Add upstream patches (
   commit b87604bc9782bf92f053aaf3ceb739a32f44ea13