Add patch to fix picasaweb export. Closing bug 176177

Package-Manager: portage-2.1.2.7

5 files changed, 98 insertions, 5 deletions

diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index d0f537ec0d50..fac2f2460cdf 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/f-spot
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.19 2007/05/15 09:55:15 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.20 2007/06/01 18:22:02 joem Exp $
+
+*f-spot-0.3.5-r1 (01 Jun 2007)
+
+  01 Jun 2007; Joe McCann <joem@gentoo.org>
+  +files/f-spot-0.3.5-picasa_fix.patch, +f-spot-0.3.5-r1.ebuild:
+  Add patch to fix picasaweb export. Closing bug 176177
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest
index 2974ff52bbc4..5a302df4615c 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -6,6 +6,10 @@ AUX f-spot-0.3.3-dont_eat_cpu.patch 931 RMD160 56a138d7e08d5581ac1dc6a45f5f380b3
 MD5 57c7f1509826c1c7732dd9dae04dc6e8 files/f-spot-0.3.3-dont_eat_cpu.patch 931
 RMD160 56a138d7e08d5581ac1dc6a45f5f380b379d2f5f files/f-spot-0.3.3-dont_eat_cpu.patch 931
 SHA256 0c9953a3bcf66de6ce263d0ab9d027c35dcae33adf9133ac08451f2b234d0be7 files/f-spot-0.3.3-dont_eat_cpu.patch 931
+AUX f-spot-0.3.5-picasa_fix.patch 769 RMD160 af1579dc313b746ba4bbe21d3748f42af2ed81c6 SHA1 ff7f52364fa8e65eb5ba705e990525de712c1351 SHA256 12baa01fcfea792c4ec174d11880cd5f2c1a1e664011b4f96151385fea2ef8f3
+MD5 b24bd8023a77dab2cf3a60ec16b186a8 files/f-spot-0.3.5-picasa_fix.patch 769
+RMD160 af1579dc313b746ba4bbe21d3748f42af2ed81c6 files/f-spot-0.3.5-picasa_fix.patch 769
+SHA256 12baa01fcfea792c4ec174d11880cd5f2c1a1e664011b4f96151385fea2ef8f3 files/f-spot-0.3.5-picasa_fix.patch 769
 DIST f-spot-0.3.3.tar.bz2 1748891 RMD160 7f0e7599c5338b82e94f9e0ddf3ddbd4ec187344 SHA1 9254728c0cdb12bfa0190c1c8f15b8bfc79d013f SHA256 318af2ab4bb4fba06894bdb1b538197fdb6daefa7b0b6830350a8168b0b501ad
 DIST f-spot-0.3.4.tar.bz2 1758147 RMD160 f84482a3e6026104ea5bcbade399649916800d38 SHA1 0c421f7fc67ac70c793b6d1a1a7d838038ba8985 SHA256 aee76da748c0b3050f6f1a8d09d23eb51324efae5ae2688178fc8a335dbecbe2
 DIST f-spot-0.3.5.tar.bz2 1770616 RMD160 c15334dc45ed55b9316a379cdc62e8484bb31440 SHA1 287bb81ab60e1f642a86937d45681a6a61d52d9c SHA256 441997d27f0155ab2090b14dd6f29ccdf850f3565fa951dac5e589c75980a72b
@@ -17,14 +21,18 @@ EBUILD f-spot-0.3.4.ebuild 1698 RMD160 47a0544ebf29c70c4d27131a3d5da6eee7b31ef9
 MD5 82fc2517323f42cae6125f28be083105 f-spot-0.3.4.ebuild 1698
 RMD160 47a0544ebf29c70c4d27131a3d5da6eee7b31ef9 f-spot-0.3.4.ebuild 1698
 SHA256 c59fd655c3b10983fbdec0b6004f797670d5779e1e06d0ec585eeb7d111b99ec f-spot-0.3.4.ebuild 1698
