cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updatet o gdm-3.16.4.

Browse Source
This commit is contained in:
ajacoutot 2015-09-18 20:30:07 +00:00
parent ea8b7c2a67
commit f323f2f03a
3 changed files with 4 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/gdm/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.236 2015/09/18 13:38:45 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.237 2015/09/18 20:30:07 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.16.3
GNOME_VERSION= 3.16.4
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} puflogh1000X248.gif:0
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}

4
x11/gnome/gdm/distinfo
View File

@ -1,4 +1,4 @@
SHA256 (gnome/gdm-3.16.3.tar.xz) = 1LRivCMfAKrlQ6BzmQtUIlzFrYiYM/V2dnnu2bPMPoM=
SHA256 (gnome/gdm-3.16.4.tar.xz) = KB3SjXKeqrL2fkULWxYimd7FN7b36B+hEk41yJ05Qv0=
SHA256 (gnome/puflogh1000X248.gif) = /Cl2kyuX6zQVfYO41Zjey65xUZ28V2as8j9eS13SG6k=
SIZE (gnome/gdm-3.16.3.tar.xz) = 1535764
SIZE (gnome/gdm-3.16.4.tar.xz) = 1535580
SIZE (gnome/puflogh1000X248.gif) = 28427

71
x11/gnome/gdm/patches/patch-daemon_gdm-local-display-factory_c
View File

@ -1,71 +0,0 @@
$OpenBSD: patch-daemon_gdm-local-display-factory_c,v 1.1 2015/09/18 13:38:45 ajacoutot Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=749418
--- daemon/gdm-local-display-factory.c.orig Wed Sep 16 15:27:06 2015
+++ daemon/gdm-local-display-factory.c Fri Sep 18 15:34:09 2015
@@ -271,6 +271,26 @@ gdm_local_display_factory_create_transient_display (Gd
return ret;
}
+static gboolean
+ensure_initial_display_configuration (GdmLocalDisplayFactory *factory)
+{
+ GdmDisplay *display;
+
+#ifdef WITH_SYSTEMD
+ if (LOGIND_RUNNING()) {
+ if (!factory->priv->seat_new_id) {
+ gdm_local_display_factory_start_monitor (factory);
+ }
+ return gdm_local_display_factory_sync_seats (factory);
+ }
+#endif
+
+ /* On ConsoleKit just create Seat1, and that's it. */
+ display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
+
+ return display != NULL;
+}
+
static void
on_display_status_changed (GdmDisplay *display,
GParamSpec *arg1,
@@ -317,7 +337,7 @@ on_display_status_changed (GdmDisplay *dis
/* reset num failures */
factory->priv->num_failures = 0;
- gdm_local_display_factory_sync_seats (factory);
+ ensure_initial_display_configuration (factory);
}
break;
case GDM_DISPLAY_FAILED:
@@ -609,7 +629,7 @@ static gboolean
gdm_local_display_factory_start (GdmDisplayFactory *base_factory)
{
GdmLocalDisplayFactory *factory = GDM_LOCAL_DISPLAY_FACTORY (base_factory);
- GdmDisplay *display;
+ gboolean display_started;
GdmDisplayStore *store;
g_return_val_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory), FALSE);
@@ -626,17 +646,9 @@ gdm_local_display_factory_start (GdmDisplayFactory *ba
G_CALLBACK (on_display_removed),
factory);
-#ifdef WITH_SYSTEMD
- if (LOGIND_RUNNING()) {
- gdm_local_display_factory_start_monitor (factory);
- return gdm_local_display_factory_sync_seats (factory);
- }
-#endif
+ display_started = ensure_initial_display_configuration (factory);
- /* On ConsoleKit just create Seat1, and that's it. */
- display = create_display (factory, CK_SEAT1_PATH, NULL, TRUE);
-
- return display != NULL;
+ return display_started;
}
static gboolean