diff options
Diffstat (limited to 'gnome-base')
21 files changed, 0 insertions, 1953 deletions
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest deleted file mode 100644 index fca28eb..0000000 --- a/gnome-base/gnome-desktop/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST gnome-desktop-2.91.0.tar.bz2 1375768 RMD160 061f68670c7611358a863f1c172c73a921a99a6b SHA1 67dfad07430bcc88994af7016c7598a326695cb0 SHA256 e98d9469f0dec12952b392852a461643036cda4c5a831f1c89c0d5a0aaac0070 -DIST gnome-desktop-2.91.3.tar.bz2 1349752 RMD160 c19336519431439ca54d24f6ee2edacb2f483b0e SHA1 ee7ce4afddf7de280f2f5e824abbf5235bfdb02c SHA256 9ef820b487c6a529dec418e5b41ff4309e0da9d947d09bb6bade4d193129d2cb -EBUILD gnome-desktop-2.91.0.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3 -EBUILD gnome-desktop-2.91.3.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3 diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild deleted file mode 100644 index 6649847..0000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit gnome2 autotools eutils - -DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="doc" - -# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids) -RDEPEND=">=x11-libs/gtk+-2.91.0:3 - >=dev-libs/glib-2.19.1 - >=x11-libs/libXrandr-1.2 - >=gnome-base/gconf-2 - >=x11-libs/gdk-pixbuf-2.21.3 - >=x11-libs/startup-notification-0.5 - x11-libs/libX11" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.9 - >=app-text/gnome-doc-utils-0.3.2 - doc? ( >=dev-util/gtk-doc-1.4 ) - ~app-text/docbook-xml-dtd-4.1.2 - x11-proto/xproto - >=x11-proto/randrproto-1.2" -# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about, -# etc. are installed. Switch to doing things the other way around once -# gnome-about no longer uses pygtk 2 -PDEPEND=">=gnome-base/gnome-desktop-2.31:2" - -# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto -# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and -# eventually libXrandr shouldn't RDEPEND on randrproto) - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --with-gnome-distributor=Gentoo - --disable-scrollkeeper - --disable-static - --disable-gnome-about - --disable-desktop-docs - --with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids" -} - diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild deleted file mode 100644 index 6649847..0000000 --- a/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit gnome2 autotools eutils - -DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="doc" - -# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids) -RDEPEND=">=x11-libs/gtk+-2.91.0:3 - >=dev-libs/glib-2.19.1 - >=x11-libs/libXrandr-1.2 - >=gnome-base/gconf-2 - >=x11-libs/gdk-pixbuf-2.21.3 - >=x11-libs/startup-notification-0.5 - x11-libs/libX11" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.9 - >=app-text/gnome-doc-utils-0.3.2 - doc? ( >=dev-util/gtk-doc-1.4 ) - ~app-text/docbook-xml-dtd-4.1.2 - x11-proto/xproto - >=x11-proto/randrproto-1.2" -# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about, -# etc. are installed. Switch to doing things the other way around once -# gnome-about no longer uses pygtk 2 -PDEPEND=">=gnome-base/gnome-desktop-2.31:2" - -# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto -# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and -# eventually libXrandr shouldn't RDEPEND on randrproto) - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --with-gnome-distributor=Gentoo - --disable-scrollkeeper - --disable-static - --disable-gnome-about - --disable-desktop-docs - --with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids" -} - diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest deleted file mode 100644 index 5ef11d8..0000000 --- a/gnome-base/gnome-settings-daemon/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158 -DIST gnome-settings-daemon-2.91.5.tar.bz2 1354146 RMD160 2627d9a6d43016a3cc8fe198ff9f4ab7019bcf48 SHA1 02f0af593d0583f10829918e8fb567184235d5f3 SHA256 8d1bc81c0f331ecf6680071770321c4ed4acaa57e214be94a5273294bafc42ff -EBUILD gnome-settings-daemon-2.91.5.ebuild 2168 RMD160 25c16fe55751a8e5016a07dd041aad5404a9b7a6 SHA1 8504076b7f412f111c642bcf9d3bca59a8079a2d SHA256 a415daabfab72a3e29da78c073f9b003f985bf79fa827bed222a185a93c852b9 diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch deleted file mode 100644 index 57bb633..0000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch +++ /dev/null @@ -1,856 +0,0 @@ -From 32a79f1b04c352dc9b9c28c4bdd3d772eeff974d Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Wed, 31 Mar 2010 20:53:05 +0300 -Subject: [PATCH] GStreamer support in the volume applet; powered by the Gentoo GNOME team. - -https://bugzilla.gnome.org/show_bug.cgi?id=571145 ---- - configure.ac | 43 ++ - plugins/media-keys/Makefile.am | 15 +- - plugins/media-keys/cut-n-paste/Makefile.am | 34 ++- - .../cut-n-paste/gvc-gstreamer-acme-vol.c | 402 ++++++++++++++++++++ - .../cut-n-paste/gvc-gstreamer-acme-vol.h | 56 +++ - plugins/media-keys/gsd-media-keys-manager.c | 64 +++- - 6 files changed, 589 insertions(+), 25 deletions(-) - create mode 100644 plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c - create mode 100644 plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h - -diff --git a/configure.ac b/configure.ac -index 92f20c8..723a0cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -251,6 +251,48 @@ AM_CONDITIONAL(HAVE_PULSE, test "x$have_pulse" = "xtrue") - AC_SUBST(PULSE_CFLAGS) - AC_SUBST(PULSE_LIBS) - -+dnl ============================================== -+dnl GStreamer section -+dnl ============================================== -+GST_MAJORMINOR=auto -+ -+AC_ARG_ENABLE(gstreamer, -+AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]), -+[case "${enableval}" in -+ yes) ENABLE_GSTREAMER=yes ;; -+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;; -+ no) ENABLE_GSTREAMER=no ;; -+ *) AC_MSG_ERROR([ -+ *** Bad value ${enableval} for --enable-gstreamer -+ *** Please use one of the following: -+ *** --enable-gstreamer=0.10 -+ ]) ;; -+esac], -+[ENABLE_GSTREAMER=yes]) dnl Default value -+ -+have_gstreamer=no -+if test "x$ENABLE_GSTREAMER" = "xyes"; then -+ GST_REQS=0.10.1.2 -+ PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS" -+ -+ PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes, -+ AC_MSG_RESULT([no])) -+ -+ if test "x$have_pulse" = "xtrue"; then -+ AC_MSG_ERROR([*** GStreamer & Pulseaudio both are selected ***]) -+ fi -+ -+ if test "x$have_gstreamer" = "xyes"; then -+ GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10" -+ AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer]) -+ fi -+else -+ AC_MSG_NOTICE([*** GStreamer support disabled ***]) -+fi -+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes") -+AC_SUBST(GST_LIBS) -+AC_SUBST(GST_CFLAGS) -+ - # --------------------------------------------------------------------------- - # Enable Profiling - # --------------------------------------------------------------------------- -@@ -389,6 +431,7 @@ echo " - dbus-1 system.d dir: ${DBUS_SYS_DIR} - - Libnotify support: ${have_libnotify} -+ GStreamer support: ${have_gstreamer} - PulseAudio support: ${have_pulse} - Profiling support: ${enable_profiling} - " -diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am -index f9a71cd..92b19f4 100644 ---- a/plugins/media-keys/Makefile.am -+++ b/plugins/media-keys/Makefile.am -@@ -3,13 +3,8 @@ context = actions - - NULL = - --SUBDIRS = --plugin_LTLIBRARIES = -- --if HAVE_PULSE --SUBDIRS += cut-n-paste --plugin_LTLIBRARIES += libmedia-keys.la --endif -+SUBDIRS = cut-n-paste -+plugin_LTLIBRARIES = libmedia-keys.la - - BUILT_SOURCES = \ - gsd-media-keys-manager-glue.h \ -@@ -100,7 +95,7 @@ libmedia_keys_la_LDFLAGS = \ - - libmedia_keys_la_LIBADD = \ - $(top_builddir)/plugins/common/libcommon.la \ -- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ -+ $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ - $(SETTINGS_PLUGIN_LIBS) \ - $(XF86MISC_LIBS) \ - -lm -@@ -108,9 +103,7 @@ libmedia_keys_la_LIBADD = \ - plugin_in_files = \ - media-keys.gnome-settings-plugin.in - --if HAVE_PULSE - plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) --endif - - noinst_PROGRAMS = \ - test-media-keys \ -@@ -176,9 +169,7 @@ test_media_keys_LDADD = \ - $(GST_LIBS) \ - -lm - --if HAVE_PULSE - test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la --endif - - gtkbuilderdir = $(pkgdatadir) - gtkbuilder_DATA = \ -diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am -index bc59a10..6486ac0 100644 ---- a/plugins/media-keys/cut-n-paste/Makefile.am -+++ b/plugins/media-keys/cut-n-paste/Makefile.am -@@ -4,16 +4,24 @@ noinst_LTLIBRARIES = libgvc.la - - INCLUDES = \ - $(WARN_CFLAGS) \ -- $(VOLUME_CONTROL_CFLAGS) \ -- $(PULSE_CFLAGS) \ - $(NULL) - - libgvc_la_LIBADD = \ -- $(VOLUME_CONTROL_LIBS) \ -- $(PULSE_LIBS) \ - $(NULL) - - libgvc_la_SOURCES = \ -+ $(NULL) -+ -+if HAVE_PULSE -+INCLUDES += \ -+ $(VOLUME_CONTROL_CFLAGS) \ -+ $(PULSE_CFLAGS) -+ -+libgvc_la_LIBADD += \ -+ $(VOLUME_CONTROL_LIBS) \ -+ $(PULSE_LIBS) -+ -+libgvc_la_SOURCES += \ - gvc-mixer-stream.h \ - gvc-mixer-stream.c \ - gvc-channel-map.h \ -@@ -31,8 +39,22 @@ libgvc_la_SOURCES = \ - gvc-mixer-event-role.h \ - gvc-mixer-event-role.c \ - gvc-mixer-control.h \ -- gvc-mixer-control.c \ -- $(NULL) -+ gvc-mixer-control.c -+endif -+ -+if HAVE_GSTREAMER -+INCLUDES += \ -+ $(SETTINGS_PLUGIN_CFLAGS) \ -+ $(AM_CFLAGS) \ -+ $(GST_CFLAGS) -+ -+libgvc_la_LIBADD += \ -+ $(GST_LIBS) -+ -+libgvc_la_SOURCES += \ -+ gvc-gstreamer-acme-vol.c \ -+ gvc-gstreamer-acme-vol.h -+endif - - MAINTAINERCLEANFILES = \ - *~ \ -diff --git a/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c -new file mode 100644 -index 0000000..8948480 ---- /dev/null -+++ b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c -@@ -0,0 +1,402 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -+ -+/* acme-volume.c -+ -+ Copyright (C) 2002, 2003 Bastien Nocera -+ Copyright (C) 2004 Novell, Inc. -+ Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org> -+ -+ The Gnome Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public License as -+ published by the Free Software Foundation; either version 2 of the -+ License, or (at your option) any later version. -+ -+ The Gnome 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 -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with the Gnome Library; see the file COPYING.LIB. If not, -+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+ -+ Author: Bastien Nocera <hadess@hadess.net> -+ Jon Trowbridge <trow@ximian.com> -+*/ -+ -+#include "config.h" -+#include "gvc-gstreamer-acme-vol.h" -+ -+#include <gst/gst.h> -+#include <gst/audio/mixerutils.h> -+#include <gst/interfaces/mixer.h> -+#include <gst/interfaces/propertyprobe.h> -+ -+#include <gconf/gconf-client.h> -+ -+#include <string.h> -+ -+#define TIMEOUT 4 -+ -+#define DEFAULT_MIXER_DEVICE_KEY "/desktop/gnome/sound/default_mixer_device" -+#define DEFAULT_MIXER_TRACKS_KEY "/desktop/gnome/sound/default_mixer_tracks" -+ -+#define ACME_VOLUME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACME_TYPE_VOLUME, AcmeVolumePrivate)) -+ -+struct AcmeVolumePrivate { -+ GstMixer *mixer; -+ GList *mixer_tracks; -+ guint timer_id; -+ gdouble volume; -+ gboolean mute; -+ GConfClient *gconf_client; -+}; -+ -+G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT) -+ -+static gboolean acme_volume_open (AcmeVolume *acme); -+static void acme_volume_close (AcmeVolume *acme); -+static gboolean acme_volume_close_real (AcmeVolume *self); -+ -+static gpointer acme_volume_object = NULL; -+ -+static void -+acme_volume_finalize (GObject *object) -+{ -+ AcmeVolume *self; -+ -+ g_return_if_fail (object != NULL); -+ g_return_if_fail (ACME_IS_VOLUME (object)); -+ -+ self = ACME_VOLUME (object); -+ -+ if (self->_priv->timer_id != 0) -+ g_source_remove (self->_priv->timer_id); -+ acme_volume_close_real (self); -+ -+ if (self->_priv->gconf_client != NULL) { -+ g_object_unref (self->_priv->gconf_client); -+ self->_priv->gconf_client = NULL; -+ } -+ -+ G_OBJECT_CLASS (acme_volume_parent_class)->finalize (object); -+} -+ -+void -+acme_volume_set_mute (AcmeVolume *self, gboolean val) -+{ -+ GList *t; -+ -+ g_return_if_fail(ACME_IS_VOLUME(self)); -+ g_return_if_fail(acme_volume_open(self)); -+ -+ for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) { -+ GstMixerTrack *track = GST_MIXER_TRACK (t->data); -+ gst_mixer_set_mute (self->_priv->mixer, track, val); -+ } -+ self->_priv->mute = val; -+ acme_volume_close (self); -+} -+ -+static void -+update_state (AcmeVolume * self) -+{ -+ gint *volumes, n; -+ gdouble vol = 0; -+ GstMixerTrack *track = GST_MIXER_TRACK (self->_priv->mixer_tracks->data); -+ -+ /* update mixer by getting volume */ -+ volumes = g_new0 (gint, track->num_channels); -+ gst_mixer_get_volume (self->_priv->mixer, track, volumes); -+ for (n = 0; n < track->num_channels; n++) -+ vol += volumes[n]; -+ g_free (volumes); -+ vol /= track->num_channels; -+ vol = 100 * vol / (track->max_volume - track->min_volume); -+ -+ /* update mute flag, and volume if not muted */ -+ if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE)) -+ self->_priv->mute = TRUE; -+ self->_priv->volume = vol; -+} -+ -+gboolean -+acme_volume_get_mute (AcmeVolume *self) -+{ -+ g_return_val_if_fail(acme_volume_open(self), FALSE); -+ -+ update_state (self); -+ acme_volume_close (self); -+ -+ return self->_priv->mute; -+} -+ -+gint -+acme_volume_get_volume (AcmeVolume *self) -+{ -+ -+ g_return_val_if_fail(acme_volume_open(self), 0); -+ -+ update_state (self); -+ -+ acme_volume_close (self); -+ -+ return (gint) (self->_priv->volume + 0.5); -+} -+ -+void -+acme_volume_set_volume (AcmeVolume *self, gint val) -+{ -+ GList *t; -+ -+ g_return_if_fail(acme_volume_open(self)); -+ -+ val = CLAMP (val, 0, 100); -+ -+ for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) { -+ GstMixerTrack *track = GST_MIXER_TRACK (t->data); -+ gint *volumes, n; -+ gdouble scale = (track->max_volume - track->min_volume) / 100.0; -+ gint vol = (gint) (val * scale + track->min_volume + 0.5); -+ -+ volumes = g_new (gint, track->num_channels); -+ for (n = 0; n < track->num_channels; n++) -+ volumes[n] = vol; -+ gst_mixer_set_volume (self->_priv->mixer, track, volumes); -+ g_free (volumes); -+ } -+ -+ /* update state */ -+ self->_priv->volume = val; -+ -+ acme_volume_close (self); -+} -+ -+void -+acme_volume_mute_toggle (AcmeVolume *self) -+{ -+ gboolean muted; -+ -+ g_return_if_fail (self != NULL); -+ g_return_if_fail (ACME_IS_VOLUME(self)); -+ -+ muted = acme_volume_get_mute(self); -+ acme_volume_set_mute(self, !muted); -+} -+ -+gint -+acme_volume_get_threshold (AcmeVolume *self) -+{ -+ GList *t; -+ gint steps = 101; -+ -+ g_return_val_if_fail(acme_volume_open(self), 1); -+ -+ for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) { -+ GstMixerTrack *track = GST_MIXER_TRACK (t->data); -+ gint track_steps = track->max_volume - track->min_volume; -+ if (track_steps > 0 && track_steps < steps) -+ steps = track_steps; -+ } -+ -+ acme_volume_close (self); -+ -+ return 100 / steps + 1; -+} -+ -+static gboolean -+acme_volume_close_real (AcmeVolume *self) -+{ -+ if (self->_priv->mixer != NULL) -+ { -+ gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL); -+ gst_object_unref (GST_OBJECT (self->_priv->mixer)); -+ g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL); -+ g_list_free (self->_priv->mixer_tracks); -+ self->_priv->mixer = NULL; -+ self->_priv->mixer_tracks = NULL; -+ } -+ -+ self->_priv->timer_id = 0; -+ return FALSE; -+} -+ -+/* -+ * _acme_set_mixer -+ * @mixer A pointer to mixer element -+ * @data A pointer to user data (AcmeVolume instance to be modified) -+ * @return A gboolean indicating success if Master track was found, failed otherwises. -+ */ -+static gboolean -+_acme_set_mixer(GstMixer *mixer, gpointer user_data) -+{ -+ const GList *tracks; -+ -+ for (tracks = gst_mixer_list_tracks (mixer); tracks != NULL; tracks = tracks->next) { -+ GstMixerTrack *track = GST_MIXER_TRACK (tracks->data); -+ -+ if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) { -+ AcmeVolume *self; -+ -+ self = ACME_VOLUME (user_data); -+ -+ self->_priv->mixer = mixer; -+ self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track)); -+ return TRUE; -+ } -+ -+ continue; -+ } -+ -+ return FALSE; -+} -+ -+/* This is a modified version of code from gnome-media's gst-mixer */ -+static gboolean -+acme_volume_open (AcmeVolume *self) -+{ -+ gchar *mixer_device, **factory_and_device = NULL; -+ GList *mixer_list; -+ -+ if (self->_priv->timer_id != 0) { -+ g_source_remove (self->_priv->timer_id); -+ self->_priv->timer_id = 0; -+ return TRUE; -+ } -+ -+ mixer_device = gconf_client_get_string (self->_priv->gconf_client, DEFAULT_MIXER_DEVICE_KEY, NULL); -+ if (mixer_device != NULL) -+ factory_and_device = g_strsplit (mixer_device, ":", 2); -+ -+ if (factory_and_device != NULL && factory_and_device[0] != NULL) { -+ GstElement *element; -+ -+ element = gst_element_factory_make (factory_and_device[0], NULL); -+ -+ if (element != NULL) { -+ if (factory_and_device[1] != NULL && -+ g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device")) -+ g_object_set (G_OBJECT (element), "device", factory_and_device[1], NULL); -+ gst_element_set_state (element, GST_STATE_READY); -+ -+ if (GST_IS_MIXER (element)) -+ self->_priv->mixer = GST_MIXER (element); -+ else { -+ gst_element_set_state (element, GST_STATE_NULL); -+ gst_object_unref (element); -+ } -+ } -+ } -+ -+ g_free (mixer_device); -+ g_strfreev (factory_and_device); -+ -+ if (self->_priv->mixer != NULL) { -+ const GList *m; -+ GSList *tracks, *t; -+ GError *error = NULL; -+ -+ /* Try to use tracks saved in GConf -+ Note: errors need to be treated , for example if the user set a non type list for this key -+ or if the elements type_list are not "matched" */ -+ tracks = gconf_client_get_list (self->_priv->gconf_client, DEFAULT_MIXER_TRACKS_KEY, -+ GCONF_VALUE_STRING, &error); -+ -+ if (error) { -+ g_warning("ERROR: %s\n", error->message); -+ g_error_free(error); -+ } -+ -+ /* We use these tracks ONLY if they are supported on the system with the following mixer */ -+ for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) { -+ GstMixerTrack *track = GST_MIXER_TRACK (m->data); -+ -+ for (t = tracks; t != NULL; t = t->next) -+ if (!strcmp (t->data, track->label)) -+ self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track)); -+ -+ } -+ -+ g_slist_foreach (tracks, (GFunc)g_free, NULL); -+ g_slist_free (tracks); -+ -+ /* If no track stored in GConf is avaiable try to use Master track */ -+ if (self->_priv->mixer_tracks == NULL) { -+ for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) { -+ GstMixerTrack *track = GST_MIXER_TRACK (m->data); -+ -+ if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) { -+ self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track)); -+ break; -+ } -+ } -+ } -+ -+ if (self->_priv->mixer_tracks != NULL) -+ return TRUE; -+ else { -+ gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL); -+ gst_object_unref (self->_priv->mixer); -+ } -+ } -+ -+ /* Go through all elements of a certain class and check whether -+ * they implement a mixer. If so, walk through the tracks and look -+ * for first one named "volume". -+ * -+ * We should probably do something intelligent if we don't find an -+ * appropriate mixer/track. But now we do something stupid... -+ * everything just becomes a no-op. -+ */ -+ mixer_list = gst_audio_default_registry_mixer_filter (_acme_set_mixer, -+ TRUE, -+ self); -+ -+ if (mixer_list == NULL) -+ return FALSE; -+ -+ /* do not unref the mixer as we keep the ref for self->priv->mixer */ -+ g_list_free (mixer_list); -+ -+ return TRUE; -+} -+ -+static void -+acme_volume_close (AcmeVolume *self) -+{ -+ self->_priv->timer_id = g_timeout_add_seconds (TIMEOUT, -+ (GSourceFunc) acme_volume_close_real, self); -+} -+ -+static void -+acme_volume_init (AcmeVolume *self) -+{ -+ self->_priv = ACME_VOLUME_GET_PRIVATE (self); -+ self->_priv->gconf_client = gconf_client_get_default (); -+} -+ -+static void -+acme_volume_class_init (AcmeVolumeClass *klass) -+{ -+ G_OBJECT_CLASS (klass)->finalize = acme_volume_finalize; -+ -+ gst_init (NULL, NULL); -+ -+ g_type_class_add_private (klass, sizeof (AcmeVolumePrivate)); -+} -+ -+/* acme_volume_new -+ * @return A singleton instance of type AcmeVolume -+ */ -+AcmeVolume * -+acme_volume_new (void) -+{ -+ if (acme_volume_object == NULL) { -+ acme_volume_object = g_object_new (ACME_TYPE_VOLUME, NULL); -+ return ACME_VOLUME(acme_volume_object); -+ } -+ g_object_ref(acme_volume_object); -+ return ACME_VOLUME(acme_volume_object); -+} -+ -diff --git a/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h -new file mode 100644 -index 0000000..c14ebc8 ---- /dev/null -+++ b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h -@@ -0,0 +1,56 @@ -+/* acme-volume.h -+ -+ Copyright (C) 2002, 2003 Bastien Nocera -+ Copyright (C) 2004 Novell, Inc. -+ Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org> -+ -+ The Gnome Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Library General Public License as -+ published by the Free Software Foundation; either version 2 of the -+ License, or (at your option) any later version. -+ -+ The Gnome 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 -+ Library General Public License for more details. -+ -+ You should have received a copy of the GNU Library General Public -+ License along with the Gnome Library; see the file COPYING.LIB. If not, -+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+ -+ Author: Bastien Nocera <hadess@hadess.net> -+ Jon Trowbridge <trow@ximian.com> -+ */ -+ -+#include <glib-object.h> -+ -+#define ACME_TYPE_VOLUME (acme_volume_get_type ()) -+#define ACME_VOLUME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_VOLUME, AcmeVolume)) -+#define ACME_VOLUME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ACME_TYPE_VOLUME, AcmeVolumeClass)) -+#define ACME_IS_VOLUME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_VOLUME)) -+#define ACME_VOLUME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ACME_TYPE_VOLUME, AcmeVolumeClass)) -+ -+typedef struct AcmeVolume AcmeVolume; -+typedef struct AcmeVolumeClass AcmeVolumeClass; -+typedef struct AcmeVolumePrivate AcmeVolumePrivate; -+ -+struct AcmeVolume { -+ GObject parent; -+ AcmeVolumePrivate *_priv; -+}; -+ -+struct AcmeVolumeClass { -+ GObjectClass parent; -+}; -+ -+GType acme_volume_get_type (void); -+AcmeVolume *acme_volume_new (void); -+void acme_volume_set_mute (AcmeVolume *self, gboolean val); -+void acme_volume_mute_toggle (AcmeVolume *self); -+gboolean acme_volume_get_mute (AcmeVolume *self); -+void acme_volume_set_volume (AcmeVolume *self, gint val); -+gint acme_volume_get_volume (AcmeVolume *self); -+gint acme_volume_get_threshold (AcmeVolume *self); -+ -+ -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index b563f73..64893b5 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -53,6 +53,8 @@ - #ifdef HAVE_PULSE - #include <canberra-gtk.h> - #include "gvc-mixer-control.h" -+#elif defined(HAVE_GSTREAMER) -+#include "gvc-gstreamer-acme-vol.h" - #endif /* HAVE_PULSE */ - - #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon" -@@ -78,6 +80,8 @@ struct GsdMediaKeysManagerPrivate - /* Volume bits */ - GvcMixerControl *volume; - GvcMixerStream *stream; -+#elif defined(HAVE_GSTREAMER) -+ AcmeVolume *volume; - #endif /* HAVE_PULSE */ - GtkWidget *dialog; - GConfClient *conf_client; -@@ -650,14 +654,16 @@ do_touchpad_action (GsdMediaKeysManager *manager) - gconf_client_set_bool (client, TOUCHPAD_ENABLED_KEY, !state, NULL); - } - --#ifdef HAVE_PULSE -+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) - static void - update_dialog (GsdMediaKeysManager *manager, - guint vol, - gboolean muted, - gboolean sound_changed) - { -+#ifdef HAVE_PULSE - vol = (int) (100 * (double) vol / PA_VOLUME_NORM); -+#endif - vol = CLAMP (vol, 0, 100); - - dialog_init (manager); -@@ -668,12 +674,14 @@ update_dialog (GsdMediaKeysManager *manager, - GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME); - dialog_show (manager); - -+#ifdef HAVE_PULSE - if (sound_changed != FALSE && muted == FALSE) - ca_gtk_play_for_widget (manager->priv->dialog, 0, - CA_PROP_EVENT_ID, "audio-volume-change", - CA_PROP_EVENT_DESCRIPTION, "volume changed through key press", - CA_PROP_APPLICATION_ID, "org.gnome.VolumeControl", - NULL); -+#endif - } - - static void -@@ -685,7 +693,11 @@ do_sound_action (GsdMediaKeysManager *manager, - int vol_step; - gboolean sound_changed; - -+#ifdef HAVE_PULSE - if (manager->priv->stream == NULL) -+#else -+ if (manager->priv->volume == NULL) -+#endif - return; - - vol_step = gconf_client_get_int (manager->priv->conf_client, -@@ -695,20 +707,35 @@ do_sound_action (GsdMediaKeysManager *manager, - if (vol_step <= 0 || vol_step > 100) - vol_step = VOLUME_STEP; - -+ sound_changed = FALSE; -+#ifdef HAVE_PULSE - norm_vol_step = PA_VOLUME_NORM * vol_step / 100; - - /* FIXME: this is racy */ - vol = gvc_mixer_stream_get_volume (manager->priv->stream); - muted = gvc_mixer_stream_get_is_muted (manager->priv->stream); -- sound_changed = FALSE; -- -+#else -+ if (vol_step > 0) { -+ gint threshold = acme_volume_get_threshold (manager->priv->volume); -+ if (vol_step < threshold) -+ vol_step = threshold; -+ g_debug ("Using volume step of %d", vol_step); -+ } -+ vol = acme_volume_get_volume (manager->priv->volume); -+ muted = acme_volume_get_mute (manager->priv->volume); -+#endif - switch (type) { - case MUTE_KEY: - muted = !muted; -- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); - sound_changed = TRUE; -+#ifdef HAVE_PULSE -+ gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); -+#else -+ acme_volume_mute_toggle (manager->priv->volume); -+#endif - break; - case VOLUME_DOWN_KEY: -+#ifdef HAVE_PULSE - if (!muted && (vol <= norm_vol_step)) { - muted = !muted; - vol = 0; -@@ -724,11 +751,17 @@ do_sound_action (GsdMediaKeysManager *manager, - sound_changed = TRUE; - } - } -+#else -+ if (!muted && (vol <= vol_step)) -+ acme_volume_mute_toggle (manager->priv->volume); -+ acme_volume_set_volume (manager->priv->volume, vol - vol_step); -+#endif - break; - case VOLUME_UP_KEY: - if (muted) { - muted = !muted; - if (vol == 0) { -+#ifdef HAVE_PULSE - vol = vol + norm_vol_step; - gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); - if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) { -@@ -739,7 +772,15 @@ do_sound_action (GsdMediaKeysManager *manager, - gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); - sound_changed = TRUE; - } -+#else -+ /* We need to unmute otherwise vol is blocked (and muted) */ -+ acme_volume_set_mute (manager->priv->volume, FALSE); -+ } -+ acme_volume_set_volume (manager->priv->volume, vol + vol_step); -+ -+#endif - } else { -+#ifdef HAVE_PULSE - if (vol < MAX_VOLUME) { - if (vol + norm_vol_step >= MAX_VOLUME) { - vol = MAX_VOLUME; -@@ -751,13 +792,18 @@ do_sound_action (GsdMediaKeysManager *manager, - sound_changed = TRUE; - } - } -+#else -+ acme_volume_set_volume (manager->priv->volume, vol + vol_step); -+#endif /* HAVE_PULSE */ - } - break; - } - - update_dialog (manager, vol, muted, sound_changed); - } -+#endif /* defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) */ - -+#ifdef HAVE_PULSE - static void - update_default_sink (GsdMediaKeysManager *manager) - { -@@ -793,7 +839,6 @@ on_control_default_sink_changed (GvcMixerControl *control, - { - update_default_sink (manager); - } -- - #endif /* HAVE_PULSE */ - - static gint -@@ -919,9 +964,9 @@ do_action (GsdMediaKeysManager *manager, - case MUTE_KEY: - case VOLUME_DOWN_KEY: - case VOLUME_UP_KEY: --#ifdef HAVE_PULSE -+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) - do_sound_action (manager, type); --#endif /* HAVE_PULSE */ -+#endif /* HAVE_PULSE || HAVE_GSTREAMER */ - break; - case POWER_KEY: - do_exit_action (manager); -@@ -1122,6 +1167,10 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager, - gvc_mixer_control_open (manager->priv->volume); - - gnome_settings_profile_end ("gvc_mixer_control_new"); -+#elif defined(HAVE_GSTREAMER) -+ gnome_settings_profile_start ("acme_volume_new"); -+ manager->priv->volume = acme_volume_new (); -+ gnome_settings_profile_end ("acme_volume_new"); - #endif /* HAVE_PULSE */ - g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager); - -@@ -1199,6 +1248,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - g_object_unref (priv->stream); - priv->stream = NULL; - } -+#elif defined(HAVE_GSTREAMER) - - if (priv->volume) { - g_object_unref (priv->volume); --- -1.7.0.3 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild deleted file mode 100644 index da733af..0000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit autotools eutils gnome2 - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="http://www.gnome.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="debug libnotify policykit pulseaudio" - -RDEPEND=">=dev-libs/dbus-glib-0.74 - >=dev-libs/glib-2.18.0 - >=x11-libs/gtk+-2.91.0:3 - >=gnome-base/gsettings-desktop-schemas-0.1.1 - >=gnome-base/libgnomekbd-2.91.1 - >=gnome-base/gnome-desktop-2.91.3:3 - - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXext - x11-libs/libXxf86misc - >=x11-libs/libxklavier-5.0 - media-libs/fontconfig - - libnotify? ( >=x11-libs/libnotify-0.6.0 ) - policykit? ( - >=sys-auth/polkit-0.91 - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-1.1.2 ) - pulseaudio? ( - >=media-sound/pulseaudio-0.9.15 - media-libs/libcanberra[gtk] ) - !pulseaudio? ( - >=media-libs/gstreamer-0.10.1.2 - >=media-libs/gst-plugins-base-0.10.1.2 )" -DEPEND="${RDEPEND} - !<gnome-base/gnome-control-center-2.22 - sys-devel/gettext - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.19 - x11-proto/inputproto - x11-proto/xproto" - -# README is empty -DOCS="AUTHORS NEWS ChangeLog MAINTAINERS" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - $(use_enable debug) - $(use_with libnotify) - $(use_enable policykit polkit) - $(use_enable pulseaudio pulse) - $(use_enable !pulseaudio gstreamer)" - - if use pulseaudio; then - elog "Building volume media keys using Pulseaudio" - else - elog "Building volume media keys using GStreamer" - fi -} - -src_prepare() { - gnome2_src_prepare - - # Restore gstreamer volume control support, upstream bug #571145 - epatch "${FILESDIR}/${PN}-2.30.0-gst-vol-control-support.patch" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! use pulseaudio; then - elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team" - elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead" - fi -} diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest deleted file mode 100644 index 0346cef..0000000 --- a/gnome-base/gnome-shell/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST gnome-shell-2.91.1.tar.bz2 803066 RMD160 c8a030427bea60a8edbd9baedde6fc4a68782b19 SHA1 841a237936b447c836a69ba224640114429ebf08 SHA256 9ff972455a0fc3b1693d9bc0d880619d4a4a087574c92df062723368b529e937 -DIST gnome-shell-2.91.2.tar.bz2 809309 RMD160 140b1235cb767eb023120f14f7b8660c6a0050cd SHA1 934ea7729428954bba86cfc7170b1a897dc0c871 SHA256 b7a32b55a99193b552ac4e9cb574d76659874abbf9777cd7f74a5685e082ec0f -EBUILD gnome-shell-2.91.1.ebuild 1312 RMD160 535bbb24a6010719a48f10c8c891ca1df95f3f74 SHA1 73e56abc4c81f3f784196231663d9070eb6db9d0 SHA256 f310f14eaace98391e9d7176034afe1893bd3e2c842bdf69b9412dc41579ae08 -EBUILD gnome-shell-2.91.2.ebuild 1314 RMD160 e712dafe2ed32ee5a1e98e028913da894cf6cf11 SHA1 f59eaabd6540d8e19add7113c2f8af2f00bd3cad SHA256 159f44171be7e51d2cce5e2444a7c94f05bf2aedd30d44a65f3715c68f2694cc -EBUILD gnome-shell-9999.ebuild 1477 RMD160 5cba45d01286d8810fb5d72ee685928ab26f4733 SHA1 315f807817419dec36b7ed9e074d1598ad10e239 SHA256 0824019c7369b24082653f6172d657b1e168bf7ebe1d03714da9b0b2cf44ebee diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild deleted file mode 100644 index 27f2968..0000000 --- a/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="http://live.gnome.org/GnomeShell" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -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.91.0:3 - >=dev-libs/gobject-introspection-0.9.5 - - dev-libs/dbus-glib - >=dev-libs/gjs-0.7 - x11-libs/pango[introspection] - >=media-libs/clutter-1.4.0[introspection] - dev-libs/libcroco:0.6 - - >=gnome-base/dconf-0.4.1 - gnome-base/gconf[introspection] - gnome-base/gnome-menus - x11-libs/startup-notification - x11-libs/libXfixes - >=x11-wm/mutter-2.91.2[introspection] - x11-apps/mesa-progs - dev-python/dbus-python - media-sound/pulseaudio - gnome-base/gsettings-desktop-schemas -" - -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6 - >=dev-lang/python-2.5 - sys-devel/gettext - >=dev-util/pkgconfig-0.22 - >=dev-util/intltool-0.26 - gnome-base/gnome-common -" -DOCS="AUTHORS README" - -pkg_postinst() { - elog " Start with 'gnome-shell --replace' " - elog " or add gnome-shell.desktop to ~/.config/autostart/ " - - gnome2_pkg_postinst -} diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild deleted file mode 100644 index 33e42bb..0000000 --- a/gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="http://live.gnome.org/GnomeShell" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -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.91.0:3 - >=dev-libs/gobject-introspection-0.9.5 - - dev-libs/dbus-glib - >=dev-libs/gjs-0.7.5 - x11-libs/pango[introspection] - >=media-libs/clutter-1.4.0[introspection] - dev-libs/libcroco:0.6 - - >=gnome-base/dconf-0.4.1 - gnome-base/gconf[introspection] - gnome-base/gnome-menus - x11-libs/startup-notification - x11-libs/libXfixes - >=x11-wm/mutter-2.91.2[introspection] - x11-apps/mesa-progs - dev-python/dbus-python - media-sound/pulseaudio - gnome-base/gsettings-desktop-schemas -" - -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6 - >=dev-lang/python-2.5 - sys-devel/gettext - >=dev-util/pkgconfig-0.22 - >=dev-util/intltool-0.26 - gnome-base/gnome-common -" -DOCS="AUTHORS README" - -pkg_postinst() { - elog " Start with 'gnome-shell --replace' " - elog " or add gnome-shell.desktop to ~/.config/autostart/ " - - gnome2_pkg_postinst -} diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild deleted file mode 100644 index 02d8a1e..0000000 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -GCONF_DEBUG="no" - -EGIT_REPO_URI="git://git.gnome.org/gnome-shell" - -inherit autotools gnome2 git - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="http://live.gnome.org/GnomeShell" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -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.91.2:3 - >=dev-libs/gobject-introspection-0.9.5 - - dev-libs/dbus-glib - >=dev-libs/gjs-0.7.5 - x11-libs/pango[introspection] - >=media-libs/clutter-1.4.0[introspection] - dev-libs/libcroco:0.6 - - >=gnome-base/dconf-0.4.1 - gnome-base/gconf[introspection] - gnome-base/gnome-menus - x11-libs/startup-notification - x11-libs/libXfixes - >=x11-wm/mutter-2.91.2[introspection] - x11-apps/mesa-progs - dev-python/dbus-python - media-sound/pulseaudio - gnome-base/gsettings-desktop-schemas -" - -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6 - >=dev-lang/python-2.5 - sys-devel/gettext - >=dev-util/pkgconfig-0.22 - >=dev-util/intltool-0.26 - gnome-base/gnome-common -" -DOCS="AUTHORS README" - -src_prepare() { - - mkdir m4 - intltoolize --force --copy --automake || die - eautoreconf -} - -pkg_postinst() { - elog " Start with 'gnome-shell --replace' " - elog " or add gnome-shell.desktop to ~/.config/autostart/ " - - gnome2_pkg_postinst -} diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest deleted file mode 100644 index f242fa9..0000000 --- a/gnome-base/gsettings-desktop-schemas/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST gsettings-desktop-schemas-0.1.2.tar.bz2 90449 RMD160 f04561f3b53a4278ab82c87f30338faa467c06fe SHA1 9aa357e95316736a3a7f60221036f46781a9d664 SHA256 971519a80cb51b6aba41ea1ba9a388d588b00ab018f3825733c438fae004e68b -EBUILD gsettings-desktop-schemas-0.1.2.ebuild 550 RMD160 1bdd5eef994a5ef557d9c31b70c09c47897b75fb SHA1 dc0c32bab1e718fa8f080c03af6774ae89dbdc66 SHA256 ebed9c1ecddeefebbd0c9ba2c2f835cc3e7116d02d20174ce034a4b752086f9d -EBUILD gsettings-desktop-schemas-9999.ebuild 679 RMD160 e6378b8b7f96b807efd4a3e0a3e6755e1f1f07c8 SHA1 bc3fa8ed43943ab96c889c97cdba2eb317a8501b SHA256 7ebe8c20a9bea455961f9f0c5b4c36bf6fd8483dad5ad2d1a87a35a42f5f6a45 diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild deleted file mode 100644 index e2f51c8..0000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" -inherit gnome2 - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.21" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild deleted file mode 100644 index 13c3e0c..0000000 --- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -EGIT_REPO_URI="git://git.gnome.org/gsettings-desktop-schemas" - -inherit autotools gnome2 git - -DESCRIPTION="Collection of GSettings schemas for GNOME desktop" -HOMEPAGE="http://www.gnome.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.21" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.40" - -src_prepare() { - mkdir m4 - intltoolize --force --copy --automake || die - eautoreconf -} diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest deleted file mode 100644 index 06a6dc8..0000000 --- a/gnome-base/gvfs/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -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.7.0.tar.bz2 1388236 RMD160 2424e68e1bb55ff779c7d9383d26a68e571d33e4 SHA1 6d7f6c640e1486e39eb55c720b3db021aedfcc29 SHA256 0ff012cdcbc4de672ef0bc40dc8b54fb2f5e830e4ffe6a56016ad334ac28a483 -EBUILD gvfs-1.7.0.ebuild 3047 RMD160 90f2654b2705f48483b65324a11e94d62135576c SHA1 467ad3940113cde2e9844bd21bb07b43af88247e SHA256 d5cb49cab904e0ee2c940099a27b2ca6da3edd3734f03c05c0ef7034c2adb4dd 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 deleted file mode 100644 index 86222e5..0000000 --- a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch +++ /dev/null @@ -1,56 +0,0 @@ -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 deleted file mode 100644 index 78fecb7..0000000 --- a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index a236dd2..0000000 --- a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 73cc912..0000000 --- a/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch +++ /dev/null @@ -1,388 +0,0 @@ -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.7.0.ebuild b/gnome-base/gvfs/gvfs-1.7.0.ebuild deleted file mode 100644 index 8d523bf..0000000 --- a/gnome-base/gvfs/gvfs-1.7.0.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# 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="3" - -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-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-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 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 - - # 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" -} diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest deleted file mode 100644 index 9c66b3f..0000000 --- a/gnome-base/libgnomekbd/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libgnomekbd-2.91.3.1.tar.bz2 412398 RMD160 75ba3891777f0e6b1b8976020d83525563df1744 SHA1 8ab3a79de9ea88b8f4b707b74d0e18540aa8d827 SHA256 06771653341d63dc838db997ba963275c363ab92efdf539ef720c1c62b681fb0 -EBUILD libgnomekbd-2.91.3.1.ebuild 1061 RMD160 197a78bd21edc41689f0834c98397bedac4bd0db SHA1 1ae54a6624ea7d466f02ae9c350b7084374a76bd SHA256 557f8bc064904e1c005fb04e3494a6493a062769bd98ce817e2b188d0b5eec33 diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild deleted file mode 100644 index 8dd54bb..0000000 --- a/gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild,v 1.1 2010/06/13 16:47:46 pacho Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit eutils gnome2 multilib - -DESCRIPTION="Gnome keyboard configuration library" -HOMEPAGE="http://www.gnome.org" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.18 - >=sys-apps/dbus-0.92 - >=dev-libs/dbus-glib-0.34 - >=x11-libs/gtk+-2.90:3 - >=x11-libs/libxklavier-5.0" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.19" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - # Only user interaction required graphical tests at the time of 2.22.0 - not useful for us - G2CONF="${G2CONF} --disable-tests --disable-static" -} - -src_compile() { - # FreeBSD doesn't like -j, upstream? bug #???? - use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" - gnome2_src_compile -} |