summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-03-25 21:51:19 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-03-25 21:51:19 +0000
commitab9040c40003eead31877db08631dfc3ceca6556 (patch)
tree90224c56f5fa9e86a58d5fdacf48aceb1c552569 /media-gfx
parentFix bug #261617 (icons not showing up during boot). (diff)
downloadhistorical-ab9040c40003eead31877db08631dfc3ceca6556.tar.gz
historical-ab9040c40003eead31877db08631dfc3ceca6556.tar.bz2
historical-ab9040c40003eead31877db08631dfc3ceca6556.zip
Fixes for multiple compile failures, for juniper on forums.
Package-Manager: portage-2.2_rc26/cvs/Linux x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/f-spot/ChangeLog5
-rw-r--r--media-gfx/f-spot/Manifest4
-rw-r--r--media-gfx/f-spot/f-spot-0.4.3.1.ebuild16
3 files changed, 20 insertions, 5 deletions
diff --git a/media-gfx/f-spot/ChangeLog b/media-gfx/f-spot/ChangeLog
index c30c8003a6b0..c247b7f29283 100644
--- a/media-gfx/f-spot/ChangeLog
+++ b/media-gfx/f-spot/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/f-spot
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.33 2009/02/01 16:24:47 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/ChangeLog,v 1.34 2009/03/25 21:51:19 loki_val Exp $
+
+ 25 Mar 2009; Peter Alfredsen <loki_val@gentoo.org> f-spot-0.4.3.1.ebuild:
+ Fixes for multiple compile failures, for juniper on forums.
*f-spot-0.5.0.3-r1 (01 Feb 2009)
diff --git a/media-gfx/f-spot/Manifest b/media-gfx/f-spot/Manifest
index 58fc83f20dc9..0bc34434b27f 100644
--- a/media-gfx/f-spot/Manifest
+++ b/media-gfx/f-spot/Manifest
@@ -2,7 +2,7 @@ AUX f-spot-0.5.0.3-icon-size-crash-fix.patch 1646 RMD160 bb6144678b2ba8b256e9bab
AUX f-spot-0.5.0.3-no-image-in-collection-crash-fix.patch 559 RMD160 4b3cd0f12808103d057bd975b2debdac02658d3f SHA1 c51ac33e1dd34f56115dc8c94f679d14ae77c870 SHA256 4dd00083c9ad97672f00eaa3ad5b4e84f325bdda926867c678b8a55a72562505
DIST f-spot-0.4.3.1.tar.bz2 2494478 RMD160 6fbda5239ce78ab57c8bd033ea6abf6ce62bfafd SHA1 9cbed08261f7576185ac1dda837c3d62e1978031 SHA256 c0900eaac824a30e6c6b1741afeadf265a1c126b899bd8a7eb397752d7d1b6c3
DIST f-spot-0.5.0.3.tar.bz2 2776582 RMD160 0b02a2a5a8133e4304dfe6d0d6e971ee6ee48d0c SHA1 9b666c1d38ea765ddbbba56c42eaa721e2f14096 SHA256 7f0f9229e0b832c2ce5c75fb49247f7227141b49a5bcfb2020d0a01e6972e0bd
-EBUILD f-spot-0.4.3.1.ebuild 1356 RMD160 015d91aa1653e7bd2dcd17cd64cda7504a5b831c SHA1 874e995b7f733232ac681dd0c91c70024fed8dde SHA256 de29cfd64127ca906aead6081bbd7e6676621fee2e26d0d032b270aeaada5fd0
+EBUILD f-spot-0.4.3.1.ebuild 1727 RMD160 58828306200205da2334716a64ac13ff484fe907 SHA1 f5adfffc3bec2ab217527f0a2b0966edcc67921b SHA256 1e4b5060f7942948b177eb3466381819fc57e1d8c6ca14cd0d71159944e06759
EBUILD f-spot-0.5.0.3-r1.ebuild 1847 RMD160 417d915aea7ffe88728f1803b098a23e2d8252e9 SHA1 3fef6200dd3875ea94724a1b6d168b4da1a7d9e9 SHA256 255af7883274256a32d1021874a029c62b52e8a6f021baf450605879d4e04dc2
-MISC ChangeLog 6160 RMD160 50234775c854796d85e91e1f45d34043835027bc SHA1 f7a5e422f6e54482b0a0a60f72cd09eb6b2535dd SHA256 8c6ece421e169a0cab44ff09b42287e805383e29909fb55fca150f0f77c90e97
+MISC ChangeLog 6299 RMD160 ccff767d544f50d88f3b3fcf57f1dc3f5a508782 SHA1 bbce70bf18ababdd06b201762551f13280b703a5 SHA256 062137ad4991b8a98ba6ff458ca1d88e77c46e63bb43facf749bc62b7ead4d20
MISC metadata.xml 365 RMD160 a22107faaa65a4397d44ff9d4f933db9c035d532 SHA1 0ca0017b2fb1b2b432ac5c12dfcf06358333e790 SHA256 f36ffa6e9a595fd3e8978318314da449472d246abcc9f8230103040db9587136
diff --git a/media-gfx/f-spot/f-spot-0.4.3.1.ebuild b/media-gfx/f-spot/f-spot-0.4.3.1.ebuild
index d6a33d3be4ac..3c8c9e872d37 100644
--- a/media-gfx/f-spot/f-spot-0.4.3.1.ebuild
+++ b/media-gfx/f-spot/f-spot-0.4.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.4.3.1.ebuild,v 1.2 2008/06/29 10:21:06 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/f-spot/f-spot-0.4.3.1.ebuild,v 1.3 2009/03/25 21:51:19 loki_val Exp $
inherit gnome2 mono autotools
@@ -48,7 +48,19 @@ src_unpack() {
# Disable Beagle
sed -i -e '/PKG_CHECK_MODULES.*BEAGLE/,/AC_SUBST.*LINK_BEAGLE/ d' configure.in || die "sed failed"
+ #Fix compile failure with new gtk+
+ sed -i -e 's/-DGTK_DISABLE_DEPRECATED//' libfspot/Makefile.am || die "sed makefile failed"
eautoreconf
intltoolize --force || die "intltoolize --force failed"
+
+ # Sandbox failure
+ # http://bugs.gentoo.org/show_bug.cgi?id=252636
+ # http://bugzilla.gnome.org/565733
+ sed -i -e '/rm \-f $(pl/d' \
+ $(
+ grep -lr --include='Makefile.in' \
+ 'rm -f \$(pl' "${S}"/extensions/
+ ) || die "sed failed"
+
}