rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/gdm revision 86.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=e4d102f93f1105a2b86743dc8580a862
This commit is contained in:
OBS User buildservice-autocommit 2009-12-08 09:25:28 +00:00 committed by Git OBS Bridge
parent 09722b303c
commit 85b0313b50
10 changed files with 212 additions and 850 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-2.28.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4
size 2314347

3
gdm-2.29.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ca5d04512cb51ea2288661f9e5786645485ede2e3d510b0998bd75ea1ce1ff5
size 2337055

13
gdm-build-fixes.patch
View File

@ -1,13 +0,0 @@
Index: gdm-2.28.0/daemon/gdm-slave.c
===================================================================
--- gdm-2.28.0.orig/daemon/gdm-slave.c
+++ gdm-2.28.0/daemon/gdm-slave.c
@@ -836,6 +836,8 @@ gdm_slave_parse_enriched_login (GdmSlave
} else {
return (g_strdup (username));
}
+
+ return NULL;
}
gboolean

186
gdm-devkit-power.patch
View File

@ -1,186 +0,0 @@
From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 28 Sep 2009 09:14:33 +0100
Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power
---
configure.ac | 7 ++
gui/simple-greeter/Makefile.am | 4 +
gui/simple-greeter/gdm-greeter-login-window.c | 84 ++++++-------------------
3 files changed, 31 insertions(+), 64 deletions(-)
diff --git a/configure.ac b/configure.ac
index 756890a..2cae1cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
#FONTCONFIG_REQUIRED_VERSION=2.6.0
FONTCONFIG_REQUIRED_VERSION=2.5.0
+DEVKIT_POWER_REQUIRED_VERSION=008
EXTRA_COMPILE_WARNINGS(yes)
@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF,
AC_SUBST(GCONF_CFLAGS)
AC_SUBST(GCONF_LIBS)
+PKG_CHECK_MODULES(DEVKIT_POWER,
+ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION
+)
+AC_SUBST(DEVKIT_POWER_CFLAGS)
+AC_SUBST(DEVKIT_POWER_LIBS)
+
PKG_CHECK_MODULES(SIMPLE_GREETER,
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gtk+-2.0 >= $GTK_REQUIRED_VERSION
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index 8c9ae46..4c06bc3 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -18,6 +18,8 @@ AM_CPPFLAGS = \
-DSBINDIR=\""$(sbindir)"\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
+ $(DEVKIT_POWER_CFLAGS) \
+ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
$(DISABLE_DEPRECATED_CFLAGS) \
$(GTK_CFLAGS) \
$(SIMPLE_GREETER_CFLAGS) \
@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD = \
libgdmuser.la \
$(COMMON_LIBS) \
$(SIMPLE_GREETER_LIBS) \
+ $(DEVKIT_POWER_LIBS) \
$(RBAC_LIBS) \
$(NULL)
@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = \
$(SIMPLE_GREETER_LIBS) \
$(RBAC_LIBS) \
$(LIBXKLAVIER_LIBS) \
+ $(DEVKIT_POWER_LIBS) \
$(NULL)
gladedir = $(pkgdatadir)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index c7ea5d6..7d4ef83 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -56,6 +56,8 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
+#include <devkit-power-gobject/devicekit-power.h>
+
#include "gdm-settings-client.h"
#include "gdm-settings-keys.h"
#include "gdm-profile.h"
@@ -79,10 +81,6 @@
#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
-#define GPM_DBUS_NAME "org.freedesktop.PowerManagement"
-#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
-#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
-
#define GLADE_XML_FILE "gdm-greeter-login-window.glade"
#define KEY_GREETER_DIR "/apps/gdm/simple-greeter"
@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window)
static gboolean
can_suspend (GdmGreeterLoginWindow *login_window)
{
- DBusGConnection *connection;
- DBusGProxy *proxy;
- GError *error;
- gboolean ret;
- gboolean res;
-
- error = NULL;
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- if (error != NULL) {
- g_warning ("Couldn't connect to power manager: %s", error->message);
- g_error_free (error);
- return FALSE;
- }
- proxy = dbus_g_proxy_new_for_name (connection,
- GPM_DBUS_NAME,
- GPM_DBUS_PATH,
- GPM_DBUS_INTERFACE);
- ret = FALSE;
-
- res = dbus_g_proxy_call (proxy, "CanSuspend",
- &error,
- G_TYPE_INVALID,
- G_TYPE_BOOLEAN,
- &ret,
- G_TYPE_INVALID);
- if (! res) {
- if (error != NULL) {
- g_warning ("Could not ask power manager if user can suspend: %s",
- error->message);
- g_error_free (error);
- }
- ret = FALSE;
- }
+ gboolean ret;
+ DkpClient *dkp_client;
+ /* use DeviceKit-power to get data */
+ dkp_client = dkp_client_new ();
+ g_object_get (dkp_client,
+ "can-suspend", &ret,
+ NULL);
+ g_object_unref (dkp_client);
return ret;
}
@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window)
static void
do_suspend (GdmGreeterLoginWindow *login_window)
{
- GError *error;
- DBusGConnection *connection;
- DBusGProxy *proxy;
+ gboolean ret;
+ DkpClient *dkp_client;
+ GError *error = NULL;
- g_debug ("GdmGreeterLoginWindow: Suspend button clicked");
-
- error = NULL;
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- if (error != NULL) {
+ /* use DeviceKit-power to get data */
+ dkp_client = dkp_client_new ();
+ ret = dkp_client_suspend (dkp_client, &error);
+ if (!ret) {
g_warning ("Couldn't suspend: %s", error->message);
g_error_free (error);
return;
}
- proxy = dbus_g_proxy_new_for_name (connection,
- GPM_DBUS_NAME,
- GPM_DBUS_PATH,
- GPM_DBUS_INTERFACE);
- error = NULL;
- dbus_g_proxy_call (proxy,
- "Suspend",
- &error,
- G_TYPE_INVALID,
- G_TYPE_INVALID);
- if (error != NULL) {
- g_warning ("Couldn't suspend: %s", error->message);
- g_error_free (error);
- return;
- }
-
- g_object_unref (proxy);
+ g_object_unref (dkp_client);
}
static void
--
1.6.4.4

544
gdm-greeter-greater-ui.patch
View File

@ -1,15 +1,13 @@
Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c
Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.c
===================================================================
--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.c
+++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c
@@ -1199,29 +1199,6 @@ on_user_unchosen (GdmUserChooserWidget
--- gdm-2.29.1.orig/gui/simple-greeter/gdm-greeter-login-window.c
+++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.c
@@ -887,35 +887,6 @@ on_user_unchosen (GdmUserChooserWidget
do_cancel (login_window);
}
-static gboolean
-on_computer_info_label_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GdmGreeterLoginWindow *login_window)
-static void
-rotate_computer_info (GdmGreeterLoginWindow *login_window)
-{
- GtkWidget *notebook;
- int current_page;
@ -26,13 +24,29 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c
- gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
- }
-
-}
-
-static gboolean
-on_computer_info_label_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GdmGreeterLoginWindow *login_window)
-{
- rotate_computer_info (login_window);
- return FALSE;
-}
-
static char *
file_read_one_line (const char *filename)
{
@@ -1314,9 +1291,12 @@ create_computer_info (GdmGreeterLoginWin
@@ -1014,16 +985,19 @@ create_computer_info (GdmGreeterLoginWin
if (strcmp (localhost, "localhost") == 0 ||
strcmp (localhost, "localhost.localdomain") == 0) {
- rotate_computer_info (login_window);
+ gtk_widget_hide (label);
}
}
label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label");
if (label != NULL) {
char *version;
@ -46,7 +60,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c
}
gdm_profile_end (NULL);
@@ -1455,9 +1435,6 @@ load_theme (GdmGreeterLoginWindow *login
@@ -1151,9 +1125,6 @@ load_theme (GdmGreeterLoginWindow *login
create_computer_info (login_window);
@ -56,11 +70,11 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.c
switch_mode (login_window, MODE_SELECTION);
gdm_profile_end (NULL);
Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade
===================================================================
--- gdm-2.28.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade
+++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
@@ -1,789 +1,374 @@
--- gdm-2.29.1.orig/gui/simple-greeter/gdm-greeter-login-window.glade
+++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade
@@ -1,601 +1,250 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
@ -401,200 +415,6 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkButton" id="disconnect-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-disconnect</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="suspend-button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image9">
- <property name="visible">True</property>
- <property name="icon_name">media-playback-pause</property>
- <property name="pixel_size">16</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Suspend</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="restart-button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="icon_name">view-refresh</property>
- <property name="pixel_size">16</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Restart</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="shutdown-button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="can_focus">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
-
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="icon_name">system-shutdown</property>
- <property name="pixel_size">16</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Shut Down</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="cancel-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
@ -754,6 +574,9 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- <accessibility>
- <atkrelation target="auth-prompt-entry" type="label-for"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
@ -773,6 +596,9 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="activates_default">True</property>
- <accessibility>
- <atkrelation target="auth-prompt-label" type="labelled-by"/>
- </accessibility>
- </widget>
- <packing>
- <property name="padding">0</property>
@ -872,7 +698,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
@ -964,6 +790,9 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ <child>
+ <widget class="GtkLabel" id="auth-prompt-label">
+ <property name="visible">True</property>
+ <accessibility>
+ <atkrelation type="label-for" target="auth-prompt-entry"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
@ -978,6 +807,9 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="invisible_char">&#x25CF;</property>
+ <property name="activates_default">True</property>
+ <accessibility>
+ <atkrelation type="labelled-by" target="auth-prompt-label"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="position">1</property>
@ -1024,11 +856,11 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ <property name="spacing">6</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton" id="disconnect-button">
+ <property name="label">gtk-disconnect</property>
+ <widget class="GtkButton" id="cancel-button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
@ -1038,142 +870,12 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="suspend-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">media-playback-pause</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Suspend</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="restart-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">view-refresh</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Restart</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="shutdown-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">system-shutdown</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Shut Down</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="cancel-button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="log-in-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
@ -1203,7 +905,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
@ -1222,11 +924,11 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade
+ </child>
+ </widget>
</glade-interface>
Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade.new
===================================================================
--- /dev/null
+++ gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
@@ -0,0 +1,374 @@
+++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-login-window.glade.new
@@ -0,0 +1,250 @@
+<?xml version="1.0"?>
+<glade-interface>
+ <!-- interface-requires gtk+ 2.6 -->
@ -1251,7 +953,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
@ -1343,6 +1045,9 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
+ <child>
+ <widget class="GtkLabel" id="auth-prompt-label">
+ <property name="visible">True</property>
+ <accessibility>
+ <atkrelation type="label-for" target="auth-prompt-entry"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
@ -1357,6 +1062,9 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="invisible_char">&#x25CF;</property>
+ <property name="activates_default">True</property>
+ <accessibility>
+ <atkrelation type="labelled-by" target="auth-prompt-label"/>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="position">1</property>
@ -1403,11 +1111,11 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
+ <property name="spacing">6</property>
+ <property name="layout_style">end</property>
+ <child>
+ <widget class="GtkButton" id="disconnect-button">
+ <property name="label">gtk-disconnect</property>
+ <widget class="GtkButton" id="cancel-button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
@ -1417,142 +1125,12 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="suspend-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">media-playback-pause</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Suspend</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="restart-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">view-refresh</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Restart</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="shutdown-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">system-shutdown</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Shut Down</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="cancel-button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="log-in-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="receives_default">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
@ -1582,7 +1160,7 @@ Index: gdm-2.28.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>

65
gdm-helper-directory.patch
View File

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac
index 8cd83c6..915b532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -982,6 +982,22 @@ fi
Index: gdm-2.29.1/configure.ac
===================================================================
--- gdm-2.29.1.orig/configure.ac
+++ gdm-2.29.1/configure.ac
@@ -990,6 +990,22 @@ fi
AC_SUBST(GDM_CUSTOM_CONF)
AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
@ -25,7 +25,7 @@ index 8cd83c6..915b532 100644
dnl ---------------------------------------------------------------------------
dnl - Check for XEvIE extension support
dnl ---------------------------------------------------------------------------
@@ -1386,6 +1402,8 @@ echo "
@@ -1417,6 +1433,8 @@ echo "
dmconfdir: ${dmconfdir}
localstatedir: ${localstatedir}
datadir: ${datadir}
@ -34,23 +34,23 @@ index 8cd83c6..915b532 100644
source code location: ${srcdir}
compiler: ${CC}
cflags: ${CFLAGS}
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 3daf924..10b0bd8 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \
Index: gdm-2.29.1/daemon/Makefile.am
===================================================================
--- gdm-2.29.1.orig/daemon/Makefile.am
+++ gdm-2.29.1/daemon/Makefile.am
@@ -18,6 +18,7 @@ AM_CPPFLAGS = \
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
+ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
$(DISABLE_DEPRECATED_CFLAGS) \
$(DAEMON_CFLAGS) \
$(XLIB_CFLAGS) \
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index ba10386..d3476e7 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
Index: gdm-2.29.1/daemon/gdm-server.c
===================================================================
--- gdm-2.29.1.orig/daemon/gdm-server.c
+++ gdm-2.29.1/daemon/gdm-server.c
@@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device
g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
error = NULL;
@ -59,10 +59,10 @@ index ba10386..d3476e7 100644
server->priv->display_name);
g_debug ("GdmServer: Running helper %s", command);
diff --git a/data/greeter-autostart/Makefile.am b/data/greeter-autostart/Makefile.am
index 2f45a74..ea90455 100644
--- a/data/greeter-autostart/Makefile.am
+++ b/data/greeter-autostart/Makefile.am
Index: gdm-2.29.1/data/greeter-autostart/Makefile.am
===================================================================
--- gdm-2.29.1.orig/data/greeter-autostart/Makefile.am
+++ gdm-2.29.1/data/greeter-autostart/Makefile.am
@@ -5,7 +5,8 @@ edit = sed \
-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
-e 's|@LIBDIR[@]|$(libdir)|g' \
@ -73,10 +73,10 @@ index 2f45a74..ea90455 100644
%.desktop.in: %.desktop.in.in Makefile
$(edit) $< >$@
diff --git a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
index b4b31e1..45131c9 100644
--- a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+++ b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
===================================================================
--- gdm-2.29.1.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+++ gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
@ -88,3 +88,16 @@ index b4b31e1..45131c9 100644
OnlyShowIn=GNOME;
X-GNOME-Autostart-Phase=Initialization
X-GNOME-Autostart-Notify=true
Index: gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
===================================================================
--- gdm-2.29.1.orig/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
+++ gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
_Name=AT SPI Registry Wrapper
-Exec=@LIBEXECDIR@/at-spi-registryd
+Exec=@AT_SPI_REGISTRYD_DIR@/at-spi-registryd
OnlyShowIn=GNOME;
AutostartCondition=GNOME /desktop/gnome/interface/accessibility
X-GNOME-Autostart-Phase=Initialization

104
gdm-keyboard-from-sysconfig.patch
View File

@ -1,104 +0,0 @@
Index: gdm-2.26.1/daemon/gdm-session-direct.c
===================================================================
--- gdm-2.26.1.orig/daemon/gdm-session-direct.c
+++ gdm-2.26.1/daemon/gdm-session-direct.c
@@ -45,6 +45,8 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
+#include "gdm-sysconfig.h"
+
#include "gdm-session-direct.h"
#include "gdm-session.h"
#include "gdm-session-private.h"
@@ -598,12 +600,88 @@ get_default_language_name (GdmSessionDir
return setlocale (LC_MESSAGES, NULL);
}
+static char *
+_get_layout_name_from_sax_map (const char *layout)
+{
+ char *map_file;
+ char **lines;
+ char **fields;
+ int i;
+ char *retval;
+
+ if (!layout)
+ return NULL;
+
+ if (!g_file_get_contents ("/usr/share/sax/sysp/maps/Keyboard.map",
+ &map_file, NULL, NULL))
+ return NULL;
+
+ lines = g_strsplit (map_file, "\n", 0);
+ g_free (map_file);
+
+ retval = NULL;
+ for (i = 0; lines[i] != NULL; i++) {
+ if (lines[i][0] == '\n' || lines[i][0] == '#')
+ continue;
+
+ fields = g_strsplit (lines[i], ":", 0);
+
+ g_strstrip (fields[0]);
+ if (fields[0] && fields[1] && fields[2] &&
+ strcmp (fields[0], layout) == 0) {
+ char *add_layouts;
+
+ g_strstrip (fields[2]);
+
+ add_layouts = strchr (fields[2], ',');
+ if (add_layouts)
+ add_layouts[0] = '\0';
+
+ retval = g_strdup (fields[2]);
+ g_strfreev (fields);
+ break;
+ }
+
+ g_strfreev (fields);
+ }
+
+ g_strfreev (lines);
+
+ return retval;
+}
+
+static char *
+_get_default_layout_name_from_sysconfig (void)
+{
+ char *sysconfig_layout;
+ char *layout;
+
+ sysconfig_layout = gdm_sysconfig_load_value ("/etc/sysconfig/keyboard", "KEYTABLE");
+ if (!sysconfig_layout)
+ return NULL;
+
+ if (g_str_has_suffix (sysconfig_layout, ".gz"))
+ *(sysconfig_layout + strlen (sysconfig_layout) - strlen (".gz")) = '\0';
+ if (g_str_has_suffix (sysconfig_layout, ".map"))
+ *(sysconfig_layout + strlen (sysconfig_layout) - strlen (".map")) = '\0';
+
+ layout = _get_layout_name_from_sax_map (sysconfig_layout);
+
+ if (layout) {
+ g_free (sysconfig_layout);
+ return layout;
+ } else
+ return sysconfig_layout;
+}
+
static const char *
get_default_layout_name (GdmSessionDirect *session)
{
- if (session->priv->saved_layout != NULL) {
+ if (!session->priv->saved_layout)
+ session->priv->saved_layout = _get_default_layout_name_from_sysconfig ();
+
+ if (session->priv->saved_layout)
return session->priv->saved_layout;
- }
return "us";
}

24
gdm-save-panel-space-on-low-resolutions.patch
View File

@ -1,16 +1,16 @@
Index: gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
Index: gdm-2.29.1/gui/simple-greeter/gdm-greeter-panel.c
===================================================================
--- gdm-2.25.92.orig/gui/simple-greeter/gdm-greeter-panel.c
+++ gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
@@ -571,6 +571,7 @@ gdm_greeter_panel_init (GdmGreeterPanel
--- gdm-2.29.1.orig/gui/simple-greeter/gdm-greeter-panel.c
+++ gdm-2.29.1/gui/simple-greeter/gdm-greeter-panel.c
@@ -836,6 +836,7 @@ gdm_greeter_panel_init (GdmGreeterPanel
{
NaTray *tray;
GtkWidget *spacer;
+ GdkScreen *screen;
int padding;
gdm_profile_start (NULL);
@@ -648,7 +649,15 @@ gdm_greeter_panel_init (GdmGreeterPanel
@@ -964,7 +965,15 @@ gdm_greeter_panel_init (GdmGreeterPanel
panel->priv->clock = gdm_clock_widget_new ();
gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
@ -22,16 +22,16 @@ Index: gdm-2.25.92/gui/simple-greeter/gdm-greeter-panel.c
+
+ /* If resolution is limited, hide clock to conserve horizontal space */
+
+ if (!screen || gdk_screen_get_width (screen) > 1024)
+ if (!screen || gdk_screen_get_width (screen) >= 1024)
+ gtk_widget_show (panel->priv->clock);
tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
GTK_ORIENTATION_HORIZONTAL);
Index: gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
Index: gdm-2.29.1/gui/simple-greeter/gdm-option-widget.c
===================================================================
--- gdm-2.25.92.orig/gui/simple-greeter/gdm-option-widget.c
+++ gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
@@ -618,8 +618,17 @@ gdm_option_widget_check_visibility (GdmO
--- gdm-2.29.1.orig/gui/simple-greeter/gdm-option-widget.c
+++ gdm-2.29.1/gui/simple-greeter/gdm-option-widget.c
@@ -645,8 +645,17 @@ gdm_option_widget_check_visibility (GdmO
(widget->priv->number_of_top_rows > 0 ||
widget->priv->number_of_middle_rows > 1 ||
widget->priv->number_of_bottom_rows > 0)) {
@ -44,7 +44,7 @@ Index: gdm-2.25.92/gui/simple-greeter/gdm-option-widget.c
+
+ /* If resolution is limited, hide labels to conserve horizontal space */
+
+ if (!screen || gdk_screen_get_width (screen) > 1280)
+ if (!screen || gdk_screen_get_width (screen) >= 1280)
+ gtk_widget_show (widget->priv->label);
+

83
gdm.changes
View File

@ -1,3 +1,86 @@
-------------------------------------------------------------------
Thu Dec 3 11:13:08 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.1:
+ A new desktop extension is now supported in GDM session desktop
files (normally found in /usr/share/xsessions). Setting the
X-GDM_BypassXsession key to true (X-GDM_BypassXsession=true)
will cause the Xsession script to not be used to launch the
session. This can be useful if you want to create a "failsafe"
xterm session.
+ Fix makedist problem.
- Changes from version 2.29.0:
+ Now GDM supports Include, Exclude, and IncludeAll configuration
options to allow the ability to configure which users are
displayed in the FaceBrowser.
+ Now GDM supports better debugging. Users can set the
debug/Enable configuration option to turn on GDM debugging.
+ The directory where GDM screenshots are placed has been moved
to its own directory: /var/run/gdm/greeter/GDM-Screenshot.png.
The screenshot directory can now be specified at build time via
the --with-screenshot-dir configure argument.
+ Many simple-greeter Face Browser usability improvements.
+ The simple-greeter Face Browser tree view search entry is now
obscured to help prevent accidental display of passwords.
+ Shutdown and reboot functions are moved to a menu in the
simple-greeter panel instead of being presented as buttons.
The shutdown menu is better positioned on multi-monitor
displays.
+ The simple-greeter panel notification area has been improved
and now honors the GConf setting for
/apps/notification_area_applet/prefs/padding.
+ The entry field in the simple-greeter now has accessibility
labels so it will work better with accessibility programs.
+ The clock in the simple-greeter panel no longer shows the date,
making the screen look a little cleaner. The date is moved to
the clock tooltip so it is still available.
+ The simple-greeter now uses gethostname instead of
g_get_host_name since it is more reliable when the hostname
changes at runtime.
+ The user switch applet now honors disable_lock_screen. The
option to lock screen is now not shown if disable_lock_screen
is set.
+ The /var/run/gdm directory is better locked down.
+ GDM no longer crashes on bad UTF-8 in the /etc/passwd file.
+ When the worker dies, the auth-failed signal is no longer sent.
This prevents a crash that happens when switching run-levels
when the login screen is displayed.
+ Ensure that the length of sockaddr structure is set to the
correct length for IPv4 or IPv6. This makes GDM work better on
some operating systems that are picky about the length being exact.
+ String and documentation improvements.
- Changes from version 2.28.1:
+ GDM will now avoid calling XAddHosts for remote connections.
Refer to bgo#598142 for more information.
+ Now GDM uses DeviceKit-power instead of gnome-power-manager for
Suspend support.
+ Now the at-spi-registryd-wrapper.desktop GDM autostart file
will run at-spi-registryd directly instead of calling
at-spi-registryd-wrapper.
+ Fix to the visibility check for the "Other" button which
corrects some situations where the button would not appear when
it was supposed to.
+ Now the GDM daemon will make the /var/log/gdm directory if it
does not exist.
+ Fixes to avoid autologin failure when a NULL username is passed
in.
+ Restore CTYPE when canonicalizing codesets.
+ Several fixes to avoid warnings.
- Change default permissions of /var/run/gdm from 755 to 751
(upstream moved to 711).
- Rebase gdm-helper-directory.patch to apply without fuzz, and add
a fix from upstream to really use the right at-spi-registryd
directory.
- Rebase gdm-greeter-greater-ui.patch.
- Rebase gdm-save-panel-space-on-low-resolutions.patch, and also
tweak it a bit because the size of the clock label has been
reduced.
- Drop gdm-build-fixes.patch: fixed upstream.
- Drop gdm-devkit-power.patch: fixed upstream.
- Drop gdm-keyboard-from-sysconfig.patch: this is needed for
openSUSE <= 11.1, but DeviceKit-power is now required by gdm and
won't work on such versions of openSUSE.
-------------------------------------------------------------------
Tue Oct 20 09:26:00 CEST 2009 - vuntz@opensuse.org

37
gdm.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package gdm (Version 2.28.0)
# spec file for package gdm (Version 2.29.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -40,10 +40,10 @@ BuildRequires: update-desktop-files
BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-extra
BuildRequires: zenity
License: GPL v2 or later
License: GPLv2+
Group: System/GUI/GNOME
Version: 2.28.0
Release: 2
Version: 2.29.1
Release: 1
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@ -51,7 +51,7 @@ Source2: gdm-autologin.pamd
# FIXME: See FIXME in the script.
Source3: SuSEconfig.gdm
Source5: sysconfig.displaymanager-gdm
# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory and --with-consolekit-directory
# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory, --with-consolekit-directory, --with-at-spi-registryd-directory
Patch1: gdm-helper-directory.patch
# PATCH-FIX-OPENSUSE gdm-2.21.9-no-fatal-warnings.patch -- Do not accept fatal warnings in development version: gdm is too critical
Patch2: gdm-2.21.9-no-fatal-warnings.patch
@ -69,7 +69,7 @@ Patch13: gdm-sysconfig-settings.patch
Patch15: gdm-greeter-greater-ui.patch
# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
Patch18: gdm-always-reflect-keyboard-layout.patch
# PATCH-FIX-OPENSUSE gdm-save-panel-space-on-low-resolutions.patch bnc449815 hpj@novell.com -- Hide clock and/or selector labels on low resolutions.
# PATCH-FIX-UPSTREAM gdm-save-panel-space-on-low-resolutions.patch bnc449815 bgo603817 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. (needed because of gdm-domain-logon.patch)
Patch19: gdm-save-panel-space-on-low-resolutions.patch
# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
Patch20: gdm-selecting-desktop-environment.patch
@ -77,18 +77,12 @@ Patch20: gdm-selecting-desktop-environment.patch
Patch31: gdm-gconf-path.patch
# PATCH-FIX-UPSTREAM gdm-keyboard-from-hal.patch bnc492284 bnc478083 vuntz@novell.com -- Read the keyboard layout from hal
Patch32: gdm-keyboard-from-hal.patch
# PATCH-FIX-OPENSUSE gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal)
Patch33: gdm-keyboard-from-sysconfig.patch
# PATCH-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default
Patch34: gdm-default-wm.patch
# PATCH-FIX-OPENSUSE gdm-xauthlocalhostname.patch bgo555464 vuntz@novell.com -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes
Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-build-fixes.patch bgo596605 vuntz@novell.com -- Add missing return value
Patch36: gdm-build-fixes.patch
# PATCH-FIX-UPSTREAM gdm-autologin-once.patch bgo587606 vuntz@novell.com -- Make autologin work only once
Patch37: gdm-autologin-once.patch
# PATCH-FIX-UPSTREAM gdm-devkit-power.patch bgo596569 vuntz@opensuse.org -- Use devkit-power instead of non-existing dbus API, patch from upstream
Patch38: gdm-devkit-power.patch
# PATCH-FIX-UPSTREAM gdm-polkit-gnome-path.patch bgo597050 vuntz@opensuse.org -- Use the right patch for the polkit agent. The current patch is a quick workaround for now, until we know how upstream wants to fix this.
Patch39: gdm-polkit-gnome-path.patch
# PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
@ -121,7 +115,7 @@ display manager that has many options, is usable for remote login, and
provides a good looking graphical interface.
%package branding-upstream
License: GPL v2 or later
License: GPLv2+
Summary: The GNOME 2.x Display Manager
Group: System/GUI/GNOME
Provides: %{name}-branding = %{version}
@ -156,16 +150,10 @@ gnome-patch-translation-prepare
%patch19 -p1
%patch20 -p1
%patch31 -p1
%if %suse_version > 1110
%patch32 -p1
%else
%patch33 -p1
%endif
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%patch38 -p1
%patch39 -p1
%patch40 -p1
%patch60
@ -177,9 +165,9 @@ autoreconf -f -i
%configure\
--libexecdir=%{_prefix}/lib/gdm \
--localstatedir=%{_localstatedir} \
--with-at-spi-registryd-directory=%{_prefix}/lib/at-spi \
--with-gnome-settings-daemon-directory=%{_prefix}/lib/gnome-settings-daemon \
--with-consolekit-directory=%{_prefix}/lib/ConsoleKit \
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \
--with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \
--with-consolekit-directory=%{_libexecdir}/ConsoleKit \
--with-selinux \
--enable-ipv6\
--disable-scrollkeeper
@ -187,6 +175,9 @@ autoreconf -f -i
%install
%makeinstall
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
%find_gconf_schemas
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
@ -256,7 +247,7 @@ fi
%{_libdir}/bonobo/servers/*
%{_datadir}/gnome-2.0/ui/*
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
%attr(755,gdm,gdm) %dir %{_localstatedir}/run/gdm
%attr(751,gdm,gdm) %dir %{_localstatedir}/run/gdm
%attr(750,gdm,gdm) %dir %{_localstatedir}/log/gdm
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml