[arch-commits] Commit in gdm/repos (4 files)
Jan de Groot
jgc at archlinux.org
Tue Oct 20 07:04:08 UTC 2009
Date: Tuesday, October 20, 2009 @ 03:04:08
Author: jgc
Revision: 56168
Merged revisions 56167 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gdm/trunk
........
r56167 | jgc | 2009-10-20 09:03:53 +0200 (Tue, 20 Oct 2009) | 2 lines
upgpkg: gdm 2.28.1-1
Update to 2.28.1 - remove upstream applied patch, fixup user account on upgrades
........
Modified:
gdm/repos/extra-x86_64/ (properties)
gdm/repos/extra-x86_64/PKGBUILD
gdm/repos/extra-x86_64/gdm.install
Deleted:
gdm/repos/extra-x86_64/gdm-2.28.0-use-devicekit-power.patch
--------------------------------------+
PKGBUILD | 13 --
gdm-2.28.0-use-devicekit-power.patch | 186 ---------------------------------
gdm.install | 6 -
3 files changed, 8 insertions(+), 197 deletions(-)
Property changes on: gdm/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /gdm/trunk:1-54815
+ /gdm/trunk:1-56167
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-10-20 07:03:53 UTC (rev 56167)
+++ extra-x86_64/PKGBUILD 2009-10-20 07:04:08 UTC (rev 56168)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=gdm
-pkgver=2.28.0
+pkgver=2.28.1
pkgrel=1
pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
arch=(i686 x86_64)
@@ -10,20 +10,18 @@
backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
groups=('gnome-extra')
options=('!libtool')
-depends=('libcanberra>=0.14' 'gnome-panel>=2.28.0' 'libxklavier>=4.0' 'tcp_wrappers' 'gnome-session>=2.28.0' 'devicekit-power>=010')
+depends=('libcanberra>=0.21' 'gnome-panel>=2.28.0' 'libxklavier>=4.0' 'tcp_wrappers' 'gnome-session>=2.28.0' 'devicekit-power>=012')
makedepends=('intltool' 'gnome-doc-utils>=0.18.0' 'xorg-server')
conflicts=('fast-user-switch-applet')
replaces=('fast-user-switch-applet')
install=gdm.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2
04_fix_external_program_directories.patch
- gdm-2.28.0-use-devicekit-power.patch
gdm.pam
gdm-autologin.pam
gdm)
-sha256sums=('b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4'
+sha256sums=('da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a'
'd41b0945a3db78a06b5aa4101f5515f7ea5d57e70974681c23e5def1df1834bb'
- '343f82a570aec7cdfbeb559c8dfd206677e74bd93bf01a24cddce144950799c5'
'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
'3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
'272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550')
@@ -32,11 +30,6 @@
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/04_fix_external_program_directories.patch" || return 1
- patch -Np1 -i "${srcdir}/gdm-2.28.0-use-devicekit-power.patch" || return 1
- libtoolize --force || return 1
- aclocal || return 1
- autoconf || return 1
- automake || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
--disable-scrollkeeper || return 1
Deleted: extra-x86_64/gdm-2.28.0-use-devicekit-power.patch
===================================================================
--- extra-x86_64/gdm-2.28.0-use-devicekit-power.patch 2009-10-20 07:03:53 UTC (rev 56167)
+++ extra-x86_64/gdm-2.28.0-use-devicekit-power.patch 2009-10-20 07:04:08 UTC (rev 56168)
@@ -1,186 +0,0 @@
-From aa132a553b871a19a8d23fe8e9d93f736f2a4faf Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard at hughsie.com>
-Date: Mon, 28 Sep 2009 09:14:33 +0100
-Subject: [PATCH] Convert gdm from using gnome-power-manager to DeviceKit-power
-
----
- configure.ac | 7 ++
- gui/simple-greeter/Makefile.am | 4 +
- gui/simple-greeter/gdm-greeter-login-window.c | 84 ++++++-------------------
- 3 files changed, 31 insertions(+), 64 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 756890a..2cae1cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -51,6 +51,7 @@ LIBXKLAVIER_REQUIRED_VERSION=4.0
- LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- #FONTCONFIG_REQUIRED_VERSION=2.6.0
- FONTCONFIG_REQUIRED_VERSION=2.5.0
-+DEVKIT_POWER_REQUIRED_VERSION=008
-
- EXTRA_COMPILE_WARNINGS(yes)
-
-@@ -103,6 +104,12 @@ PKG_CHECK_MODULES(GCONF,
- AC_SUBST(GCONF_CFLAGS)
- AC_SUBST(GCONF_LIBS)
-
-+PKG_CHECK_MODULES(DEVKIT_POWER,
-+ devkit-power-gobject >= $DEVKIT_POWER_REQUIRED_VERSION
-+)
-+AC_SUBST(DEVKIT_POWER_CFLAGS)
-+AC_SUBST(DEVKIT_POWER_LIBS)
-+
- PKG_CHECK_MODULES(SIMPLE_GREETER,
- dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
- gtk+-2.0 >= $GTK_REQUIRED_VERSION
-diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
-index 8c9ae46..4c06bc3 100644
---- a/gui/simple-greeter/Makefile.am
-+++ b/gui/simple-greeter/Makefile.am
-@@ -18,6 +18,8 @@ AM_CPPFLAGS = \
- -DSBINDIR=\""$(sbindir)"\" \
- -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
- -DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\"" \
-+ $(DEVKIT_POWER_CFLAGS) \
-+ -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
- $(DISABLE_DEPRECATED_CFLAGS) \
- $(GTK_CFLAGS) \
- $(SIMPLE_GREETER_CFLAGS) \
-@@ -90,6 +92,7 @@ test_greeter_login_window_LDADD = \
- libgdmuser.la \
- $(COMMON_LIBS) \
- $(SIMPLE_GREETER_LIBS) \
-+ $(DEVKIT_POWER_LIBS) \
- $(RBAC_LIBS) \
- $(NULL)
-
-@@ -324,6 +327,7 @@ gdm_simple_greeter_LDADD = \
- $(SIMPLE_GREETER_LIBS) \
- $(RBAC_LIBS) \
- $(LIBXKLAVIER_LIBS) \
-+ $(DEVKIT_POWER_LIBS) \
- $(NULL)
-
- gladedir = $(pkgdatadir)
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index c7ea5d6..7d4ef83 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -56,6 +56,8 @@
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
-
-+#include <devkit-power-gobject/devicekit-power.h>
-+
- #include "gdm-settings-client.h"
- #include "gdm-settings-keys.h"
- #include "gdm-profile.h"
-@@ -79,10 +81,6 @@
- #define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat"
- #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
-
--#define GPM_DBUS_NAME "org.freedesktop.PowerManagement"
--#define GPM_DBUS_PATH "/org/freedesktop/PowerManagement"
--#define GPM_DBUS_INTERFACE "org.freedesktop.PowerManagement"
--
- #define GLADE_XML_FILE "gdm-greeter-login-window.glade"
-
- #define KEY_GREETER_DIR "/apps/gdm/simple-greeter"
-@@ -480,40 +478,15 @@ adjust_other_login_visibility(GdmGreeterLoginWindow *login_window)
- static gboolean
- can_suspend (GdmGreeterLoginWindow *login_window)
- {
-- DBusGConnection *connection;
-- DBusGProxy *proxy;
-- GError *error;
-- gboolean ret;
-- gboolean res;
--
-- error = NULL;
-- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-- if (error != NULL) {
-- g_warning ("Couldn't connect to power manager: %s", error->message);
-- g_error_free (error);
-- return FALSE;
-- }
-- proxy = dbus_g_proxy_new_for_name (connection,
-- GPM_DBUS_NAME,
-- GPM_DBUS_PATH,
-- GPM_DBUS_INTERFACE);
-- ret = FALSE;
--
-- res = dbus_g_proxy_call (proxy, "CanSuspend",
-- &error,
-- G_TYPE_INVALID,
-- G_TYPE_BOOLEAN,
-- &ret,
-- G_TYPE_INVALID);
-- if (! res) {
-- if (error != NULL) {
-- g_warning ("Could not ask power manager if user can suspend: %s",
-- error->message);
-- g_error_free (error);
-- }
-- ret = FALSE;
-- }
-+ gboolean ret;
-+ DkpClient *dkp_client;
-
-+ /* use DeviceKit-power to get data */
-+ dkp_client = dkp_client_new ();
-+ g_object_get (dkp_client,
-+ "can-suspend", &ret,
-+ NULL);
-+ g_object_unref (dkp_client);
- return ret;
- }
-
-@@ -655,36 +628,19 @@ do_disconnect (GdmGreeterLoginWindow *login_window)
- static void
- do_suspend (GdmGreeterLoginWindow *login_window)
- {
-- GError *error;
-- DBusGConnection *connection;
-- DBusGProxy *proxy;
-+ gboolean ret;
-+ DkpClient *dkp_client;
-+ GError *error = NULL;
-
-- g_debug ("GdmGreeterLoginWindow: Suspend button clicked");
--
-- error = NULL;
-- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-- if (error != NULL) {
-+ /* use DeviceKit-power to get data */
-+ dkp_client = dkp_client_new ();
-+ ret = dkp_client_suspend (dkp_client, &error);
-+ if (!ret) {
- g_warning ("Couldn't suspend: %s", error->message);
- g_error_free (error);
- return;
- }
-- proxy = dbus_g_proxy_new_for_name (connection,
-- GPM_DBUS_NAME,
-- GPM_DBUS_PATH,
-- GPM_DBUS_INTERFACE);
-- error = NULL;
-- dbus_g_proxy_call (proxy,
-- "Suspend",
-- &error,
-- G_TYPE_INVALID,
-- G_TYPE_INVALID);
-- if (error != NULL) {
-- g_warning ("Couldn't suspend: %s", error->message);
-- g_error_free (error);
-- return;
-- }
--
-- g_object_unref (proxy);
-+ g_object_unref (dkp_client);
- }
-
- static void
---
-1.6.4.4
-
Modified: extra-x86_64/gdm.install
===================================================================
--- extra-x86_64/gdm.install 2009-10-20 07:03:53 UTC (rev 56167)
+++ extra-x86_64/gdm.install 2009-10-20 07:04:08 UTC (rev 56168)
@@ -2,7 +2,11 @@
post_install() {
getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
- getent passwd gdm >/dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ if getent passwd gdm > /dev/null 2>&1; then
+ usr/sbin/usermod -d /var/lib/gdm -c 'Gnome Display Manager' -s /sbin/nologin gdm > /dev/null
+ else
+ usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
+ fi
passwd -l gdm > /dev/null
chown root:gdm /var/lib/gdm > /dev/null
chown -R root:gdm /var/lib/gdm/.gconf.mandatory
More information about the arch-commits
mailing list