From 2a106d08cac4113a0b13a89807942be0892398bd Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 1 Oct 2010 19:40:19 +0000 Subject: Version bump Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- media-gfx/f-spot/ChangeLog | 26 +++++++- media-gfx/f-spot/Manifest | 15 ++++- media-gfx/f-spot/f-spot-0.8.0.ebuild | 75 ++++++++++++++++++++++ .../f-spot/files/f-spot-0.8.0-empty-crash.patch | 21 ++++++ 4 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 media-gfx/f-spot/f-spot-0.8.0.ebuild create mode 100644 media-gfx/f-spot/files/f-spot-0.8.0-empty-crash.patch (limited to 'media-gfx/f-spot') diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog index 6b06b2da95e3..4c5529f486c7 100644 --- a/media-gfx/f-spot/ChangeLog +++ b/media-gfx/f-spot/ChangeLog @@ -1,6 +1,30 @@ # ChangeLog for media-gfx/f-spot # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.46 2010/06/21 14:40:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.47 2010/10/01 19:40:19 pacho Exp $ + +*f-spot-0.8.0 (01 Oct 2010) + + 01 Oct 2010; Pacho Ramos +f-spot-0.8.0.ebuild, + +files/f-spot-0.8.0-empty-crash.patch: + Version bump with a ton of upstream fixes (bug #320627, thanks a lot to + Samuli Suominen for showing me how to properly run eautoreconf). Fixed + some opened bug reports: + - RDEPEND on media-gfx/dcraw when wanted (bug #227411 by uzytkownik). + - 'low image quality' issues reported in bug #285064 by Daniel Drake + should be solved by upstream. + - Looks to solve location issues reported in bug #299487 by Marcello + Magaldi. + - Seems to not show any DB problem as reported in bug #302926 by Oo.et.oO. + - It should fix problems with facebook extension (bug #306745 by Jacob + Godserv fixed by upstream). + - Build system looks parallel build safe (bug #321377 by Michael Weber). + - Doesn't segfault as reported in bug #322885 by Dustin Polke (tested by + me on icewm). + Related with ebuild changes: documentation configure option is now being + passed behind 'doc' USE flag, configure options are now passed in + pkg_setup as done in most ebuilds inheriting gnome2.eclass, added + previously missing gnome2_src_prepare call, drop unneeded + SCROLLKEEPER_UPDATE=0. 21 Jun 2010; Samuli Suominen f-spot-0.6.1.1-r3.ebuild: diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest index 44cb062e80e3..9f8468f19644 100644 --- a/media-gfx/f-spot/Manifest +++ b/media-gfx/f-spot/Manifest @@ -1,14 +1,27 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX f-spot-0.5.0.3-icon-size-crash-fix.patch 1646 RMD160 bb6144678b2ba8b256e9bab3dae86109ae3e2e76 SHA1 4171c56939e4e7585a65133e697d66d19a1636e0 SHA256 dc4412f58e059c9c006aef49f389e6d1c4088c5f7dc0748e8e8c95fd6ef78db3 AUX f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch 559 RMD160 4b3cd0f12808103d057bd975b2debdac02658d3f SHA1 c51ac33e1dd34f56115dc8c94f679d14ae77c870 SHA256 4dd00083c9ad97672f00eaa3ad5b4e84f325bdda926867c678b8a55a72562505 AUX f-spot-0.6.0.0-parallel-build.patch 2781 RMD160 fb2458f0c3b11183fa66261c6706fdadc82bf975 SHA1 3a28f4381ea4ab69954f61e153768581cbe37a95 SHA256 6f91434993f68019244f7fd968cf685ce773bd271624206f660c67b6d306fe90 AUX f-spot-0.6.0.0-sandbox-violation.patch 2622 RMD160 6bce291d37a4c971ee067ef462715fafd0711494 SHA1 0b56957a3248774953f25c12de54727128acc40c SHA256 d09dfed85328ea8cabb078ff213c641704145a53825771dd7fef3d79a70c71f0 +AUX f-spot-0.8.0-empty-crash.patch 813 RMD160 782335ebb8382f5630a5872b5cf70ded6d130559 SHA1 1dba4836434d955f5202a63d3268a1e0560b6250 SHA256 b65127b4931a37b117cf2b3aa1cbfbd058eab3b43c6016d52cd8dd3ae5f5abfc DIST f-spot-0.5.0.3.tar.bz2 2776582 RMD160 0b02a2a5a8133e4304dfe6d0d6e971ee6ee48d0c SHA1 9b666c1d38ea765ddbbba56c42eaa721e2f14096 SHA256 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd DIST f-spot-0.6.0.0.tar.bz2 3006475 RMD160 48e63f47f34d715f7fad85489b2e51cc93b6da0f SHA1 1532e57bc67171e811ada19a04a17fd9c447e0d8 SHA256 90801e2f0d62a9b8710e214433dbac8d7b9cb2c8832cf03447cde15324bc6220 DIST f-spot-0.6.1.1-gentoo-1.tar.bz2 4020 RMD160 0804c65cf35443e993e53182b9fe3b431df41aa2 SHA1 8ec500037a80c5a839209bacdde1956a14a3a1a7 SHA256 7934cdd201773d47d6496f64a2c4fd42463931c6d4f1712aa514f6537dea8da5 DIST f-spot-0.6.1.1.tar.bz2 2814962 RMD160 3233e0d081ebbe66ff756cb75945bcbe4176e9ce SHA1 ac2abd9fabaa948c5d6dd8a418deb9b992bf46c3 SHA256 bca09c0161056535311f7409082604ceb14eea441887790bed263114c66c8be8 +DIST f-spot-0.8.0.tar.bz2 3129753 RMD160 a93bb4a40be4c011a83e4482f20319fbf19b1965 SHA1 e08e570c9bbfd22ab7fed2f4846f7f36d99156fd SHA256 3a4606ae8260928ef5db87b42dfdbf23cc94c3168f1184290b0867719f5e25d7 EBUILD f-spot-0.5.0.3-r1.ebuild 1899 RMD160 bb9f6480af142da2b73259f3847165031ff635bd SHA1 5115307a3f0750fb4015f7a8c5b635bc554d96c1 SHA256 12f4289b98e41eae65d812e7e56ee12e16d72693f008c1afa48e4c45fc037dd0 EBUILD f-spot-0.6.0.0.ebuild 1639 RMD160 299a29201e84a972eb4c06fe8e255d1e04b98fc8 SHA1 eebc7a14a852c31deb88bc36a410428e3bc0874c SHA256 098a9fe81490c69b83f2efa387ed9dd1def509b50d010c7d9dca8c297aacf52f EBUILD f-spot-0.6.1.1-r2.ebuild 1726 RMD160 de10eca53c4b190b4f5cc2205877a19a19299481 SHA1 4c2968874e813a003980ca44a384c0ed0c615a56 SHA256 14c19a3d7f87f79cf6001304bf1759af2833b1ed539ac72dbfd6ef724316a47b EBUILD f-spot-0.6.1.1-r3.ebuild 1935 RMD160 6d18152a73e3f46aa016108e77ced4f0a18d0e68 SHA1 6853d9bdddd6f4cc4eba13b88e040f7707280f06 SHA256 c8f2ac5ecd4240c2a40afbdaff63d87422d8ec479355d8f992e1f9ccedcc935f -MISC ChangeLog 8718 RMD160 1c92400487af8bf7f8a774796804ad6b01fa185b SHA1 ad39764c031e92568ca0ebc5688ed4406e5a5e15 SHA256 1b85b73f2d9c53ec45a7301f31fc3096e4f5809a641e3dbf57cca0d804c61741 +EBUILD f-spot-0.8.0.ebuild 2020 RMD160 436eda5893b19bbefb2027e4898262fcd936cc19 SHA1 ec23242f47ca0ee1fdc7bcc58b2b2b8df43f74d6 SHA256 1cf6ac0d41309c6373cfa99b66b9c32976b8f1d0658605c6146e2bbf1c0a246c +MISC ChangeLog 9926 RMD160 4293506b628736f142bd1e97c5ecfc72b2058709 SHA1 c02b2c5aee35a2d026b17cd7e64754e89e769fa1 SHA256 69f49ddd361f2311756656ee26eab4391e94ae9c5288f7c85efd436507ee29d8 MISC metadata.xml 522 RMD160 d85cdf5feec0044ac650f1c9904cdffff73f3e8c SHA1 6d9625420a2a3cbfe056f613d66259cb5e5a00dd SHA256 a8ecf54ebf5a2c0ffcfd9aac5a8e237cac7bb04681427ab16ce9c1eaddbd0ce2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iEYEARECAAYFAkymOSwACgkQCaWpQKGI+9RsDACdHN8fDzgyBL7PYDnfvXKvKwom +SdkAoICnBK3N6Rmj5xRdgU8zWhkhrxGI +=Z+vy +-----END PGP SIGNATURE----- diff --git a/media-gfx/f-spot/f-spot-0.8.0.ebuild b/media-gfx/f-spot/f-spot-0.8.0.ebuild new file mode 100644 index 000000000000..e1ea26be9205 --- /dev/null +++ b/media-gfx/f-spot/f-spot-0.8.0.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2010 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.8.0.ebuild,v 1.1 2010/10/01 19:40:19 pacho Exp $ + +EAPI="2" + +inherit gnome2 mono eutils autotools multilib + +DESCRIPTION="Personal photo management application for the gnome desktop" +HOMEPAGE="http://f-spot.org" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc flickr raw" + +RDEPEND=">=dev-lang/mono-2.2 + >=gnome-base/libgnome-2.2 + >=gnome-base/libgnomeui-2.2 + dev-dotnet/gnome-keyring-sharp + >=dev-dotnet/gtk-sharp-2.12.2 + >=dev-dotnet/glib-sharp-2.12.2 + >=x11-libs/gtk+-2.16 + >=dev-libs/glib-2.22 + >=dev-libs/libunique-1.0 + >=dev-dotnet/gnome-sharp-2.8 + >=dev-dotnet/glib-sharp-2.12 + >=dev-dotnet/gconf-sharp-2.20.2 + >=dev-dotnet/mono-addins-0.3 + >=dev-libs/dbus-glib-0.71 + >=dev-dotnet/dbus-sharp-0.4.2 + >=dev-dotnet/dbus-glib-sharp-0.3.0 + >=media-libs/lcms-1.12:0 + >=x11-libs/cairo-1.4 + doc? ( virtual/monodoc + >=app-text/gnome-doc-utils-0.17.3 ) + flickr? ( >=dev-dotnet/flickrnet-bin-2.2-r1 ) + raw? ( media-gfx/dcraw )" + +DEPEND="${RDEPEND} + >=dev-dotnet/gtk-sharp-gapi-2.12.2 + >=app-text/gnome-doc-utils-0.17.3 + dev-util/pkgconfig + >=dev-util/intltool-0.35" + +DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --disable-scrollkeeper + $(use_enable doc user-help)" +} + +src_prepare() { + gnome2_src_prepare + + # Don't crash with empty databases + epatch "${FILESDIR}/${P}-empty-crash.patch" + + sed -r -i -e 's:-D[A-Z]+_DISABLE_DEPRECATED::g' \ + lib/libfspot/Makefile.am || die + + if ! use flickr; then + sed -i -e '/FSpot.Exporters.Flickr/d' src/Extensions/Exporters/Makefile.am || die + sed -i -e '/FSPOT_CHECK_FLICKRNET/d' configure.ac || die + fi + + intltoolize --force --automake --copy || die "intltoolized failed" + AT_M4DIR="build/m4/f-spot build/m4/shamrock build/m4/shave" eautoreconf +} + +src_install() { + gnome2_src_install + find "${D}" -name '*.la' -delete || die "la removal failed" +} diff --git a/media-gfx/f-spot/files/f-spot-0.8.0-empty-crash.patch b/media-gfx/f-spot/files/f-spot-0.8.0-empty-crash.patch new file mode 100644 index 000000000000..7a3b70b316c4 --- /dev/null +++ b/media-gfx/f-spot/files/f-spot-0.8.0-empty-crash.patch @@ -0,0 +1,21 @@ +From 9054153b3b40f76f7e094ca8db98de0eaca62808 Mon Sep 17 00:00:00 2001 +From: Ruben Vermeersch +Date: Wed, 15 Sep 2010 17:56:40 +0000 +Subject: Don't crash with empty databases. + +--- +diff --git a/src/Clients/MainApp/FSpot/App.cs b/src/Clients/MainApp/FSpot/App.cs +index cdcfeea..53bdcb4 100644 +--- a/src/Clients/MainApp/FSpot/App.cs ++++ b/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)); + } + +-- +cgit v0.8.3.1 -- cgit v1.2.3-65-gdbad