pool/gdm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 360406 from GNOME:Next

Browse Source 
Scripted push of project GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/360406
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=306
This commit is contained in:
Dominique Leuenberger 2016-02-19 14:57:34 +00:00 committed by Git OBS Bridge
parent cf6b9dcd2a
commit 70bc3df37a
7 changed files with 116 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-3.18.2.tar.xz
View File

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

3
gdm-3.19.90.tar.xz Normal file
View File

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

14
gdm-default-wm.patch
View File

@ -1,7 +1,7 @@
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c Index: gdm-3.19.2/daemon/gdm-session.c
index 90b9045..f2ea011 100644 ===================================================================
--- a/daemon/gdm-session.c --- gdm-3.19.2.orig/daemon/gdm-session.c
+++ b/daemon/gdm-session.c +++ gdm-3.19.2/daemon/gdm-session.c
@@ -43,6 +43,8 @@ @@ -43,6 +43,8 @@
#include <glib-object.h> #include <glib-object.h>
#include <gio/gio.h> #include <gio/gio.h>
@ -11,12 +11,12 @@ index 90b9045..f2ea011 100644
#include "gdm-session.h" #include "gdm-session.h"
#include "gdm-session-glue.h" #include "gdm-session-glue.h"
#include "gdm-dbus-util.h" #include "gdm-dbus-util.h"
@@ -518,6 +520,14 @@ get_fallback_session_name (GdmSession *self) @@ -523,6 +525,14 @@ get_fallback_session_name (GdmSession *s
} }
} }
+ name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM"); + name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM");
+ if (name && get_session_command_for_name (name, NULL)) { + if (name && get_session_command_for_name (self, name, NULL)) {
+ g_free (self->priv->fallback_session_name); + g_free (self->priv->fallback_session_name);
+ self->priv->fallback_session_name = name; + self->priv->fallback_session_name = name;
+ goto out; + goto out;
@ -24,5 +24,5 @@ index 90b9045..f2ea011 100644
+ g_free (name); + g_free (name);
+ +
name = g_strdup ("gnome"); name = g_strdup ("gnome");
if (get_session_command_for_name (name, NULL)) { if (get_session_command_for_name (self, name, NULL)) {
g_free (self->priv->fallback_session_name); g_free (self->priv->fallback_session_name);

40
gdm-desktop-session-env-pam.patch
View File

@ -1,7 +1,7 @@
Index: gdm-3.17.3.1/daemon/gdm-session-worker.c Index: gdm-3.19.90/daemon/gdm-session-worker.c
=================================================================== ===================================================================
--- gdm-3.17.3.1.orig/daemon/gdm-session-worker.c --- gdm-3.19.90.orig/daemon/gdm-session-worker.c
+++ gdm-3.17.3.1/daemon/gdm-session-worker.c +++ gdm-3.19.90/daemon/gdm-session-worker.c
@@ -175,6 +175,8 @@ struct GdmSessionWorkerPrivate @@ -175,6 +175,8 @@ struct GdmSessionWorkerPrivate
GdmSessionSettings *user_settings; GdmSessionSettings *user_settings;
@ -21,7 +21,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session-worker.c
g_debug ("GdmSessionWorker: state SETUP_COMPLETE"); g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE; worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE;
@@ -2307,6 +2312,12 @@ gdm_session_worker_handle_set_session_na @@ -2306,6 +2311,12 @@ gdm_session_worker_handle_set_session_na
{ {
GdmSessionWorker *worker = GDM_SESSION_WORKER (object); GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
g_debug ("GdmSessionWorker: session name set to %s", session_name); g_debug ("GdmSessionWorker: session name set to %s", session_name);
@ -34,7 +34,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session-worker.c
gdm_session_settings_set_session_name (worker->priv->user_settings, gdm_session_settings_set_session_name (worker->priv->user_settings,
session_name); session_name);
gdm_dbus_worker_complete_set_session_name (object, invocation); gdm_dbus_worker_complete_set_session_name (object, invocation);
@@ -2314,6 +2325,23 @@ gdm_session_worker_handle_set_session_na @@ -2313,6 +2324,23 @@ gdm_session_worker_handle_set_session_na
} }
static gboolean static gboolean
@ -58,7 +58,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session-worker.c
gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker *object, gdm_session_worker_handle_set_session_display_mode (GdmDBusWorker *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const char *str) const char *str)
@@ -3121,6 +3149,7 @@ worker_interface_init (GdmDBusWorkerIfac @@ -3119,6 +3147,7 @@ worker_interface_init (GdmDBusWorkerIfac
interface->handle_open = gdm_session_worker_handle_open; interface->handle_open = gdm_session_worker_handle_open;
interface->handle_set_language_name = gdm_session_worker_handle_set_language_name; interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
interface->handle_set_session_name = gdm_session_worker_handle_set_session_name; interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
@ -66,7 +66,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session-worker.c
interface->handle_set_session_display_mode = gdm_session_worker_handle_set_session_display_mode; interface->handle_set_session_display_mode = gdm_session_worker_handle_set_session_display_mode;
interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable; interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable;
interface->handle_start_program = gdm_session_worker_handle_start_program; interface->handle_start_program = gdm_session_worker_handle_start_program;
@@ -3238,6 +3267,8 @@ gdm_session_worker_finalize (GObject *ob @@ -3236,6 +3265,8 @@ gdm_session_worker_finalize (GObject *ob
g_hash_table_unref (worker->priv->reauthentication_requests); g_hash_table_unref (worker->priv->reauthentication_requests);
@ -75,10 +75,10 @@ Index: gdm-3.17.3.1/daemon/gdm-session-worker.c
G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object); G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object);
} }
Index: gdm-3.17.3.1/daemon/gdm-session-worker.xml Index: gdm-3.19.90/daemon/gdm-session-worker.xml
=================================================================== ===================================================================
--- gdm-3.17.3.1.orig/daemon/gdm-session-worker.xml --- gdm-3.19.90.orig/daemon/gdm-session-worker.xml
+++ gdm-3.17.3.1/daemon/gdm-session-worker.xml +++ gdm-3.19.90/daemon/gdm-session-worker.xml
@@ -13,6 +13,9 @@ @@ -13,6 +13,9 @@
<method name="SetSessionName"> <method name="SetSessionName">
<arg name="session_name" direction="in" type="s" /> <arg name="session_name" direction="in" type="s" />
@ -89,11 +89,11 @@ Index: gdm-3.17.3.1/daemon/gdm-session-worker.xml
<method name="SetSessionDisplayMode"> <method name="SetSessionDisplayMode">
<arg name="mode" direction="in" type="s"/> <arg name="mode" direction="in" type="s"/>
</method> </method>
Index: gdm-3.17.3.1/daemon/gdm-session.c Index: gdm-3.19.90/daemon/gdm-session.c
=================================================================== ===================================================================
--- gdm-3.17.3.1.orig/daemon/gdm-session.c --- gdm-3.19.90.orig/daemon/gdm-session.c
+++ gdm-3.17.3.1/daemon/gdm-session.c +++ gdm-3.19.90/daemon/gdm-session.c
@@ -183,6 +183,8 @@ G_DEFINE_TYPE (GdmSession, @@ -190,6 +190,8 @@ G_DEFINE_TYPE (GdmSession,
gdm_session, gdm_session,
G_TYPE_OBJECT); G_TYPE_OBJECT);
@ -102,7 +102,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session.c
static GdmSessionConversation * static GdmSessionConversation *
find_conversation_by_name (GdmSession *self, find_conversation_by_name (GdmSession *self,
const char *service_name) const char *service_name)
@@ -588,6 +590,9 @@ get_default_session_name (GdmSession *se @@ -607,6 +609,9 @@ get_default_session_name (GdmSession *se
static void static void
gdm_session_defaults_changed (GdmSession *self) gdm_session_defaults_changed (GdmSession *self)
{ {
@ -110,9 +110,9 @@ Index: gdm-3.17.3.1/daemon/gdm-session.c
+ gpointer key, value; + gpointer key, value;
+ const char *text; + const char *text;
if (self->priv->greeter_interface != NULL) { update_session_type (self);
gdm_dbus_greeter_emit_default_language_name_changed (self->priv->greeter_interface,
@@ -595,6 +600,19 @@ gdm_session_defaults_changed (GdmSession @@ -616,6 +621,19 @@ gdm_session_defaults_changed (GdmSession
gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface, gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface,
get_default_session_name (self)); get_default_session_name (self));
} }
@ -132,7 +132,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session.c
} }
void void
@@ -903,6 +921,10 @@ worker_on_saved_session_name_read (GdmDB @@ -924,6 +942,10 @@ worker_on_saved_session_name_read (GdmDB
if (strcmp (session_name, if (strcmp (session_name,
get_default_session_name (self)) != 0) { get_default_session_name (self)) != 0) {
@ -143,7 +143,7 @@ Index: gdm-3.17.3.1/daemon/gdm-session.c
g_free (self->priv->saved_session); g_free (self->priv->saved_session);
self->priv->saved_session = g_strdup (session_name); self->priv->saved_session = g_strdup (session_name);
@@ -912,6 +934,19 @@ worker_on_saved_session_name_read (GdmDB @@ -931,6 +953,19 @@ worker_on_saved_session_name_read (GdmDB
gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface, gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface,
session_name); session_name);
} }

29
gdm-xdmcp-display-this-shouldn-t-be-an-abstract-type.patch
View File

@ -1,29 +0,0 @@
From d28f4d6d3b5abc0001fbf11f4ff54aeacece84b6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Wed, 4 Nov 2015 15:11:29 -0500
Subject: [PATCH] xdmcp-display: this shouldn't be an abstract type
We instantiate it directly, so make it a normal
type.
https://bugzilla.gnome.org/show_bug.cgi?id=757714
---
daemon/gdm-xdmcp-display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemon/gdm-xdmcp-display.c b/daemon/gdm-xdmcp-display.c
index 764bcff..c9f9c3d 100644
--- a/daemon/gdm-xdmcp-display.c
+++ b/daemon/gdm-xdmcp-display.c
@@ -66,7 +66,7 @@ enum {
static void gdm_xdmcp_display_class_init (GdmXdmcpDisplayClass *klass);
static void gdm_xdmcp_display_init (GdmXdmcpDisplay *xdmcp_display);
-G_DEFINE_ABSTRACT_TYPE (GdmXdmcpDisplay, gdm_xdmcp_display, GDM_TYPE_DISPLAY)
+G_DEFINE_TYPE (GdmXdmcpDisplay, gdm_xdmcp_display, GDM_TYPE_DISPLAY)
gint32
gdm_xdmcp_display_get_session_number (GdmXdmcpDisplay *display)
--
2.6.2

75
gdm.changes
View File

@ -1,9 +1,52 @@
-------------------------------------------------------------------
Wed Feb 17 16:30:21 UTC 2016 - dimstar@opensuse.org
- Update to version 3.19.90:
+ Better build goo output.
+ Support dbus user bus better.
+ Fix bug that prevents wayland sessions from being wayland
sometimes.
+ Updated translations.
- Rebase gdm-desktop-session-env-pam.patch.
-------------------------------------------------------------------
Fri Feb 12 22:46:19 UTC 2016 - zaitor@opensuse.org
- Drop gdm-xdmcp-display-this-shouldn-t-be-an-abstract-type.patch:
Already upstream for 3.19 branch.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 10 10:05:39 UTC 2016 - fcrozat@suse.com Wed Feb 10 10:05:39 UTC 2016 - fcrozat@suse.com
- Add gdm-xdmcp-display-this-shouldn-t-be-an-abstract-type.patch: - Add gdm-xdmcp-display-this-shouldn-t-be-an-abstract-type.patch:
fix xdmcp not working at all (bgo#757714). fix xdmcp not working at all (bgo#757714).
-------------------------------------------------------------------
Mon Jan 25 19:16:16 UTC 2016 - zaitor@opensuse.org
- Update to version 3.19.4.1:
+ Fix crasher introduced in 3.19.4.
+ Updated translations.
-------------------------------------------------------------------
Fri Jan 22 08:47:47 UTC 2016 - dimstar@opensuse.org
- Update to version 3.19.4:
+ Don't override PAM message for password change.
+ Disable GVFS when we don't need it.
+ Fail better when no sessions are installed.
+ Support gnome-session in different PREFIX than GDM.
+ Doc updates.
+ Ensure unlock screen gets told when verification completes.
+ Updated translations.
- Drop gdm-really-disable-wayland.patch: fixed upstream.
-------------------------------------------------------------------
Tue Jan 12 10:38:38 UTC 2016 - fcrozat@suse.com
- Allow to disable wayland support and add patch
gdm-really-disable-wayland.patch (bgo#760518).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 29 11:39:32 UTC 2015 - zaitor@opensuse.org Tue Dec 29 11:39:32 UTC 2015 - zaitor@opensuse.org
@ -13,6 +56,38 @@ Tue Dec 29 11:39:32 UTC 2015 - zaitor@opensuse.org
- Add explicit pkgconfig(gtk+-3.0) BuildRequires: It used to be - Add explicit pkgconfig(gtk+-3.0) BuildRequires: It used to be
pulled in by libcanberra-devel pulled in by libcanberra-devel
-------------------------------------------------------------------
Mon Dec 28 10:05:42 UTC 2015 - zaitor@opensuse.org
- Stop pretending we can support a non systemd setup:
+ Remove %{with_systemd} and it's define.
+ Drop conditional ConsoleKit-x11 Requires.
+ Stop passing conditional --with-consolekit-directory,
--without-systemd and --with-console-kit.
+ Removed conditon on pkgconfig(libsystemd) BuildRequires.
+ Stop passing --with-systemd: No longer needed, nor recognized.
-------------------------------------------------------------------
Sun Dec 27 06:59:20 UTC 2015 - damjanovic.ivo@gmail.com
- Drop gnome-session-wayland Requires: No longer needed, nor
provided.
- Pass --enable-systemd-journal to configure: Ensure we support it.
-------------------------------------------------------------------
Wed Dec 23 14:35:29 UTC 2015 - dimstar@opensuse.org
- Update to version 3.19.2:
+ Get rid of "custom" session.
+ Separate X sessions and Wayland sessions.
+ Hide Wayland sessions if the login screen is on X.
+ Pass session mode to the shell via environment.
+ Rename gnome-wayland session to gnome.
+ Use -listen instead of -nolisten for new Xorg.
- Rebase gdm-default-wm.patch.
- Add pkgconfig(xorg-server) BuildRequires: configure needs access
to this .pc file in order to decide what options to pass to Xorg.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 17 18:50:18 UTC 2015 - zaitor@opensuse.org Tue Nov 17 18:50:18 UTC 2015 - zaitor@opensuse.org

35
gdm.spec
View File

@ -16,24 +16,22 @@
# #
# We can enable systemd support only if we have xorg 1.12, as it means # Allow to disable wayland components
# starting X with --seat, and only if we build the whole system with %bcond_without wayland
# systemd support (for instance, NetworkManager).
%define with_systemd 1
%if %{with_systemd}
%define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd) %define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd)
%endif
# FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999 # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
%define enable_split_authentication 0 %define enable_split_authentication 0
Name: gdm Name: gdm
Version: 3.18.2 Version: 3.19.90
Release: 0 Release: 0
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://projects.gnome.org/gdm/ Url: http://projects.gnome.org/gdm/
Source: http://download.gnome.org/sources/gdm/3.18/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gdm/3.19/%{name}-%{version}.tar.xz
Source1: gdm.pamd Source1: gdm.pamd
Source2: gdm-autologin.pamd Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd Source3: gdm-launch-environment.pamd
@ -60,8 +58,6 @@ Patch34: gdm-default-wm.patch
Patch35: gdm-xauthlocalhostname.patch Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running # PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running
Patch41: gdm-plymouth-vt1.patch Patch41: gdm-plymouth-vt1.patch
# PATCH-FIX-UPSTREAM gdm-xdmcp-display-this-shouldn-t-be-an-abstract-type.patch bgo#757714 fcrozat@suse.com -- Fix xdmcp not starting at all
Patch42: gdm-xdmcp-display-this-shouldn-t-be-an-abstract-type.patch
BuildRequires: check-devel BuildRequires: check-devel
# needed for directory ownership # needed for directory ownership
BuildRequires: dconf BuildRequires: dconf
@ -83,20 +79,15 @@ BuildRequires: xorg-x11-server-extra
BuildRequires: pkgconfig(accountsservice) BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libcanberra-gtk3)
%if %{with_systemd}
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
%endif
BuildRequires: pkgconfig(ply-boot-client) BuildRequires: pkgconfig(ply-boot-client)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau) BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xorg-server)
BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrandr)
Requires: %{name}-branding = %{version} Requires: %{name}-branding = %{version}
%if ! %{with_systemd}
Requires: ConsoleKit-x11
%endif
Requires: gdmflexiserver Requires: gdmflexiserver
Requires: gnome-session-core Requires: gnome-session-core
Requires: gnome-session-wayland
Requires: gnome-settings-daemon Requires: gnome-settings-daemon
Requires: gnome-shell Requires: gnome-shell
Requires: xorg-x11-server-extra Requires: xorg-x11-server-extra
@ -194,7 +185,6 @@ translation-update-upstream
%patch34 -p1 %patch34 -p1
#patch35 -p1 #patch35 -p1
%patch41 -p1 %patch41 -p1
%patch42 -p1
%build %build
NOCONFIGURE=1 sh autogen.sh NOCONFIGURE=1 sh autogen.sh
@ -208,13 +198,12 @@ NOCONFIGURE=1 sh autogen.sh
--enable-ipv6 \ --enable-ipv6 \
--enable-gdm-xsession \ --enable-gdm-xsession \
--with-plymouth \ --with-plymouth \
%if %{with_systemd} %if %{with wayland}
--with-systemd \ --enable-wayland-support \
%else %else
--with-consolekit-directory=%{_libexecdir}/ConsoleKit \ --disable-wayland-support \
--without-systemd \
--with-console-kit \
%endif %endif
--enable-systemd-journal \
%if %{enable_split_authentication} %if %{enable_split_authentication}
--enable-split-authentication \ --enable-split-authentication \
%else %else
@ -228,9 +217,7 @@ NOCONFIGURE=1 sh autogen.sh
%make_install %make_install
find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
# Do not ship the systemd.service file: openSUSE uses xdm, which enables the DM based on sysconfig. # Do not ship the systemd.service file: openSUSE uses xdm, which enables the DM based on sysconfig.
%if %{with_systemd}
rm %{buildroot}%{systemdsystemunitdir}/gdm.service rm %{buildroot}%{systemdsystemunitdir}/gdm.service
%endif
## Install PAM files. ## Install PAM files.
mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/pam.d
# Generic pam config # Generic pam config