+EBUILD f-spot-0.3.5-r1.ebuild 1742 RMD160 2ed4fa69ef2c27361f4422f3ea0864ef1927d572 SHA1 4007670012ec1094252900394888992f1a3926e0 SHA256 899df99fdcb007a3f653ea79fed65ccea30745923688058356c4462de26144c9
+MD5 29246811144fd22ce8d4cb41c5a8b9b4 f-spot-0.3.5-r1.ebuild 1742
+RMD160 2ed4fa69ef2c27361f4422f3ea0864ef1927d572 f-spot-0.3.5-r1.ebuild 1742
+SHA256 899df99fdcb007a3f653ea79fed65ccea30745923688058356c4462de26144c9 f-spot-0.3.5-r1.ebuild 1742
 EBUILD f-spot-0.3.5.ebuild 1698 RMD160 1930a3f7ab115c867bd4c214aa5f915515dba124 SHA1 539eb20de6f841a4e341616809371ad0536363e2 SHA256 db3d60c529385ea510ce69b75b358967c82fb1e9d9d31f12a3cfe10a25ed92f1
 MD5 c5e5e98d613ed097d83d1e0521e93e5a f-spot-0.3.5.ebuild 1698
 RMD160 1930a3f7ab115c867bd4c214aa5f915515dba124 f-spot-0.3.5.ebuild 1698
 SHA256 db3d60c529385ea510ce69b75b358967c82fb1e9d9d31f12a3cfe10a25ed92f1 f-spot-0.3.5.ebuild 1698
-MISC ChangeLog 3501 RMD160 c25a96809e8628b1d0c179fac76dc96f3913596a SHA1 57d3d24b612cc23e7cf97396de1248b1338e3765 SHA256 5d7a79851f89f1c60c958481d1329be6be5052a9680611d9956a0890bc2c293d
-MD5 1cc61be02e23e60003ddebf744b56ec1 ChangeLog 3501
-RMD160 c25a96809e8628b1d0c179fac76dc96f3913596a ChangeLog 3501
-SHA256 5d7a79851f89f1c60c958481d1329be6be5052a9680611d9956a0890bc2c293d ChangeLog 3501
+MISC ChangeLog 3696 RMD160 685b44345e2ea26f71c74e65b5df4759bd19cc1e SHA1 97a7bbd55b718436eb414cf82381e01384974026 SHA256 7445fd99f5cc1e42e883cce0904746e799943feea3e55e5d0677b68b9dfe72ac
+MD5 3efd137462f0f08098d4242d2bd4b06d ChangeLog 3696
+RMD160 685b44345e2ea26f71c74e65b5df4759bd19cc1e ChangeLog 3696
+SHA256 7445fd99f5cc1e42e883cce0904746e799943feea3e55e5d0677b68b9dfe72ac ChangeLog 3696
 MISC metadata.xml 358 RMD160 9a3930c091e2a7eb4dcff75d2432986a5af231e6 SHA1 f2a366253402024e9613bb9fb334ed386fe527b6 SHA256 a36df2c0b3273b66d05d84062efc062ed4f08670554c989a0ce582635b3eba68
 MD5 6a9d544797442d1796b6fb71377146cf metadata.xml 358
 RMD160 9a3930c091e2a7eb4dcff75d2432986a5af231e6 metadata.xml 358
@@ -38,3 +46,6 @@ SHA256 e88321f2abd236866bcb1ea192b00f435023262ac54cfc978380dcb566f4d3cd files/di
 MD5 72154161d874b619a0e4b4007c180eaf files/digest-f-spot-0.3.5 244
 RMD160 f765a81cb05e5ee2c61ae80e92447da8068bb10d files/digest-f-spot-0.3.5 244
 SHA256 7253ce0c22f7091b56dab325440f02dce442e1f55e434c5a73ef873484c5fdc5 files/digest-f-spot-0.3.5 244
