From 9e8af5668415440e2898d3b123d0ec89a2b8139c8de926c7320ad82f2044bbd4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 22 Jun 2015 13:11:28 +0000 Subject: [PATCH 1/2] fix_for_openSUSE:42 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=221 --- ...-settings-daemon-fdo-Screensaver-Lock.patch | 18 ++++++++++++++++++ gnome-settings-daemon.changes | 6 ++++++ gnome-settings-daemon.spec | 3 +++ 3 files changed, 27 insertions(+) create mode 100644 gnome-settings-daemon-fdo-Screensaver-Lock.patch diff --git a/gnome-settings-daemon-fdo-Screensaver-Lock.patch b/gnome-settings-daemon-fdo-Screensaver-Lock.patch new file mode 100644 index 0000000..18391f7 --- /dev/null +++ b/gnome-settings-daemon-fdo-Screensaver-Lock.patch @@ -0,0 +1,18 @@ +Index: gnome-settings-daemon-3.12.0.1/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c +=================================================================== +--- gnome-settings-daemon-3.12.0.1.orig/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c ++++ gnome-settings-daemon-3.12.0.1/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c +@@ -253,7 +253,12 @@ handle_method_call (GDBusConnection + } else if (g_strcmp0 (method_name, "UnThrottle") == 0) { + g_dbus_method_invocation_return_value (invocation, NULL); + } else if (g_strcmp0 (method_name, "Lock") == 0) { +- goto unimplemented; ++ GVariant *ret; ++ ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (G_DBUS_PROXY (manager->priv->session)), ++ "Lock", ++ NULL, ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, NULL, NULL); + } else if (g_strcmp0 (method_name, "SimulateUserActivity") == 0) { + goto unimplemented; + } else if (g_strcmp0 (method_name, "GetActive") == 0) { diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index d521dac..b0d8373 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 22 13:10:53 UTC 2015 - dimstar@opensuse.org + +- Add conditional pkgconfig(wayland-client) BuildRequires, based + on bcond wayland. + ------------------------------------------------------------------- Tue May 12 18:34:15 UTC 2015 - zaitor@opensuse.org diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index d288f94..6411ed1 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -85,6 +85,9 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xtst) +%if %{with wayland} +BuildRequires: pkgconfig(wayland-client) +%endif Requires: gsettings-desktop-schemas # g-s-d uses the pkexec binary Requires: polkit From d9dbe7df2aac10b30d416025ca31be20deeae05c5c348b46ea51c161223995cf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 22 Jun 2015 13:18:15 +0000 Subject: [PATCH 2/2] fixup OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=222 --- ...-settings-daemon-fdo-Screensaver-Lock.patch | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 gnome-settings-daemon-fdo-Screensaver-Lock.patch diff --git a/gnome-settings-daemon-fdo-Screensaver-Lock.patch b/gnome-settings-daemon-fdo-Screensaver-Lock.patch deleted file mode 100644 index 18391f7..0000000 --- a/gnome-settings-daemon-fdo-Screensaver-Lock.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: gnome-settings-daemon-3.12.0.1/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c -=================================================================== ---- gnome-settings-daemon-3.12.0.1.orig/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c -+++ gnome-settings-daemon-3.12.0.1/plugins/screensaver-proxy/gsd-screensaver-proxy-manager.c -@@ -253,7 +253,12 @@ handle_method_call (GDBusConnection - } else if (g_strcmp0 (method_name, "UnThrottle") == 0) { - g_dbus_method_invocation_return_value (invocation, NULL); - } else if (g_strcmp0 (method_name, "Lock") == 0) { -- goto unimplemented; -+ GVariant *ret; -+ ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (G_DBUS_PROXY (manager->priv->session)), -+ "Lock", -+ NULL, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, NULL, NULL); - } else if (g_strcmp0 (method_name, "SimulateUserActivity") == 0) { - goto unimplemented; - } else if (g_strcmp0 (method_name, "GetActive") == 0) {