rpms/f-spot/F-11 0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch, NONE, 1.1 f-spot.spec, 1.92, 1.93
chkr
chkr at fedoraproject.org
Wed Sep 30 22:39:42 UTC 2009
Author: chkr
Update of /cvs/pkgs/rpms/f-spot/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13974
Modified Files:
f-spot.spec
Added Files:
0001-use-mono-s-cairo-API-instead-of-using-DllImport.patch
Log Message:
* Thu Oct 01 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)
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-11/f-spot.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- f-spot.spec 22 Sep 2009 22:31:40 -0000 1.92
+++ f-spot.spec 30 Sep 2009 22:39:41 -0000 1.93
@@ -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
@@ -71,6 +74,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
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
@@ -143,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
%changelog
+* Thu Oct 01 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)
+
* Tue Sep 22 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.2-2
- Add upstream patches (
commit b87604bc9782bf92f053aaf3ceb739a32f44ea13
More information about the scm-commits
mailing list