summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2011-02-25 22:02:49 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2011-02-25 22:02:49 +0000
commit8d564e1fb1c08cdebff5f27adc436b3d54e0b524 (patch)
tree307ae14b5ef6c6554d6ccfdf14a9613f798a78c3 /gnome-base/gvfs
parentdepend virtual/jpeg (diff)
downloadhistorical-8d564e1fb1c08cdebff5f27adc436b3d54e0b524.tar.gz
historical-8d564e1fb1c08cdebff5f27adc436b3d54e0b524.tar.bz2
historical-8d564e1fb1c08cdebff5f27adc436b3d54e0b524.zip
Fix build with >=glib-2.27, bug #346055.
Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64 RepoMan-Options: --force
Diffstat (limited to 'gnome-base/gvfs')
-rw-r--r--gnome-base/gvfs/ChangeLog5
-rw-r--r--gnome-base/gvfs/Manifest14
-rw-r--r--gnome-base/gvfs/gvfs-1.6.6-r1.ebuild7
3 files changed, 22 insertions, 4 deletions
diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 682876b57fee..8774c0ad6525 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for gnome-base/gvfs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.130 2011/01/30 18:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.131 2011/02/25 22:02:49 eva Exp $
+
+ 25 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> gvfs-1.6.6-r1.ebuild:
+ Fix build with >=glib-2.27, bug #346055.
30 Jan 2011; Raúl Porcel <armin76@gentoo.org> gvfs-1.6.6-r1.ebuild:
alpha/arm/ia64/sh/sparc stable wrt #348987
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index e79f99f0f2e8..116e9ee14d9a 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
AUX gvfs-1.6.4-O_TRUNC-fix.patch 2589 RMD160 8a0d4f627f8c258432afd59d2e774291349719a8 SHA1 670c093a44fae8dcd2175a3b0e8fe12f543204fe SHA256 1c5885854901e9dcf3e2626359cef63151040e382dfd611e4eb3aacd1f9f46b9
@@ -7,6 +10,13 @@ DIST gvfs-1.6.4.tar.bz2 1385999 RMD160 b5aeb97260534f16c565a36ef87150823fb05283
DIST gvfs-1.6.6.tar.bz2 1387796 RMD160 705934a0a3f520a41237374abeb0182d01398903 SHA1 066800558370187abd838c358349bb73f1579f8b SHA256 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
EBUILD gvfs-1.6.3.ebuild 3022 RMD160 cbdd2873068f2f5b344fcea577b2638b3bce1018 SHA1 8aec1dfe99b9c55c6dcfce312eac5b88a05ba0cc SHA256 3aec682a24b2b76d9cbcca5900fbd9a4c2ffa0be806e9695d074f55367d5579a
EBUILD gvfs-1.6.4-r2.ebuild 3206 RMD160 72a2630781f40f9c9555e306aac0d78f56700c87 SHA1 7bf3592e62e2ab799625945dda56b56df38f1ba9 SHA256 cec5b3cb5cb8bcb9d368a0402e215e6d79e973405361cc944c7c45ce7e7ea1d9
-EBUILD gvfs-1.6.6-r1.ebuild 3182 RMD160 be040bc2e648f9ad64078737984a9d0ecae60dd0 SHA1 1cad2e97dd11e136e4b55df04d0fa7534d6fdb4f SHA256 8fb6ddb66fca0aa4d8f79936b92ac36c72d83e598ba830f9f50efd941feb39ce
-MISC ChangeLog 18229 RMD160 8760aaedd462967c1dd523255f177db820f0757f SHA1 02ad5ada587a249b6480bb2dbcfafce4e42b68ad SHA256 5011b2198e34892c1cf7299537950673365666541b2d90288abeb35bebf7cd73
+EBUILD gvfs-1.6.6-r1.ebuild 3331 RMD160 7e2cabde94a7519fc3f3f90996896dadde3787f3 SHA1 5af50096b5d6bb4579ee9403b4effd14100eb1d3 SHA256 c735068a92ef517d06accd8e57d3ed22405bf97b1825f68b13c066b217a94f40
+MISC ChangeLog 18345 RMD160 8df7d274846a786db1a831ed5ab6cb70814e327e SHA1 c0ac213c7425e4e68b9ad789a18510804a53b1a2 SHA256 e69c12569641a13f09647bdc812754ba3fb82e73bcc310c9b89a5548874d9cc3
MISC metadata.xml 1100 RMD160 2d3714eb866d2d48d35e2b69fd5f2228b414793c SHA1 79ac2d6f91caecd4be3202ebb71489d7ff7dee98 SHA256 9b2f7554d979873b4a6900725cba341517bab4980cb63625704cbd62e8bbbb37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk1oJykACgkQ1fmVwcYIWAa9XwCeMoSWr0PorUIybpqco4mNrLgC
+VjsAmwVvO3bdh5n7Rjkj78AedHaI8GfS
+=iEVt
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild b/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
index d929b7dffefb..8143372e6733 100644
--- a/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild,v 1.5 2011/01/30 18:45:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.6-r1.ebuild,v 1.6 2011/02/25 22:02:49 eva Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -95,6 +95,11 @@ src_prepare() {
fi
use gphoto2 || use archive && eautoreconf
+
+ # Disable API deprecation
+ sed 's/-DG_DISABLE_DEPRECATED//' \
+ -i */*/Makefile.am */*/Makefile.in */Makefile.am */Makefile.in \
+ || die "sed failed"
}
src_install() {