+MD5 72154161d874b619a0e4b4007c180eaf files/digest-f-spot-0.3.5-r1 244
+RMD160 f765a81cb05e5ee2c61ae80e92447da8068bb10d files/digest-f-spot-0.3.5-r1 244
+SHA256 7253ce0c22f7091b56dab325440f02dce442e1f55e434c5a73ef873484c5fdc5 files/digest-f-spot-0.3.5-r1 244
diff --git a/media-gfx/f-spot/f-spot-0.3.5-r1.ebuild b/media-gfx/f-spot/f-spot-0.3.5-r1.ebuild
new file mode 100644
index 000000000000..e8fcb40b2344
--- /dev/null
+++ b/media-gfx/f-spot/f-spot-0.3.5-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.3.5-r1.ebuild,v 1.1 2007/06/01 18:22:02 joem Exp $
+
+inherit gnome2 mono eutils autotools
+
+DESCRIPTION="Personal photo management application for the gnome desktop"
+HOMEPAGE="http://f-spot.org"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-1.1.10
+|| ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) )
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2.6
+	>=dev-dotnet/gtk-sharp-2.7
+	>=dev-dotnet/gtkhtml-sharp-2.7
+	>=dev-dotnet/gconf-sharp-2.7
+	>=dev-dotnet/glade-sharp-2.7
+	>=dev-dotnet/gnomevfs-sharp-2.7
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	>=media-libs/libexif-0.6
+	<media-libs/libexif-0.7.0
+	>=media-libs/libgphoto2-2.1.4
+	>=media-libs/lcms-1.14
+	media-libs/jpeg
+	>=dev-db/sqlite-3"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# Gentoo used old so version until libexif-0.6.13-r2
+	if has_version "<media-libs/libexif-0.6.13-r2";
+	then
+	sed -i -e 's/EXIF_SOVERSION=12/EXIF_SOVERSION=10/' configure.in
+	fi
+	# Multilib fix
+	sed -i -e 's:prefix mono`/lib:libdir mono`:' \
+		configure.in || die "sed failed"
+
+	#older versions put headers in wrong spot, see #100269
+	if has_version "<=media-libs/lcms-1.13-r1" || has_version "=media-libs/lcms-1.14"; then
+		sed -i "s:lcms.h:lcms/lcms.h:" ${S}/configure.in || die "sed failed"
+		sed -i "s:lcms.h:lcms/lcms.h:" ${S}/libeog/image-view.c || die "sed failed"
+	fi
+	epatch ${FILESDIR}/${P}-picasa_fix.patch
+	eautoconf || die "autoconf failed"
+}
+
diff --git a/media-gfx/f-spot/files/digest-f-spot-0.3.5-r1 b/media-gfx/f-spot/files/digest-f-spot-0.3.5-r1
new file mode 100644
index 000000000000..f0b12eb6cbcc
--- /dev/null
+++ b/media-gfx/f-spot/files/digest-f-spot-0.3.5-r1
@@ -0,0 +1,3 @@
+MD5 dafa8ac8149b80d010cecee3629e39b5 f-spot-0.3.5.tar.bz2 1770616
+RMD160 c15334dc45ed55b9316a379cdc62e8484bb31440 f-spot-0.3.5.tar.bz2 1770616
+SHA256 441997d27f0155ab2090b14dd6f29ccdf850f3565fa951dac5e589c75980a72b f-spot-0.3.5.tar.bz2 1770616
diff --git a/media-gfx/f-spot/files/f-spot-0.3.5-picasa_fix.patch b/media-gfx/f-spot/files/f-spot-0.3.5-picasa_fix.patch
new file mode 100644
index 000000000000..1033c139b012
--- /dev/null
+++ b/media-gfx/f-spot/files/f-spot-0.3.5-picasa_fix.patch
@@ -0,0 +1,12 @@
+--- google-sharp/PicasaWeb.cs	2007-01-09 10:07:29.000000000 +0800
++++ google-sharp/PicasaWeb.cs	2007-05-28 20:20:48.000000000 +0800
+@@ -260,7 +260,8 @@ namespace Mono.Google.Picasa {
+ 			XmlNamespaceManager nsmgr = new XmlNamespaceManager (doc.NameTable);
+ 			nsmgr.AddNamespace ("photo", "http://www.pheed.com/pheed/");
+ 			nsmgr.AddNamespace ("media", "http://search.yahoo.com/mrss/");
+-			nsmgr.AddNamespace ("gphoto", "http://picasaweb.google.com/lh/picasaweb");
++			nsmgr.AddNamespace ("gphoto", "http://schemas.google.com/photos/2007");
++			nsmgr.AddNamespace ("batch", "http://schemas.google.com/gdata/batch");
+ 			node = channel.SelectSingleNode ("gphoto:user", nsmgr);
+ 			user = node.InnerText;
+ 			node = channel.SelectSingleNode ("gphoto:nickname", nsmgr);