Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=28b1929484fae63b6b58359013663099fd5d42c3
commit 28b1929484fae63b6b58359013663099fd5d42c3 Author: bouleetbil <bouleet...@frogdev.info> Date: Wed Oct 20 22:23:03 2010 +0000 f-spot-0.8.0-2-i686 *rebuild with mono 2.8 *switch to dbus-sharp diff --git a/source/gnome-extra/f-spot/FrugalBuild b/source/gnome-extra/f-spot/FrugalBuild index ba11e9b..cab90bc 100644 --- a/source/gnome-extra/f-spot/FrugalBuild +++ b/source/gnome-extra/f-spot/FrugalBuild @@ -4,12 +4,12 @@ pkgname=f-spot pkgver=0.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A personal photo management program for Gnome" url="http://www.gnome.org/projects/f-spot/"; depends=('gtk2-sharp' 'lcms' 'libexif' 'libgphoto2' 'gnome-keyring-sharp' \ - 'libjpeg>=8a' 'sqlite3' 'ndesk-dbus' 'mono-addins' 'libflickrnet' \ - 'ndesk-dbus-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp>=2.24.0-1') + 'libjpeg>=8a' 'sqlite3' 'dbus-sharp' 'mono-addins' 'libflickrnet' \ + 'dbus-sharp-glib' 'gnome-sharp>=2.16.0-3' 'gnome-desktop-sharp>=2.24.0-1') makedepends=('gnome-screensaver' 'perl-xml-parser' 'gnome-doc-utils' 'intltool') groups=('gnome-extra') archs=('i686' 'x86_64' 'ppc') @@ -18,12 +18,20 @@ _F_gnome_iconcache=y _F_gnome_scrollkeeper=y _F_gnome_devel=y Finclude gnome mono gnome-scriptlet -sha1sums=('e08e570c9bbfd22ab7fed2f4846f7f36d99156fd') +source=($source mono28.diff gdk.diff) +sha1sums=('e08e570c9bbfd22ab7fed2f4846f7f36d99156fd' \ + 'f52c19650064baf48d423232f84712ad92571840' \ + 'c58877642fcaddc8b48ec3a5f194092bb318e7a7') build() { unset MAKEFLAGS Fmonoexport Fbuild_slice_scrollkeeper + Fcd + Fsed 'ndesk-dbus' 'dbus-sharp' configure + Fsed 'ndesk-dbus-glib' 'dbus-sharp-glib' configure + find src -exec sed -i "s/NDesk.DBus/DBus/g" {} \; + Fpatchall Fmake Fmakeinstall Fmonocleanup diff --git a/source/gnome-extra/f-spot/gdk.diff b/source/gnome-extra/f-spot/gdk.diff new file mode 100644 index 0000000..80e5636 --- /dev/null +++ b/source/gnome-extra/f-spot/gdk.diff @@ -0,0 +1,22 @@ +From 9d6e8052b188c2b1cb310ef05842da74a730a39f Mon Sep 17 00:00:00 2001 +From: Marek Habersack <gren...@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 diff --git a/source/gnome-extra/f-spot/mono28.diff b/source/gnome-extra/f-spot/mono28.diff new file mode 100644 index 0000000..56c366f --- /dev/null +++ b/source/gnome-extra/f-spot/mono28.diff @@ -0,0 +1,35 @@ + +--- a/lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs ++++ b/lib/TagLib/TagLib/src/TagLib/IFD/Entries/Rational.cs +@@ -62,8 +62,10 @@ namespace TagLib.IFD.Entries + /// </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 + +--- a/lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs ++++ b/lib/TagLib/TagLib/src/TagLib/IFD/Entries/SRational.cs +@@ -62,8 +62,10 @@ namespace TagLib.IFD.Entries + /// </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 +-- +1.7.2.3 + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
