Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/clementine/PKGBUILD
	community-testing/gedit-plugins/PKGBUILD
	community-testing/giggle/PKGBUILD
	community-testing/gimmie/PKGBUILD
	community-testing/glipper/PKGBUILD
	community-testing/gnome-system-tools/PKGBUILD
	community-testing/gnote/PKGBUILD
	community-testing/gnubiff/PKGBUILD
	community-testing/google-gadgets/PKGBUILD
	community-testing/gphpedit/PKGBUILD
	community-testing/ibus/PKGBUILD
	community-testing/inputattach/PKGBUILD
	community-testing/liboobs/PKGBUILD
	community-testing/perl-gtk2-webkit/PKGBUILD
	community-testing/shotwell/PKGBUILD
	community-testing/surf/PKGBUILD
	community-testing/system-tools-backends/PKGBUILD
	community-testing/uzbl/PKGBUILD
	community-testing/workrave/PKGBUILD
	community/cherrypy/PKGBUILD
	community/llvm/PKGBUILD
	community/xonotic/PKGBUILD
	extra/ntfs-3g/PKGBUILD
	extra/ntfsprogs/PKGBUILD
	extra/rhino/PKGBUILD
	testing/accountsservice/PKGBUILD
	testing/anjuta/PKGBUILD
	testing/ardour/PKGBUILD
	testing/at-spi/PKGBUILD
	testing/at-spi2-atk/PKGBUILD
	testing/at-spi2-core/PKGBUILD
	testing/atk/PKGBUILD
	testing/atkmm/PKGBUILD
	testing/avahi/PKGBUILD
	testing/banshee/PKGBUILD
	testing/brasero/PKGBUILD
	testing/cairomm/PKGBUILD
	testing/cheese/PKGBUILD
	testing/claws-mail-extra-plugins/PKGBUILD
	testing/clutter-gst/PKGBUILD
	testing/clutter-gtk/PKGBUILD
	testing/clutter-gtk2/PKGBUILD
	testing/clutter/PKGBUILD
	testing/cups-pk-helper/PKGBUILD
	testing/dconf/PKGBUILD
	testing/devhelp/PKGBUILD
	testing/ekiga/PKGBUILD
	testing/empathy/PKGBUILD
	testing/eog-plugins/PKGBUILD
	testing/eog/PKGBUILD
	testing/epiphany-extensions/PKGBUILD
	testing/epiphany/PKGBUILD
	testing/evince/PKGBUILD
	testing/evolution-data-server/PKGBUILD
	testing/evolution-exchange/PKGBUILD
	testing/evolution/PKGBUILD
	testing/farsight2/PKGBUILD
	testing/file-roller/PKGBUILD
	testing/folks/PKGBUILD
	testing/gcalctool/PKGBUILD
	testing/gconf-editor/PKGBUILD
	testing/gconf/PKGBUILD
	testing/gdk-pixbuf2/PKGBUILD
	testing/gdl/PKGBUILD
	testing/gdm/PKGBUILD
	testing/gedit/PKGBUILD
	testing/gimp-devel/PKGBUILD
	testing/gimp/PKGBUILD
	testing/gjs/PKGBUILD
	testing/glade/PKGBUILD
	testing/glib-networking/PKGBUILD
	testing/glib2/PKGBUILD
	testing/glibmm/PKGBUILD
	testing/gnome-applets/PKGBUILD
	testing/gnome-bluetooth/PKGBUILD
	testing/gnome-color-manager/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/gnome-desktop/PKGBUILD
	testing/gnome-disk-utility/PKGBUILD
	testing/gnome-games/PKGBUILD
	testing/gnome-keyring/PKGBUILD
	testing/gnome-media/PKGBUILD
	testing/gnome-menus/PKGBUILD
	testing/gnome-nettool/PKGBUILD
	testing/gnome-panel/PKGBUILD
	testing/gnome-pilot/PKGBUILD
	testing/gnome-power-manager/PKGBUILD
	testing/gnome-screensaver/PKGBUILD
	testing/gnome-session/PKGBUILD
	testing/gnome-settings-daemon/PKGBUILD
	testing/gnome-sharp/PKGBUILD
	testing/gnome-shell/PKGBUILD
	testing/gnome-system-monitor/PKGBUILD
	testing/gnome-terminal/PKGBUILD
	testing/gnome-themes-standard/PKGBUILD
	testing/gnome-user-share/PKGBUILD
	testing/gnome-utils/PKGBUILD
	testing/gobject-introspection/PKGBUILD
	testing/gthumb/PKGBUILD
	testing/gtk-vnc/PKGBUILD
	testing/gtk2/PKGBUILD
	testing/gtk3/PKGBUILD
	testing/gtkhtml4/PKGBUILD
	testing/gtkmm/PKGBUILD
	testing/gtkmm3/PKGBUILD
	testing/gtksourceview3/PKGBUILD
	testing/gucharmap/PKGBUILD
	testing/gvfs/PKGBUILD
	testing/kdeplasma-applets-networkmanagement/PKGBUILD
	testing/kismet/PKGBUILD
	testing/lcms2/PKGBUILD
	testing/libcanberra/PKGBUILD
	testing/libchamplain/PKGBUILD
	testing/libdmapsharing/PKGBUILD
	testing/libgda/PKGBUILD
	testing/libgdata/PKGBUILD
	testing/libgnome-keyring/PKGBUILD
	testing/libgnome-media-profiles/PKGBUILD
	testing/libgnomekbd/PKGBUILD
	testing/libgpod/PKGBUILD
	testing/libgweather/PKGBUILD
	testing/libimobiledevice/PKGBUILD
	testing/liblrdf/PKGBUILD
	testing/libnice/PKGBUILD
	testing/libnotify/PKGBUILD
	testing/libpeas/PKGBUILD
	testing/librsvg/PKGBUILD
	testing/libsocialweb/PKGBUILD
	testing/libsoup/PKGBUILD
	testing/libunique/PKGBUILD
	testing/libunique3/PKGBUILD
	testing/libwebkit/PKGBUILD
	testing/libwnck/PKGBUILD
	testing/libwnck3/PKGBUILD
	testing/libxklavier/PKGBUILD
	testing/liferea/PKGBUILD
	testing/mail-notification/PKGBUILD
	testing/metacity/PKGBUILD
	testing/midori/PKGBUILD
	testing/miro/PKGBUILD
	testing/mousetweaks/PKGBUILD
	testing/mpd/PKGBUILD
	testing/mutter/PKGBUILD
	testing/mx/PKGBUILD
	testing/nautilus-open-terminal/PKGBUILD
	testing/nautilus-sendto/PKGBUILD
	testing/nautilus/PKGBUILD
	testing/network-manager-applet/PKGBUILD
	testing/networkmanager-openvpn/PKGBUILD
	testing/networkmanager-pptp/PKGBUILD
	testing/networkmanager-vpnc/PKGBUILD
	testing/networkmanager/PKGBUILD
	testing/notification-daemon/PKGBUILD
	testing/opal/PKGBUILD
	testing/pangomm/PKGBUILD
	testing/pidgin/PKGBUILD
	testing/polkit-gnome/PKGBUILD
	testing/polkit/PKGBUILD
	testing/ptlib/PKGBUILD
	testing/pygobject/PKGBUILD
	testing/pygtk/PKGBUILD
	testing/pywebkitgtk/PKGBUILD
	testing/raptor/PKGBUILD
	testing/raptor1/PKGBUILD
	testing/rasqal/PKGBUILD
	testing/redland/PKGBUILD
	testing/rest/PKGBUILD
	testing/rhythmbox/PKGBUILD
	testing/seahorse/PKGBUILD
	testing/slv2/PKGBUILD
	testing/soprano/PKGBUILD
	testing/sound-juicer/PKGBUILD
	testing/telepathy-gabble/PKGBUILD
	testing/telepathy-glib/PKGBUILD
	testing/telepathy-logger/PKGBUILD
	testing/telepathy-mission-control/PKGBUILD
	testing/tomboy/PKGBUILD
	testing/totem-plparser/PKGBUILD
	testing/totem/PKGBUILD
	testing/udisks/PKGBUILD
	testing/upower/PKGBUILD
	testing/vinagre/PKGBUILD
	testing/vino/PKGBUILD
	testing/vte/PKGBUILD
	testing/yelp/PKGBUILD
	testing/zenity/PKGBUILD

