# ChangeLog for gnome-base/gnome-vfs
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.110 2004/10/18 16:30:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.111 2004/10/27 11:14:12 foser Exp $
+
+*gnome-vfs-2.8.1-r1 (27 Oct 2004)
+
+ 27 Oct 2004; foser <foser@gentoo.org> gnome-vfs-2.8.1-r1.ebuild :
+ Add patch to fix issues in eggdesktop (#66695)
+ Thanks to Alex Rostovtsev <tetromino@gmail.com> for the notification
18 Oct 2004; foser <foser@gentoo.org> gnome-vfs-2.8.1.ebuild :
Fix libxml dep (#67949)
MD5 80dad5a0ab8a18445dc7ef2240ca5d1e gnome-vfs-2.6.2.ebuild 1760
MD5 c63c2eb131b87cab24c9f164fe83be4d gnome-vfs-2.6.1.1.ebuild 1758
MD5 913e7d93a9752a67076f89b9c1f680e3 gnome-vfs-1.0.5-r3.ebuild 1939
-MD5 9eede8b144891ab48d8dccfc33254b31 ChangeLog 13043
+MD5 17cccc7ae259c8fc8bb5d9d50988d437 gnome-vfs-2.8.1-r1.ebuild 2187
+MD5 3ba3e93e38198879a9a231aceb290ead ChangeLog 13267
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
MD5 5decf8bb73287c8ce01500e5cd0ee463 files/digest-gnome-vfs-2.4.2-r1 69
+MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1-r1 69
MD5 6126fab0b179eb680b819593f4bf1412 files/digest-gnome-vfs-2.6.1.1 71
MD5 a88e201c8f2ec5444db0bea2e8c302b4 files/digest-gnome-vfs-1.0.5-r3 68
MD5 76bd9665c0d55d08fcf71c2085ce3b9b files/gnome-vfs-2.8.1-howl_config.patch 950
+MD5 2cd7247981f899f8e3674866efec39d1 files/gnome-vfs-2.8.1-eggdesktop.patch 2104
MD5 48146c7a23e8af499720b290a58b7417 files/digest-gnome-vfs-2.6.0 69
MD5 b9a8c5cd605a7e483e1b93edee7155c0 files/digest-gnome-vfs-2.6.2 69
MD5 b1346620d53413ed5a6e5309c14c228c files/digest-gnome-vfs-2.8.1 69
--- /dev/null
+MD5 1c7286496a417dabfea563b724eae86b gnome-vfs-2.8.1.tar.bz2 1877981
--- /dev/null
+diff -uNr gnome-vfs-2.8.1/libgnomevfs/eggdesktopentries.c gnome-vfs-2.8.1.patched/libgnomevfs/eggdesktopentries.c
+--- gnome-vfs-2.8.1/libgnomevfs/eggdesktopentries.c 2004-09-06 08:28:17.000000000 +0200
++++ gnome-vfs-2.8.1.patched/libgnomevfs/eggdesktopentries.c 2004-10-27 12:51:20.495171696 +0200
+@@ -224,7 +224,7 @@
+ g_free (path);
+
+ if (fd < 0 && file_error == NULL)
+- g_set_error (&file_error, G_FILE_ERROR,
++ file_error = g_error_new (G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ _("File could not be opened: %s"),
+ g_strerror (errno));
+@@ -261,10 +261,8 @@
+ gint fd;
+ gchar **data_dirs;
+ GError *file_error;
+- GError *secondary_error;
+
+ file_error = NULL;
+- secondary_error = NULL;
+
+
+ data_dirs = g_new0 (char *, 2);
+@@ -275,20 +273,18 @@
+ if (fd < 0)
+ {
+ data_dirs = egg_get_secondary_data_dirs ();
+- fd = egg_find_file_in_data_dirs (file, data_dirs, &secondary_error);
++ fd = egg_find_file_in_data_dirs (file, data_dirs, NULL);
+ g_strfreev (data_dirs);
+
+ if (fd >= 0)
+- {
+- g_error_free (file_error);
+- file_error = NULL;
+- }
++ {
++ g_error_free (file_error);
++ file_error = NULL;
++ }
+ }
+
+ if (file_error)
+ g_propagate_error (error, file_error);
+- else if (secondary_error)
+- g_propagate_error (error, secondary_error);
+
+ return fd;
+ }
+@@ -405,6 +401,7 @@
+ g_string_free (entries->parse_buffer, TRUE);
+
+ g_strfreev (entries->legal_start_groups);
++ g_free (entries->default_group_name);
+
+ tmp = entries->groups;
+ while (tmp != NULL)
+@@ -1912,9 +1909,9 @@
+ q = strstr (p, "@");
+
+ if (!q)
+- country_len = q - p;
+- else
+ country_len = strlen (p);
++ else
++ country_len = q - p;
+
+ if (country_len <= 0)
+ return NULL;
+@@ -1972,9 +1969,9 @@
+ q = strstr (p, "@");
+
+ if (!q)
+- encoding_len = q - p;
+- else
+ encoding_len = strlen (p);
++ else
++ encoding_len = q - p;
+
+ if (encoding_len <= 0)
+ {
--- /dev/null
+# Copyright 1999-2004 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.8.1-r1.ebuild,v 1.1 2004/10/27 11:14:12 foser Exp $
+
+inherit gnome2 eutils
+
+IUSE="doc ssl gnutls samba ipv6 hal howl"
+
+SLOT="2"
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~mips ~ia64 ~ppc64"
+LICENSE="GPL-2 LGPL-2"
+
+RDEPEND=">=dev-libs/glib-2
+ >=gnome-base/gconf-1.2
+ >=gnome-base/orbit-2.9
+ >=gnome-base/libbonobo-2
+ >=dev-libs/libxml2-2.6
+ app-arch/bzip2
+
+ app-admin/fam
+
+ gnome-base/gnome-mime-data
+ >=x11-misc/shared-mime-info-0.14
+
+ ssl? ( >=dev-libs/openssl-0.9.5
+ !gnome-extra/gnome-vfs-sftp )
+ gnutls? ( !ssl? ( net-libs/gnutls
+ !gnome-extra/gnome-vfs-sftp ) )
+ samba? ( >=net-fs/samba-3
+ !gnome-extra/gnome-vfs-extras )
+ hal? ( >=sys-apps/hal-0.2.92
+ >=sys-apps/dbus-0.22 )
+ howl? ( >=net-misc/howl-0.9.6-r1 )"
+
+# FIXME : make the fam dep a virtual
+
+# ssl/gnutls USE deps : if both are enabled choose openssl
+# foser <foser@gentoo.org> 19 Apr 2004
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.29
+ >=dev-util/pkgconfig-0.12.0
+ doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} \
+ $(use_enable ssl openssl) \
+ $(use_enable gnutls) \
+ $(use_enable samba) \
+ $(use_enable ipv6) \
+ $(use_enable hal) \
+ $(use_enable howl) \
+ --disable-schemas-install
+ --without-gtk"
+
+# 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-gnutls"
+
+DOCS="AUTHORS COPYING* ChangeLog HACKING INSTALL NEWS README TODO"
+
+src_unpack() {
+
+ unpack ${A}
+ cd ${S}
+
+ # fix eggdesktop leaks and misallacations (#66695)
+ epatch ${FILESDIR}/${P}-eggdesktop.patch
+ # make howl a real switch (#64906)
+ epatch ${FILESDIR}/${P}-howl_config.patch
+ autoconf
+
+}
+
+src_install() {
+
+ gnome2_src_install
+
+ # remove unused dir (#46567)
+ rmdir ${D}/usr/doc
+
+ # FIXME: there are cleaner ways to do this
+ echo "trash: libvfolder-desktop" >> ${D}/etc/gnome-vfs-2.0/modules/default-modules.conf
+
+}
+
+# Fix bonobo
+USE_DESTDIR="1"
projects / gentoo.git / commitdiff