packages: f-spot/f-spot.spec, f-spot/f-spot-PixbufLoader.patch (NEW) - GdkI...

baggins baggins at pld-linux.org
Thu Oct 28 22:55:46 CEST 2010


Author: baggins                      Date: Thu Oct 28 20:55:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- GdkImageLoader fix from upstream

---- Files affected:
packages/f-spot:
   f-spot.spec (1.104 -> 1.105) , f-spot-PixbufLoader.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/f-spot/f-spot.spec
diff -u packages/f-spot/f-spot.spec:1.104 packages/f-spot/f-spot.spec:1.105
--- packages/f-spot/f-spot.spec:1.104	Thu Oct 28 22:43:21 2010
+++ packages/f-spot/f-spot.spec	Thu Oct 28 22:55:40 2010
@@ -13,6 +13,7 @@
 Source0:	http://ftp.gnome.org/Public/GNOME/sources/f-spot/0.8/%{name}-%{version}.tar.bz2
 # Source0-md5:	f7d52adbf280c972adccd66338e49f3d
 Patch0:		%{name}-taglib.patch
+Patch1:		%{name}-PixbufLoader.patch
 URL:		http://www.gnome.org/projects/f-spot/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
@@ -72,6 +73,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -148,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2010/10/28 20:55:40  baggins
+- GdkImageLoader fix from upstream
+
 Revision 1.104  2010/10/28 20:43:21  baggins
 - fix compilation issues with new mono in taglib
   https://bugzilla.gnome.org/show_bug.cgi?id=629222

================================================================
Index: packages/f-spot/f-spot-PixbufLoader.patch
diff -u /dev/null packages/f-spot/f-spot-PixbufLoader.patch:1.1
--- /dev/null	Thu Oct 28 22:55:46 2010
+++ packages/f-spot/f-spot-PixbufLoader.patch	Thu Oct 28 22:55:40 2010
@@ -0,0 +1,22 @@
+From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001
+From: Marek Habersack <grendel at twistedcode.net>
+Date: Wed, 15 Sep 2010 21:21:52 +0000
+Subject: PixbufLoader from gtk-sharp/master does not have a Close () overload which takes a boolean parameter
+
+https://bugzilla.gnome.org/show_bug.cgi?id=629224
+---
+diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+index 2eea50e..9c9c07a 100644
+--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
++++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+@@ -132,7 +132,7 @@ namespace FSpot.Loaders {
+ 		public new bool Close ()
+ 		{
+ 			lock (sync_handle) {
+-				return base.Close (true);
++				return base.Close ();
+ 			}
+ 		}
+ #endregion
+--
+cgit v0.8.3.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/f-spot/f-spot.spec?r1=1.104&r2=1.105&f=u



More information about the pld-cvs-commit mailing list