1 files changed, 0 insertions, 46 deletions

diff --git a/extra/gnome-vfs/hal-show-volume-names.patch b/extra/gnome-vfs/hal-show-volume-names.patch
deleted file mode 100644
index 5b8420c2b..000000000
--- a/extra/gnome-vfs/hal-show-volume-names.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: gnome-vfs-hal-mounts.c
-===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v
-retrieving revision 1.33
-diff -u -p -r1.33 gnome-vfs-hal-mounts.c
---- gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	7 Jul 2006 15:56:57 -0000	1.33
-+++ gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	14 Jul 2006 18:48:51 -0000
-@@ -877,6 +877,7 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	GnomeVFSDrive *drive;
- 	GnomeVFSVolumeMonitor *volume_monitor;
- 	char *name;
-+  char *icon;
- 	gboolean allowed_by_policy;
- 	const char *backing_udi;
- 
-@@ -975,6 +976,8 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	 */
- 	drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi (volume_monitor, libhal_volume_get_udi (hal_volume));
- 	if (drive == NULL && allowed_by_policy) {
-+    name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		drive = g_object_new (GNOME_VFS_TYPE_DRIVE, NULL);
- 		if (libhal_volume_disc_has_audio (hal_volume)) {
- 			drive->priv->activation_uri = g_strdup_printf ("cdda://%s", 
-@@ -989,16 +992,16 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 			 * So just set it to the empty string
- 			 */
- 			drive->priv->activation_uri = g_strdup ("");
-+      g_free (name);
-+      name = _hal_volume_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+      g_free (icon);
-+      icon = _hal_volume_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		}
- 		drive->priv->is_connected = TRUE;
- 		drive->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
- 		drive->priv->device_type = _hal_get_gnome_vfs_device_type (hal_drive);
- 	
--		/* TODO: could add an icon of a drive with media in it since this codepath only
--		 * handles drives with media in them
--		 */
--		drive->priv->icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, NULL);
--		name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    drive->priv->icon = icon;
- 		drive->priv->display_name = _gnome_vfs_volume_monitor_uniquify_drive_name (volume_monitor, name);
- 		g_free (name);
- 		name = g_utf8_casefold (drive->priv->display_name, -1);