mtasaka pushed to cairo-dock-plug-ins (f21). "Default to xdg-screensaver for lock_screen (..more)"

Wed Mar 25 04:01:39 UTC 2015

>From ecd26ed5f304987ec3fd2dbc44cdc18c0b7c344d Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Wed, 25 Mar 2015 13:00:01 +0900
Subject: Default to xdg-screensaver for lock_screen

- Restrict the dependency for core package

diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec
index e1da703..aea6004 100644
--- a/cairo-dock-plug-ins.spec
+++ b/cairo-dock-plug-ins.spec
@@ -9,7 +9,7 @@
 
 Name:			cairo-dock-plug-ins
 Version:		%{mainver}
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Plug-ins files for Cairo-Dock
 
 License:		GPLv3+
@@ -20,12 +20,15 @@ Source0:		cairo-dock-plugins-fedora-%{version}.tar.gz
 # Source0 is created from Source1
 Source1:		cairo-dock-plug-ins-create-fedora-tarball.sh
 # demo_ruby: fix traceback when changing themes
-Patch0:		cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
+Patch1:		cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch
+# Default to xdg-screensaver for lock_screen
+Patch2:		cairo-dock-plugins-3.4.1-0002-Default-to-xdg-screensaver-for-lock_screen.patch
+Patch3:		cairo-dock-plugins-3.4.1-0003-lock-screen.sh-used-xdg-screensaver-if-available.patch
 
 BuildRequires:	cmake
 BuildRequires:	gettext
 
-BuildRequires:	pkgconfig(gldi)
+BuildRequires:	pkgconfig(gldi) = %{core_least_ver}
 BuildRequires:	pkgconfig(glib-2.0)
 BuildRequires:	pkgconfig(gio-2.0)
 
@@ -70,7 +73,7 @@ This package is a meta package for Cairo-Dock plugins.
 
 %package	base
 Summary:	Base files for Cairo-Dock plugins
-Requires:	cairo-dock-core%{?_isa} >= %{core_least_ver}
+Requires:	cairo-dock-core%{?_isa} = %{core_least_ver}
 Requires:	%{name}-common = %{version}-%{release}
 
 %description	base
@@ -185,7 +188,9 @@ binding for Cairo-Dock.
 
 %prep
 %setup -q -n cairo-dock-plugins-%{mainver}
-%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 ## permission
 # %%_fixperms cannot fix permissions completely here
@@ -379,6 +384,10 @@ popd
 %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h
 
 %changelog
+* Wed Mar 25 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.1-2
+- Default to xdg-screensaver for lock_screen
+- Restrict the dependency for core package
+
 * Thu Mar 13 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 3.4.1-1
 - 3.4.1
 - demo_ruby: fix traceback when changing themes
diff --git a/cairo-dock-plugins-3.4.1-0002-Default-to-xdg-screensaver-for-lock_screen.patch b/cairo-dock-plugins-3.4.1-0002-Default-to-xdg-screensaver-for-lock_screen.patch
new file mode 100644
index 0000000..110afa0
--- /dev/null
+++ b/cairo-dock-plugins-3.4.1-0002-Default-to-xdg-screensaver-for-lock_screen.patch
@@ -0,0 +1,44 @@
+From f17bf51d90cc7359040b2f504c019b22a451cce7 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka at fedoraproject.org>
+Date: Mon, 23 Mar 2015 15:19:09 +0900
+Subject: [PATCH 2/3] Default to xdg-screensaver for lock_screen
+
+xdg-screensaver script is available with xdg-utils
+package, which is maintained by freedesktop.org
+and designed to be used in various DE. So falling
+back to use xdg-screensaver as default is preferable
+for many users.
+---
+ gvfs-integration/cairo-dock-gio-vfs.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gvfs-integration/cairo-dock-gio-vfs.c b/gvfs-integration/cairo-dock-gio-vfs.c
+index e3f020b..6256c70 100644
+--- a/gvfs-integration/cairo-dock-gio-vfs.c
++++ b/gvfs-integration/cairo-dock-gio-vfs.c
+@@ -1566,6 +1566,14 @@ static GList *cairo_dock_gio_vfs_list_apps_for_file (const gchar *cBaseURI)
+ 	return pList;
+ }
+ 
++static void cairo_dock_gio_vfs_lock_screen (void) {
++	gchar *cResult = cairo_dock_launch_command_sync ("which xdg-screensaver");
++	if (cResult != NULL && *cResult == '/')
++		cairo_dock_launch_command ("xdg-screensaver lock");
++
++	g_free (cResult);
++}
++
+ gboolean cairo_dock_gio_vfs_fill_backend(CairoDockDesktopEnvBackend *pVFSBackend)
+ {
+ 	if(pVFSBackend)
+@@ -1590,6 +1598,7 @@ gboolean cairo_dock_gio_vfs_fill_backend(CairoDockDesktopEnvBackend *pVFSBackend
+ 		pVFSBackend->empty_trash = cairo_dock_gio_vfs_empty_trash;
+ 		pVFSBackend->get_desktop_path = cairo_dock_gio_vfs_get_desktop_path;
+ 		pVFSBackend->list_apps_for_file = cairo_dock_gio_vfs_list_apps_for_file;
++		pVFSBackend->lock_screen = cairo_dock_gio_vfs_lock_screen;
+ 	}
+ 
+ 	return TRUE;
+-- 
+2.1.0
+
diff --git a/cairo-dock-plugins-3.4.1-0003-lock-screen.sh-used-xdg-screensaver-if-available.patch b/cairo-dock-plugins-3.4.1-0003-lock-screen.sh-used-xdg-screensaver-if-available.patch
new file mode 100644
index 0000000..4a57cff
--- /dev/null
+++ b/cairo-dock-plugins-3.4.1-0003-lock-screen.sh-used-xdg-screensaver-if-available.patch
@@ -0,0 +1,25 @@
+From 88ae103e999a7ffd10df16b82f5474b5ea801595 Mon Sep 17 00:00:00 2001
+From: Matthieu Baerts <matttbe at gmail.com>
+Date: Tue, 24 Mar 2015 22:56:11 +0100
+Subject: [PATCH 3/3] lock-screen.sh used xdg-screensaver if available
+
+---
+ shared-files/scripts/lock-screen.sh | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/shared-files/scripts/lock-screen.sh b/shared-files/scripts/lock-screen.sh
+index 72ad7df..c1798f5 100755
+--- a/shared-files/scripts/lock-screen.sh
++++ b/shared-files/scripts/lock-screen.sh
+@@ -30,6 +30,8 @@ elif test -n "`echo $PS_OUTPUT | grep light-locker`"; then
+ 	light-locker-command --lock
+ elif hash xlock 2> /dev/null; then
+ 	xlock
++elif hash xdg-screensaver 2> /dev/null; then
++	xdg-screensaver lock
+ else # check is another "*-screensaver" daemon is running
+ 	# we need to relaunch ps, easier to parse compare to PS_OUTPUT which contains only one big line
+ 	SCREENSAVER=`ps -u $USER -wwo pid,cmd | grep "\-[s]creensaver" | awk '{print $2}'`
+-- 
+2.1.0
+
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cairo-dock-plug-ins.git/commit/?h=f21&id=ecd26ed5f304987ec3fd2dbc44cdc18c0b7c344d

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
