summaryrefslogtreecommitdiff
path: root/community/lightdm
diff options
context:
space:
mode:
Diffstat (limited to 'community/lightdm')
-rwxr-xr-xcommunity/lightdm/PKGBUILD38
-rwxr-xr-xcommunity/lightdm/lightdm-1.5.1-systemd_login1_power.patch211
2 files changed, 9 insertions, 240 deletions
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index c195eea24..9570465d6 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,35 +1,34 @@
-# $Id: PKGBUILD 86229 2013-03-13 18:51:51Z alucryd $
+# $Id: PKGBUILD 86254 2013-03-14 11:38:24Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Morfeo <morfeo89@hotmail.it>
pkgbase=lightdm
-pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.5.1
-pkgrel=6
+pkgname=('lightdm' 'liblightdm-qt4')
+pkgver=1.4.0
+pkgrel=1
+epoch=1
pkgdesc="A lightweight display manager"
arch=('i686' 'x86_64')
url="https://launchpad.net/lightdm"
license=('GPL3' 'LGPL3')
-makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base')
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4')
options=('!emptydirs' '!libtool')
-source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
+source=("https://launchpad.net/lightdm/1.4/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz"
'lightdm.service'
'lightdm.tmpfiles'
'lightdm.pam'
'lightdm-autologin.pam'
'lightdm.rules'
'lightdm-default-config.patch'
- 'lightdm-1.5.1-systemd_login1_power.patch'
'lightdm-lock-screen-before-switch.patch'
'xsession')
-sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86'
+sha256sums=('3486a9f828864a78d452696cf6fef6e1dec2f4ef92a72e90ab37edf9a0824c43'
'2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
'51ec7eb1c50c0ba0b96b846662707533ebc1d6558cea75cb7424afddf0d064f0'
- '8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608'
'4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
'7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
@@ -38,7 +37,6 @@ build() {
# Patch
patch -Np1 -i ../lightdm-default-config.patch
- patch -Np1 -i ../lightdm-1.5.1-systemd_login1_power.patch
patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
# Build
@@ -47,7 +45,7 @@ build() {
}
package_lightdm() {
-depends=('libgcrypt' 'libxklavier' 'pam')
+depends=('libxklavier' 'pam')
optdepends=('xorg-server-xephyr: LightDM test mode'
'accountsservice: limit visible accounts')
backup=('etc/apparmor.d/lightdm-guest-session'
@@ -88,24 +86,6 @@ depends=('lightdm' 'qt4')
make DESTDIR="${pkgdir}" -C liblightdm-gobject install
make DESTDIR="${pkgdir}" -C liblightdm-qt install
make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
- find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} +
- find "${pkgdir}" -type f -name *qt5* -exec rm {} +
- find "${pkgdir}" -type l -name *qt5* -exec rm {} +
-}
-
-package_liblightdm-qt5() {
-pkgdesc=('LightDM Qt client library')
-depends=('lightdm' 'qt5-base')
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
-
-# Install
- make DESTDIR="${pkgdir}" -C liblightdm-gobject install
- make DESTDIR="${pkgdir}" -C liblightdm-qt install
- make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
- find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} +
- find "${pkgdir}" -type f -name *qt[!5]* -exec rm {} +
- find "${pkgdir}" -type l -name *qt[!5]* -exec rm {} +
}
# vim: ts=2 sw=2 et:
diff --git a/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch b/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch
deleted file mode 100755
index 0bcb24589..000000000
--- a/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-diff -up lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.5.1/liblightdm-gobject/power.c
---- lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power 2013-03-05 20:40:10.000000000 -0600
-+++ lightdm-1.5.1/liblightdm-gobject/power.c 2013-03-09 11:31:00.169897568 -0600
-@@ -17,6 +17,7 @@
-
- static GDBusProxy *upower_proxy = NULL;
- static GDBusProxy *ck_proxy = NULL;
-+static GDBusProxy *login1_proxy = NULL;
-
- static gboolean
- upower_call_function (const gchar *function, gboolean default_result, GError **error)
-@@ -147,6 +148,59 @@ ck_call_function (const gchar *function,
- return function_result;
- }
-
-+static gboolean
-+login1_call_function (const gchar *function, GVariant *parameters, gboolean default_result, GError **error)
-+{
-+ GVariant *result;
-+ gboolean function_result = FALSE;
-+ const gchar *true_result = "yes";
-+ gchar *str_result;
-+
-+ if (!login1_proxy)
-+ {
-+ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+ G_DBUS_PROXY_FLAGS_NONE,
-+ NULL,
-+ "org.freedesktop.login1",
-+ "/org/freedesktop/login1",
-+ "org.freedesktop.login1.Manager",
-+ NULL,
-+ error);
-+ if (!login1_proxy)
-+ return FALSE;
-+ }
-+
-+ result = g_dbus_proxy_call_sync (login1_proxy,
-+ function,
-+ parameters,
-+ 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, "(s)", &function_result);
-+
-+ /**
-+ * CanReboot, CanPowerOff returns a string "yes", "no", or "challenge", not a boolean as ConsoleKit
-+ **/
-+ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(s)"))) {
-+ g_variant_get (result, "(b)", str_result);
-+ if(g_strcmp0(str_result,true_result) == 0) {
-+ function_result = TRUE;
-+ }
-+ else {
-+ function_result = default_result;
-+ }
-+ }
-+
-+ g_variant_unref (result);
-+ return function_result;
-+}
-+
- /**
- * lightdm_get_can_restart:
- *
-@@ -157,7 +211,11 @@ ck_call_function (const gchar *function,
- gboolean
- lightdm_get_can_restart (void)
- {
-- return ck_call_function ("CanRestart", FALSE, NULL);
-+ gboolean function_result = FALSE;
-+ function_result = login1_call_function ("CanReboot", NULL, FALSE, NULL);
-+ if (!function_result)
-+ function_result = ck_call_function ("CanRestart", FALSE, NULL);
-+ return function_result;
- }
-
- /**
-@@ -171,7 +229,11 @@ lightdm_get_can_restart (void)
- gboolean
- lightdm_restart (GError **error)
- {
-- return ck_call_function ("Restart", TRUE, error);
-+ gboolean function_result = FALSE;
-+ function_result = login1_call_function ("Reboot", g_variant_new("(b)",0), TRUE, error);
-+ if (!function_result)
-+ function_result = ck_call_function ("Restart", TRUE, error);
-+ return function_result;
- }
-
- /**
-@@ -184,7 +246,11 @@ lightdm_restart (GError **error)
- gboolean
- lightdm_get_can_shutdown (void)
- {
-- return ck_call_function ("CanStop", FALSE, NULL);
-+ gboolean function_result = FALSE;
-+ function_result = login1_call_function ("CanPowerOff", NULL, FALSE, NULL);
-+ if (!function_result)
-+ function_result = ck_call_function ("CanStop", FALSE, NULL);
-+ return function_result;
- }
-
- /**
-@@ -198,5 +264,9 @@ lightdm_get_can_shutdown (void)
- gboolean
- lightdm_shutdown (GError **error)
- {
-- return ck_call_function ("Stop", TRUE, error);
-+ gboolean function_result = FALSE;
-+ function_result = login1_call_function ("PowerOff", g_variant_new("(b)",0), TRUE, error);
-+ if (!function_result)
-+ function_result = ck_call_function ("Stop", TRUE, error);
-+ return function_result;
- }
-diff -up lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.1/liblightdm-qt/power.cpp
---- lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power 2013-03-05 20:40:10.000000000 -0600
-+++ lightdm-1.5.1/liblightdm-qt/power.cpp 2013-03-09 11:36:47.140559838 -0600
-@@ -15,6 +15,7 @@
- #include <QtCore/QVariant>
- #include <QtDBus/QDBusInterface>
- #include <QtDBus/QDBusReply>
-+#include <QDebug>
-
- #include "config.h"
-
-@@ -26,11 +27,13 @@ public:
- PowerInterfacePrivate();
- QScopedPointer<QDBusInterface> powerManagementInterface;
- QScopedPointer<QDBusInterface> consoleKitInterface;
-+ QScopedPointer<QDBusInterface> login1Interface;
- };
-
- PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() :
- powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())),
-- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus()))
-+ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())),
-+ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus()))
- {
- }
-
-@@ -80,34 +83,55 @@ void PowerInterface::hibernate()
-
- bool PowerInterface::canShutdown()
- {
-+
-+ if ( d->login1Interface->isValid() ) {
-+ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
-+ if (reply1.isValid()) {
-+ return (reply1.value()=="yes");
-+ }
-+ }
-+ qWarning() << d->login1Interface->lastError();
-+
- QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop");
- if (reply.isValid()) {
- return reply.value();
- }
-- else {
-- return false;
-- }
-+
-+ return false;
- }
-
- void PowerInterface::shutdown()
- {
-- d->consoleKitInterface->call("Stop");
-+ if ( d->login1Interface->isValid() )
-+ d->login1Interface->call("PowerOff",false);
-+ else
-+ d->consoleKitInterface->call("Stop");
- }
-
- bool PowerInterface::canRestart()
- {
-+ if ( d->login1Interface->isValid() ) {
-+ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
-+ if (reply1.isValid()) {
-+ return (reply1.value()=="yes");
-+ }
-+ }
-+ qWarning() << d->login1Interface->lastError();
-+
- QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
- if (reply.isValid()) {
- return reply.value();
- }
-- else {
-- return false;
-- }
-+
-+ return false;
- }
-
- void PowerInterface::restart()
- {
-- d->consoleKitInterface->call("Restart");
-+ if ( d->login1Interface->isValid() )
-+ d->login1Interface->call("Reboot",false);
-+ else
-+ d->consoleKitInterface->call("Restart");
- }
-
- #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-28 03:07:13 +0000