[arch-commits] Commit in lightdm/trunk (PKGBUILD lightdm-use-login1.patch)
Date: Thursday, June 13, 2013 @ 10:51:13
Author: alucryd
Revision: 92708
FS#35704: lightdm 1:1.6.0-5
Modified:
lightdm/trunk/PKGBUILD
lightdm/trunk/lightdm-use-login1.patch
--+
PKGBUILD |6
lightdm-use-login1.patch | 639 +++--
2 files changed, 394 insertions(+), 251 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-13 08:34:56 UTC (rev 92707)
+++ PKGBUILD2013-06-13 08:51:13 UTC (rev 92708)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.6.0
-pkgrel=4
+pkgrel=5
epoch=1
pkgdesc=A lightweight display manager
arch=('i686' 'x86_64')
@@ -32,7 +32,7 @@
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
'6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
'4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
-'bac646accb407c02c9cebf0b087b7a47f6353bc3829de4e82e10b2e4396a87e6'
+'3247aa1e5e7c2c2f8653cfbb22e1f74252c556b6159ff4ec47c1c7d5ea6883ac'
'7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
prepare() {
@@ -40,7 +40,7 @@
patch -Np1 -i ../lightdm-default-config.patch
patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
- patch -Np1 -i ../lightdm-use-login1.patch
+ patch -Np0 -i ../lightdm-use-login1.patch
sed -i 's/MOC5 --qt=qt5/MOC5/' configure
}
Modified: lightdm-use-login1.patch
===
--- lightdm-use-login1.patch2013-06-13 08:34:56 UTC (rev 92707)
+++ lightdm-use-login1.patch2013-06-13 08:51:13 UTC (rev 92708)
@@ -1,279 +1,101 @@
-diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c
lightdm-1.6.0/liblightdm-gobject/power.c
lightdm-1.6.0.orig/liblightdm-gobject/power.c 2013-03-06
03:40:10.0 +0100
-+++ lightdm-1.6.0/liblightdm-gobject/power.c 2013-06-08 00:45:07.411183727
+0200
-@@ -15,44 +15,67 @@
+=== modified file 'liblightdm-gobject/power.c'
+--- liblightdm-gobject/power.c 2013-01-31 20:56:09 +
liblightdm-gobject/power.c 2013-04-15 02:21:06 +
+@@ -17,6 +17,7 @@
- #include lightdm/power.h
+ static GDBusProxy *upower_proxy = NULL;
+ static GDBusProxy *ck_proxy = NULL;
++static GDBusProxy *login1_proxy = NULL;
--static GDBusProxy *upower_proxy = NULL;
--static GDBusProxy *ck_proxy = NULL;
-+/* static GDBusProxy *upower_proxy = NULL;
-+ static GDBusProxy *ck_proxy = NULL;
-+ static GDBusProxy *login1_proxy = NULL;
-+ */
-+
-+struct proxy_info {
-+ /* proxy reference */
-+ GDBusProxy *proxy;
-+
-+ /* arguments to g_dbus_proxy_new_for_bus_sync() */
-+ const char *name;
-+ const char *object_path;
-+ const char *interface_name;
-+
-+};
-+
-+static struct proxy_info upower_proxy = {
-+ .proxy = NULL,
-+ .name = org.freedesktop.UPower,
-+ .object_path = /org/freedesktop/UPower,
-+ .interface_name = org.freedesktop.UPower,
-+};
-+
-+static struct proxy_info ck_proxy = {
-+ .proxy = NULL,
-+ .name = org.freedesktop.ConsoleKit,
-+ .object_path = /org/freedesktop/ConsoleKit/Manager,
-+ .interface_name = org.freedesktop.ConsoleKit.Manager,
-+};
-+
-+static struct proxy_info login1_proxy = {
-+ .proxy = NULL,
-+ .name = org.freedesktop.login1,
-+ .object_path = /org/freedesktop/login1,
-+ .interface_name = org.freedesktop.login1.Manager,
-+};
+ static gboolean
+ upower_call_function (const gchar *function, gboolean default_result, GError
**error)
+@@ -109,11 +110,10 @@
+ return upower_call_function (Hibernate, TRUE, error);
+ }
-static gboolean
--upower_call_function (const gchar *function, gboolean default_result, GError
**error)
+-ck_call_function (const gchar *function, gboolean default_result, GError
**error)
+static GVariant *
-+do_call_function (const gchar *function, GVariant *parameters, GError
**error, struct proxy_info *proxy)
++ck_call_function (const gchar *function, GError **error)
{
-GVariant *result;
-gboolean function_result = FALSE;
--
--if (!upower_proxy)
-+if (!proxy-proxy)
++GVariant *r;
+
+ if (!ck_proxy)
{
--upower_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-- G_DBUS_PROXY_FLAGS_NONE,
-- NULL,
--
org.freedesktop.UPower,
--
/org/freedesktop/UPower,
--
org.freedesktop.UPower,
-- NULL,
-- error);
--if (!upower_proxy)
--return FALSE;
--}
--
--result = g_dbus_proxy_call_sync (upower_proxy,
+@@ -129,22 +129,46 @@
+ return FALSE;
+ }
+
[arch-commits] Commit in lightdm/trunk (PKGBUILD lightdm-use-login1.patch)
Date: Saturday, June 8, 2013 @ 16:59:50
Author: alucryd
Revision: 92561
FS#35704: lightdm 1:1.6.0-4
Added:
lightdm/trunk/lightdm-use-login1.patch
Modified:
lightdm/trunk/PKGBUILD
--+
PKGBUILD |5
lightdm-use-login1.patch | 371 +
2 files changed, 375 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-08 14:19:40 UTC (rev 92560)
+++ PKGBUILD2013-06-08 14:59:50 UTC (rev 92561)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.6.0
-pkgrel=3
+pkgrel=4
epoch=1
pkgdesc=A lightweight display manager
arch=('i686' 'x86_64')
@@ -22,6 +22,7 @@
'lightdm.rules'
'lightdm-default-config.patch'
'lightdm-lock-screen-before-switch.patch'
+'lightdm-use-login1.patch'
'xsession')
sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
'3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f'
@@ -31,6 +32,7 @@
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
'6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
'4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
+'bac646accb407c02c9cebf0b087b7a47f6353bc3829de4e82e10b2e4396a87e6'
'7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
prepare() {
@@ -38,6 +40,7 @@
patch -Np1 -i ../lightdm-default-config.patch
patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
+ patch -Np1 -i ../lightdm-use-login1.patch
sed -i 's/MOC5 --qt=qt5/MOC5/' configure
}
Added: lightdm-use-login1.patch
===
--- lightdm-use-login1.patch(rev 0)
+++ lightdm-use-login1.patch2013-06-08 14:59:50 UTC (rev 92561)
@@ -0,0 +1,371 @@
+diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c
lightdm-1.6.0/liblightdm-gobject/power.c
+--- lightdm-1.6.0.orig/liblightdm-gobject/power.c 2013-03-06
03:40:10.0 +0100
lightdm-1.6.0/liblightdm-gobject/power.c 2013-06-08 00:45:07.411183727
+0200
+@@ -15,44 +15,67 @@
+
+ #include lightdm/power.h
+
+-static GDBusProxy *upower_proxy = NULL;
+-static GDBusProxy *ck_proxy = NULL;
++/* static GDBusProxy *upower_proxy = NULL;
++ static GDBusProxy *ck_proxy = NULL;
++ static GDBusProxy *login1_proxy = NULL;
++ */
++
++struct proxy_info {
++ /* proxy reference */
++ GDBusProxy *proxy;
++
++ /* arguments to g_dbus_proxy_new_for_bus_sync() */
++ const char *name;
++ const char *object_path;
++ const char *interface_name;
++
++};
++
++static struct proxy_info upower_proxy = {
++ .proxy = NULL,
++ .name = org.freedesktop.UPower,
++ .object_path = /org/freedesktop/UPower,
++ .interface_name = org.freedesktop.UPower,
++};
++
++static struct proxy_info ck_proxy = {
++ .proxy = NULL,
++ .name = org.freedesktop.ConsoleKit,
++ .object_path = /org/freedesktop/ConsoleKit/Manager,
++ .interface_name = org.freedesktop.ConsoleKit.Manager,
++};
++
++static struct proxy_info login1_proxy = {
++ .proxy = NULL,
++ .name = org.freedesktop.login1,
++ .object_path = /org/freedesktop/login1,
++ .interface_name = org.freedesktop.login1.Manager,
++};
+
+-static gboolean
+-upower_call_function (const gchar *function, gboolean default_result, GError
**error)
++static GVariant *
++do_call_function (const gchar *function, GVariant *parameters, GError
**error, struct proxy_info *proxy)
+ {
+-GVariant *result;
+-gboolean function_result = FALSE;
+-
+-if (!upower_proxy)
++if (!proxy-proxy)
+ {
+-upower_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+- G_DBUS_PROXY_FLAGS_NONE,
+- NULL,
+-
org.freedesktop.UPower,
+-
/org/freedesktop/UPower,
+-
org.freedesktop.UPower,
+- NULL,
+- error);
+-if (!upower_proxy)
+-return FALSE;
+-}
+-
+-result = g_dbus_proxy_call_sync (upower_proxy,
+- function,
+- NULL,
+- G_DBUS_CALL_FLAGS_NONE,
+- -1,
+- NULL,
+- error);
+-if (!result)
+-return default_result;
+-
+-if (g_variant_is_of_type (result, G_VARIANT_TYPE ((b
+-g_variant_get (result, (b), function_result);
++proxy-proxy =
