rpms/f-spot/F-10 0001-remove-support-for-older-cairo-version.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 f-spot.spec, 1.87, 1.88 sources, 1.22, 1.23 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, 1.1, NONE

Tue Oct 13 22:22:31 UTC 2009

Author: chkr

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

Modified Files:
	.cvsignore f-spot.spec sources 
Added Files:
	0001-remove-support-for-older-cairo-version.patch 
Removed Files:
	0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch 
Log Message:
* Tue Oct 13 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
- Update to 0.6.1.3 (BZ 526217)
- Remove two upstreamed patches
- Use a slightly different fix for the cairo-devel dependency
  (suggested by upstream)


0001-remove-support-for-older-cairo-version.patch:
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE 0001-remove-support-for-older-cairo-version.patch ---
>From 9c61aa6f334a94f077e63e3b82f1aeaa457dfe8a Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sun, 4 Oct 2009 20:30:18 +0200
Subject: [PATCH] remove support for older cairo version

- remove DllImport of cairo since it is not needed anymore
- remove special code for older cairo version
- check for cairo >= 1.4.0 in configure.ac
---
 configure.ac     |    3 ++-
 src/SoftFocus.cs |   20 ++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 22fcd86..7f82d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,11 +69,12 @@ BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
+CAIRO_REQUIRED=1.4.0
 dnl -- this check is 	
 LCMS_REQUIRED=1.12
 dnl -- LIBGPHOTO2_REQUIRED=2.1.4
 
-PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED)
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED cairo >= $CAIRO_REQUIRED)
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
diff --git a/src/SoftFocus.cs b/src/SoftFocus.cs
index 86f2918..7291d5a 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;
@@ -107,20 +104,11 @@ 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)) {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
-							     center.X * scale, center.Y * scale, radius * max + max * .2);
-
-				circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			} else {
-				circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max + max * .2,
-							     center.X * scale, center.Y * scale, radius * max * .7);
+			circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
+						     center.X * scale, center.Y * scale, radius * max + max * .2);
 
-				circle.AddColorStop (1.0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
-				circle.AddColorStop (0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
-			}
+			circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
+			circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
 			return circle;
 		}
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	27 Sep 2009 11:32:23 -0000	1.22
+++ .cvsignore	13 Oct 2009 22:22:30 -0000	1.23
@@ -1 +1 @@
-f-spot-0.6.1.2.tar.bz2
+f-spot-0.6.1.3.tar.bz2


Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/f-spot.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- f-spot.spec	3 Oct 2009 09:24:57 -0000	1.87
+++ f-spot.spec	13 Oct 2009 22:22:31 -0000	1.88
@@ -1,26 +1,20 @@
 Name:           f-spot
-Version:        0.6.1.2
-Release:        2%{?dist}
+Version:        0.6.1.3
+Release:        1%{?dist}
 Summary:        Photo management application
 
 Group:          Applications/Multimedia
 License:        GPLv2+ and LGPLv2+ and CPL and MIT
 URL:            http://f-spot.org/
 Source0:        http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=593243
-Patch1:         0001-fix-parallel-build.patch
 # Use system mono-addins
 Patch2:         0001-use-system-Mono.Addins-if-available.patch
 # unmount cameras before importing
 Patch3:         0002-enhance-the-f-spot-import-script.patch
 # I'm told this is fixed in SVN
 Patch4:         f-spot-0.6.0.0-gtk-deprecated.patch
-# upstream patch to fix crash in facebook exporter:
-# commit 807dab4344ecdadc7e46793369821de8b49692e5
-# commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
-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
+Patch6:         0001-remove-support-for-older-cairo-version.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,12 +67,10 @@ photo collection in a slideshow as a scr
 %prep
 %setup -q
 
-%patch1 -p1 -b .parallel-build
 %patch2 -p1 -b .link-system-mono-addins
 %patch3 -p1 -b .gvfs-gphoto
 %patch4 -p1 -F 2 -b .gtk-deprecated
-%patch5 -p1 -b .faceboox-exporter-crash
-%patch6 -p1 -b .cairo-fix
+%patch6 -p1 -F 2 -b .cairo-fix
 
 %build
 autoreconf -f -i
@@ -152,6 +144,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/screensavers/f-spot-screensaver.desktop
 
 %changelog
+* Tue Oct 13 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.3-1
+- Update to 0.6.1.3 (BZ 526217)
+- Remove two upstreamed patches
+- Use a slightly different fix for the cairo-devel dependency
+  (suggested by upstream)
+
 * 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)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources	27 Sep 2009 11:32:23 -0000	1.22
+++ sources	13 Oct 2009 22:22:31 -0000	1.23
@@ -1 +1 @@
-ca2960be13e3c1d2f15da175691d671a  f-spot-0.6.1.2.tar.bz2
+fbfef5c37c201f54b590f03d5b0000d5  f-spot-0.6.1.3.tar.bz2


--- 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch DELETED ---


