diff options
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-shell/Manifest | 6 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild (renamed from gnome-base/gnome-shell/gnome-shell-2.31.2.ebuild) | 26 | ||||
-rw-r--r-- | gnome-base/gnome-shell/gnome-shell-9999.ebuild | 2 | ||||
-rw-r--r-- | gnome-base/gvfs/Manifest | 6 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch | 56 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch | 28 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch | 30 | ||||
-rw-r--r-- | gnome-base/gvfs/files/gvfs-glib-2.27-port.patch | 388 | ||||
-rw-r--r-- | gnome-base/gvfs/gvfs-1.6.4-r990.ebuild | 117 |
9 files changed, 644 insertions, 15 deletions
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index 7d301e2..513e841 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,3 +1,3 @@ -DIST gnome-shell-2.31.2.tar.bz2 692948 RMD160 264205b60b702fa5ceafde5de362db9525de4442 SHA1 9df6117f9d3b9f9056e71f801cb1cefe66569ee9 SHA256 cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2 -EBUILD gnome-shell-2.31.2.ebuild 1122 RMD160 94c2bf2b89c0cb993dce7f87268a3eb84fe1a9c0 SHA1 3979cb86e04b9cf46d7198855dcb5e9c15f90ae8 SHA256 a361c691fed36cf892680e9a5a007bd79675981dc9fd98a389a4da25e814edcd -EBUILD gnome-shell-9999.ebuild 1391 RMD160 c4cf171cb9f2904bd6c916c5cd4e7cb28ec95084 SHA1 ad67283d68f736f8199c1018f327e80cdbdd8272 SHA256 f19ff26e41f2c08fc3617073e12526def3b14210d28be09975348c6b40a95600 +DIST gnome-shell-2.91.1.tar.bz2 803066 RMD160 c8a030427bea60a8edbd9baedde6fc4a68782b19 SHA1 841a237936b447c836a69ba224640114429ebf08 SHA256 9ff972455a0fc3b1693d9bc0d880619d4a4a087574c92df062723368b529e937 +EBUILD gnome-shell-2.91.1.ebuild 1229 RMD160 46e32301a671724961dc19336c26b510a3f88e18 SHA1 662fb28950d35bcfc380bdb22cb073f9a5d7e496 SHA256 a816bf33323cb8c41af278465b3c0bc9266e2903cc4c854f6eeca24b6414d577 +EBUILD gnome-shell-9999.ebuild 1391 RMD160 7f56a162159069ba5aef4b319c0cc9e79c6014a1 SHA1 7f5cf81b7c3cd85bba48836057b84478843db929 SHA256 db2241b5cd9d2c0559f39ab639910e19092f59f690b97ab25ed2c6a9e66021e4 diff --git a/gnome-base/gnome-shell/gnome-shell-2.31.2.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild index 7ad650e..7f4554b 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.31.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -15,33 +15,37 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=dev-libs/glib-2.20 - >=x11-libs/gtk+-2.16 +RDEPEND=">=dev-libs/glib-2.25.9 + >=x11-libs/gtk+-2.91.0:3[introspection] >=media-libs/gstreamer-0.10.16 >=media-libs/gst-plugins-base-0.10.16 - >=gnome-base/gnome-desktop-2.26 - >=dev-libs/gobject-introspection-0.6.9 + >=gnome-base/gnome-desktop-2.91.0:3 + >=dev-libs/gobject-introspection-0.9.5 dev-libs/dbus-glib - >=dev-libs/gjs-0.6 - >=media-libs/clutter-1.2.0[opengl,introspection] + >=dev-libs/gjs-0.7 + x11-libs/pango[introspection] + >=media-libs/clutter-1.4.0[introspection] dev-libs/libcroco:0.6 - gnome-base/gconf + gnome-base/gconf[introspection] gnome-base/gnome-menus x11-libs/startup-notification x11-libs/libXfixes - >=x11-wm/mutter-2.29.1[introspection] + >=x11-wm/mutter-2.91.1[gtk3,introspection] x11-apps/mesa-progs + dev-python/dbus-python " + DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2.6 >=dev-lang/python-2.5 sys-devel/gettext - >=dev-util/pkgconfig-0.9 + >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.26 gnome-base/gnome-common " -DOCS="AUTHORS ChangeLog NEWS README" +DOCS="AUTHORS README" pkg_postinst() { elog " Start with 'gnome-shell --replace' " diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index 3c5e47f..d52cae2 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest new file mode 100644 index 0000000..1a73e71 --- /dev/null +++ b/gnome-base/gvfs/Manifest @@ -0,0 +1,6 @@ +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-sftp-timeout.patch 978 RMD160 01baba58c316fddda48cae2abf8ffee3942ac7fb SHA1 8f36224495e845db734de15c3478b9a5499d8713 SHA256 9b66f6e711dd70172204fa40a2a0e77f47253720532f831d5e571ec8021c98f6 +AUX gvfs-glib-2.27-port.patch 11813 RMD160 735bc7b8db5921c826840b1fb8be943c62de5bc2 SHA1 9e4fc13b1816c7f2e4e1c761ed5b198b20539fc5 SHA256 0a43dc5bffcefcae0db68b0a0c085a7cea06ab51664618dd585eead4358359ce +DIST gvfs-1.6.4.tar.bz2 1385999 RMD160 b5aeb97260534f16c565a36ef87150823fb05283 SHA1 b859dc23916d03e2e6eb7e000916929d223b32e8 SHA256 e1e2810678b42cb0160642f0cd33ccd377cddfb18fc868d6faa04c449f813693 +EBUILD gvfs-1.6.4-r990.ebuild 3362 RMD160 6d84726efdb88582c4436c9825ce959d6aa76bea SHA1 36154798449851b3c2447ca82daedf95c3bb15b3 SHA256 6db6bdab9a7886e76f872add68f6e290cca55943b3dfc07c33d880e20a5fd4d3 diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch new file mode 100644 index 0000000..86222e5 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch @@ -0,0 +1,56 @@ +Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora) +Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829 +---- +Index: mount-archive.desktop.in.in +=================================================================== +--- mount-archive.desktop.in.in (revision 0) ++++ mount-archive.desktop.in.in (revision 0) +@@ -0,0 +1,14 @@ ++[Desktop Entry] ++Encoding=UTF-8 ++_Name=Archive Mounter ++Exec=@libexecdir@/gvfsd-archive file=%u ++X-Gnome-Vfs-System=gio ++MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar; ++Terminal=false ++StartupNotify=false ++Type=Application ++NoDisplay=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gvfs ++X-GNOME-Bugzilla-Component=archive-backend ++X-GNOME-Bugzilla-Version=@VERSION@ +Index: Makefile.am +=================================================================== +--- Makefile.am.orig 2008-07-22 15:35:49.000000000 +0200 ++++ Makefile.am 2008-07-22 17:56:59.417180064 +0200 +@@ -1,5 +1,20 @@ + NULL = + ++@INTLTOOL_DESKTOP_RULE@ ++ ++desktop_in_files = mount-archive.desktop.in ++ ++mount-archive.desktop.in: mount-archive.desktop.in.in ++ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ ++ ++desktopdir = $(datadir)/applications ++if HAVE_ARCHIVE ++desktop_DATA = mount-archive.desktop ++else ++desktop_DATA = ++endif ++ ++ + SUBDIRS = \ + common \ + client \ +@@ -15,6 +30,8 @@ + + EXTRA_DIST = \ + MAINTAINERS \ ++ mount-archive.desktop.in.in \ ++ $(desktop_in_files) \ + $(NULL) + + DISTCLEANFILES = \ diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch new file mode 100644 index 0000000..78fecb7 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch @@ -0,0 +1,28 @@ +Gentoo bug 264941 +Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027 +--- +diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac +--- gvfs-1.2.2/configure.ac 2009-04-03 13:00:54.000000000 +0530 ++++ gvfs-1.2.2-new/configure.ac 2009-05-04 22:53:24.000000000 +0530 +@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a " + ;; + esac + ++ if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then ++ AC_MSG_ERROR([gphoto2 support requested but not available]) ++ fi ++ + if test "x$msg_gphoto2" = "xyes"; then + if test "x$use_gphoto2" = "xyes"; then + PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0) + AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available]) + else +- AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.]) ++ if test "x$enable_gphoto2" = "xyes"; then ++ AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.]) ++ else ++ AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.]) ++ fi + msg_gphoto2=no + fi + fi diff --git a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch new file mode 100644 index 0000000..a236dd2 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch @@ -0,0 +1,30 @@ +From 4033907045abcf498686c1b34be7b0160260088d Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson <andreas@fatal.se> +Date: Sat, 02 Oct 2010 12:51:54 +0000 +Subject: sftp: fix poll() timeout. + +When switching from select() to poll() in commit +"sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934) +the difference in seconds vs milliseconds for select/poll timeout +argument was missed. + +SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000 +when using it with poll(). + +https://bugzilla.gnome.org/show_bug.cgi?id=631169 +--- +diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c +index 9fecf6a..f6b7785 100644 +--- a/daemon/gvfsbackendsftp.c ++++ b/daemon/gvfsbackendsftp.c +@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend, + fds[1].fd = prompt_fd; + fds[1].events = POLLIN; + +- ret = poll(fds, 2, SFTP_READ_TIMEOUT); ++ ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000); + + if (ret <= 0) + { +-- +cgit v0.8.3.1 diff --git a/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch b/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch new file mode 100644 index 0000000..73cc912 --- /dev/null +++ b/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch @@ -0,0 +1,388 @@ +From e868c0c306c31ffb9b65ca8555fd27cdc53a083d Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Tue, 5 Oct 2010 14:12:00 +0100 +Subject: [PATCH] Remove app lookup extension + +Now done in GIO itself + +https://bugzilla.gnome.org/show_bug.cgi?id=631398 +--- + Makefile.am | 1 - + configure.ac | 1 - + gconf/Makefile.am | 32 --------- + gconf/gapplookupgconf.c | 178 ----------------------------------------------- + gconf/gapplookupgconf.h | 51 ------------- + gconf/gconf-module.c | 55 --------------- + 6 files changed, 0 insertions(+), 318 deletions(-) + delete mode 100644 gconf/Makefile.am + delete mode 100644 gconf/gapplookupgconf.c + delete mode 100644 gconf/gapplookupgconf.h + delete mode 100644 gconf/gconf-module.c + +diff --git a/Makefile.am b/Makefile.am +index 95d0654..23261da 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,6 @@ SUBDIRS = \ + client \ + daemon \ + monitor \ +- gconf \ + po \ + programs \ + test \ +diff --git a/configure.ac b/configure.ac +index a4e3387..94c870e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -704,7 +704,6 @@ monitor/hal/Makefile + monitor/gdu/Makefile + monitor/gphoto2/Makefile + monitor/afc/Makefile +-gconf/Makefile + programs/Makefile + test/Makefile + po/Makefile.in +diff --git a/gconf/Makefile.am b/gconf/Makefile.am +deleted file mode 100644 +index 85d4d8d..0000000 +--- a/gconf/Makefile.am ++++ /dev/null +@@ -1,32 +0,0 @@ +- +-NULL = +- +-module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)' +- +-if USE_GCONF +-giomodules_LTLIBRARIES = libgiogconf.la +-endif +- +-libgiogconf_la_SOURCES = \ +- gapplookupgconf.c gapplookupgconf.h \ +- gconf-module.c \ +- $(NULL) +- +-libgiogconf_la_CFLAGS = \ +- -DG_LOG_DOMAIN=\"GVFS-GConf\" \ +- -I$(top_srcdir)/common \ +- $(GLIB_CFLAGS) \ +- $(GCONF_CFLAGS) \ +- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \ +- -DGVFS_LOCALEDIR=\""$(localedir)"\" \ +- -DG_DISABLE_DEPRECATED \ +- $(NULL) +- +-libgiogconf_la_LDFLAGS = \ +- $(module_flags) \ +- $(NULL) +- +-libgiogconf_la_LIBADD = \ +- $(GLIB_LIBS) \ +- $(GCONF_LIBS) \ +- $(NULL) +diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c +deleted file mode 100644 +index 2690265..0000000 +--- a/gconf/gapplookupgconf.c ++++ /dev/null +@@ -1,178 +0,0 @@ +- +-/* GIO - GLib Input, Output and Streaming Library +- * +- * Copyright (C) 2006-2007 Red Hat, Inc. +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General +- * Public License along with this library; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, +- * Boston, MA 02111-1307, USA. +- * +- * Author: Alexader Larsson <alexl@redhat.com> +- */ +- +-#include <config.h> +- +-#include <string.h> +- +-#include <glib.h> +-#include <glib/gi18n-lib.h> +-#include <gio/gio.h> +-#include <gconf/gconf-client.h> +- +-#include "gapplookupgconf.h" +- +- +-struct _GAppLookupGConf { +- GObject parent; +- +-}; +- +-static void lookup_iface_init (GDesktopAppInfoLookupIface *iface); +-static void g_app_lookup_gconf_finalize (GObject *object); +- +-G_DEFINE_DYNAMIC_TYPE_EXTENDED (GAppLookupGConf, g_app_lookup_gconf, G_TYPE_OBJECT, 0, +- G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DESKTOP_APP_INFO_LOOKUP, +- lookup_iface_init)) +- +-static void +-g_app_lookup_gconf_finalize (GObject *object) +-{ +- if (G_OBJECT_CLASS (g_app_lookup_gconf_parent_class)->finalize) +- (*G_OBJECT_CLASS (g_app_lookup_gconf_parent_class)->finalize) (object); +-} +- +-static GObject * +-g_app_lookup_gconf_constructor (GType type, +- guint n_construct_properties, +- GObjectConstructParam *construct_properties) +-{ +- GObject *object; +- GAppLookupGConfClass *klass; +- GObjectClass *parent_class; +- +- object = NULL; +- +- /* Invoke parent constructor. */ +- klass = G_APP_LOOKUP_GCONF_CLASS (g_type_class_peek (G_TYPE_APP_LOOKUP_GCONF)); +- parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass)); +- object = parent_class->constructor (type, +- n_construct_properties, +- construct_properties); +- +- return object; +-} +- +-static void +-g_app_lookup_gconf_init (GAppLookupGConf *lookup) +-{ +-} +- +-static void +-g_app_lookup_gconf_class_finalize (GAppLookupGConfClass *klass) +-{ +-} +- +- +-static void +-g_app_lookup_gconf_class_init (GAppLookupGConfClass *klass) +-{ +- GObjectClass *gobject_class = G_OBJECT_CLASS (klass); +- +- gobject_class->constructor = g_app_lookup_gconf_constructor; +- gobject_class->finalize = g_app_lookup_gconf_finalize; +-} +- +-#define GCONF_PATH_PREFIX "/desktop/gnome/url-handlers/" +- +-static GAppInfo * +-get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, +- const char *uri_scheme) +-{ +- GAppInfo *appinfo; +- GConfClient *client; +- char *command_key, *enabled_key, *terminal_key, *command; +- gboolean enabled, needs_terminal; +- GAppInfoCreateFlags flags; +- +- appinfo = NULL; +- +- client = gconf_client_get_default (); +- +- command_key = g_strconcat (GCONF_PATH_PREFIX, +- uri_scheme, +- "/command", +- NULL); +- command = gconf_client_get_string (client, +- command_key, +- NULL); +- g_free (command_key); +- if (command) +- { +- enabled_key = g_strconcat (GCONF_PATH_PREFIX, +- uri_scheme, +- "/enabled", +- NULL); +- enabled = gconf_client_get_bool (client, +- enabled_key, +- NULL); +- g_free (enabled_key); +- +- terminal_key = g_strconcat (GCONF_PATH_PREFIX, +- uri_scheme, +- "/needs_terminal", +- NULL); +- needs_terminal = gconf_client_get_bool (client, +- terminal_key, +- NULL); +- g_free (terminal_key); +- +- if (enabled) +- { +- if (g_str_has_suffix (command, "\"%s\"") || +- g_str_has_suffix (command, "\'%s\'")) +- command[strlen (command) - 4] = 0; +- else if (g_str_has_suffix (command, "%s")) +- command[strlen (command) - 2] = 0; +- +- flags = G_APP_INFO_CREATE_SUPPORTS_URIS; +- if (needs_terminal) +- flags |= G_APP_INFO_CREATE_NEEDS_TERMINAL; +- appinfo = g_app_info_create_from_commandline (command, +- NULL, +- flags, +- NULL); +- } +- } +- +- g_object_unref (client); +- g_free (command); +- +- return appinfo; +-} +- +-static void +-lookup_iface_init (GDesktopAppInfoLookupIface *iface) +-{ +- iface->get_default_for_uri_scheme = get_default_for_uri_scheme; +-} +- +-void +-g_app_lookup_gconf_register (GIOModule *module) +-{ +- g_app_lookup_gconf_register_type (G_TYPE_MODULE (module)); +- g_io_extension_point_implement (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME, +- G_TYPE_APP_LOOKUP_GCONF, +- "gconf", +- 10); +-} +diff --git a/gconf/gapplookupgconf.h b/gconf/gapplookupgconf.h +deleted file mode 100644 +index a268415..0000000 +--- a/gconf/gapplookupgconf.h ++++ /dev/null +@@ -1,51 +0,0 @@ +-/* GIO - GLib Input, Output and Streaming Library +- * +- * Copyright (C) 2006-2007 Red Hat, Inc. +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General +- * Public License along with this library; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, +- * Boston, MA 02111-1307, USA. +- * +- * Author: Alexander Larsson <alexl@redhat.com> +- */ +- +-#ifndef __G_APP_LOOKUP_GCONF_H__ +-#define __G_APP_LOOKUP_GCONF_H__ +- +-#include <glib-object.h> +-#include <gio/gio.h> +-#include <gio/gdesktopappinfo.h> +- +- +-G_BEGIN_DECLS +- +-#define G_TYPE_APP_LOOKUP_GCONF (g_app_lookup_gconf_get_type ()) +-#define G_APP_LOOKUP_GCONF(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LOOKUP_GCONF, GAppLookupGConf)) +-#define G_APP_LOOKUP_GCONF_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LOOKUP_GCONF, GAppLookupGConfClass)) +-#define G_IS_APP_LOOKUP_GCONF(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LOOKUP_GCONF)) +-#define G_IS_APP_LOOKUP_GCONF_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LOOKUP_GCONF)) +- +-typedef struct _GAppLookupGConf GAppLookupGConf; +-typedef struct _GAppLookupGConfClass GAppLookupGConfClass; +- +-struct _GAppLookupGConfClass { +- GObjectClass parent_class; +-}; +- +-GType g_app_lookup_gconf_get_type (void) G_GNUC_CONST; +-void g_app_lookup_gconf_register (GIOModule *module); +- +-G_END_DECLS +- +-#endif /* __G_APP_LOOKUP_GCONF_H__ */ +diff --git a/gconf/gconf-module.c b/gconf/gconf-module.c +deleted file mode 100644 +index e5753a6..0000000 +--- a/gconf/gconf-module.c ++++ /dev/null +@@ -1,55 +0,0 @@ +- +-/* GIO - GLib Input, Output and Streaming Library +- * +- * Copyright (C) 2006-2007 Red Hat, Inc. +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Lesser General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This library is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Lesser General Public License for more details. +- * +- * You should have received a copy of the GNU Lesser General +- * Public License along with this library; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place, Suite 330, +- * Boston, MA 02111-1307, USA. +- * +- * Author: David Zeuthen <davidz@redhat.com> +- */ +- +-#include <config.h> +- +-#include <glib.h> +-#include <glib/gi18n-lib.h> +-#include <gmodule.h> +-#include <gio/gio.h> +- +-#include "gapplookupgconf.h" +- +-void +-g_io_module_load (GIOModule *module) +-{ +- bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR); +- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +- +- g_app_lookup_gconf_register (module); +-} +- +-void +-g_io_module_unload (GIOModule *module) +-{ +-} +- +-char ** +-g_io_module_query (void) +-{ +- char *eps[] = { +- G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME, +- NULL +- }; +- return g_strdupv (eps); +-} +-- +1.7.2.2 + diff --git a/gnome-base/gvfs/gvfs-1.6.4-r990.ebuild b/gnome-base/gvfs/gvfs-1.6.4-r990.ebuild new file mode 100644 index 0000000..ce45a14 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.6.4-r990.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $ + +EAPI="2" +GCONF_DEBUG="no" + +inherit autotools bash-completion gnome2 eutils + +DESCRIPTION="GNOME Virtual Filesystem Layer" +HOMEPAGE="http://www.gnome.org" + +LICENSE="LGPL-2" +SLOT="0" +# Needs glib-2.27, which is unkeyworded +#KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="archive avahi bluetooth cdda doc fuse gdu gnome gnome-keyring gphoto2 hal ++http iphone samba +udev" + +# Need newer glib for gnome bug 631398 +# patch applied below +RDEPEND=">=dev-libs/glib-2.27.1 + >=sys-apps/dbus-1.0 + dev-libs/libxml2 + net-misc/openssh + >=sys-fs/udev-138 + archive? ( app-arch/libarchive ) + avahi? ( >=net-dns/avahi-0.6 ) + bluetooth? ( + >=app-mobilephone/obex-data-server-0.4.5 + dev-libs/dbus-glib + net-wireless/bluez + dev-libs/expat ) + fuse? ( sys-fs/fuse ) + gdu? ( >=sys-apps/gnome-disk-utility-2.29 ) + gnome? ( >=gnome-base/gconf-2.0 ) + gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) + iphone? ( app-pda/libimobiledevice ) + udev? ( + cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) + >=sys-fs/udev-145[extras] ) + hal? ( + cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) + >=sys-apps/hal-0.5.10 ) + http? ( >=net-libs/libsoup-gnome-2.26.0 ) + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] + <=net-fs/samba-3.3 ) )" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.19 + dev-util/gtk-doc-am + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog NEWS README TODO" + +pkg_setup() { + if use cdda && ! use hal && ! use udev; then + ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\"" + ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev" + fi + + G2CONF="${G2CONF} + --enable-udev + --disable-bash-completion + --with-dbus-service-dir=/usr/share/dbus-1/services + $(use_enable archive) + $(use_enable avahi) + $(use_enable bluetooth obexftp) + $(use_enable cdda) + $(use_enable fuse) + $(use_enable gdu) + $(use_enable gnome gconf) + $(use_enable gphoto2) + $(use_enable iphone afc) + $(use_enable udev gudev) + $(use_enable hal) + $(use_enable http) + $(use_enable gnome-keyring keyring) + $(use_enable samba)" +} + +src_prepare() { + gnome2_src_prepare + + # sftp: fix poll() timeout, bug #339695 + epatch "${FILESDIR}/${P}-sftp-timeout.patch" + + # Remove app lookup gconf extension + # https://bugzilla.gnome.org/show_bug.cgi?id=631398 + epatch "${FILESDIR}/${PN}-glib-2.27-port.patch" + + # Conditional patching purely to avoid eautoreconf + use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch" + + if use archive; then + epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch" + echo "mount-archive.desktop.in" >> po/POTFILES.in + echo "mount-archive.desktop.in.in" >> po/POTFILES.in + fi + + use gphoto2 || use archive && eautoreconf +} + +src_install() { + gnome2_src_install + use bash-completion && \ + dobashcompletion programs/gvfs-bash-completion.sh ${PN} +} + +pkg_postinst() { + gnome2_pkg_postinst + use bash-completion && bash-completion_pkg_postinst + + ewarn "In order to use the new gvfs services, please reload dbus configuration" + ewarn "You may need to log out and log back in for some changes to take effect" +} |