rpms/f-spot/devel 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE, 1.1 f-spot.spec, 1.93, 1.94

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20043

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


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/devel/f-spot.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- f-spot.spec	22 Sep 2009 22:08:57 -0000	1.93
+++ f-spot.spec	30 Sep 2009 21:17:07 -0000	1.94
@@ -1,6 +1,6 @@
 Name:           f-spot
 Version:        0.6.1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
@@ -16,7 +16,10 @@ Patch3:         0002-enhance-the-f-spot-
 # upstream patch to fix crash in facebook exporter:
 # commit 807dab4344ecdadc7e46793369821de8b49692e5
 # commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-Patch4:         facebook-exporter-duplicate-label-fix.patch        
+Patch4:         facebook-exporter-duplicate-label-fix.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=596922
+Patch5:         0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  mono-devel mono-web mono-data mono-data-sqlite lcms-devel
@@ -70,6 +73,7 @@ photo collection in a slideshow as a scr
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -b .faceboox-exporter-crash
+%patch5 -p1 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -143,26 +147,31 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Wed Sep 30 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-3
+- Add patch to fix f-spot crash when using "soft focus" and cairo-devel
+  was not installed (BZ 526563)
+- Minor spec file beautification
+
 * Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
-- add upstream patches (
+- Add upstream patches (
   commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
   commit 807dab4344ecdadc7e46793369821de8b49692e5 )
   to fix crash in facebook exporter (BZ 524860)
 
 * Thu Sep 17 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-1
-- update to 0.6.1.2 (BZ 519290)
+- Update to 0.6.1.2 (BZ 519290)
 
 * Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
-- move the screensaver plugin into a sub-package (BZ 519640)
-- let f-spot-screensaver obsolete older f-spot version so that it
+- Move the screensaver plugin into a sub-package (BZ 519640)
+- Let f-spot-screensaver obsolete older f-spot version so that it
   is pulled in during update (fresh installations of f-spot will not
   pull in gnome-screensaver)
 
 * Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
-- update to 0.6.1.1
-- remove upstreamed patch
-- updated use-system-Mono.Addins-if-available patch
-- add a patch to enable parallel build 
+- Update to 0.6.1.1
+- Remove upstreamed patch
+- Updated use-system-Mono.Addins-if-available patch
+- Add a patch to enable parallel build 
 
 * Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
 - Build arch ppc64.