From 79496e4a642995a53f96f4353dfe532999155e9ffebc3ad06f787ab501458ce6 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 10 May 2017 12:57:03 +0000
Subject: [PATCH] Accepting request 492254 from home:Zaitor

Add patch to fix missing hidpi support in gdm screen, resub

OBS-URL: https://build.opensuse.org/request/show/492254
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=280
---
 gnome-settings-daemon-gdm-hidpi-fix.patch | 89 +++++++++++++++++++++++
 gnome-settings-daemon.changes             |  6 ++
 gnome-settings-daemon.spec                |  3 +
 3 files changed, 98 insertions(+)
 create mode 100644 gnome-settings-daemon-gdm-hidpi-fix.patch

diff --git a/gnome-settings-daemon-gdm-hidpi-fix.patch b/gnome-settings-daemon-gdm-hidpi-fix.patch
new file mode 100644
index 0000000..b10ab7e
--- /dev/null
+++ b/gnome-settings-daemon-gdm-hidpi-fix.patch
@@ -0,0 +1,89 @@
+From 1de232bd5b72534489f61eb4c666b5a892120f6d Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Tue, 18 Apr 2017 14:35:36 -0400
+Subject: common: Fix plugin whitelist for gdm
+
+The plugin names don't have a gsd- prefix, so the login screen
+is currently getting started with no plugins!
+
+This commit fixes that, and as a consequence, fixes hidpi scaling
+for the login screen.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=780208
+---
+ plugins/common/daemon-skeleton-gtk.h | 24 ++++++++++++------------
+ plugins/common/daemon-skeleton.h     | 24 ++++++++++++------------
+ 2 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
+index 714e48b..3bfd618 100644
+--- a/plugins/common/daemon-skeleton-gtk.h
++++ b/plugins/common/daemon-skeleton-gtk.h
+@@ -39,18 +39,18 @@ static GOptionEntry entries[] = {
+ };
+ 
+ static const char *gdm_helpers[] = {
+-	"gsd-a11y-keyboard",
+-	"gsd-a11y-settings",
+-	"gsd-clipboard",
+-	"gsd-color",
+-	"gsd-keyboard",
+-	"gsd-media-keys",
+-	"gsd-orientation",
+-	"gsd-power",
+-	"gsd-smartcard",
+-	"gsd-sound",
+-	"gsd-xrandr",
+-	"gsd-xsettings"
++	"a11y-keyboard",
++	"a11y-settings",
++	"clipboard",
++	"color",
++	"keyboard",
++	"media-keys",
++	"orientation",
++	"power",
++	"smartcard",
++	"sound",
++	"xrandr",
++	"xsettings"
+ };
+ 
+ static gboolean
+diff --git a/plugins/common/daemon-skeleton.h b/plugins/common/daemon-skeleton.h
+index dedfd61..07f8d23 100644
+--- a/plugins/common/daemon-skeleton.h
++++ b/plugins/common/daemon-skeleton.h
+@@ -38,18 +38,18 @@ static GOptionEntry entries[] = {
+ };
+ 
+ static const char *gdm_helpers[] = {
+-	"gsd-a11y-keyboard",
+-	"gsd-a11y-settings",
+-	"gsd-clipboard",
+-	"gsd-color",
+-	"gsd-keyboard",
+-	"gsd-media-keys",
+-	"gsd-orientation",
+-	"gsd-power",
+-	"gsd-smartcard",
+-	"gsd-sound",
+-	"gsd-xrandr",
+-	"gsd-xsettings"
++	"a11y-keyboard",
++	"a11y-settings",
++	"clipboard",
++	"color",
++	"keyboard",
++	"media-keys",
++	"orientation",
++	"power",
++	"smartcard",
++	"sound",
++	"xrandr",
++	"xsettings"
+ };
+ 
+ static gboolean
+-- 
+cgit v0.12
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 6e2cd1d..78c5835 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Apr 30 21:17:11 UTC 2017 - zaitor@opensuse.org
+
+- Add gnome-settings-daemon-gdm-hidpi-fix.patch: Fix missing HiDPI
+  support in gdm login screen (bgo#780208).
+
 -------------------------------------------------------------------
 Mon Apr 24 11:19:54 UTC 2017 - dimstar@opensuse.org
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index ef236e8..2f6148d 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -51,6 +51,8 @@ Patch29:        gnome-settings-daemon-initial-keyboard.patch
 Patch31:        gnome-settings-daemon-bring-back-updates-plugin.patch
 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-more-power-button-actions.patch bsc#996342 fezhang@suse.com -- Bring back the "shutdown" and "interactive" power button actions.
 Patch32:        gnome-settings-daemon-more-power-button-actions.patch
+# PATCH-FIX-UPSTREAM gnome-settings-daemon-gdm-hidpi-fix.patch bgo#780208 zaitor@opensuse.org -- Fix HiDPI on gdm login screen.
+Patch33:        gnome-settings-daemon-gdm-hidpi-fix.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 BuildRequires:  gtk-doc
@@ -164,6 +166,7 @@ gnome-patch-translation-prepare
 %patch31 -p1
 %endif
 %patch32 -p1
+%patch33 -p1
 
 %build
 %if 0%{?suse_version} == 1315