diff options
| -rw-r--r-- | gnome-base/gnome-vfs/ChangeLog | 10 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/Manifest | 19 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1 | 3 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff | 16 | ||||
| -rw-r--r-- | gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild | 95 |
5 files changed, 138 insertions, 5 deletions
diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog index 88de5bead5ef..44832aa7f453 100644 --- a/gnome-base/gnome-vfs/ChangeLog +++ b/gnome-base/gnome-vfs/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/gnome-vfs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.241 2007/01/18 22:57:30 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.242 2007/01/22 20:53:43 pva Exp $ + +*gnome-vfs-2.16.3-r1 (22 Jan 2007) + + 22 Jan 2007; <pva@gentoo.org> + +files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff, + +gnome-vfs-2.16.3-r1.ebuild: + Fixed gnome_vfs_url_show_with_env does not work if empty 'Path=' entry + exists in *.desktop. Bug #161089. 18 Jan 2007; Jeroen Roovers <jer@gentoo.org> gnome-vfs-2.16.3.ebuild: Stable for HPPA (bug #147751). diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest index 0dbd49ccd564..1805f7fd50f2 100644 --- a/gnome-base/gnome-vfs/Manifest +++ b/gnome-base/gnome-vfs/Manifest @@ -18,20 +18,28 @@ AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17 MD5 83ce05e705bb1615ecc14c41d848ab96 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345 files/gnome-vfs-2.16.0-no-dbus-crash.patch 710 +AUX gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751 RMD160 6332da63ede8cc9ff16ac2b64f6cd466d153b2d4 SHA1 b95e64e0e83442812563bb52245e57e6232e6a81 SHA256 ebf013bb78968ea05802233ffe38a79c144f9693e1f6ee6491f5e41e5bb3877d +MD5 fb50c499ee96f38ffd7c90a4ef1fb4d8 files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751 +RMD160 6332da63ede8cc9ff16ac2b64f6cd466d153b2d4 files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751 +SHA256 ebf013bb78968ea05802233ffe38a79c144f9693e1f6ee6491f5e41e5bb3877d files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff 751 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7 DIST gnome-vfs-2.16.3.tar.bz2 1900424 RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc SHA1 a4c97179e2c4abf8cfcf236e56f7d328feaef89b SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777 EBUILD gnome-vfs-2.14.2-r1.ebuild 2036 RMD160 83e8bf96ef2869a3f021ab103a9db77bfe77698c SHA1 30bfc0d8dfb9174c778dbb93a976de99d723d38f SHA256 42e72d37519652fc3e189bc2f514bec7ee432966859ba8498e2652b92a0b6db7 MD5 345a311458b2341f2c59cb7cb7c6ed01 gnome-vfs-2.14.2-r1.ebuild 2036 RMD160 83e8bf96ef2869a3f021ab103a9db77bfe77698c gnome-vfs-2.14.2-r1.ebuild 2036 SHA256 42e72d37519652fc3e189bc2f514bec7ee432966859ba8498e2652b92a0b6db7 gnome-vfs-2.14.2-r1.ebuild 2036 +EBUILD gnome-vfs-2.16.3-r1.ebuild 2604 RMD160 3b4ae3af2b130910c4bffb65468f935fff1b08c3 SHA1 1bd02c53158aad1b98c821ccfc656350602c171d SHA256 836ac524a33c83199e1a0537bff5601d1fea5010f7138e861305abb4bddd12f7 +MD5 8cabe174ee96640275588f763e7baf3b gnome-vfs-2.16.3-r1.ebuild 2604 +RMD160 3b4ae3af2b130910c4bffb65468f935fff1b08c3 gnome-vfs-2.16.3-r1.ebuild 2604 +SHA256 836ac524a33c83199e1a0537bff5601d1fea5010f7138e861305abb4bddd12f7 gnome-vfs-2.16.3-r1.ebuild 2604 EBUILD gnome-vfs-2.16.3.ebuild 2461 RMD160 b3dc473770278f2135657d313e1af7e5e5b2577b SHA1 38c24424d5d975bcb0ac74e4137a11be8f461512 SHA256 c9d505a3b946cfca8355035943e1e7c71100284d3ba1f7217ceb067f890fab1a MD5 3b1b557f22470020bcfafdec881b632d gnome-vfs-2.16.3.ebuild 2461 RMD160 b3dc473770278f2135657d313e1af7e5e5b2577b gnome-vfs-2.16.3.ebuild 2461 SHA256 c9d505a3b946cfca8355035943e1e7c71100284d3ba1f7217ceb067f890fab1a gnome-vfs-2.16.3.ebuild 2461 -MISC ChangeLog 31024 RMD160 9781ee9f4430bc6b787dd68b1e94fed401d6ec38 SHA1 f559574a57c45e8aad6435845578ed0b5d166c0e SHA256 36dbfadee2bbbb026f15904a5a262c08846124cffcf4628a35100afb3379e8a3 -MD5 ab1342a7b29065c7872bb671995ea42c ChangeLog 31024 -RMD160 9781ee9f4430bc6b787dd68b1e94fed401d6ec38 ChangeLog 31024 -SHA256 36dbfadee2bbbb026f15904a5a262c08846124cffcf4628a35100afb3379e8a3 ChangeLog 31024 +MISC ChangeLog 31290 RMD160 71a181d0ca0944b6444d30f22dc6081988efcb9c SHA1 a5a12a5a2d5548f21cef724fa9e3eee37b3ab03c SHA256 881c3740e0d3759e7f05d98fda2a6ff6d5e00810c97077483a06bed49f281d32 +MD5 ee697fbcd53d9cf28cdac292f1b45c42 ChangeLog 31290 +RMD160 71a181d0ca0944b6444d30f22dc6081988efcb9c ChangeLog 31290 +SHA256 881c3740e0d3759e7f05d98fda2a6ff6d5e00810c97077483a06bed49f281d32 ChangeLog 31290 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -42,3 +50,6 @@ SHA256 bb570a6e1ed458d3e0173c04dcdddf3bd535f6a5cbda70592e5c472edbc9aa8a files/di MD5 28792f7ed0fdae28e12fe6241aab69f2 files/digest-gnome-vfs-2.16.3 256 RMD160 103fa1e26870938e412081a05cfb05ff0c5a0746 files/digest-gnome-vfs-2.16.3 256 SHA256 835094a7022fd132b2fe440cf39b51e57961a11c434bd44fc6e9fda283d99e9a files/digest-gnome-vfs-2.16.3 256 +MD5 28792f7ed0fdae28e12fe6241aab69f2 files/digest-gnome-vfs-2.16.3-r1 256 +RMD160 103fa1e26870938e412081a05cfb05ff0c5a0746 files/digest-gnome-vfs-2.16.3-r1 256 +SHA256 835094a7022fd132b2fe440cf39b51e57961a11c434bd44fc6e9fda283d99e9a files/digest-gnome-vfs-2.16.3-r1 256 diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1 new file mode 100644 index 000000000000..11e08a39e511 --- /dev/null +++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.16.3-r1 @@ -0,0 +1,3 @@ +MD5 586d6fe3740385c000a864d5e2cf8215 gnome-vfs-2.16.3.tar.bz2 1900424 +RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc gnome-vfs-2.16.3.tar.bz2 1900424 +SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777 gnome-vfs-2.16.3.tar.bz2 1900424 diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff new file mode 100644 index 000000000000..1bda6cdc1d4d --- /dev/null +++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.3-empty-desktop-entry-Path.diff @@ -0,0 +1,16 @@ +diff -Naur gnome-vfs-2.16.3.ori/libgnomevfs/gnome-vfs-mime-handlers.c gnome-vfs-2.16.3/libgnomevfs/gnome-vfs-mime-handlers.c +--- gnome-vfs-2.16.3.ori/libgnomevfs/gnome-vfs-mime-handlers.c 2006-11-20 10:44:13.000000000 +0300 ++++ gnome-vfs-2.16.3/libgnomevfs/gnome-vfs-mime-handlers.c 2006-12-25 16:44:11.000000000 +0300 +@@ -1423,6 +1423,12 @@ + app->priv->path = g_key_file_get_string (key_file, DESKTOP_ENTRY_GROUP, + "Path", NULL); + ++ /* 'Path=' .desktop item is not working. bugzilla.gnome.org/389273 */ ++ if (app->priv->path != NULL && *app->priv->path == 0) { ++ g_free (app->priv->path); ++ app->priv->path = NULL; ++ } ++ + app->requires_terminal = g_key_file_get_boolean + (key_file, DESKTOP_ENTRY_GROUP, "Terminal", &err); + if (err) { diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild new file mode 100644 index 000000000000..bc5cf71e3538 --- /dev/null +++ b/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.16.3-r1.ebuild,v 1.1 2007/01/22 20:53:43 pva Exp $ + +WANT_AUTOCONF=latest +WANT_AUTOMAKE=1.9 +inherit eutils gnome2 autotools + +DESCRIPTION="Gnome Virtual Filesystem" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2 LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" +IUSE="avahi doc gnutls hal ipv6 samba ssl" + +RDEPEND=">=gnome-base/gconf-2 + >=dev-libs/glib-2.9.3 + >=gnome-base/orbit-2.12.4 + >=dev-libs/libxml2-2.6 + >=net-misc/neon-0.25.3 + app-arch/bzip2 + virtual/fam + gnome-base/gnome-mime-data + >=x11-misc/shared-mime-info-0.14 + || ( >=dev-libs/dbus-glib-0.71 <sys-apps/dbus-0.90 ) + samba? ( >=net-fs/samba-3 ) + gnutls? ( + net-libs/gnutls + !gnome-extra/gnome-vfs-sftp + ) + ssl? ( + !gnutls? ( + >=dev-libs/openssl-0.9.5 + !gnome-extra/gnome-vfs-sftp + ) + ) + hal? ( + >=sys-apps/hal-0.5.7 + ) + avahi? ( >=net-dns/avahi-0.6 )" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1 )" +PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )" + +DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" + +pkg_setup() { + if use hal ; then + G2CONF="--with-hal-mount=/usr/bin/gnome-mount \ + --with-hal-umount=/usr/bin/gnome-umount \ + --with-hal-eject=/usr/bin/gnome-eject" + fi + + G2CONF="${G2CONF} \ + --disable-schemas-install \ + --disable-cdda \ + --disable-howl \ + --enable-http-neon \ + $(use_enable ssl openssl) \ + $(use_enable gnutls) \ + $(use_enable samba) \ + $(use_enable ipv6) \ + $(use_enable hal) \ + $(use_enable avahi)" + + # this works because of the order of conifgure parsing + # so should always be behind the use_enable options + # foser <foser@gentoo.org 19 Apr 2004 + use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl" +} + +src_unpack() { + gnome2_src_unpack + + # Allow the Trash on afs filesystems (#106118) + epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch + + # Fix compiling with headers missing + epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch + + # Fix for crashes running programs via sudo + epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch + + # Fix gnome_vfs_url_show_with_env with 'Path=' in .desktop (bug 161089) + epatch "${FILESDIR}"/${P}-empty-desktop-entry-Path.diff + + # For gtk-doc macro failure when it's not installed + cp aclocal.m4 old_macros.m4 + AT_M4DIR="." + eautoreconf +} |