From 3523ad412fd83d10a3bcbb23ba67a237360376b7a43f3cf84d7f513e1224f7c3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 13 Apr 2018 06:49:32 +0000 Subject: [PATCH 1/3] Accepting request 595020 from home:zhangxiaofei:branches:GNOME:Factory - Rename gdm-disable-wayland-on-mgag200-chipsets.patch to gdm-disable-wayland-on-unsupported-chipsets.patch: add rules for ASPEED ast drivers (boo#1088539). OBS-URL: https://build.opensuse.org/request/show/595020 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=392 --- ... gdm-disable-wayland-on-unsupported-chipsets.patch | 11 +++++++---- gdm.changes | 7 +++++++ gdm.spec | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) rename gdm-disable-wayland-on-mgag200-chipsets.patch => gdm-disable-wayland-on-unsupported-chipsets.patch (83%) diff --git a/gdm-disable-wayland-on-mgag200-chipsets.patch b/gdm-disable-wayland-on-unsupported-chipsets.patch similarity index 83% rename from gdm-disable-wayland-on-mgag200-chipsets.patch rename to gdm-disable-wayland-on-unsupported-chipsets.patch index 897c4ea..10c07a4 100644 --- a/gdm-disable-wayland-on-mgag200-chipsets.patch +++ b/gdm-disable-wayland-on-unsupported-chipsets.patch @@ -1,8 +1,8 @@ -Index: gdm-3.28.0/data/61-gdm.rules +Index: b/data/61-gdm.rules =================================================================== ---- gdm-3.28.0.orig/data/61-gdm.rules -+++ gdm-3.28.0/data/61-gdm.rules -@@ -1,2 +1,14 @@ +--- a/data/61-gdm.rules 2018-02-20 02:16:32.000000000 +0800 ++++ b/data/61-gdm.rules 2018-04-08 20:31:18.860133428 +0800 +@@ -1,2 +1,17 @@ -# disable Wayland on Cirrus chipsets +# Disable Wayland on specific chipsets + @@ -18,3 +18,6 @@ Index: gdm-3.28.0/data/61-gdm.rules +ATTR{vendor}=="0x102b", ATTR{device}=="0x0534", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'" +ATTR{vendor}=="0x102b", ATTR{device}=="0x0536", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'" +ATTR{vendor}=="0x102b", ATTR{device}=="0x0538", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'" ++ ++# ASPEED Technology, Inc. ++ATTR{vendor}=="0x1a03", ATTR{device}=="0x2000", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'" diff --git a/gdm.changes b/gdm.changes index 914a2e4..a6a6c42 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Apr 8 12:33:28 UTC 2018 - fezhang@suse.com + +- Rename gdm-disable-wayland-on-mgag200-chipsets.patch to + gdm-disable-wayland-on-unsupported-chipsets.patch: add rules for + ASPEED ast drivers (boo#1088539). + ------------------------------------------------------------------- Thu Mar 22 20:20:46 CET 2018 - hpj@suse.com diff --git a/gdm.spec b/gdm.spec index b50ca36..642e29d 100644 --- a/gdm.spec +++ b/gdm.spec @@ -40,8 +40,8 @@ Source6: gdmflexiserver-wrapper Source7: X11-displaymanager-gdm # GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script Source8: autogen.sh -# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-mgag200-chipsets.patch bgo#794106 bsc#1083609 yfjiang@suse.com -- Disable Wayland on mgag200 chipsets -Patch1: gdm-disable-wayland-on-mgag200-chipsets.patch +# PATCH-FIX-UPSTREAM gdm-disable-wayland-on-unsupported-chipsets.patch bgo#794106 bsc#1083609 boo#1088539 yfjiang@suse.com -- Disable Wayland on unsupported chipsets +Patch1: gdm-disable-wayland-on-unsupported-chipsets.patch # WARNING: do not remove/significantly change patch3 without updating the relevant patch in accountsservice too # PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 bsc#919723 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager; note that accountsservice has a similar patch (accountsservice-sysconfig.patch) Patch3: gdm-sysconfig-settings.patch From 8965ec665f2fe28005299710a9619ef4fc332668710521c6c41a8d56e0e5526d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Apr 2018 09:22:16 +0000 Subject: [PATCH 2/3] Accepting request 596284 from home:iznogood:branches:GNOME:Factory Stable bump + drag along change done in GN, but without mangling of .changes. Post ack of this, a force branch of GF/gdm to GN is probably worth looking into OBS-URL: https://build.opensuse.org/request/show/596284 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=393 --- gdm-3.28.0.tar.xz | 3 --- gdm-3.28.1.tar.xz | 3 +++ gdm.changes | 13 +++++++++++++ gdm.spec | 9 ++------- 4 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 gdm-3.28.0.tar.xz create mode 100644 gdm-3.28.1.tar.xz diff --git a/gdm-3.28.0.tar.xz b/gdm-3.28.0.tar.xz deleted file mode 100644 index e5f5886..0000000 --- a/gdm-3.28.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a20dde3d02a0d27710ba883f4eaa4ce07c703c5fb15441f4295eee64cfeb944 -size 1121916 diff --git a/gdm-3.28.1.tar.xz b/gdm-3.28.1.tar.xz new file mode 100644 index 0000000..2bcab0d --- /dev/null +++ b/gdm-3.28.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77068fa775bc2c002e85883c250103f6a77361d32ba0cb8a60997b70b397b2fb +size 1122164 diff --git a/gdm.changes b/gdm.changes index a6a6c42..a124d3a 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 13 10:07:57 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 3.28.1: + + Properly stop boot splash even if local login screen is + disabled. + + Updated translations. + ------------------------------------------------------------------- Sun Apr 8 12:33:28 UTC 2018 - fezhang@suse.com @@ -5,6 +13,11 @@ Sun Apr 8 12:33:28 UTC 2018 - fezhang@suse.com gdm-disable-wayland-on-unsupported-chipsets.patch: add rules for ASPEED ast drivers (boo#1088539). +------------------------------------------------------------------- +Wed Apr 4 09:48:52 UTC 2018 - fezhang@suse.com + +- Clean up specfile: Enable Wayland unconditionally. + ------------------------------------------------------------------- Thu Mar 22 20:20:46 CET 2018 - hpj@suse.com diff --git a/gdm.spec b/gdm.spec index 642e29d..32748fd 100644 --- a/gdm.spec +++ b/gdm.spec @@ -19,10 +19,9 @@ %define systemdsystemunitdir %(pkg-config --variable=systemdsystemunitdir systemd) # 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 -# Allow to disable wayland components -%bcond_without wayland + Name: gdm -Version: 3.28.0 +Version: 3.28.1 Release: 0 Summary: The GNOME Display Manager License: GPL-2.0-or-later @@ -221,11 +220,7 @@ autoreconf -fiv --enable-ipv6 \ --enable-gdm-xsession \ --with-plymouth \ -%if %{with wayland} --enable-wayland-support \ -%else - --disable-wayland-support \ -%endif %if 0%{?is_opensuse} --enable-systemd-journal \ %else From 1f7eebe4966efb08b96246d897f1bd40067fa79801752a4945b4f025df0f8d5b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 19 Apr 2018 15:10:23 +0000 Subject: [PATCH 3/3] Accepting request 597258 from home:yfjiang:branches:GNOME:Factory Append some bug ids in the 3.28.1 changelog. OBS-URL: https://build.opensuse.org/request/show/597258 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=394 --- gdm.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdm.changes b/gdm.changes index a124d3a..73c9ef4 100644 --- a/gdm.changes +++ b/gdm.changes @@ -3,7 +3,7 @@ Fri Apr 13 10:07:57 UTC 2018 - bjorn.lie@gmail.com - Update to version 3.28.1: + Properly stop boot splash even if local login screen is - disabled. + disabled (bsc#1083646 bgo#795120). + Updated translations. -------------------------------------------------------------------