[SM-Commit] GIT changes to master grimoire by George Sherwood (606e518e86895b0c332d48e96dc3076718083966)

George Sherwood scm at sourcemage.org
Sat Nov 20 21:49:19 EST 2010


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 graphics/f-spot/HISTORY                   |    6 ++++++
 graphics/f-spot/PRE_BUILD                 |    5 +++++
 graphics/f-spot/empty-crash.patch         |   11 +++++++++++
 graphics/f-spot/f-stop-PixbufLoader.patch |   13 +++++++++++++
 graphics/f-spot/mono-2.8.1-f-stop.patch   |   30 ++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+)

New commits:
commit 606e518e86895b0c332d48e96dc3076718083966
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    f-stop: Added patches to build with mono 2.8.1 and also fix a
    crash with an empty database.

diff --git a/graphics/f-spot/HISTORY b/graphics/f-spot/HISTORY
index 86ad0c9..6211099 100644
--- a/graphics/f-spot/HISTORY
+++ b/graphics/f-spot/HISTORY
@@ -1,3 +1,9 @@
+2010-11-20 George Sherwood <gsherwood at sourcemage.org>
+	* PRE_BUILD: Added for 3 patches
+	* mono-2.8.1-f-stop.patch: patch for mono 2.8.1
+	* f-stop-PixbufLoader.patch: patch to fix build issues
+	* empty-crash.patch: Gentoo patch to fix crash with empty db
+
 2010-10-12 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Depends on gnome-keyring-sharp
 
diff --git a/graphics/f-spot/PRE_BUILD b/graphics/f-spot/PRE_BUILD
new file mode 100755
index 0000000..b78b0b3
--- /dev/null
+++ b/graphics/f-spot/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/mono-2.8.1-f-stop.patch &&
+patch -p0 < $SPELL_DIRECTORY/f-stop-PixbufLoader.patch &&
+patch -p0 < $SPELL_DIRECTORY/empty-crash.patch
diff --git a/graphics/f-spot/empty-crash.patch b/graphics/f-spot/empty-crash.patch
new file mode 100644
index 0000000..18b62ca
--- /dev/null
+++ b/graphics/f-spot/empty-crash.patch
@@ -0,0 +1,11 @@
+--- src/Clients/MainApp/FSpot/App.cs
++++ src/Clients/MainApp/FSpot/App.cs
+@@ -223,7 +223,7 @@ namespace FSpot
+         {
+             // Some users get wonky URIs here, trying to work around below.
+             // https://bugzilla.gnome.org/show_bug.cgi?id=629248
+-            if (path.StartsWith ("gphoto2:usb:")) {
++            if (path != null && path.StartsWith ("gphoto2:usb:")) {
+                 path = String.Format ("gphoto2://[{0}]", path.Substring (8));
+             }
+ 
diff --git a/graphics/f-spot/f-stop-PixbufLoader.patch b/graphics/f-spot/f-stop-PixbufLoader.patch
new file mode 100644
index 0000000..0085ac3
--- /dev/null
+++ b/graphics/f-spot/f-stop-PixbufLoader.patch
@@ -0,0 +1,13 @@
+
+--- src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
++++ 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
+ 
diff --git a/graphics/f-spot/mono-2.8.1-f-stop.patch b/graphics/f-spot/mono-2.8.1-f-stop.patch
new file mode 100644
index 0000000..63812d1
--- /dev/null
+++ b/graphics/f-spot/mono-2.8.1-f-stop.patch
@@ -0,0 +1,30 @@
+--- lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs.orig	2010-11-20 19:50:45.520002431 -0600
++++ lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs	2010-11-20 19:51:47.440002796 -0600
+@@ -62,8 +62,10 @@
+ 		/// </param>
+ 		public Rational (uint numerator, uint denominator)
+ 		{
+-			Numerator = numerator;
+-			Denominator = denominator;
++			if (denominator == 0)
++				throw new ArgumentException ("denominator");
++			this.numerator = numerator;
++			this.denominator = denominator;
+ 		}
+ 
+ #endregion
+--- lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs.orig	2010-11-20 19:52:11.384002643 -0600
++++ lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs	2010-11-20 19:52:43.948002767 -0600
+@@ -62,8 +62,10 @@
+ 		/// </param>
+ 		public SRational (int numerator, int denominator)
+ 		{
+-			Numerator = numerator;
+-			Denominator = denominator;
++			if (denominator == 0)
++				throw new ArgumentException ("denominator");
++			this.numerator = numerator;
++			this.denominator = denominator;
+ 		}
+ 
+ #endregion



More information about the SM-Commit mailing list