* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2011-03-05 19:59 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-05 19:59 UTC (permalink / raw
To: gentoo-commits
commit: c84e5e8b7a1b1c3e11aa560a8a65696efff287f0
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 19:54:43 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 19:57:53 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c84e5e8b
gnome-base/gnome-session: sync with tree, cleanup session-saving patch
* Didn't apply, and XSMP session saving is deprecated in GNOME 3
---
...nome-session-2.32.0-session-saving-button.patch | 559 --------------------
.../gnome-session/gnome-session-2.91.90.1.ebuild | 12 +-
gnome-base/gnome-session/gnome-session-9999.ebuild | 3 +-
3 files changed, 4 insertions(+), 570 deletions(-)
diff --git a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch b/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch
deleted file mode 100644
index b407f9a..0000000
--- a/gnome-base/gnome-session/files/gnome-session-2.32.0-session-saving-button.patch
+++ /dev/null
@@ -1,559 +0,0 @@
-From c56898dcc1a73af37333b5df28f3b298a0c0669d Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Thu, 9 Sep 2010 15:38:37 +0300
-Subject: [PATCH] Implement session saving UI in gnome-session-properties
-
-Original patch by Ghee Teo and Josselin Mouette
-
-https://bugzilla.gnome.org/show_bug.cgi?id=575544
----
- capplet/gsm-properties-dialog.c | 63 ++++++++++++-
- configure.ac | 1 +
- data/session-properties.ui | 12 ++
- gnome-session/gsm-client.c | 10 ++
- gnome-session/gsm-client.h | 6 +
- gnome-session/gsm-dbus-client.c | 14 +++
- gnome-session/gsm-manager.c | 150 +++++++++++++++++++++++++++-
- gnome-session/gsm-manager.h | 3 +
- gnome-session/gsm-xsmp-client.c | 37 +++++++
- gnome-session/gsm-xsmp-client.h | 3 +-
- gnome-session/org.gnome.SessionManager.xml | 8 ++
- 11 files changed, 303 insertions(+), 4 deletions(-)
-
-diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
-index 84ef910..f54656e 100644
---- a/capplet/gsm-properties-dialog.c
-+++ b/capplet/gsm-properties-dialog.c
-@@ -35,6 +35,12 @@
- #include "gsm-util.h"
- #include "gsp-app.h"
- #include "gsp-app-manager.h"
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+
-+#define GSM_SERVICE_DBUS "org.gnome.SessionManager"
-+#define GSM_PATH_DBUS "/org/gnome/SessionManager"
-+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager"
-
- #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
-
-@@ -50,6 +56,7 @@
- #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button"
- #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button"
- #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button"
-+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
- #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle"
-
- #define STARTUP_APP_ICON "system-run"
-@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButton *button,
- }
-
- static void
-+session_saved_message (GsmPropertiesDialog *dialog,
-+ const char *msg,
-+ gboolean is_error)
-+{
-+ GtkLabel *label;
-+ gchar *markup;
-+ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
-+ if (is_error)
-+ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
-+ else
-+ markup = g_markup_escape_text (msg, -1);
-+ gtk_label_set_markup (label, markup);
-+ g_free (markup);
-+}
-+
-+static void
-+session_saved_cb (DBusGProxy *proxy,
-+ DBusGProxyCall *call_id,
-+ void *user_data)
-+{
-+ gboolean res;
-+ GsmPropertiesDialog *dialog = user_data;
-+
-+ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
-+ if (res)
-+ session_saved_message (dialog, _("Your session has been saved."), FALSE);
-+ else
-+ session_saved_message (dialog, _("Failed to save session"), TRUE);
-+
-+ g_object_unref (proxy);
-+}
-+
-+static void
- on_save_session_clicked (GtkWidget *widget,
- GsmPropertiesDialog *dialog)
- {
-- g_debug ("Session saving is not implemented yet!");
-+ DBusGConnection *conn;
-+ DBusGProxy *proxy;
-+ DBusGProxyCall *call;
-+
-+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
-+ if (conn == NULL) {
-+ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
-+ return;
-+ }
-+
-+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
-+ if (proxy == NULL) {
-+ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
-+ return;
-+ }
-+
-+ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
-+ if (call == NULL) {
-+ session_saved_message (dialog, _("Failed to save session"), TRUE);
-+ g_object_unref (proxy);
-+ return;
-+ }
- }
-
- static void
-diff --git a/configure.ac b/configure.ac
-index 3988b4a..b2b96b8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
- PKG_CHECK_MODULES(SESSION_PROPERTIES,
- glib-2.0 >= $GLIB_REQUIRED
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
-+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- )
-
- PKG_CHECK_MODULES(SM, sm)
-diff --git a/data/session-properties.ui b/data/session-properties.ui
-index 24f721d..3083fc1 100644
---- a/data/session-properties.ui
-+++ b/data/session-properties.ui
-@@ -148,6 +148,7 @@
- <property name="visible">True</property>
- <child>
- <object class="GtkButton" id="session_properties_save_button">
-+ <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
-@@ -191,6 +192,17 @@
- <property name="position">1</property>
- </packing>
- </child>
-+ <child>
-+ <object class="GtkLabel" id="session_properties_session_saved_label">
-+ <property name="visible">True</property>
-+ <property name="wrap">True</property>
-+ </object>
-+ <packing>
-+ <property name="expand">False</property>
-+ <property name="fill">False</property>
-+ <property name="position">2</property>
-+ </packing>
-+ </child>
- </object>
- <packing>
- <property name="position">1</property>
-diff --git a/gnome-session/gsm-client.c b/gnome-session/gsm-client.c
-index b1c3c02..b063aca 100644
---- a/gnome-session/gsm-client.c
-+++ b/gnome-session/gsm-client.c
-@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *client)
- g_signal_emit (client, signals[DISCONNECTED], 0);
- }
-
-+gboolean
-+gsm_client_request_save (GsmClient *client,
-+ guint flags,
-+ GError **error)
-+{
-+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
-+
-+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
-+}
-+
- GKeyFile *
- gsm_client_save (GsmClient *client,
- GError **error)
-diff --git a/gnome-session/gsm-client.h b/gnome-session/gsm-client.h
-index 8fa28ad..a191e1d 100644
---- a/gnome-session/gsm-client.h
-+++ b/gnome-session/gsm-client.h
-@@ -92,6 +92,9 @@ struct _GsmClientClass
- GError **error);
- gboolean (*impl_stop) (GsmClient *client,
- GError **error);
-+ gboolean (*impl_request_save) (GsmClient *client,
-+ guint flags,
-+ GError **error);
- GKeyFile * (*impl_save) (GsmClient *client,
- GError **error);
- };
-@@ -137,6 +140,9 @@ gboolean gsm_client_cancel_end_session (GsmClient *client,
-
- void gsm_client_disconnected (GsmClient *client);
-
-+gboolean gsm_client_request_save (GsmClient *client,
-+ guint flags,
-+ GError **error);
- GKeyFile *gsm_client_save (GsmClient *client,
- GError **error);
- /* exported to bus */
-diff --git a/gnome-session/gsm-dbus-client.c b/gnome-session/gsm-dbus-client.c
-index e0aaf3d..a6ab43a 100644
---- a/gnome-session/gsm-dbus-client.c
-+++ b/gnome-session/gsm-dbus-client.c
-@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *object)
- G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
- }
-
-+static gboolean
-+dbus_client_request_save (GsmClient *client,
-+ guint flags,
-+ GError **error)
-+{
-+ g_debug ("GsmDBusClient: sending save request to client with id %s",
-+ gsm_client_peek_id (client));
-+
-+ /* FIXME: The protocol does not support this */
-+
-+ return FALSE;
-+}
-+
- static GKeyFile *
- dbus_client_save (GsmClient *client,
- GError **error)
-@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClientClass *klass)
- object_class->set_property = gsm_dbus_client_set_property;
- object_class->dispose = gsm_dbus_client_dispose;
-
-+ client_class->impl_request_save = dbus_client_request_save;
- client_class->impl_save = dbus_client_save;
- client_class->impl_stop = dbus_client_stop;
- client_class->impl_query_end_session = dbus_client_query_end_session;
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index c85cea6..ca1a0ae 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -68,6 +68,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
-
- #define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
-
- #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
- #define GDM_FLEXISERVER_ARGS "--startnew Standard"
-@@ -1153,6 +1154,69 @@ query_end_session_complete (GsmManager *manager)
-
- }
-
-+static gboolean
-+_client_request_save (GsmClient *client,
-+ ClientEndSessionData *data)
-+{
-+ gboolean ret;
-+ GError *error;
-+
-+ error = NULL;
-+ ret = gsm_client_request_save (client, data->flags, &error);
-+ if (ret) {
-+ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
-+ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
-+ client);
-+ } else if (error) {
-+ g_debug ("GsmManager: unable to query client: %s", error->message);
-+ g_error_free (error);
-+ }
-+
-+ return FALSE;
-+}
-+
-+static gboolean
-+_client_request_save_helper (const char *id,
-+ GsmClient *client,
-+ ClientEndSessionData *data)
-+{
-+ return _client_request_save (client, data);
-+}
-+
-+static void
-+query_save_session_complete (GsmManager *manager)
-+{
-+ GError *error = NULL;
-+
-+ if (g_slist_length (manager->priv->next_query_clients) > 0) {
-+ ClientEndSessionData data;
-+
-+ data.manager = manager;
-+ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
-+
-+ g_slist_foreach (manager->priv->next_query_clients,
-+ (GFunc)_client_request_save,
-+ &data);
-+
-+ g_slist_free (manager->priv->next_query_clients);
-+ manager->priv->next_query_clients = NULL;
-+
-+ return;
-+ }
-+
-+ if (manager->priv->query_timeout_id > 0) {
-+ g_source_remove (manager->priv->query_timeout_id);
-+ manager->priv->query_timeout_id = 0;
-+ }
-+
-+ gsm_session_save (manager->priv->clients, &error);
-+
-+ if (error) {
-+ g_warning ("Error saving session: %s", error->message);
-+ g_error_free (error);
-+ }
-+}
-+
- static guint32
- generate_cookie (void)
- {
-@@ -1227,6 +1291,21 @@ _on_query_end_session_timeout (GsmManager *manager)
- return FALSE;
- }
-
-+static gboolean
-+_on_query_save_session_timeout (GsmManager *manager)
-+{
-+ manager->priv->query_timeout_id = 0;
-+
-+ g_debug ("GsmManager: query to save session timed out");
-+
-+ g_slist_free (manager->priv->query_clients);
-+ manager->priv->query_clients = NULL;
-+
-+ query_save_session_complete (manager);
-+
-+ return FALSE;
-+}
-+
- static void
- do_phase_query_end_session (GsmManager *manager)
- {
-@@ -1863,13 +1942,32 @@ on_client_end_session_response (GsmClient *client,
- const char *reason,
- GsmManager *manager)
- {
-- /* just ignore if received outside of shutdown */
-- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+ /* just ignore if we are not yet running */
-+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
- return;
- }
-
- g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
-
-+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
-+ /* Ignore responses when no requests were sent */
-+ if (manager->priv->query_clients == NULL) {
-+ return;
-+ }
-+
-+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
-+
-+ if (do_last) {
-+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
-+ client);
-+ }
-+
-+ if (manager->priv->query_clients == NULL) {
-+ query_save_session_complete (manager);
-+ }
-+ return;
-+ }
-+
- if (cancel) {
- cancel_end_session (manager);
- return;
-@@ -1968,6 +2066,15 @@ on_xsmp_client_logout_request (GsmXSMPClient *client,
- }
-
- static void
-+on_xsmp_client_save_request (GsmXSMPClient *client,
-+ gboolean show_dialog,
-+ GsmManager *manager)
-+{
-+ g_debug ("GsmManager: save_request");
-+ gsm_manager_save_session (manager, NULL);
-+}
-+
-+static void
- on_store_client_added (GsmStore *store,
- const char *id,
- GsmManager *manager)
-@@ -1988,6 +2095,10 @@ on_store_client_added (GsmStore *store,
- "logout-request",
- G_CALLBACK (on_xsmp_client_logout_request),
- manager);
-+ g_signal_connect (client,
-+ "save-request",
-+ G_CALLBACK (on_xsmp_client_save_request),
-+ manager);
- }
-
- g_signal_connect (client,
-@@ -2945,6 +3056,41 @@ gsm_manager_shutdown (GsmManager *manager,
- }
-
- gboolean
-+gsm_manager_save_session (GsmManager *manager,
-+ GError **error)
-+{
-+ ClientEndSessionData data;
-+
-+ g_debug ("GsmManager: SaveSession called");
-+
-+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-+
-+ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
-+ g_set_error (error,
-+ GSM_MANAGER_ERROR,
-+ GSM_MANAGER_ERROR_NOT_IN_RUNNING,
-+ "SaveSession interface is only available during the Running phase");
-+ return FALSE;
-+ }
-+
-+ data.manager = manager;
-+ data.flags = 0;
-+ gsm_store_foreach (manager->priv->clients,
-+ (GsmStoreFunc)_client_request_save_helper,
-+ &data);
-+
-+ if (manager->priv->query_clients) {
-+ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
-+ (GSourceFunc)_on_query_save_session_timeout,
-+ manager);
-+ return TRUE;
-+ } else {
-+ g_debug ("GsmManager: Nothing to save");
-+ return FALSE;
-+ }
-+}
-+
-+gboolean
- gsm_manager_can_shutdown (GsmManager *manager,
- gboolean *shutdown_available,
- GError **error)
-diff --git a/gnome-session/gsm-manager.h b/gnome-session/gsm-manager.h
-index 17c70b3..dd6f198 100644
---- a/gnome-session/gsm-manager.h
-+++ b/gnome-session/gsm-manager.h
-@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhibited (GsmManager
- gboolean gsm_manager_shutdown (GsmManager *manager,
- GError **error);
-
-+gboolean gsm_manager_save_session (GsmManager *manager,
-+ GError **error);
-+
- gboolean gsm_manager_can_shutdown (GsmManager *manager,
- gboolean *shutdown_available,
- GError **error);
-diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c
-index ce22ed9..ed55406 100644
---- a/gnome-session/gsm-xsmp-client.c
-+++ b/gnome-session/gsm-xsmp-client.c
-@@ -69,6 +69,7 @@ enum {
- enum {
- REGISTER_REQUEST,
- LOGOUT_REQUEST,
-+ SAVE_REQUEST,
- LAST_SIGNAL
- };
-
-@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *client,
- return TRUE;
- }
-
-+static gboolean
-+xsmp_request_save (GsmClient *client,
-+ guint flags,
-+ GError **error)
-+{
-+ GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
-+
-+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
-+
-+ if (xsmp->priv->conn == NULL) {
-+ g_set_error (error,
-+ GSM_CLIENT_ERROR,
-+ GSM_CLIENT_ERROR_NOT_REGISTERED,
-+ "Client is not registered");
-+ return FALSE;
-+ }
-+
-+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
-+ xsmp_save_yourself_phase2 (client);
-+ else
-+ do_save_yourself (xsmp, SmSaveLocal, FALSE);
-+
-+ return TRUE;
-+}
- static char *
- get_desktop_file_path (GsmXSMPClient *client)
- {
-@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass)
- object_class->get_property = gsm_xsmp_client_get_property;
- object_class->set_property = gsm_xsmp_client_set_property;
-
-+ client_class->impl_request_save = xsmp_request_save;
- client_class->impl_save = xsmp_save;
- client_class->impl_stop = xsmp_stop;
- client_class->impl_query_end_session = xsmp_query_end_session;
-@@ -1006,6 +1032,17 @@ gsm_xsmp_client_class_init (GsmXSMPClientClass *klass)
- G_TYPE_NONE,
- 1, G_TYPE_BOOLEAN);
-
-+ signals[SAVE_REQUEST] =
-+ g_signal_new ("save-request",
-+ G_OBJECT_CLASS_TYPE (object_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
-+ NULL,
-+ NULL,
-+ g_cclosure_marshal_VOID__BOOLEAN,
-+ G_TYPE_NONE,
-+ 1, G_TYPE_BOOLEAN);
-+
- g_object_class_install_property (object_class,
- PROP_ICE_CONNECTION,
- g_param_spec_pointer ("ice-connection",
-diff --git a/gnome-session/gsm-xsmp-client.h b/gnome-session/gsm-xsmp-client.h
-index b80f933..4fa24fb 100644
---- a/gnome-session/gsm-xsmp-client.h
-+++ b/gnome-session/gsm-xsmp-client.h
-@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
- char **client_id);
- gboolean (*logout_request) (GsmXSMPClient *client,
- gboolean prompt);
--
-+ gboolean (*save_request) (GsmXSMPClient *client,
-+ gboolean prompt);
-
- void (*saved_state) (GsmXSMPClient *client);
-
-diff --git a/gnome-session/org.gnome.SessionManager.xml b/gnome-session/org.gnome.SessionManager.xml
-index b8bec4e..bece3f5 100644
---- a/gnome-session/org.gnome.SessionManager.xml
-+++ b/gnome-session/org.gnome.SessionManager.xml
-@@ -256,6 +256,14 @@
- </doc:doc>
- </method>
-
-+ <method name="SaveSession">
-+ <doc:doc>
-+ <doc:description>
-+ <doc:para>Request to save session</doc:para>
-+ </doc:description>
-+ </doc:doc>
-+ </method>
-+
- <method name="CanShutdown">
- <arg name="is_available" direction="out" type="b">
- <doc:doc>
---
-1.7.2.2
-
diff --git a/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild b/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild
index 3e71c94..f001356 100644
--- a/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.91.90.1.ebuild
@@ -5,7 +5,7 @@
EAPI="3"
GCONF_DEBUG="yes"
-inherit autotools eutils gnome2
+inherit gnome2
DESCRIPTION="Gnome session manager"
HOMEPAGE="http://www.gnome.org/"
@@ -58,6 +58,7 @@ DEPEND="${COMMON_DEPEND}
doc? (
app-text/xmlto
dev-libs/libxslt )"
+# gnome-common needed for eautoreconf
# gnome-base/gdm does not provide gnome.desktop anymore
src_prepare() {
@@ -72,15 +73,6 @@ src_prepare() {
$(use_enable ipv6)"
DOCS="AUTHORS ChangeLog NEWS README"
- # Add "session saving" button back, upstream bug #575544
- # FIXME: Doesn't apply anymore
-# epatch "${FILESDIR}/${PN}-2.32.0-session-saving-button.patch"
-#
-# if [[ ${PV} != 9999 ]]; then
-# intltoolize --force --copy --automake || die "intltoolize failed"
-# eautoreconf
-# fi
-
gnome2_src_prepare
}
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 1762c08..4dce076 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="3"
GCONF_DEBUG="yes"
-inherit eutils gnome2
+inherit gnome2
DESCRIPTION="Gnome session manager"
HOMEPAGE="http://www.gnome.org/"
@@ -58,6 +58,7 @@ DEPEND="${COMMON_DEPEND}
doc? (
app-text/xmlto
dev-libs/libxslt )"
+# gnome-common needed for eautoreconf
# gnome-base/gdm does not provide gnome.desktop anymore
src_prepare() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2011-03-23 21:59 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 7d5b206f2f2e51dcba43d5a9ceed3703b88353aa
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 21:52:40 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 21:59:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7d5b206f
gnome-base/gnome-session: fix logout hang
https://bugzilla.gnome.org/show_bug.cgi?id=645432
---
.../files/gnome-session-2.91.92-fix-logout.patch | 271 ++++++++++++++++++++
...1.92.ebuild => gnome-session-2.91.92-r1.ebuild} | 5 +-
2 files changed, 275 insertions(+), 1 deletions(-)
diff --git a/gnome-base/gnome-session/files/gnome-session-2.91.92-fix-logout.patch b/gnome-base/gnome-session/files/gnome-session-2.91.92-fix-logout.patch
new file mode 100644
index 0000000..35d811d
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-2.91.92-fix-logout.patch
@@ -0,0 +1,271 @@
+From 1cb7101054a04b443b44b6e60928c53f2379034f Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 21 Mar 2011 14:03:55 -0400
+Subject: [PATCH] manager: port to latest shell api
+
+The shell API changed to support multiple
+buttons on the log out dialog (see bug 641375)
+
+This commit brings gnome-session up to speed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=645432
+---
+ gnome-session/gsm-manager.c | 68 +++++++++++++++++++++++++++++++-----
+ gnome-session/gsm-shell.c | 82 ++++++++++++++++++++++++++++++++++++------
+ gnome-session/gsm-shell.h | 5 ++-
+ 3 files changed, 133 insertions(+), 22 deletions(-)
+
+diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
+index abbc223..4892c5c 100644
+--- a/gnome-session/gsm-manager.c
++++ b/gnome-session/gsm-manager.c
+@@ -149,7 +149,9 @@ struct GsmManagerPrivate
+ GsmShell *shell;
+ guint shell_end_session_dialog_canceled_id;
+ guint shell_end_session_dialog_open_failed_id;
+- guint shell_end_session_dialog_confirmed_id;
++ guint shell_end_session_dialog_confirmed_logout_id;
++ guint shell_end_session_dialog_confirmed_shutdown_id;
++ guint shell_end_session_dialog_confirmed_reboot_id;
+ };
+
+ enum {
+@@ -3058,10 +3060,22 @@ disconnect_shell_dialog_signals (GsmManager *manager)
+ manager->priv->shell_end_session_dialog_canceled_id = 0;
+ }
+
+- if (manager->priv->shell_end_session_dialog_confirmed_id != 0) {
++ if (manager->priv->shell_end_session_dialog_confirmed_logout_id != 0) {
+ g_signal_handler_disconnect (manager->priv->shell,
+- manager->priv->shell_end_session_dialog_confirmed_id);
+- manager->priv->shell_end_session_dialog_confirmed_id = 0;
++ manager->priv->shell_end_session_dialog_confirmed_logout_id);
++ manager->priv->shell_end_session_dialog_confirmed_logout_id = 0;
++ }
++
++ if (manager->priv->shell_end_session_dialog_confirmed_shutdown_id != 0) {
++ g_signal_handler_disconnect (manager->priv->shell,
++ manager->priv->shell_end_session_dialog_confirmed_shutdown_id);
++ manager->priv->shell_end_session_dialog_confirmed_shutdown_id = 0;
++ }
++
++ if (manager->priv->shell_end_session_dialog_confirmed_reboot_id != 0) {
++ g_signal_handler_disconnect (manager->priv->shell,
++ manager->priv->shell_end_session_dialog_confirmed_reboot_id);
++ manager->priv->shell_end_session_dialog_confirmed_reboot_id = 0;
+ }
+
+ if (manager->priv->shell_end_session_dialog_open_failed_id != 0) {
+@@ -3080,8 +3094,8 @@ on_shell_end_session_dialog_canceled (GsmShell *shell,
+ }
+
+ static void
+-on_shell_end_session_dialog_confirmed (GsmShell *shell,
+- GsmManager *manager)
++_handle_end_session_dialog_response (GsmManager *manager,
++ GsmManagerLogoutType logout_type)
+ {
+ /* Note we're checking for END_SESSION here and
+ * QUERY_END_SESSION in the fallback cases elsewhere.
+@@ -3098,7 +3112,31 @@ on_shell_end_session_dialog_confirmed (GsmShell *shell,
+ }
+
+ manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_FORCE;
++ manager->priv->logout_type = logout_type;
+ end_phase (manager);
++}
++
++static void
++on_shell_end_session_dialog_confirmed_logout (GsmShell *shell,
++ GsmManager *manager)
++{
++ _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_LOGOUT);
++ disconnect_shell_dialog_signals (manager);
++}
++
++static void
++on_shell_end_session_dialog_confirmed_shutdown (GsmShell *shell,
++ GsmManager *manager)
++{
++ _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_SHUTDOWN);
++ disconnect_shell_dialog_signals (manager);
++}
++
++static void
++on_shell_end_session_dialog_confirmed_reboot (GsmShell *shell,
++ GsmManager *manager)
++{
++ _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_REBOOT);
+ disconnect_shell_dialog_signals (manager);
+ }
+
+@@ -3120,10 +3158,22 @@ connect_shell_dialog_signals (GsmManager *manager)
+ G_CALLBACK (on_shell_end_session_dialog_canceled),
+ manager);
+
+- manager->priv->shell_end_session_dialog_confirmed_id =
++ manager->priv->shell_end_session_dialog_confirmed_logout_id =
++ g_signal_connect (manager->priv->shell,
++ "end-session-dialog-confirmed-logout",
++ G_CALLBACK (on_shell_end_session_dialog_confirmed_logout),
++ manager);
++
++ manager->priv->shell_end_session_dialog_confirmed_shutdown_id =
++ g_signal_connect (manager->priv->shell,
++ "end-session-dialog-confirmed-shutdown",
++ G_CALLBACK (on_shell_end_session_dialog_confirmed_shutdown),
++ manager);
++
++ manager->priv->shell_end_session_dialog_confirmed_reboot_id =
+ g_signal_connect (manager->priv->shell,
+- "end-session-dialog-confirmed",
+- G_CALLBACK (on_shell_end_session_dialog_confirmed),
++ "end-session-dialog-confirmed-reboot",
++ G_CALLBACK (on_shell_end_session_dialog_confirmed_reboot),
+ manager);
+ }
+
+diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
+index fb5f4ed..be234aa 100644
+--- a/gnome-session/gsm-shell.c
++++ b/gnome-session/gsm-shell.c
+@@ -74,7 +74,9 @@ enum {
+ END_SESSION_DIALOG_OPENED = 0,
+ END_SESSION_DIALOG_OPEN_FAILED,
+ END_SESSION_DIALOG_CANCELED,
+- END_SESSION_DIALOG_CONFIRMED,
++ END_SESSION_DIALOG_CONFIRMED_LOGOUT,
++ END_SESSION_DIALOG_CONFIRMED_SHUTDOWN,
++ END_SESSION_DIALOG_CONFIRMED_REBOOT,
+ NUMBER_OF_SIGNALS
+ };
+
+@@ -169,11 +171,31 @@ gsm_shell_class_init (GsmShellClass *shell_class)
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+- signals [END_SESSION_DIALOG_CONFIRMED] =
+- g_signal_new ("end-session-dialog-confirmed",
++ signals [END_SESSION_DIALOG_CONFIRMED_LOGOUT] =
++ g_signal_new ("end-session-dialog-confirmed-logout",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+- G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed),
++ G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_logout),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
++
++ signals [END_SESSION_DIALOG_CONFIRMED_SHUTDOWN] =
++ g_signal_new ("end-session-dialog-confirmed-shutdown",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_shutdown),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
++
++ signals [END_SESSION_DIALOG_CONFIRMED_REBOOT] =
++ g_signal_new ("end-session-dialog-confirmed-reboot",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_reboot),
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__VOID,
+@@ -477,8 +499,21 @@ on_end_session_dialog_canceled (DBusGProxy *proxy,
+ }
+
+ static void
+-on_end_session_dialog_confirmed (DBusGProxy *proxy,
+- GsmShell *shell)
++on_end_session_dialog_confirmed_logout (DBusGProxy *proxy,
++ GsmShell *shell)
++{
++ if (shell->priv->update_idle_id != 0) {
++ g_source_remove (shell->priv->update_idle_id);
++ shell->priv->update_idle_id = 0;
++ }
++
++ shell->priv->has_open_dialog = FALSE;
++ g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_LOGOUT], 0);
++}
++
++static void
++on_end_session_dialog_confirmed_shutdown (DBusGProxy *proxy,
++ GsmShell *shell)
+ {
+ if (shell->priv->update_idle_id != 0) {
+ g_source_remove (shell->priv->update_idle_id);
+@@ -486,7 +521,20 @@ on_end_session_dialog_confirmed (DBusGProxy *proxy,
+ }
+
+ shell->priv->has_open_dialog = FALSE;
+- g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED], 0);
++ g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_SHUTDOWN], 0);
++}
++
++static void
++on_end_session_dialog_confirmed_reboot (DBusGProxy *proxy,
++ GsmShell *shell)
++{
++ if (shell->priv->update_idle_id != 0) {
++ g_source_remove (shell->priv->update_idle_id);
++ shell->priv->update_idle_id = 0;
++ }
++
++ shell->priv->has_open_dialog = FALSE;
++ g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_REBOOT], 0);
+ }
+
+ static void
+@@ -575,14 +623,24 @@ gsm_shell_open_end_session_dialog (GsmShell *shell,
+ "Canceled",
+ G_CALLBACK (on_end_session_dialog_canceled),
+ shell, NULL);
+-
+ dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
+- "Confirmed", G_TYPE_INVALID);
++ "ConfirmedLogout", G_TYPE_INVALID);
+ dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
+- "Confirmed",
+- G_CALLBACK (on_end_session_dialog_confirmed),
++ "ConfirmedLogout",
++ G_CALLBACK (on_end_session_dialog_confirmed_logout),
++ shell, NULL);
++ dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
++ "ConfirmedShutdown", G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
++ "ConfirmedShutdown",
++ G_CALLBACK (on_end_session_dialog_confirmed_shutdown),
++ shell, NULL);
++ dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
++ "ConfirmedReboot", G_TYPE_INVALID);
++ dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
++ "ConfirmedReboot",
++ G_CALLBACK (on_end_session_dialog_confirmed_reboot),
+ shell, NULL);
+-
+ }
+
+ inhibitor_array = get_array_from_store (inhibitors);
+diff --git a/gnome-session/gsm-shell.h b/gnome-session/gsm-shell.h
+index 74a617d..123d4cc 100644
+--- a/gnome-session/gsm-shell.h
++++ b/gnome-session/gsm-shell.h
+@@ -64,7 +64,10 @@ struct _GsmShellClass
+ void (* end_session_dialog_opened) (GsmShell *shell);
+ void (* end_session_dialog_open_failed) (GsmShell *shell);
+ void (* end_session_dialog_canceled) (GsmShell *shell);
+- void (* end_session_dialog_confirmed) (GsmShell *shell);
++
++ void (* end_session_dialog_confirmed_logout) (GsmShell *shell);
++ void (* end_session_dialog_confirmed_shutdown) (GsmShell *shell);
++ void (* end_session_dialog_confirmed_reboot) (GsmShell *shell);
+
+ };
+
+--
+1.7.4.1
\ No newline at end of file
diff --git a/gnome-base/gnome-session/gnome-session-2.91.92.ebuild b/gnome-base/gnome-session/gnome-session-2.91.92-r1.ebuild
similarity index 95%
rename from gnome-base/gnome-session/gnome-session-2.91.92.ebuild
rename to gnome-base/gnome-session/gnome-session-2.91.92-r1.ebuild
index 177516d..df7fdaa 100644
--- a/gnome-base/gnome-session/gnome-session-2.91.92.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.91.92-r1.ebuild
@@ -5,7 +5,7 @@
EAPI="3"
GCONF_DEBUG="yes"
-inherit gnome2
+inherit eutils gnome2
DESCRIPTION="Gnome session manager"
HOMEPAGE="http://www.gnome.org/"
@@ -73,6 +73,9 @@ src_prepare() {
$(use_enable ipv6)"
DOCS="AUTHORS ChangeLog NEWS README"
+ # Fixed upstream, https://bugzilla.gnome.org/show_bug.cgi?id=645432
+ epatch "${FILESDIR}/${P}-fix-logout.patch"
+
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2011-03-23 22:07 Nirbheek Chauhan
0 siblings, 0 replies; 9+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 28209b0a43f4fa71d4ed7b04d0e59f8289f6e447
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 22:07:09 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 22:07:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=28209b0a
Revert "gnome-base/gnome-session: fix logout hang"
This reverts commit 7d5b206f2f2e51dcba43d5a9ceed3703b88353aa.
* Commit was accidentally pushed, the patch isn't actually ready
---
.../files/gnome-session-2.91.92-fix-logout.patch | 271 --------------------
...1.92-r1.ebuild => gnome-session-2.91.92.ebuild} | 5 +-
2 files changed, 1 insertions(+), 275 deletions(-)
diff --git a/gnome-base/gnome-session/files/gnome-session-2.91.92-fix-logout.patch b/gnome-base/gnome-session/files/gnome-session-2.91.92-fix-logout.patch
deleted file mode 100644
index 35d811d..0000000
--- a/gnome-base/gnome-session/files/gnome-session-2.91.92-fix-logout.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From 1cb7101054a04b443b44b6e60928c53f2379034f Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 21 Mar 2011 14:03:55 -0400
-Subject: [PATCH] manager: port to latest shell api
-
-The shell API changed to support multiple
-buttons on the log out dialog (see bug 641375)
-
-This commit brings gnome-session up to speed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=645432
----
- gnome-session/gsm-manager.c | 68 +++++++++++++++++++++++++++++++-----
- gnome-session/gsm-shell.c | 82 ++++++++++++++++++++++++++++++++++++------
- gnome-session/gsm-shell.h | 5 ++-
- 3 files changed, 133 insertions(+), 22 deletions(-)
-
-diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
-index abbc223..4892c5c 100644
---- a/gnome-session/gsm-manager.c
-+++ b/gnome-session/gsm-manager.c
-@@ -149,7 +149,9 @@ struct GsmManagerPrivate
- GsmShell *shell;
- guint shell_end_session_dialog_canceled_id;
- guint shell_end_session_dialog_open_failed_id;
-- guint shell_end_session_dialog_confirmed_id;
-+ guint shell_end_session_dialog_confirmed_logout_id;
-+ guint shell_end_session_dialog_confirmed_shutdown_id;
-+ guint shell_end_session_dialog_confirmed_reboot_id;
- };
-
- enum {
-@@ -3058,10 +3060,22 @@ disconnect_shell_dialog_signals (GsmManager *manager)
- manager->priv->shell_end_session_dialog_canceled_id = 0;
- }
-
-- if (manager->priv->shell_end_session_dialog_confirmed_id != 0) {
-+ if (manager->priv->shell_end_session_dialog_confirmed_logout_id != 0) {
- g_signal_handler_disconnect (manager->priv->shell,
-- manager->priv->shell_end_session_dialog_confirmed_id);
-- manager->priv->shell_end_session_dialog_confirmed_id = 0;
-+ manager->priv->shell_end_session_dialog_confirmed_logout_id);
-+ manager->priv->shell_end_session_dialog_confirmed_logout_id = 0;
-+ }
-+
-+ if (manager->priv->shell_end_session_dialog_confirmed_shutdown_id != 0) {
-+ g_signal_handler_disconnect (manager->priv->shell,
-+ manager->priv->shell_end_session_dialog_confirmed_shutdown_id);
-+ manager->priv->shell_end_session_dialog_confirmed_shutdown_id = 0;
-+ }
-+
-+ if (manager->priv->shell_end_session_dialog_confirmed_reboot_id != 0) {
-+ g_signal_handler_disconnect (manager->priv->shell,
-+ manager->priv->shell_end_session_dialog_confirmed_reboot_id);
-+ manager->priv->shell_end_session_dialog_confirmed_reboot_id = 0;
- }
-
- if (manager->priv->shell_end_session_dialog_open_failed_id != 0) {
-@@ -3080,8 +3094,8 @@ on_shell_end_session_dialog_canceled (GsmShell *shell,
- }
-
- static void
--on_shell_end_session_dialog_confirmed (GsmShell *shell,
-- GsmManager *manager)
-+_handle_end_session_dialog_response (GsmManager *manager,
-+ GsmManagerLogoutType logout_type)
- {
- /* Note we're checking for END_SESSION here and
- * QUERY_END_SESSION in the fallback cases elsewhere.
-@@ -3098,7 +3112,31 @@ on_shell_end_session_dialog_confirmed (GsmShell *shell,
- }
-
- manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_FORCE;
-+ manager->priv->logout_type = logout_type;
- end_phase (manager);
-+}
-+
-+static void
-+on_shell_end_session_dialog_confirmed_logout (GsmShell *shell,
-+ GsmManager *manager)
-+{
-+ _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_LOGOUT);
-+ disconnect_shell_dialog_signals (manager);
-+}
-+
-+static void
-+on_shell_end_session_dialog_confirmed_shutdown (GsmShell *shell,
-+ GsmManager *manager)
-+{
-+ _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_SHUTDOWN);
-+ disconnect_shell_dialog_signals (manager);
-+}
-+
-+static void
-+on_shell_end_session_dialog_confirmed_reboot (GsmShell *shell,
-+ GsmManager *manager)
-+{
-+ _handle_end_session_dialog_response (manager, GSM_MANAGER_LOGOUT_REBOOT);
- disconnect_shell_dialog_signals (manager);
- }
-
-@@ -3120,10 +3158,22 @@ connect_shell_dialog_signals (GsmManager *manager)
- G_CALLBACK (on_shell_end_session_dialog_canceled),
- manager);
-
-- manager->priv->shell_end_session_dialog_confirmed_id =
-+ manager->priv->shell_end_session_dialog_confirmed_logout_id =
-+ g_signal_connect (manager->priv->shell,
-+ "end-session-dialog-confirmed-logout",
-+ G_CALLBACK (on_shell_end_session_dialog_confirmed_logout),
-+ manager);
-+
-+ manager->priv->shell_end_session_dialog_confirmed_shutdown_id =
-+ g_signal_connect (manager->priv->shell,
-+ "end-session-dialog-confirmed-shutdown",
-+ G_CALLBACK (on_shell_end_session_dialog_confirmed_shutdown),
-+ manager);
-+
-+ manager->priv->shell_end_session_dialog_confirmed_reboot_id =
- g_signal_connect (manager->priv->shell,
-- "end-session-dialog-confirmed",
-- G_CALLBACK (on_shell_end_session_dialog_confirmed),
-+ "end-session-dialog-confirmed-reboot",
-+ G_CALLBACK (on_shell_end_session_dialog_confirmed_reboot),
- manager);
- }
-
-diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c
-index fb5f4ed..be234aa 100644
---- a/gnome-session/gsm-shell.c
-+++ b/gnome-session/gsm-shell.c
-@@ -74,7 +74,9 @@ enum {
- END_SESSION_DIALOG_OPENED = 0,
- END_SESSION_DIALOG_OPEN_FAILED,
- END_SESSION_DIALOG_CANCELED,
-- END_SESSION_DIALOG_CONFIRMED,
-+ END_SESSION_DIALOG_CONFIRMED_LOGOUT,
-+ END_SESSION_DIALOG_CONFIRMED_SHUTDOWN,
-+ END_SESSION_DIALOG_CONFIRMED_REBOOT,
- NUMBER_OF_SIGNALS
- };
-
-@@ -169,11 +171,31 @@ gsm_shell_class_init (GsmShellClass *shell_class)
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-
-- signals [END_SESSION_DIALOG_CONFIRMED] =
-- g_signal_new ("end-session-dialog-confirmed",
-+ signals [END_SESSION_DIALOG_CONFIRMED_LOGOUT] =
-+ g_signal_new ("end-session-dialog-confirmed-logout",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST,
-- G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed),
-+ G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_logout),
-+ NULL,
-+ NULL,
-+ g_cclosure_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ signals [END_SESSION_DIALOG_CONFIRMED_SHUTDOWN] =
-+ g_signal_new ("end-session-dialog-confirmed-shutdown",
-+ G_OBJECT_CLASS_TYPE (object_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_shutdown),
-+ NULL,
-+ NULL,
-+ g_cclosure_marshal_VOID__VOID,
-+ G_TYPE_NONE, 0);
-+
-+ signals [END_SESSION_DIALOG_CONFIRMED_REBOOT] =
-+ g_signal_new ("end-session-dialog-confirmed-reboot",
-+ G_OBJECT_CLASS_TYPE (object_class),
-+ G_SIGNAL_RUN_LAST,
-+ G_STRUCT_OFFSET (GsmShellClass, end_session_dialog_confirmed_reboot),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
-@@ -477,8 +499,21 @@ on_end_session_dialog_canceled (DBusGProxy *proxy,
- }
-
- static void
--on_end_session_dialog_confirmed (DBusGProxy *proxy,
-- GsmShell *shell)
-+on_end_session_dialog_confirmed_logout (DBusGProxy *proxy,
-+ GsmShell *shell)
-+{
-+ if (shell->priv->update_idle_id != 0) {
-+ g_source_remove (shell->priv->update_idle_id);
-+ shell->priv->update_idle_id = 0;
-+ }
-+
-+ shell->priv->has_open_dialog = FALSE;
-+ g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_LOGOUT], 0);
-+}
-+
-+static void
-+on_end_session_dialog_confirmed_shutdown (DBusGProxy *proxy,
-+ GsmShell *shell)
- {
- if (shell->priv->update_idle_id != 0) {
- g_source_remove (shell->priv->update_idle_id);
-@@ -486,7 +521,20 @@ on_end_session_dialog_confirmed (DBusGProxy *proxy,
- }
-
- shell->priv->has_open_dialog = FALSE;
-- g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED], 0);
-+ g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_SHUTDOWN], 0);
-+}
-+
-+static void
-+on_end_session_dialog_confirmed_reboot (DBusGProxy *proxy,
-+ GsmShell *shell)
-+{
-+ if (shell->priv->update_idle_id != 0) {
-+ g_source_remove (shell->priv->update_idle_id);
-+ shell->priv->update_idle_id = 0;
-+ }
-+
-+ shell->priv->has_open_dialog = FALSE;
-+ g_signal_emit (G_OBJECT (shell), signals[END_SESSION_DIALOG_CONFIRMED_REBOOT], 0);
- }
-
- static void
-@@ -575,14 +623,24 @@ gsm_shell_open_end_session_dialog (GsmShell *shell,
- "Canceled",
- G_CALLBACK (on_end_session_dialog_canceled),
- shell, NULL);
--
- dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-- "Confirmed", G_TYPE_INVALID);
-+ "ConfirmedLogout", G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-- "Confirmed",
-- G_CALLBACK (on_end_session_dialog_confirmed),
-+ "ConfirmedLogout",
-+ G_CALLBACK (on_end_session_dialog_confirmed_logout),
-+ shell, NULL);
-+ dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-+ "ConfirmedShutdown", G_TYPE_INVALID);
-+ dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-+ "ConfirmedShutdown",
-+ G_CALLBACK (on_end_session_dialog_confirmed_shutdown),
-+ shell, NULL);
-+ dbus_g_proxy_add_signal (shell->priv->end_session_dialog_proxy,
-+ "ConfirmedReboot", G_TYPE_INVALID);
-+ dbus_g_proxy_connect_signal (shell->priv->end_session_dialog_proxy,
-+ "ConfirmedReboot",
-+ G_CALLBACK (on_end_session_dialog_confirmed_reboot),
- shell, NULL);
--
- }
-
- inhibitor_array = get_array_from_store (inhibitors);
-diff --git a/gnome-session/gsm-shell.h b/gnome-session/gsm-shell.h
-index 74a617d..123d4cc 100644
---- a/gnome-session/gsm-shell.h
-+++ b/gnome-session/gsm-shell.h
-@@ -64,7 +64,10 @@ struct _GsmShellClass
- void (* end_session_dialog_opened) (GsmShell *shell);
- void (* end_session_dialog_open_failed) (GsmShell *shell);
- void (* end_session_dialog_canceled) (GsmShell *shell);
-- void (* end_session_dialog_confirmed) (GsmShell *shell);
-+
-+ void (* end_session_dialog_confirmed_logout) (GsmShell *shell);
-+ void (* end_session_dialog_confirmed_shutdown) (GsmShell *shell);
-+ void (* end_session_dialog_confirmed_reboot) (GsmShell *shell);
-
- };
-
---
-1.7.4.1
\ No newline at end of file
diff --git a/gnome-base/gnome-session/gnome-session-2.91.92-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.91.92.ebuild
similarity index 95%
rename from gnome-base/gnome-session/gnome-session-2.91.92-r1.ebuild
rename to gnome-base/gnome-session/gnome-session-2.91.92.ebuild
index df7fdaa..177516d 100644
--- a/gnome-base/gnome-session/gnome-session-2.91.92-r1.ebuild
+++ b/gnome-base/gnome-session/gnome-session-2.91.92.ebuild
@@ -5,7 +5,7 @@
EAPI="3"
GCONF_DEBUG="yes"
-inherit eutils gnome2
+inherit gnome2
DESCRIPTION="Gnome session manager"
HOMEPAGE="http://www.gnome.org/"
@@ -73,9 +73,6 @@ src_prepare() {
$(use_enable ipv6)"
DOCS="AUTHORS ChangeLog NEWS README"
- # Fixed upstream, https://bugzilla.gnome.org/show_bug.cgi?id=645432
- epatch "${FILESDIR}/${P}-fix-logout.patch"
-
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2011-04-08 10:52 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2011-04-08 10:52 UTC (permalink / raw
To: gentoo-commits
commit: 6c59899a85102161d5c1e3835a0472010578d37b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 14:30:18 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 08:52:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6c59899a
gnome-base/gnome-session: QAed
* Import changes from gentoo-x86
* Use proper phase name for configuration
(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)
---
gnome-base/gnome-session/files/15-xdg-data-gnome | 9 +
gnome-base/gnome-session/files/defaults.list | 333 ++++++++++++++++++++
.../gnome-session/gnome-session-3.0.0.ebuild | 17 +-
gnome-base/gnome-session/gnome-session-9999.ebuild | 17 +-
4 files changed, 366 insertions(+), 10 deletions(-)
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome
new file mode 100644
index 0000000..e62f3e1
--- /dev/null
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "gnome" ]; then
+ if [ -z "$XDG_DATA_DIRS" ]; then
+ export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
+ else
+ export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
+ fi
+fi
diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list
new file mode 100644
index 0000000..1fee954
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list
@@ -0,0 +1,333 @@
+[Default Applications]
+application/rtf=abiword.desktop
+application/x-abiword=abiword.desktop
+text/abiword=abiword.desktop
+text/richtext=abiword.desktop
+text/rtf=abiword.desktop
+text/x-abiword=abiword.desktop
+text/x-xml-abiword=abiword.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
+application/x-dia-diagram=dia.desktop
+image/bmp=eog.desktop
+image/gif=eog.desktop
+image/jpeg=eog.desktop
+image/jpg=eog.desktop
+image/pjpeg=eog.desktop
+image/png=eog.desktop
+image/svg+xml=eog.desktop
+image/svg+xml-compressed=eog.desktop
+image/x-bmp=eog.desktop
+image/x-gray=eog.desktop
+image/x-icb=eog.desktop
+image/x-ico=eog.desktop
+image/x-pcx=eog.desktop
+image/x-png=eog.desktop
+image/x-portable-anymap=eog.desktop
+image/x-portable-bitmap=eog.desktop
+image/x-portable-graymap=eog.desktop
+image/x-portable-pixmap=eog.desktop
+image/x-xbitmap=eog.desktop
+image/x-xpixmap=eog.desktop
+image/vnd.wap.wbmp=eog.desktop
+image/g3fax=gimp.desktop
+image/x-compressed-xcf=gimp.desktop
+image/x-fits=gimp.desktop
+image/x-icon=gimp.desktop
+image/x-psd=gimp.desktop
+image/x-sgi=gimp.desktop
+image/x-sun-raster=gimp.desktop
+image/x-tga=gimp.desktop
+image/x-xcf=gimp.desktop
+image/x-xwindowdump=gimp.desktop
+application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+application/pdf=evince.desktop
+application/x-bzpdf=evince.desktop
+application/x-gzpdf=evince.desktop
+application/postscript=evince.desktop
+application/x-bzpostscript=evince.desktop
+application/x-gzpostscript=evince.desktop
+image/x-eps=evince.desktop
+image/x-bzeps=evince.desktop
+image/x-gzeps=evince.desktop
+application/x-dvi=evince.desktop
+application/x-bzdvi=evince.desktop
+application/x-gzdvi=evince.desktop
+image/vnd.djvu=evince.desktop
+image/tiff=evince.desktop
+application/x-cbr=evince.desktop
+application/x-cbz=evince.desktop
+application/x-cb7=evince.desktop
+application/x-7z-compressed=file-roller.desktop
+application/x-7z-compressed-tar=file-roller.desktop
+application/x-ace=file-roller.desktop
+application/x-alz=file-roller.desktop
+application/x-ar=file-roller.desktop
+application/x-arj=file-roller.desktop
+application/x-bzip=file-roller.desktop
+application/x-bzip-compressed-tar=file-roller.desktop
+application/x-bzip1=file-roller.desktop
+application/x-bzip1-compressed-tar=file-roller.desktop
+application/x-cabinet=file-roller.desktop
+application/x-cd-image=file-roller.desktop
+application/x-compress=file-roller.desktop
+application/x-compressed-tar=file-roller.desktop
+application/x-cpio=file-roller.desktop
+application/x-deb=file-roller.desktop
+application/x-ear=file-roller.desktop
+application/x-gtar=file-roller.desktop
+application/x-gzip=file-roller.desktop
+application/x-java-archive=file-roller.desktop
+application/x-lha=file-roller.desktop
+application/x-lhz=file-roller.desktop
+application/x-lzip=file-roller.desktop
+application/x-lzip-compressed-tar=file-roller.desktop
+application/x-lzma=file-roller.desktop
+application/x-lzma-compressed-tar=file-roller.desktop
+application/x-lzop=file-roller.desktop
+application/x-lzop-compressed-tar=file-roller.desktop
+application/x-rar=file-roller.desktop
+application/x-rar-compressed=file-roller.desktop
+application/x-rpm=file-roller.desktop
+application/x-rzip=file-roller.desktop
+application/x-tar=file-roller.desktop
+application/x-tarz=file-roller.desktop
+application/x-stuffit=file-roller.desktop
+application/x-war=file-roller.desktop
+application/x-xz=file-roller.desktop
+application/x-xz-compressed-tar=file-roller.desktop
+application/x-zip=file-roller.desktop
+application/x-zip-compressed=file-roller.desktop
+application/x-zoo=file-roller.desktop
+application/zip=file-roller.desktop
+multipart/x-zip=file-roller.desktop
+text/plain=gedit.desktop
+text/css=gedit.desktop
+text/javascript=gedit.desktop
+text/mathml=gedit.desktop
+text/x-csrc=gedit.desktop
+text/x-chdr=gedit.desktop
+text/x-dtd=gedit.desktop
+text/x-java=gedit.desktop
+text/x-javascript=gedit.desktop
+text/x-patch=gedit.desktop
+text/x-perl=gedit.destkop
+text/x-php=gedit.destkop
+text/x-python=gedit.destkop
+text/x-sql=gedit.desktop
+text/xml=gedit.desktop
+application/javascript=gedit.destkop
+application/x-cgi=gedit.desktop
+application/x-javascript=gedit.desktop
+application/x-perl=gedit.desktop
+application/x-php=gedit.desktop
+application/x-python=gedit.desktop
+application/xml=gedit.desktop
+application/xml-dtd=gedit.desktop
+application/x-font-ttf=gnome-font-viewer.desktop
+application/x-font-pcf=gnome-font-viewer.desktop
+application/x-font-type1=gnome-font-viewer.desktop
+application/x-font-otf=gnome-font-viewer.desktop
+application/csv=gnumeric.desktop
+application/excel=gnumeric.desktop
+application/msexcel=gnumeric.desktop
+application/tab-separated-values=gnumeric.desktop
+application/vnd.lotus-1-2-3=gnumeric.desktop
+application/vnd.ms-excel=gnumeric.desktop
+application/x-123=gnumeric.desktop
+application/x-applix-spreadsheet=gnumeric.desktop
+application/x-dbase=gnumeric.desktop
+application/x-dbf=gnumeric.desktop
+application/x-dos_ms_excel=gnumeric.desktop
+application/x-excel=gnumeric.desktop
+application/x-gnumeric=gnumeric.desktop
+application/x-mps=gnumeric.desktop
+application/x-ms-excel=gnumeric.desktop
+application/x-msexcel=gnumeric.desktop
+application/x-oleo=gnumeric.desktop
+application/x-planperfect=gnumeric.desktop
+application/x-quattropro=gnumeric.desktop
+application/x-sc=gnumeric.desktop
+application/x-sylk=gnumeric.desktop
+application/x-xbase=gnumeric.desktop
+application/x-xls=gnumeric.desktop
+application/xls=gnumeric.desktop
+text/comma-separated-values=gnumeric.desktop
+text/csv=gnumeric.desktop
+text/spreadsheet=gnumeric.desktop
+text/tab-separated-values=gnumeric.desktop
+text/x-comma-separated-values=gnumeric.desktop
+text/x-csv=gnumeric.desktop
+zz-application/zz-winassoc-xls=gnumeric.desktop
+x-content/software=nautilus-autorun-software.desktop
+x-directory/gnome-default-handler=nautilus-folder-handler.desktop
+x-directory/normal=nautilus-folder-handler.desktop
+inode/directory=nautilus-folder-handler.desktop
+application/x-gnome-saved-search=nautilus-folder-handler.desktop
+application/vnd.oasis.opendocument.spreadsheet=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=openoffice.org-calc.desktop
+application/vnd.stardivision.calc=openoffice.org-calc.desktop
+application/vnd.stardivision.chart=openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.macroenabled.12=openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=openoffice.org-calc.desktop
+application/vnd.ms-excel.template.macroenabled.12=openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.binary.macroenabled.12=openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.graphics=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=openoffice.org-draw.desktop
+application/vnd.stardivision.draw=openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.presentation=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=openoffice.org-impress.desktop
+application/vnd.stardivision.impress=openoffice.org-impress.desktop
+application/mspowerpoint=openoffice.org-impress.desktop
+application/vnd.ms-powerpoint=openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.presentation.macroenabled.12=openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.template.macroenabled.12=openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.formula=openoffice.org-math.desktop
+application/vnd.sun.xml.math=openoffice.org-math.desktop
+application/vnd.stardivision.math=openoffice.org-math.desktop
+application/vnd.oasis.opendocument.text=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.template=openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=openoffice.org-writer.desktop
+application/vnd.stardivision.writer=openoffice.org-writer.desktop
+application/msword=openoffice.org-writer.desktop
+application/vnd.ms-word=openoffice.org-writer.desktop
+application/x-doc=openoffice.org-writer.desktop
+application/vnd.wordperfect=openoffice.org-writer.desktop
+application/wordperfect=openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=openoffice.org-writer.desktop
+application/vnd.ms-word.document.macroenabled.12=openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=openoffice.org-writer.desktop
+application/vnd.ms-word.template.macroenabled.12=openoffice.org-writer.desktop
+x-content/audio-player=rhythmbox.desktop
+x-content/audio-cdda=sound-juicer.desktop
+application/x-shockwave-flash=swfdec-player.desktop
+application/futuresplash=swfdec-player.desktop
+application/mxf=totem.desktop
+application/ogg=totem.desktop
+application/ram=totem.desktop
+application/sdp=totem.desktop
+application/smil=totem.desktop
+application/smil+xml=totem.desktop
+application/vnd.ms-wpl=totem.desktop
+application/vnd.rn-realmedia=totem.desktop
+application/x-extension-m4a=totem.desktop
+application/x-extension-mp4=totem.desktop
+application/x-flac=totem.desktop
+application/x-flash-video=totem.desktop
+application/x-matroska=totem.desktop
+application/x-netshow-channel=totem.desktop
+application/x-ogg=totem.desktop
+application/x-quicktime-media-link=totem.desktop
+application/x-quicktimeplayer=totem.desktop
+application/x-shorten=totem.desktop
+application/x-smil=totem.desktop
+application/xspf+xml=totem.desktop
+audio/3gpp=totem.desktop
+audio/ac3=totem.desktop
+audio/AMR=totem.desktop
+audio/AMR-WB=totem.desktop
+audio/basic=totem.desktop
+audio/midi=totem.desktop
+audio/mp4=totem.desktop
+audio/mpeg=totem.desktop
+audio/mpegurl=totem.desktop
+audio/ogg=totem.desktop
+audio/prs.sid=totem.desktop
+audio/vnd.rn-realaudio=totem.desktop
+audio/x-ape=totem.desktop
+audio/x-flac=totem.desktop
+audio/x-gsm=totem.desktop
+audio/x-it=totem.desktop
+audio/x-m4a=totem.desktop
+audio/x-matroska=totem.desktop
+audio/x-mod=totem.desktop
+audio/x-mp3=totem.desktop
+audio/x-mpeg=totem.desktop
+audio/x-mpegurl=totem.desktop
+audio/x-ms-asf=totem.desktop
+audio/x-ms-asx=totem.desktop
+audio/x-ms-wax=totem.desktop
+audio/x-ms-wma=totem.desktop
+audio/x-musepack=totem.desktop
+audio/x-pn-aiff=totem.desktop
+audio/x-pn-au=totem.desktop
+audio/x-pn-realaudio=totem.desktop
+audio/x-pn-realaudio-plugin=totem.desktop
+audio/x-pn-wav=totem.desktop
+audio/x-pn-windows-acm=totem.desktop
+audio/x-realaudio=totem.desktop
+audio/x-real-audio=totem.desktop
+audio/x-sbc=totem.desktop
+audio/x-scpls=totem.desktop
+audio/x-speex=totem.desktop
+audio/x-tta=totem.desktop
+audio/x-vorbis=totem.desktop
+audio/x-vorbis+ogg=totem.desktop
+audio/x-wav=totem.desktop
+audio/x-wavpack=totem.desktop
+audio/x-xm=totem.desktop
+image/vnd.rn-realpix=totem.desktop
+image/x-pict=totem.desktop
+misc/ultravox=totem.desktop
+text/google-video-pointer=totem.desktop
+text/x-google-video-pointer=totem.desktop
+video/3gpp=totem.desktop
+video/dv=totem.desktop
+video/fli=totem.desktop
+video/flv=totem.desktop
+video/mp2t=totem.desktop
+video/mp4=totem.desktop
+video/mp4v-es=totem.desktop
+video/mpeg=totem.desktop
+video/msvideo=totem.desktop
+video/ogg=totem.desktop
+video/quicktime=totem.desktop
+video/vivo=totem.desktop
+video/vnd.divx=totem.desktop
+video/vnd.rn-realvideo=totem.desktop
+video/vnd.vivo=totem.desktop
+video/webm=totem.desktop
+video/x-anim=totem.desktop
+video/x-avi=totem.desktop
+video/x-flc=totem.desktop
+video/x-fli=totem.desktop
+video/x-flic=totem.desktop
+video/x-flv=totem.desktop
+video/x-m4v=totem.desktop
+video/x-matroska=totem.desktop
+video/x-mpeg=totem.desktop
+video/x-ms-asf=totem.desktop
+video/x-ms-asx=totem.desktop
+video/x-msvideo=totem.desktop
+video/x-ms-wm=totem.desktop
+video/x-ms-wmv=totem.desktop
+video/x-ms-wmx=totem.desktop
+video/x-ms-wvx=totem.desktop
+video/x-nsv=totem.desktop
+video/x-ogm+ogg=totem.desktop
+video/x-theora+ogg=totem.desktop
+video/x-totem-stream=totem.desktop
+x-content/video-dvd=totem.desktop
+x-content/video-vcd=totem.desktop
+x-content/video-svcd=totem.desktop
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;epiphany.desktop
+x-scheme-handler/https=firefox.desktop;epiphany.desktop
+x-scheme-handler/mailto=evolution.desktop
\ No newline at end of file
diff --git a/gnome-base/gnome-session/gnome-session-3.0.0.ebuild b/gnome-base/gnome-session/gnome-session-3.0.0.ebuild
index 7c1537e..70f950a 100644
--- a/gnome-base/gnome-session/gnome-session-3.0.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.0.0.ebuild
@@ -12,13 +12,13 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-IUSE="doc ipv6 elibc_FreeBSD"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
+IUSE="doc ipv6 elibc_FreeBSD"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -26,7 +26,7 @@ fi
COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
>=x11-libs/gtk+-2.90.7:3
>=dev-libs/dbus-glib-0.76
- >=gnome-base/gconf-2
+ >=gnome-base/gconf-2:2
>=sys-power/upower-0.9.0
gnome-base/librsvg:2
elibc_FreeBSD? ( dev-libs/libexecinfo )
@@ -59,7 +59,7 @@ DEPEND="${COMMON_DEPEND}
# gnome-common needed for eautoreconf
# gnome-base/gdm does not provide gnome.desktop anymore
-src_prepare() {
+pkg_setup() {
# TODO: convert libnotify to a configure option
G2CONF="${G2CONF}
--disable-deprecation-flags
@@ -69,8 +69,6 @@ src_prepare() {
$(use_enable doc docbook-docs)
$(use_enable ipv6)"
DOCS="AUTHORS ChangeLog NEWS README"
-
- gnome2_src_prepare
}
src_install() {
@@ -79,7 +77,16 @@ src_install() {
dodir /etc/X11/Sessions || die "dodir failed"
exeinto /etc/X11/Sessions
doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+ dodir /usr/share/gnome/applications/ || die
+ insinto /usr/share/gnome/applications/
+ doins "${FILESDIR}/defaults.list" || die
+
+ dodir /etc/X11/xinit/xinitrc.d/ || die
exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}/15-xdg-data-gnome" || die
+
+ # FIXME: this should be done by x11-misc/xdg-user-dirs
doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed"
}
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 7c1537e..70f950a 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -12,13 +12,13 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-IUSE="doc ipv6 elibc_FreeBSD"
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
+IUSE="doc ipv6 elibc_FreeBSD"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -26,7 +26,7 @@ fi
COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
>=x11-libs/gtk+-2.90.7:3
>=dev-libs/dbus-glib-0.76
- >=gnome-base/gconf-2
+ >=gnome-base/gconf-2:2
>=sys-power/upower-0.9.0
gnome-base/librsvg:2
elibc_FreeBSD? ( dev-libs/libexecinfo )
@@ -59,7 +59,7 @@ DEPEND="${COMMON_DEPEND}
# gnome-common needed for eautoreconf
# gnome-base/gdm does not provide gnome.desktop anymore
-src_prepare() {
+pkg_setup() {
# TODO: convert libnotify to a configure option
G2CONF="${G2CONF}
--disable-deprecation-flags
@@ -69,8 +69,6 @@ src_prepare() {
$(use_enable doc docbook-docs)
$(use_enable ipv6)"
DOCS="AUTHORS ChangeLog NEWS README"
-
- gnome2_src_prepare
}
src_install() {
@@ -79,7 +77,16 @@ src_install() {
dodir /etc/X11/Sessions || die "dodir failed"
exeinto /etc/X11/Sessions
doexe "${FILESDIR}/Gnome" || die "doexe failed"
+
+ dodir /usr/share/gnome/applications/ || die
+ insinto /usr/share/gnome/applications/
+ doins "${FILESDIR}/defaults.list" || die
+
+ dodir /etc/X11/xinit/xinitrc.d/ || die
exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}/15-xdg-data-gnome" || die
+
+ # FIXME: this should be done by x11-misc/xdg-user-dirs
doexe "${FILESDIR}/10-user-dirs-update" || die "doexe failed"
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2012-03-27 6:18 Alexandre Restovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Restovtsev @ 2012-03-27 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 036da23a989973c454ae0696e391d20b0beb28f5
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 06:14:29 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Mar 27 06:14:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=036da23a
gnome-base/gnome-session: restore cinnamon support, enable optional systemd support
---
...s-update-gnome => 10-user-dirs-update-gnome-r1} | 2 +-
.../{15-xdg-data-gnome => 15-xdg-data-gnome-r1} | 2 +-
....3.92.ebuild => gnome-session-3.3.92-r1.ebuild} | 17 +++++++++--------
gnome-base/gnome-session/gnome-session-9999.ebuild | 17 +++++++++--------
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
similarity index 74%
rename from gnome-base/gnome-session/files/10-user-dirs-update-gnome
rename to gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
index f909d44..61fd08c 100644
--- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome
+++ b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
@@ -3,7 +3,7 @@
# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
# That file is read by glib to get XDG_PICTURES_DIR, etc
-if [ "$DESKTOP_SESSION" = "gnome" ]; then
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
if type xdg-user-dirs-update &>/dev/null; then
xdg-user-dirs-update
fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
similarity index 70%
rename from gnome-base/gnome-session/files/15-xdg-data-gnome
rename to gnome-base/gnome-session/files/15-xdg-data-gnome-r1
index e62f3e1..5eaa698 100644
--- a/gnome-base/gnome-session/files/15-xdg-data-gnome
+++ b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
@@ -1,6 +1,6 @@
#!/bin/sh
-if [ "$DESKTOP_SESSION" = "gnome" ]; then
+if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
if [ -z "$XDG_DATA_DIRS" ]; then
export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
else
diff --git a/gnome-base/gnome-session/gnome-session-3.3.92.ebuild b/gnome-base/gnome-session/gnome-session-3.3.92-r1.ebuild
similarity index 88%
rename from gnome-base/gnome-session/gnome-session-3.3.92.ebuild
rename to gnome-base/gnome-session/gnome-session-3.3.92-r1.ebuild
index 0da5e6b..6881c96 100644
--- a/gnome-base/gnome-session/gnome-session-3.3.92.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.3.92-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1.ebuild,v 1.4 2011/01/03 11:41:21 pacho Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="yes"
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-IUSE="doc ipv6 elibc_FreeBSD"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -55,7 +55,8 @@ RDEPEND="${COMMON_DEPEND}
gnome-base/gnome-settings-daemon
>=gnome-base/gsettings-desktop-schemas-0.1.7
>=x11-themes/gnome-themes-standard-2.91.92
- sys-apps/dbus[X]"
+ sys-apps/dbus[X]
+ systemd? ( >=sys-apps/systemd-31 )"
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
@@ -73,10 +74,10 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-deprecation-flags
--disable-schemas-compile
- --disable-systemd
--docdir="${EPREFIX}/usr/share/doc/${PF}"
$(use_enable doc docbook-docs)
- $(use_enable ipv6)"
+ $(use_enable ipv6)
+ $(use_enable systemd)"
DOCS="AUTHORS ChangeLog NEWS README"
}
@@ -93,10 +94,10 @@ src_install() {
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
- doexe "${FILESDIR}/15-xdg-data-gnome"
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
# This should be done here as discussed in bug #270852
- doexe "${FILESDIR}/10-user-dirs-update-gnome"
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
}
pkg_postinst() {
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 0da5e6b..6881c96 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-2.32.1.ebuild,v 1.4 2011/01/03 11:41:21 pacho Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="yes"
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-IUSE="doc ipv6 elibc_FreeBSD"
+IUSE="doc elibc_FreeBSD ipv6 systemd"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
@@ -55,7 +55,8 @@ RDEPEND="${COMMON_DEPEND}
gnome-base/gnome-settings-daemon
>=gnome-base/gsettings-desktop-schemas-0.1.7
>=x11-themes/gnome-themes-standard-2.91.92
- sys-apps/dbus[X]"
+ sys-apps/dbus[X]
+ systemd? ( >=sys-apps/systemd-31 )"
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
@@ -73,10 +74,10 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-deprecation-flags
--disable-schemas-compile
- --disable-systemd
--docdir="${EPREFIX}/usr/share/doc/${PF}"
$(use_enable doc docbook-docs)
- $(use_enable ipv6)"
+ $(use_enable ipv6)
+ $(use_enable systemd)"
DOCS="AUTHORS ChangeLog NEWS README"
}
@@ -93,10 +94,10 @@ src_install() {
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
- doexe "${FILESDIR}/15-xdg-data-gnome"
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
# This should be done here as discussed in bug #270852
- doexe "${FILESDIR}/10-user-dirs-update-gnome"
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2013-02-06 3:32 Alexandre Rostovtsev
0 siblings, 0 replies; 9+ messages in thread
From: Alexandre Rostovtsev @ 2013-02-06 3:32 UTC (permalink / raw
To: gentoo-commits
commit: 84318948b8f79ec4d1ac2599cc88d3e14b1ea9db
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 3 00:46:09 2013 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Feb 3 00:46:09 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=84318948
gnome-base/gnome-session: sync with gx86
Update the defaults list for 3.6 (bug #449486).
---
gnome-base/gnome-session/files/defaults.list | 333 -------------------
gnome-base/gnome-session/files/defaults.list-r1 | 334 ++++++++++++++++++++
gnome-base/gnome-session/gnome-session-9999.ebuild | 21 +-
gnome-base/gnome-session/metadata.xml | 2 -
4 files changed, 344 insertions(+), 346 deletions(-)
diff --git a/gnome-base/gnome-session/files/defaults.list b/gnome-base/gnome-session/files/defaults.list
deleted file mode 100644
index 572b540..0000000
--- a/gnome-base/gnome-session/files/defaults.list
+++ /dev/null
@@ -1,333 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop
-application/x-abiword=abiword.desktop
-text/abiword=abiword.desktop
-text/richtext=abiword.desktop
-text/rtf=abiword.desktop
-text/x-abiword=abiword.desktop
-text/x-xml-abiword=abiword.desktop
-x-content/blank-bd=brasero-nautilus.desktop
-x-content/blank-dvd=brasero-nautilus.desktop
-x-content/blank-cd=brasero-nautilus.desktop
-x-content/blank-hddvd=brasero-nautilus.desktop
-application/x-dia-diagram=dia.desktop
-image/bmp=eog.desktop
-image/gif=eog.desktop
-image/jpeg=eog.desktop
-image/jpg=eog.desktop
-image/pjpeg=eog.desktop
-image/png=eog.desktop
-image/svg+xml=eog.desktop
-image/svg+xml-compressed=eog.desktop
-image/x-bmp=eog.desktop
-image/x-gray=eog.desktop
-image/x-icb=eog.desktop
-image/x-ico=eog.desktop
-image/x-pcx=eog.desktop
-image/x-png=eog.desktop
-image/x-portable-anymap=eog.desktop
-image/x-portable-bitmap=eog.desktop
-image/x-portable-graymap=eog.desktop
-image/x-portable-pixmap=eog.desktop
-image/x-xbitmap=eog.desktop
-image/x-xpixmap=eog.desktop
-image/vnd.wap.wbmp=eog.desktop
-image/g3fax=gimp.desktop
-image/x-compressed-xcf=gimp.desktop
-image/x-fits=gimp.desktop
-image/x-icon=gimp.desktop
-image/x-psd=gimp.desktop
-image/x-sgi=gimp.desktop
-image/x-sun-raster=gimp.desktop
-image/x-tga=gimp.desktop
-image/x-xcf=gimp.desktop
-image/x-xwindowdump=gimp.desktop
-application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
-application/pdf=evince.desktop
-application/x-bzpdf=evince.desktop
-application/x-gzpdf=evince.desktop
-application/postscript=evince.desktop
-application/x-bzpostscript=evince.desktop
-application/x-gzpostscript=evince.desktop
-image/x-eps=evince.desktop
-image/x-bzeps=evince.desktop
-image/x-gzeps=evince.desktop
-application/x-dvi=evince.desktop
-application/x-bzdvi=evince.desktop
-application/x-gzdvi=evince.desktop
-image/vnd.djvu=evince.desktop
-image/tiff=evince.desktop
-application/x-cbr=evince.desktop
-application/x-cbz=evince.desktop
-application/x-cb7=evince.desktop
-application/x-7z-compressed=file-roller.desktop
-application/x-7z-compressed-tar=file-roller.desktop
-application/x-ace=file-roller.desktop
-application/x-alz=file-roller.desktop
-application/x-ar=file-roller.desktop
-application/x-arj=file-roller.desktop
-application/x-bzip=file-roller.desktop
-application/x-bzip-compressed-tar=file-roller.desktop
-application/x-bzip1=file-roller.desktop
-application/x-bzip1-compressed-tar=file-roller.desktop
-application/x-cabinet=file-roller.desktop
-application/x-cd-image=file-roller.desktop
-application/x-compress=file-roller.desktop
-application/x-compressed-tar=file-roller.desktop
-application/x-cpio=file-roller.desktop
-application/x-deb=file-roller.desktop
-application/x-ear=file-roller.desktop
-application/x-gtar=file-roller.desktop
-application/x-gzip=file-roller.desktop
-application/x-java-archive=file-roller.desktop
-application/x-lha=file-roller.desktop
-application/x-lhz=file-roller.desktop
-application/x-lzip=file-roller.desktop
-application/x-lzip-compressed-tar=file-roller.desktop
-application/x-lzma=file-roller.desktop
-application/x-lzma-compressed-tar=file-roller.desktop
-application/x-lzop=file-roller.desktop
-application/x-lzop-compressed-tar=file-roller.desktop
-application/x-rar=file-roller.desktop
-application/x-rar-compressed=file-roller.desktop
-application/x-rpm=file-roller.desktop
-application/x-rzip=file-roller.desktop
-application/x-tar=file-roller.desktop
-application/x-tarz=file-roller.desktop
-application/x-stuffit=file-roller.desktop
-application/x-war=file-roller.desktop
-application/x-xz=file-roller.desktop
-application/x-xz-compressed-tar=file-roller.desktop
-application/x-zip=file-roller.desktop
-application/x-zip-compressed=file-roller.desktop
-application/x-zoo=file-roller.desktop
-application/zip=file-roller.desktop
-multipart/x-zip=file-roller.desktop
-text/plain=gedit.desktop
-text/css=gedit.desktop
-text/javascript=gedit.desktop
-text/mathml=gedit.desktop
-text/x-csrc=gedit.desktop
-text/x-chdr=gedit.desktop
-text/x-dtd=gedit.desktop
-text/x-java=gedit.desktop
-text/x-javascript=gedit.desktop
-text/x-patch=gedit.desktop
-text/x-perl=gedit.destkop
-text/x-php=gedit.destkop
-text/x-python=gedit.destkop
-text/x-sql=gedit.desktop
-text/xml=gedit.desktop
-application/javascript=gedit.destkop
-application/x-cgi=gedit.desktop
-application/x-javascript=gedit.desktop
-application/x-perl=gedit.desktop
-application/x-php=gedit.desktop
-application/x-python=gedit.desktop
-application/xml=gedit.desktop
-application/xml-dtd=gedit.desktop
-application/x-font-ttf=gnome-font-viewer.desktop
-application/x-font-pcf=gnome-font-viewer.desktop
-application/x-font-type1=gnome-font-viewer.desktop
-application/x-font-otf=gnome-font-viewer.desktop
-application/csv=gnumeric.desktop
-application/excel=gnumeric.desktop
-application/msexcel=gnumeric.desktop
-application/tab-separated-values=gnumeric.desktop
-application/vnd.lotus-1-2-3=gnumeric.desktop
-application/vnd.ms-excel=gnumeric.desktop
-application/x-123=gnumeric.desktop
-application/x-applix-spreadsheet=gnumeric.desktop
-application/x-dbase=gnumeric.desktop
-application/x-dbf=gnumeric.desktop
-application/x-dos_ms_excel=gnumeric.desktop
-application/x-excel=gnumeric.desktop
-application/x-gnumeric=gnumeric.desktop
-application/x-mps=gnumeric.desktop
-application/x-ms-excel=gnumeric.desktop
-application/x-msexcel=gnumeric.desktop
-application/x-oleo=gnumeric.desktop
-application/x-planperfect=gnumeric.desktop
-application/x-quattropro=gnumeric.desktop
-application/x-sc=gnumeric.desktop
-application/x-sylk=gnumeric.desktop
-application/x-xbase=gnumeric.desktop
-application/x-xls=gnumeric.desktop
-application/xls=gnumeric.desktop
-text/comma-separated-values=gnumeric.desktop
-text/csv=gnumeric.desktop
-text/spreadsheet=gnumeric.desktop
-text/tab-separated-values=gnumeric.desktop
-text/x-comma-separated-values=gnumeric.desktop
-text/x-csv=gnumeric.desktop
-zz-application/zz-winassoc-xls=gnumeric.desktop
-x-content/software=nautilus-autorun-software.desktop
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop
-x-directory/normal=nautilus-folder-handler.desktop
-inode/directory=nautilus-folder-handler.desktop
-application/x-gnome-saved-search=nautilus-folder-handler.desktop
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
-x-content/audio-player=rhythmbox.desktop
-x-content/audio-cdda=sound-juicer.desktop
-application/x-shockwave-flash=swfdec-player.desktop
-application/futuresplash=swfdec-player.desktop
-application/mxf=totem.desktop
-application/ogg=totem.desktop
-application/ram=totem.desktop
-application/sdp=totem.desktop
-application/smil=totem.desktop
-application/smil+xml=totem.desktop
-application/vnd.ms-wpl=totem.desktop
-application/vnd.rn-realmedia=totem.desktop
-application/x-extension-m4a=totem.desktop
-application/x-extension-mp4=totem.desktop
-application/x-flac=totem.desktop
-application/x-flash-video=totem.desktop
-application/x-matroska=totem.desktop
-application/x-netshow-channel=totem.desktop
-application/x-ogg=totem.desktop
-application/x-quicktime-media-link=totem.desktop
-application/x-quicktimeplayer=totem.desktop
-application/x-shorten=totem.desktop
-application/x-smil=totem.desktop
-application/xspf+xml=totem.desktop
-audio/3gpp=totem.desktop
-audio/ac3=totem.desktop
-audio/AMR=totem.desktop
-audio/AMR-WB=totem.desktop
-audio/basic=totem.desktop
-audio/midi=totem.desktop
-audio/mp4=totem.desktop
-audio/mpeg=totem.desktop
-audio/mpegurl=totem.desktop
-audio/ogg=totem.desktop
-audio/prs.sid=totem.desktop
-audio/vnd.rn-realaudio=totem.desktop
-audio/x-ape=totem.desktop
-audio/x-flac=totem.desktop
-audio/x-gsm=totem.desktop
-audio/x-it=totem.desktop
-audio/x-m4a=totem.desktop
-audio/x-matroska=totem.desktop
-audio/x-mod=totem.desktop
-audio/x-mp3=totem.desktop
-audio/x-mpeg=totem.desktop
-audio/x-mpegurl=totem.desktop
-audio/x-ms-asf=totem.desktop
-audio/x-ms-asx=totem.desktop
-audio/x-ms-wax=totem.desktop
-audio/x-ms-wma=totem.desktop
-audio/x-musepack=totem.desktop
-audio/x-pn-aiff=totem.desktop
-audio/x-pn-au=totem.desktop
-audio/x-pn-realaudio=totem.desktop
-audio/x-pn-realaudio-plugin=totem.desktop
-audio/x-pn-wav=totem.desktop
-audio/x-pn-windows-acm=totem.desktop
-audio/x-realaudio=totem.desktop
-audio/x-real-audio=totem.desktop
-audio/x-sbc=totem.desktop
-audio/x-scpls=totem.desktop
-audio/x-speex=totem.desktop
-audio/x-tta=totem.desktop
-audio/x-vorbis=totem.desktop
-audio/x-vorbis+ogg=totem.desktop
-audio/x-wav=totem.desktop
-audio/x-wavpack=totem.desktop
-audio/x-xm=totem.desktop
-image/vnd.rn-realpix=totem.desktop
-image/x-pict=totem.desktop
-misc/ultravox=totem.desktop
-text/google-video-pointer=totem.desktop
-text/x-google-video-pointer=totem.desktop
-video/3gpp=totem.desktop
-video/dv=totem.desktop
-video/fli=totem.desktop
-video/flv=totem.desktop
-video/mp2t=totem.desktop
-video/mp4=totem.desktop
-video/mp4v-es=totem.desktop
-video/mpeg=totem.desktop
-video/msvideo=totem.desktop
-video/ogg=totem.desktop
-video/quicktime=totem.desktop
-video/vivo=totem.desktop
-video/vnd.divx=totem.desktop
-video/vnd.rn-realvideo=totem.desktop
-video/vnd.vivo=totem.desktop
-video/webm=totem.desktop
-video/x-anim=totem.desktop
-video/x-avi=totem.desktop
-video/x-flc=totem.desktop
-video/x-fli=totem.desktop
-video/x-flic=totem.desktop
-video/x-flv=totem.desktop
-video/x-m4v=totem.desktop
-video/x-matroska=totem.desktop
-video/x-mpeg=totem.desktop
-video/x-ms-asf=totem.desktop
-video/x-ms-asx=totem.desktop
-video/x-msvideo=totem.desktop
-video/x-ms-wm=totem.desktop
-video/x-ms-wmv=totem.desktop
-video/x-ms-wmx=totem.desktop
-video/x-ms-wvx=totem.desktop
-video/x-nsv=totem.desktop
-video/x-ogm+ogg=totem.desktop
-video/x-theora+ogg=totem.desktop
-video/x-totem-stream=totem.desktop
-x-content/video-dvd=totem.desktop
-x-content/video-vcd=totem.desktop
-x-content/video-svcd=totem.desktop
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;epiphany.desktop
-x-scheme-handler/https=firefox.desktop;epiphany.desktop
-x-scheme-handler/mailto=evolution.desktop
\ No newline at end of file
diff --git a/gnome-base/gnome-session/files/defaults.list-r1 b/gnome-base/gnome-session/files/defaults.list-r1
new file mode 100644
index 0000000..e3aa854
--- /dev/null
+++ b/gnome-base/gnome-session/files/defaults.list-r1
@@ -0,0 +1,334 @@
+[Default Applications]
+application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-abiword=abiword.desktop;
+text/abiword=abiword.desktop;
+text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
+text/x-abiword=abiword.desktop;
+text/x-xml-abiword=abiword.desktop;
+x-content/blank-bd=brasero-nautilus.desktop;
+x-content/blank-dvd=brasero-nautilus.desktop;
+x-content/blank-cd=brasero-nautilus.desktop;
+x-content/blank-hddvd=brasero-nautilus.desktop;
+application/x-dia-diagram=dia.desktop;
+image/bmp=eog.desktop;
+image/gif=eog.desktop;
+image/jpeg=eog.desktop;
+image/jpg=eog.desktop;
+image/pjpeg=eog.desktop;
+image/png=eog.desktop;
+image/svg+xml=eog.desktop;
+image/svg+xml-compressed=eog.desktop;
+image/x-bmp=eog.desktop;
+image/x-gray=eog.desktop;
+image/x-icb=eog.desktop;
+image/x-ico=eog.desktop;
+image/x-pcx=eog.desktop;
+image/x-png=eog.desktop;
+image/x-portable-anymap=eog.desktop;
+image/x-portable-bitmap=eog.desktop;
+image/x-portable-graymap=eog.desktop;
+image/x-portable-pixmap=eog.desktop;
+image/x-xbitmap=eog.desktop;
+image/x-xpixmap=eog.desktop;
+image/vnd.wap.wbmp=eog.desktop;
+image/g3fax=gimp.desktop;
+image/x-compressed-xcf=gimp.desktop;
+image/x-fits=gimp.desktop;
+image/x-icon=gimp.desktop;
+image/x-psd=gimp.desktop;
+image/x-sgi=gimp.desktop;
+image/x-sun-raster=gimp.desktop;
+image/x-tga=gimp.desktop;
+image/x-xcf=gimp.desktop;
+image/x-xwindowdump=gimp.desktop;
+application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+text/html=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+application/pdf=evince.desktop;
+application/x-bzpdf=evince.desktop;
+application/x-gzpdf=evince.desktop;
+application/postscript=evince.desktop;
+application/x-bzpostscript=evince.desktop;
+application/x-gzpostscript=evince.desktop;
+image/x-eps=evince.desktop;
+image/x-bzeps=evince.desktop;
+image/x-gzeps=evince.desktop;
+application/x-dvi=evince.desktop;
+application/x-bzdvi=evince.desktop;
+application/x-gzdvi=evince.desktop;
+image/vnd.djvu=evince.desktop;
+image/tiff=evince.desktop;
+application/x-cbr=evince.desktop;
+application/x-cbz=evince.desktop;
+application/x-cb7=evince.desktop;
+application/x-7z-compressed=file-roller.desktop;
+application/x-7z-compressed-tar=file-roller.desktop;
+application/x-ace=file-roller.desktop;
+application/x-alz=file-roller.desktop;
+application/x-ar=file-roller.desktop;
+application/x-arj=file-roller.desktop;
+application/x-bzip=file-roller.desktop;
+application/x-bzip-compressed-tar=file-roller.desktop;
+application/x-bzip1=file-roller.desktop;
+application/x-bzip1-compressed-tar=file-roller.desktop;
+application/x-cabinet=file-roller.desktop;
+application/x-cd-image=file-roller.desktop;
+application/x-compress=file-roller.desktop;
+application/x-compressed-tar=file-roller.desktop;
+application/x-cpio=file-roller.desktop;
+application/x-deb=file-roller.desktop;
+application/x-ear=file-roller.desktop;
+application/x-gtar=file-roller.desktop;
+application/x-gzip=file-roller.desktop;
+application/x-java-archive=file-roller.desktop;
+application/x-lha=file-roller.desktop;
+application/x-lhz=file-roller.desktop;
+application/x-lzip=file-roller.desktop;
+application/x-lzip-compressed-tar=file-roller.desktop;
+application/x-lzma=file-roller.desktop;
+application/x-lzma-compressed-tar=file-roller.desktop;
+application/x-lzop=file-roller.desktop;
+application/x-lzop-compressed-tar=file-roller.desktop;
+application/x-rar=file-roller.desktop;
+application/x-rar-compressed=file-roller.desktop;
+application/x-rpm=file-roller.desktop;
+application/x-rzip=file-roller.desktop;
+application/x-tar=file-roller.desktop;
+application/x-tarz=file-roller.desktop;
+application/x-stuffit=file-roller.desktop;
+application/x-war=file-roller.desktop;
+application/x-xz=file-roller.desktop;
+application/x-xz-compressed-tar=file-roller.desktop;
+application/x-zip=file-roller.desktop;
+application/x-zip-compressed=file-roller.desktop;
+application/x-zoo=file-roller.desktop;
+application/zip=file-roller.desktop;
+multipart/x-zip=file-roller.desktop;
+text/plain=gedit.desktop;
+text/css=gedit.desktop;
+text/javascript=gedit.desktop;
+text/mathml=gedit.desktop;
+text/x-csrc=gedit.desktop;
+text/x-chdr=gedit.desktop;
+text/x-dtd=gedit.desktop;
+text/x-java=gedit.desktop;
+text/x-javascript=gedit.desktop;
+text/x-patch=gedit.desktop;
+text/x-perl=gedit.destkop
+text/x-php=gedit.destkop
+text/x-python=gedit.destkop
+text/x-sql=gedit.desktop;
+text/xml=gedit.desktop;
+application/javascript=gedit.destkop
+application/x-cgi=gedit.desktop;
+application/x-javascript=gedit.desktop;
+application/x-perl=gedit.desktop;
+application/x-php=gedit.desktop;
+application/x-python=gedit.desktop;
+application/xml=gedit.desktop;
+application/xml-dtd=gedit.desktop;
+application/x-font-ttf=gnome-font-viewer.desktop;
+application/x-font-pcf=gnome-font-viewer.desktop;
+application/x-font-type1=gnome-font-viewer.desktop;
+application/x-font-otf=gnome-font-viewer.desktop;
+application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-applix-spreadsheet=gnumeric.desktop;
+application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-gnumeric=gnumeric.desktop;
+application/x-mps=gnumeric.desktop;
+application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-oleo=gnumeric.desktop;
+application/x-planperfect=gnumeric.desktop;
+application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/x-sc=gnumeric.desktop;
+application/x-sylk=gnumeric.desktop;
+application/x-xbase=gnumeric.desktop;
+application/x-xls=gnumeric.desktop;
+application/xls=gnumeric.desktop;
+text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
+zz-application/zz-winassoc-xls=gnumeric.desktop;
+x-content/software=nautilus-autorun-software.desktop;
+x-content/unix-software=nautilus-autorun-software.desktop;
+x-directory/gnome-default-handler=nautilus-folder-handler.desktop;nautilus.desktop;
+x-directory/normal=nautilus-folder-handler.desktop;nautilus.desktop;
+inode/directory=nautilus-folder-handler.desktop;nautilus.desktop;
+application/x-gnome-saved-search=nautilus-folder-handler.desktop;nautilus.desktop;
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
+x-content/audio-player=rhythmbox.desktop;
+x-content/audio-cdda=sound-juicer.desktop;
+application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
+application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
+application/mxf=totem.desktop;
+application/ogg=totem.desktop;
+application/ram=totem.desktop;
+application/sdp=totem.desktop;
+application/smil=totem.desktop;
+application/smil+xml=totem.desktop;
+application/vnd.ms-wpl=totem.desktop;
+application/vnd.rn-realmedia=totem.desktop;
+application/x-extension-m4a=totem.desktop;
+application/x-extension-mp4=totem.desktop;
+application/x-flac=totem.desktop;
+application/x-flash-video=totem.desktop;
+application/x-matroska=totem.desktop;
+application/x-netshow-channel=totem.desktop;
+application/x-ogg=totem.desktop;
+application/x-quicktime-media-link=totem.desktop;
+application/x-quicktimeplayer=totem.desktop;
+application/x-shorten=totem.desktop;
+application/x-smil=totem.desktop;
+application/xspf+xml=totem.desktop;
+audio/3gpp=totem.desktop;
+audio/ac3=totem.desktop;
+audio/AMR=totem.desktop;
+audio/AMR-WB=totem.desktop;
+audio/basic=totem.desktop;
+audio/midi=totem.desktop;
+audio/mp4=totem.desktop;
+audio/mpeg=totem.desktop;
+audio/mpegurl=totem.desktop;
+audio/ogg=totem.desktop;
+audio/prs.sid=totem.desktop;
+audio/vnd.rn-realaudio=totem.desktop;
+audio/x-ape=totem.desktop;
+audio/x-flac=totem.desktop;
+audio/x-gsm=totem.desktop;
+audio/x-it=totem.desktop;
+audio/x-m4a=totem.desktop;
+audio/x-matroska=totem.desktop;
+audio/x-mod=totem.desktop;
+audio/x-mp3=totem.desktop;
+audio/x-mpeg=totem.desktop;
+audio/x-mpegurl=totem.desktop;
+audio/x-ms-asf=totem.desktop;
+audio/x-ms-asx=totem.desktop;
+audio/x-ms-wax=totem.desktop;
+audio/x-ms-wma=totem.desktop;
+audio/x-musepack=totem.desktop;
+audio/x-pn-aiff=totem.desktop;
+audio/x-pn-au=totem.desktop;
+audio/x-pn-realaudio=totem.desktop;
+audio/x-pn-realaudio-plugin=totem.desktop;
+audio/x-pn-wav=totem.desktop;
+audio/x-pn-windows-acm=totem.desktop;
+audio/x-realaudio=totem.desktop;
+audio/x-real-audio=totem.desktop;
+audio/x-sbc=totem.desktop;
+audio/x-scpls=totem.desktop;
+audio/x-speex=totem.desktop;
+audio/x-tta=totem.desktop;
+audio/x-vorbis=totem.desktop;
+audio/x-vorbis+ogg=totem.desktop;
+audio/x-wav=totem.desktop;
+audio/x-wavpack=totem.desktop;
+audio/x-xm=totem.desktop;
+image/vnd.rn-realpix=totem.desktop;
+image/x-pict=totem.desktop;
+misc/ultravox=totem.desktop;
+text/google-video-pointer=totem.desktop;
+text/x-google-video-pointer=totem.desktop;
+video/3gpp=totem.desktop;
+video/dv=totem.desktop;
+video/fli=totem.desktop;
+video/flv=totem.desktop;
+video/mp2t=totem.desktop;
+video/mp4=totem.desktop;
+video/mp4v-es=totem.desktop;
+video/mpeg=totem.desktop;
+video/msvideo=totem.desktop;
+video/ogg=totem.desktop;
+video/quicktime=totem.desktop;
+video/vivo=totem.desktop;
+video/vnd.divx=totem.desktop;
+video/vnd.rn-realvideo=totem.desktop;
+video/vnd.vivo=totem.desktop;
+video/webm=totem.desktop;
+video/x-anim=totem.desktop;
+video/x-avi=totem.desktop;
+video/x-flc=totem.desktop;
+video/x-fli=totem.desktop;
+video/x-flic=totem.desktop;
+video/x-flv=totem.desktop;
+video/x-m4v=totem.desktop;
+video/x-matroska=totem.desktop;
+video/x-mpeg=totem.desktop;
+video/x-ms-asf=totem.desktop;
+video/x-ms-asx=totem.desktop;
+video/x-msvideo=totem.desktop;
+video/x-ms-wm=totem.desktop;
+video/x-ms-wmv=totem.desktop;
+video/x-ms-wmx=totem.desktop;
+video/x-ms-wvx=totem.desktop;
+video/x-nsv=totem.desktop;
+video/x-ogm+ogg=totem.desktop;
+video/x-theora+ogg=totem.desktop;
+video/x-totem-stream=totem.desktop;
+x-content/video-dvd=totem.desktop;
+x-content/video-vcd=totem.desktop;
+x-content/video-svcd=totem.desktop;
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
+x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 71a4ef7..9713b80 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -18,7 +18,7 @@ SLOT="0"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
@@ -83,14 +83,13 @@ src_prepare() {
}
src_configure() {
- G2CONF="${G2CONF}
- --disable-deprecation-flags
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- $(use_enable doc docbook-docs)
- $(use_enable gconf)
- $(use_enable ipv6)
- $(use_enable systemd)"
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-deprecation-flags \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable doc docbook-docs) \
+ $(use_enable gconf) \
+ $(use_enable ipv6) \
+ $(use_enable systemd)
}
src_install() {
@@ -102,7 +101,7 @@ src_install() {
dodir /usr/share/gnome/applications/
insinto /usr/share/gnome/applications/
- doins "${FILESDIR}/defaults.list"
+ newins "${FILESDIR}/defaults.list-r1" defaults.list
dodir /etc/X11/xinit/xinitrc.d/
exeinto /etc/X11/xinit/xinitrc.d/
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
index 7688050..e7c9a75 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/metadata.xml
@@ -5,7 +5,5 @@
<use>
<flag name="gconf">Optional support for <pkg>gnome-base/gconf</pkg>
configuration storage system</flag>
- <flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
- <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2013-12-12 23:20 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-12 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 45cc24f626ec32d1fd18a64cb66dca829a5cc0d0
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 22:04:45 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:20:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=45cc24f6
gnome-base/gnome-session: 3.8.4-r1 → 3.10.1
---
gnome-base/gnome-session/ChangeLog | 11 +++++++++
.../files/gnome-session-3.8.4-blacklist-nv25.patch | 22 ++++++++++++++++++
...ion-9999.ebuild => gnome-session-3.10.1.ebuild} | 26 ++++++++++------------
gnome-base/gnome-session/gnome-session-9999.ebuild | 17 +++++++++-----
4 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/gnome-base/gnome-session/ChangeLog b/gnome-base/gnome-session/ChangeLog
new file mode 100644
index 0000000..6967e50
--- /dev/null
+++ b/gnome-base/gnome-session/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for gnome-base/gnome-session
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*gnome-session-3.10.1 (12 Dec 2013)
+
+ 12 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org>
+ +gnome-session-3.10.1.ebuild, gnome-session-9999.ebuild,
+ +files/gnome-session-3.8.4-blacklist-nv25.patch:
+ 3.8.4-r1 → 3.10.1
+
diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
new file mode 100644
index 0000000..3f28c2b
--- /dev/null
+++ b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
@@ -0,0 +1,22 @@
+From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 12 Nov 2013 13:32:45 +0000
+Subject: data: blacklist nv25
+
+It doesn't work very well.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711347
+---
+diff --git a/data/hardware-compatibility b/data/hardware-compatibility
+index 927ba8b..48b7946 100644
+--- a/data/hardware-compatibility
++++ b/data/hardware-compatibility
+@@ -27,3 +27,6 @@
+
+ # Gallium has softpipe; we explicitly enable llvmpipe
+ -softpipe
++
++# nouveau vieux NV25 doesn't work too well
++-Mesa DRI nv25
+--
+cgit v0.9.2
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
similarity index 84%
copy from gnome-base/gnome-session/gnome-session-9999.ebuild
copy to gnome-base/gnome-session/gnome-session-3.10.1.ebuild
index 9713b80..d1081e8 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.10.1.ebuild
@@ -5,21 +5,14 @@
EAPI="5"
GCONF_DEBUG="yes"
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit eutils gnome2
DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
@@ -27,11 +20,12 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
# gdk-pixbuf used in the inhibit dialog
COMMON_DEPEND="
- >=dev-libs/glib-2.33.4:2
+ >=dev-libs/glib-2.35.0:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.90.7:3
>=dev-libs/json-glib-0.10
>=dev-libs/dbus-glib-0.76
+ >=gnome-base/gnome-desktop-3.9.91:3=
>=sys-power/upower-0.9.0
elibc_FreeBSD? ( dev-libs/libexecinfo )
@@ -66,7 +60,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
>=dev-util/intltool-0.40.6
- x11-libs/pango[X]
virtual/pkgconfig
!<gnome-base/gdm-2.20.4
doc? (
@@ -77,8 +70,12 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gdm does not provide gnome.desktop anymore
src_prepare() {
- # Silence errors due to weird checks for libX11
- sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
+ # Allow people to configure startup apps, bug #464968, upstream bug #663767
+ sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
+
+ # Blacklist nv25 (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
+
gnome2_src_prepare
}
@@ -86,6 +83,7 @@ src_configure() {
gnome2_src_configure \
--disable-deprecation-flags \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
$(use_enable ipv6) \
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index 9713b80..edfb7f4 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -5,13 +5,13 @@
EAPI="5"
GCONF_DEBUG="yes"
-inherit gnome2
+inherit eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
DESCRIPTION="Gnome session manager"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/gnome-session"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
@@ -27,11 +27,12 @@ IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
# gdk-pixbuf used in the inhibit dialog
COMMON_DEPEND="
- >=dev-libs/glib-2.33.4:2
+ >=dev-libs/glib-2.35.0:2
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.90.7:3
>=dev-libs/json-glib-0.10
>=dev-libs/dbus-glib-0.76
+ >=gnome-base/gnome-desktop-3.9.91:3=
>=sys-power/upower-0.9.0
elibc_FreeBSD? ( dev-libs/libexecinfo )
@@ -66,7 +67,6 @@ DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
>=dev-util/intltool-0.40.6
- x11-libs/pango[X]
virtual/pkgconfig
!<gnome-base/gdm-2.20.4
doc? (
@@ -77,8 +77,12 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gdm does not provide gnome.desktop anymore
src_prepare() {
- # Silence errors due to weird checks for libX11
- sed -e 's/\(PANGO_PACKAGES="\)pangox/\1/' -i configure.ac configure || die
+ # Allow people to configure startup apps, bug #464968, upstream bug #663767
+ sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
+
+ # Blacklist nv25 (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
+
gnome2_src_prepare
}
@@ -86,6 +90,7 @@ src_configure() {
gnome2_src_configure \
--disable-deprecation-flags \
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
$(use_enable ipv6) \
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2014-04-20 18:17 Gilles Dartiguelongue
0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 5a05ec26ffd5f6acd7fa998dbb5b2924fd4c0360
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 14:47:21 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:27 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5a05ec26
gnome-base/gnome-session: QAed
gnome-session-properties is no more.
Fix a potential problem on install where xsltproc would not be found yet
needed for configure to succeed due to --enable-man being the default.
This is an issue inherited from previous ebuilds.
* Avoid automagic for old upower, the rest of gnome 3.12 will pull a
more modern version and we cannot have both on the system.
* Drop unneeded patch.
* Fix keywords.
* Sync live ebuild.
---
.../files/gnome-session-3.8.4-blacklist-nv25.patch | 22 ------------------
.../gnome-session/gnome-session-3.12.0.ebuild | 16 +++++++++----
gnome-base/gnome-session/gnome-session-9999.ebuild | 27 ++++++++++------------
3 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch b/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
deleted file mode 100644
index 3f28c2b..0000000
--- a/gnome-base/gnome-session/files/gnome-session-3.8.4-blacklist-nv25.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f11f157d507495589b0f4930f4fcc431c87bc121 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 12 Nov 2013 13:32:45 +0000
-Subject: data: blacklist nv25
-
-It doesn't work very well.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711347
----
-diff --git a/data/hardware-compatibility b/data/hardware-compatibility
-index 927ba8b..48b7946 100644
---- a/data/hardware-compatibility
-+++ b/data/hardware-compatibility
-@@ -27,3 +27,6 @@
-
- # Gallium has softpipe; we explicitly enable llvmpipe
- -softpipe
-+
-+# nouveau vieux NV25 doesn't work too well
-+-Mesa DRI nv25
---
-cgit v0.9.2
diff --git a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
index cc3cd8d..bb2c3ff 100644
--- a/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-session/gnome-session-3.10.1.ebuild,v 1.6 2014/03/29 21:00:14 tetromino Exp $
+# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-session"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc elibc_FreeBSD gconf ipv6 systemd"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
@@ -58,6 +58,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
+ dev-libs/libxslt
>=dev-util/intltool-0.40.6
virtual/pkgconfig
!<gnome-base/gdm-2.20.4
@@ -69,14 +70,21 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gdm does not provide gnome.desktop anymore
src_configure() {
+ # 1. Avoid automagic on old upower releases
+ # 2. xsltproc is always checked due to man configure
+ # switch, even if USE=-doc
gnome2_src_configure \
--disable-deprecation-flags \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
$(use_enable ipv6) \
- $(use_enable systemd)
+ $(use_enable systemd) \
+ UPOWER_CFLAGS="" \
+ UPOWER_LIBS=""
+ # gnome-session-selector pre-generated man page is missing
+ #$(usex !doc XSLTPROC=$(type -P true))
}
src_install() {
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
index edfb7f4..263c849 100644
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ b/gnome-base/gnome-session/gnome-session-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -33,7 +33,6 @@ COMMON_DEPEND="
>=dev-libs/json-glib-0.10
>=dev-libs/dbus-glib-0.76
>=gnome-base/gnome-desktop-3.9.91:3=
- >=sys-power/upower-0.9.0
elibc_FreeBSD? ( dev-libs/libexecinfo )
virtual/opengl
@@ -50,6 +49,7 @@ COMMON_DEPEND="
x11-apps/xdpyinfo
gconf? ( >=gnome-base/gconf-2:2 )
+ systemd? ( >=sys-apps/systemd-183:0= )
"
# Pure-runtime deps from the session files should *NOT* be added here
# Otherwise, things like gdm pull in gnome-shell
@@ -60,12 +60,12 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-base/gsettings-desktop-schemas-0.1.7
>=x11-themes/gnome-themes-standard-2.91.92
sys-apps/dbus[X]
- systemd? ( >=sys-apps/systemd-183 )
!systemd? ( sys-auth/consolekit )
"
DEPEND="${COMMON_DEPEND}
>=dev-lang/perl-5
>=sys-devel/gettext-0.10.40
+ dev-libs/libxslt
>=dev-util/intltool-0.40.6
virtual/pkgconfig
!<gnome-base/gdm-2.20.4
@@ -76,25 +76,22 @@ DEPEND="${COMMON_DEPEND}
# gnome-common needed for eautoreconf
# gnome-base/gdm does not provide gnome.desktop anymore
-src_prepare() {
- # Allow people to configure startup apps, bug #464968, upstream bug #663767
- sed -i -e '/NoDisplay/d' data/gnome-session-properties.desktop.in.in || die
-
- # Blacklist nv25 (from 'master')
- epatch "${FILESDIR}"/${PN}-3.8.4-blacklist-nv25.patch
-
- gnome2_src_prepare
-}
-
src_configure() {
+ # 1. Avoid automagic on old upower releases
+ # 2. xsltproc is always checked due to man configure
+ # switch, even if USE=-doc
gnome2_src_configure \
--disable-deprecation-flags \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-session-selector \
$(use_enable doc docbook-docs) \
$(use_enable gconf) \
$(use_enable ipv6) \
- $(use_enable systemd)
+ $(use_enable systemd) \
+ UPOWER_CFLAGS="" \
+ UPOWER_LIBS=""
+ # gnome-session-selector pre-generated man page is missing
+ #$(usex !doc XSLTPROC=$(type -P true))
}
src_install() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/
@ 2018-09-28 17:59 Mart Raudsepp
0 siblings, 0 replies; 9+ messages in thread
From: Mart Raudsepp @ 2018-09-28 17:59 UTC (permalink / raw
To: gentoo-commits
commit: b735fccdc72e56af6dd1a36f4b6cb41381f1f5f7
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 21:44:46 2018 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 21:44:46 2018 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b735fccd
gnome-base/gnome-session: remove, in ::gentoo with tweaks
Also removes live ebuild, as it's too outdated (upstream git uses meson)
.../files/10-user-dirs-update-gnome-r1 | 10 -
.../gnome-session/files/15-xdg-data-gnome-r1 | 9 -
.../gnome-session/files/90-xcursor-theme-gnome | 11 -
gnome-base/gnome-session/files/Gnome | 109 -------
gnome-base/gnome-session/files/defaults.list-r3 | 334 ---------------------
.../gnome-session/gnome-session-3.26.1.ebuild | 123 --------
gnome-base/gnome-session/gnome-session-9999.ebuild | 129 --------
gnome-base/gnome-session/metadata.xml | 8 -
8 files changed, 733 deletions(-)
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
deleted file mode 100644
index 61fd08c5..00000000
--- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
- if type xdg-user-dirs-update &>/dev/null; then
- xdg-user-dirs-update
- fi
-fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
deleted file mode 100644
index 5eaa6985..00000000
--- a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
- if [ -z "$XDG_DATA_DIRS" ]; then
- export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
- else
- export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
- fi
-fi
diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
deleted file mode 100644
index 13bc453c..00000000
--- a/gnome-base/gnome-session/files/90-xcursor-theme-gnome
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
- XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null
- if [ x"$XCURSOR_THEME" = "x" ]; then
- export XCURSOR_THEME="Adwaita"
- else
- # 'dconf read' wraps string output in single quotes
- eval export "XCURSOR_THEME=$XCURSOR_THEME"
- fi
-fi
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
deleted file mode 100644
index 55d39b63..00000000
--- a/gnome-base/gnome-session/files/Gnome
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# This file has bitrotted badly. Someone needs to clean this up.
-#
-
-if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
- export XDG_MENU_PREFIX=gnome-
-fi
-
-for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
-do
- if ( cp /dev/null "$errfile" 2> /dev/null )
- then
- chmod 600 "$errfile"
- exec > "$errfile" 2>&1
- break
- fi
-done
-#
-# Distributors:
-# You should modify the paths here to fit your distro
-# If you need to do so, send me (jirka@5z.com) a patch
-# and I'll try to make the script detect the distro stuff
-#
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-if [ -x "$HOME/.gnomerc" ]; then
- command="$HOME/.gnomerc"
-elif [ -x /etc/X11/gdm/gnomerc ]; then
- command="/etc/X11/gdm/gnomerc"
-else
- # as fallback in case the config is screwed
- command=`which gnome-session`
-fi
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
- xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
- xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
- xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
- setxkbmap `cat "$sysxkbmap"`
- XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
- setxkbmap `cat "$userxkbmap"`
- XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
- if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
- xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
- if [ -n "$xkbsymbols" ]; then
- setxkbmap -symbols "$xkbsymbols"
- XKB_IN_USE=yes
- fi
- fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
- if [ -f "$rh6sysmodmap" ]; then
- xmodmap "$rh6sysmodmap"
- fi
-
- if [ -f "$sysmodmap" ]; then
- xmodmap "$sysmodmap"
- fi
-
- if [ -f "$usermodmap" ]; then
- xmodmap "$usermodmap"
- fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
- for i in /etc/X11/xinit/xinitrc.d/* ; do
- if [ -x "$i" ]; then
- . "$i"
- fi
- done
-fi
-
-exec $command
diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3
deleted file mode 100644
index 6c62e329..00000000
--- a/gnome-base/gnome-session/files/defaults.list-r3
+++ /dev/null
@@ -1,334 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/x-abiword=abiword.desktop;
-text/x-xml-abiword=abiword.desktop;
-x-content/blank-bd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero-org.gnome.Nautilus.desktop;
-application/x-dia-diagram=dia.desktop;
-image/bmp=eog.desktop;
-image/gif=eog.desktop;
-image/jpeg=eog.desktop;
-image/jpg=eog.desktop;
-image/pjpeg=eog.desktop;
-image/png=eog.desktop;
-image/svg+xml=eog.desktop;
-image/svg+xml-compressed=eog.desktop;
-image/x-bmp=eog.desktop;
-image/x-gray=eog.desktop;
-image/x-icb=eog.desktop;
-image/x-ico=eog.desktop;
-image/x-pcx=eog.desktop;
-image/x-png=eog.desktop;
-image/x-portable-anymap=eog.desktop;
-image/x-portable-bitmap=eog.desktop;
-image/x-portable-graymap=eog.desktop;
-image/x-portable-pixmap=eog.desktop;
-image/x-xbitmap=eog.desktop;
-image/x-xpixmap=eog.desktop;
-image/vnd.wap.wbmp=eog.desktop;
-image/g3fax=gimp.desktop;
-image/x-compressed-xcf=gimp.desktop;
-image/x-fits=gimp.desktop;
-image/x-icon=gimp.desktop;
-image/x-psd=gimp.desktop;
-image/x-sgi=gimp.desktop;
-image/x-sun-raster=gimp.desktop;
-image/x-tga=gimp.desktop;
-image/x-xcf=gimp.desktop;
-image/x-xwindowdump=gimp.desktop;
-application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-application/pdf=evince.desktop;
-application/x-bzpdf=evince.desktop;
-application/x-gzpdf=evince.desktop;
-application/postscript=evince.desktop;
-application/x-bzpostscript=evince.desktop;
-application/x-gzpostscript=evince.desktop;
-image/x-eps=evince.desktop;
-image/x-bzeps=evince.desktop;
-image/x-gzeps=evince.desktop;
-application/x-dvi=evince.desktop;
-application/x-bzdvi=evince.desktop;
-application/x-gzdvi=evince.desktop;
-image/vnd.djvu=evince.desktop;
-image/tiff=evince.desktop;
-application/x-cbr=evince.desktop;
-application/x-cbz=evince.desktop;
-application/x-cb7=evince.desktop;
-application/x-7z-compressed=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=gedit.destkop
-text/x-php=gedit.destkop
-text/x-python=gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-sc=gnumeric.desktop;
-application/x-sylk=gnumeric.desktop;
-application/x-xbase=gnumeric.desktop;
-application/x-xls=gnumeric.desktop;
-application/xls=gnumeric.desktop;
-text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=sound-juicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/mxf=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
deleted file mode 100644
index 0b3dac4a..00000000
--- a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
- >=dev-libs/glib-2.46.0:2[dbus]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.18.0:3
- >=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.18:3=
- elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
- media-libs/mesa[egl,gles2]
-
- media-libs/libepoxy
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- x11-apps/xdpyinfo
-
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-settings-daemon-3.23.2
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- x11-themes/adwaita-icon-theme
- sys-apps/dbus[X]
- !systemd? (
- sys-auth/consolekit
- >=dev-libs/dbus-glib-0.76
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- >=sys-devel/gettext-0.10.40
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
- gnome-base/gnome-common
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- # 3. Disable old gconf support as other distributions did long time
- # ago
- gnome2_src_configure \
- --disable-deprecation-flags \
- --disable-gconf \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- $(use_enable !systemd consolekit) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
diff --git a/gnome-base/gnome-session/gnome-session-9999.ebuild b/gnome-base/gnome-session/gnome-session-9999.ebuild
deleted file mode 100644
index 1c0186cc..00000000
--- a/gnome-base/gnome-session/gnome-session-9999.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
- >=dev-libs/glib-2.46.0:2[dbus]
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.18.0:3
- >=dev-libs/json-glib-0.10
- >=gnome-base/gnome-desktop-3.18:3=
- elibc_FreeBSD? ( dev-libs/libexecinfo )
-
- virtual/opengl
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- x11-apps/xdpyinfo
-
- systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
- gnome-base/gnome-settings-daemon
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- >=x11-themes/gnome-themes-standard-2.91.92
- sys-apps/dbus[X]
- !systemd? (
- sys-auth/consolekit
- >=dev-libs/dbus-glib-0.76
- )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5
- >=sys-devel/gettext-0.10.40
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- !<gnome-base/gdm-2.20.4
- doc? (
- app-text/xmlto
- dev-libs/libxslt )
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-src_configure() {
- # 1. Avoid automagic on old upower releases
- # 2. xsltproc is always checked due to man configure
- # switch, even if USE=-doc
- # 3. Disable old gconf support as other distributions did long time
- # ago
- gnome2_src_configure \
- --disable-deprecation-flags \
- --disable-gconf \
- --enable-session-selector \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6) \
- $(use_enable systemd) \
- $(use_enable !systemd consolekit) \
- UPOWER_CFLAGS="" \
- UPOWER_LIBS=""
- # gnome-session-selector pre-generated man page is missing
- #$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
- gnome2_src_install
-
- dodir /etc/X11/Sessions
- exeinto /etc/X11/Sessions
- doexe "${FILESDIR}/Gnome"
-
- insinto /usr/share/applications
- newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
- dodir /etc/X11/xinit/xinitrc.d/
- exeinto /etc/X11/xinit/xinitrc.d/
- newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
- # This should be done here as discussed in bug #270852
- newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
- # Set XCURSOR_THEME from current dconf setting instead of installing
- # default cursor symlink globally and affecting other DEs (bug #543488)
- # https://bugzilla.gnome.org/show_bug.cgi?id=711703
- newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version gnome-base/gdm && ! has_version kde-base/kdm; then
- ewarn "If you use a custom .xinitrc for your X session,"
- ewarn "make sure that the commands in the xinitrc.d scripts are run."
- fi
-}
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
deleted file mode 100644
index 996e7cac..00000000
--- a/gnome-base/gnome-session/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2018-09-28 17:59 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-27 6:18 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-session/files/, gnome-base/gnome-session/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:59 Mart Raudsepp
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-12 23:20 Gilles Dartiguelongue
2013-02-06 3:32 Alexandre Rostovtsev
2011-04-08 10:52 Gilles Dartiguelongue
2011-03-23 22:07 Nirbheek Chauhan
2011-03-23 21:59 Nirbheek Chauhan
2011-03-05 19:59 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox