[arch-commits] Commit in gnome-control-center/repos (12 files)
Jan Steffens
heftig at archlinux.org
Mon Mar 12 00:28:07 UTC 2012
Date: Sunday, March 11, 2012 @ 20:28:07
Author: heftig
Revision: 153046
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
gnome-control-center/repos/gnome-unstable-i686/PKGBUILD
(from rev 153045, gnome-control-center/trunk/PKGBUILD)
gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install
(from rev 153045, gnome-control-center/trunk/gnome-control-center.install)
gnome-control-center/repos/gnome-unstable-i686/systemd-fallback.patch
(from rev 153045, gnome-control-center/trunk/systemd-fallback.patch)
gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 153045, gnome-control-center/trunk/PKGBUILD)
gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install
(from rev 153045, gnome-control-center/trunk/gnome-control-center.install)
gnome-control-center/repos/gnome-unstable-x86_64/systemd-fallback.patch
(from rev 153045, gnome-control-center/trunk/systemd-fallback.patch)
Deleted:
gnome-control-center/repos/gnome-unstable-i686/PKGBUILD
gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install
gnome-control-center/repos/gnome-unstable-i686/systemd-fallback.patch
gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD
gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install
gnome-control-center/repos/gnome-unstable-x86_64/systemd-fallback.patch
----------------------------------------------------+
gnome-unstable-i686/PKGBUILD | 95 ++++----
gnome-unstable-i686/gnome-control-center.install | 38 +--
gnome-unstable-i686/systemd-fallback.patch | 201 +++++++------------
gnome-unstable-x86_64/PKGBUILD | 93 ++++----
gnome-unstable-x86_64/gnome-control-center.install | 38 +--
gnome-unstable-x86_64/systemd-fallback.patch | 201 +++++++------------
6 files changed, 294 insertions(+), 372 deletions(-)
Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD 2012-03-12 00:25:22 UTC (rev 153045)
+++ gnome-unstable-i686/PKGBUILD 2012-03-12 00:28:07 UTC (rev 153046)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.3.91
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon'
- 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop'
- 'gnome-online-accounts' 'network-manager-applet' 'gnome-bluetooth' 'libsocialweb')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
- 'apg: adds password generation for user accounts'
- 'gnome-color-manager: for color management tasks'
- 'cheese: take account photos via webcam')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'cheese')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- systemd-fallback.patch)
-sha256sums=('6a08f50d6760ef62e567aa1240fca054cc33e8aac37a4fb318cfb4d7b611abfb'
- '8c9647c3bd1a69d9ce4d3716c235463f1cd33527cd8a241a2e88829f14da0494')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 -i ../systemd-fallback.patch
- gnome-autogen.sh
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-systemd --with-libsocialweb \
- --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
-
Copied: gnome-control-center/repos/gnome-unstable-i686/PKGBUILD (from rev 153045, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2012-03-12 00:28:07 UTC (rev 153046)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.3.91
+pkgrel=2
+pkgdesc="The Control Center for GNOME"
+arch=('i686' 'x86_64')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon'
+ 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop'
+ 'gnome-online-accounts' 'network-manager-applet' 'gnome-bluetooth' 'libsocialweb')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'apg: adds password generation for user accounts'
+ 'gnome-color-manager: for color management tasks'
+ 'cheese: take account photos via webcam')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'cheese')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+ systemd-fallback.patch)
+sha256sums=('6a08f50d6760ef62e567aa1240fca054cc33e8aac37a4fb318cfb4d7b611abfb'
+ '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ patch -Np1 -i ../systemd-fallback.patch
+ gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd --with-libsocialweb \
+ --disable-update-mimedb
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
+
Deleted: gnome-unstable-i686/gnome-control-center.install
===================================================================
--- gnome-unstable-i686/gnome-control-center.install 2012-03-12 00:25:22 UTC (rev 153045)
+++ gnome-unstable-i686/gnome-control-center.install 2012-03-12 00:28:07 UTC (rev 153046)
@@ -1,19 +0,0 @@
-pkgname=gnome-control-center
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: gnome-control-center/repos/gnome-unstable-i686/gnome-control-center.install (from rev 153045, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- gnome-unstable-i686/gnome-control-center.install (rev 0)
+++ gnome-unstable-i686/gnome-control-center.install 2012-03-12 00:28:07 UTC (rev 153046)
@@ -0,0 +1,19 @@
+pkgname=gnome-control-center
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: gnome-unstable-i686/systemd-fallback.patch
===================================================================
--- gnome-unstable-i686/systemd-fallback.patch 2012-03-12 00:25:22 UTC (rev 153045)
+++ gnome-unstable-i686/systemd-fallback.patch 2012-03-12 00:28:07 UTC (rev 153046)
@@ -1,120 +0,0 @@
-diff -u -Nr gnome-control-center-3.3.91/configure.ac gnome-control-center-3.3.91-systemd-fallback/configure.ac
---- gnome-control-center-3.3.91/configure.ac 2012-03-05 20:30:32.000000000 +0100
-+++ gnome-control-center-3.3.91-systemd-fallback/configure.ac 2012-03-07 00:06:01.752988448 +0100
-@@ -56,7 +56,7 @@
- [with_systemd=$enableval],
- [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
-- SYSTEMD=libsystemd-login
-+ SYSTEMD="libsystemd-login libsystemd-daemon"
- AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
- SYSTEMD=
-diff -u -Nr gnome-control-center-3.3.91/panels/user-accounts/um-user.c gnome-control-center-3.3.91-systemd-fallback/panels/user-accounts/um-user.c
---- gnome-control-center-3.3.91/panels/user-accounts/um-user.c 2012-03-05 15:04:55.000000000 +0100
-+++ gnome-control-center-3.3.91-systemd-fallback/panels/user-accounts/um-user.c 2012-03-07 00:13:13.002755560 +0100
-@@ -37,6 +37,11 @@
-
- #include <gio/gunixoutputstream.h>
-
-+#ifdef HAVE_SYSTEMD
-+# include <systemd/sd-login.h>
-+# include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,57 +1008,50 @@
- }
- }
-
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
-- int n_sessions;
--
-- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
-- return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+ if (sd_booted () > 0) {
-+ int n_sessions;
-
--#else
-+ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
-
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-- GVariant *result;
-- GVariantIter *iter;
-- gint n_sessions;
-- GError *error = NULL;
-+ return n_sessions > 0;
-+ } else
-+#endif
-+ {
-+ GVariant *result;
-+ GVariantIter *iter;
-+ gint n_sessions;
-+ GError *error = NULL;
-+
-+ result = g_dbus_connection_call_sync (user->bus,
-+ "org.freedesktop.ConsoleKit",
-+ "/org/freedesktop/ConsoleKit/Manager",
-+ "org.freedesktop.ConsoleKit.Manager",
-+ "GetSessionsForUnixUser",
-+ g_variant_new ("(u)", um_user_get_uid (user)),
-+ G_VARIANT_TYPE ("(ao)"),
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ NULL,
-+ &error);
-+ if (!result) {
-+ g_warning ("GetSessionsForUnixUser failed: %s", error->message);
-+ g_error_free (error);
-+ return FALSE;
-+ }
-+
-+ g_variant_get (result, "(ao)", &iter);
-+ n_sessions = g_variant_iter_n_children (iter);
-+ g_variant_iter_free (iter);
-+ g_variant_unref (result);
-
-- result = g_dbus_connection_call_sync (user->bus,
-- "org.freedesktop.ConsoleKit",
-- "/org/freedesktop/ConsoleKit/Manager",
-- "org.freedesktop.ConsoleKit.Manager",
-- "GetSessionsForUnixUser",
-- g_variant_new ("(u)", um_user_get_uid (user)),
-- G_VARIANT_TYPE ("(ao)"),
-- G_DBUS_CALL_FLAGS_NONE,
-- -1,
-- NULL,
-- &error);
-- if (!result) {
-- g_warning ("GetSessionsForUnixUser failed: %s", error->message);
-- g_error_free (error);
-- return FALSE;
-+ return n_sessions > 0;
- }
--
-- g_variant_get (result, "(ao)", &iter);
-- n_sessions = g_variant_iter_n_children (iter);
-- g_variant_iter_free (iter);
-- g_variant_unref (result);
--
-- return n_sessions > 0;
- }
-
--#endif
--
- void
- um_user_set_automatic_login (UmUser *user,
- gboolean enabled)
Copied: gnome-control-center/repos/gnome-unstable-i686/systemd-fallback.patch (from rev 153045, gnome-control-center/trunk/systemd-fallback.patch)
===================================================================
--- gnome-unstable-i686/systemd-fallback.patch (rev 0)
+++ gnome-unstable-i686/systemd-fallback.patch 2012-03-12 00:28:07 UTC (rev 153046)
@@ -0,0 +1,81 @@
+commit 9873a7536844f5c38c2a123be58175c2774e5dcc
+Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+Date: Mon Mar 12 01:12:11 2012 +0100
+
+ Fallback to CK if systemd is not available
+
+ Be nice to distributions where systemd is optional. This will select
+ the code path at runtime depending on whether the system was booted
+ using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index aee97ac..867f061 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
+ [with_systemd=$enableval],
+ [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+- SYSTEMD=libsystemd-login
++ SYSTEMD="libsystemd-login libsystemd-daemon"
+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
+ else
+ SYSTEMD=
+diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
+index f027754..5ebbe29 100644
+--- a/panels/user-accounts/um-user.c
++++ b/panels/user-accounts/um-user.c
+@@ -37,6 +37,11 @@
+
+ #include <gio/gunixoutputstream.h>
+
++#ifdef HAVE_SYSTEMD
++# include <systemd/sd-login.h>
++# include <systemd/sd-daemon.h>
++#endif
++
+ #include "um-user.h"
+ #include "um-account-type.h"
+ #include "um-utils.h"
+@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user,
+ }
+ }
+
+-#ifdef HAVE_SYSTEMD
+-
+-#include <systemd/sd-login.h>
+-
+ gboolean
+ um_user_is_logged_in (UmUser *user)
+ {
+- int n_sessions;
+-
+- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
+-
+- return n_sessions > 0;
+-}
++#ifdef HAVE_SYSTEMD
++ if (sd_booted () > 0) {
++ int n_sessions;
+
+-#else
++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
+
+-gboolean
+-um_user_is_logged_in (UmUser *user)
+-{
++ return n_sessions > 0;
++ }
++#endif
+ GVariant *result;
+ GVariantIter *iter;
+ gint n_sessions;
+@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
+ return n_sessions > 0;
+ }
+
+-#endif
+-
+ void
+ um_user_set_automatic_login (UmUser *user,
+ gboolean enabled)
Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD 2012-03-12 00:25:22 UTC (rev 153045)
+++ gnome-unstable-x86_64/PKGBUILD 2012-03-12 00:28:07 UTC (rev 153046)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.3.91
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon'
- 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop'
- 'gnome-online-accounts' 'network-manager-applet' 'gnome-bluetooth' 'libsocialweb')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
- 'apg: adds password generation for user accounts'
- 'gnome-color-manager: for color management tasks'
- 'cheese: take account photos via webcam')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'cheese')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
- systemd-fallback.patch)
-sha256sums=('6a08f50d6760ef62e567aa1240fca054cc33e8aac37a4fb318cfb4d7b611abfb'
- '8c9647c3bd1a69d9ce4d3716c235463f1cd33527cd8a241a2e88829f14da0494')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- patch -Np1 -i ../systemd-fallback.patch
- gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --enable-systemd --with-libsocialweb \
- --disable-update-mimedb
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=656229
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install
-}
-
Copied: gnome-control-center/repos/gnome-unstable-x86_64/PKGBUILD (from rev 153045, gnome-control-center/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2012-03-12 00:28:07 UTC (rev 153046)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnome-control-center
+pkgver=3.3.91
+pkgrel=2
+pkgdesc="The Control Center for GNOME"
+arch=('i686' 'x86_64')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon'
+ 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop'
+ 'gnome-online-accounts' 'network-manager-applet' 'gnome-bluetooth' 'libsocialweb')
+optdepends=('mesa-demos: provides glxinfo for graphics information'
+ 'apg: adds password generation for user accounts'
+ 'gnome-color-manager: for color management tasks'
+ 'cheese: take account photos via webcam')
+makedepends=('gnome-doc-utils' 'intltool' 'gnome-common' 'cheese')
+url="http://www.gnome.org"
+groups=('gnome')
+install=gnome-control-center.install
+license=('GPL')
+options=('!libtool' '!emptydirs')
+source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+ systemd-fallback.patch)
+sha256sums=('6a08f50d6760ef62e567aa1240fca054cc33e8aac37a4fb318cfb4d7b611abfb'
+ '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ patch -Np1 -i ../systemd-fallback.patch
+ gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-static \
+ --enable-systemd --with-libsocialweb \
+ --disable-update-mimedb
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=656229
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+}
+
Deleted: gnome-unstable-x86_64/gnome-control-center.install
===================================================================
--- gnome-unstable-x86_64/gnome-control-center.install 2012-03-12 00:25:22 UTC (rev 153045)
+++ gnome-unstable-x86_64/gnome-control-center.install 2012-03-12 00:28:07 UTC (rev 153046)
@@ -1,19 +0,0 @@
-pkgname=gnome-control-center
-
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: gnome-control-center/repos/gnome-unstable-x86_64/gnome-control-center.install (from rev 153045, gnome-control-center/trunk/gnome-control-center.install)
===================================================================
--- gnome-unstable-x86_64/gnome-control-center.install (rev 0)
+++ gnome-unstable-x86_64/gnome-control-center.install 2012-03-12 00:28:07 UTC (rev 153046)
@@ -0,0 +1,19 @@
+pkgname=gnome-control-center
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+ if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+ usr/sbin/gconfpkg --uninstall ${pkgname}
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: gnome-unstable-x86_64/systemd-fallback.patch
===================================================================
--- gnome-unstable-x86_64/systemd-fallback.patch 2012-03-12 00:25:22 UTC (rev 153045)
+++ gnome-unstable-x86_64/systemd-fallback.patch 2012-03-12 00:28:07 UTC (rev 153046)
@@ -1,120 +0,0 @@
-diff -u -Nr gnome-control-center-3.3.91/configure.ac gnome-control-center-3.3.91-systemd-fallback/configure.ac
---- gnome-control-center-3.3.91/configure.ac 2012-03-05 20:30:32.000000000 +0100
-+++ gnome-control-center-3.3.91-systemd-fallback/configure.ac 2012-03-07 00:06:01.752988448 +0100
-@@ -56,7 +56,7 @@
- [with_systemd=$enableval],
- [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
-- SYSTEMD=libsystemd-login
-+ SYSTEMD="libsystemd-login libsystemd-daemon"
- AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
- SYSTEMD=
-diff -u -Nr gnome-control-center-3.3.91/panels/user-accounts/um-user.c gnome-control-center-3.3.91-systemd-fallback/panels/user-accounts/um-user.c
---- gnome-control-center-3.3.91/panels/user-accounts/um-user.c 2012-03-05 15:04:55.000000000 +0100
-+++ gnome-control-center-3.3.91-systemd-fallback/panels/user-accounts/um-user.c 2012-03-07 00:13:13.002755560 +0100
-@@ -37,6 +37,11 @@
-
- #include <gio/gunixoutputstream.h>
-
-+#ifdef HAVE_SYSTEMD
-+# include <systemd/sd-login.h>
-+# include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,57 +1008,50 @@
- }
- }
-
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
-- int n_sessions;
--
-- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
-- return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+ if (sd_booted () > 0) {
-+ int n_sessions;
-
--#else
-+ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
-
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-- GVariant *result;
-- GVariantIter *iter;
-- gint n_sessions;
-- GError *error = NULL;
-+ return n_sessions > 0;
-+ } else
-+#endif
-+ {
-+ GVariant *result;
-+ GVariantIter *iter;
-+ gint n_sessions;
-+ GError *error = NULL;
-+
-+ result = g_dbus_connection_call_sync (user->bus,
-+ "org.freedesktop.ConsoleKit",
-+ "/org/freedesktop/ConsoleKit/Manager",
-+ "org.freedesktop.ConsoleKit.Manager",
-+ "GetSessionsForUnixUser",
-+ g_variant_new ("(u)", um_user_get_uid (user)),
-+ G_VARIANT_TYPE ("(ao)"),
-+ G_DBUS_CALL_FLAGS_NONE,
-+ -1,
-+ NULL,
-+ &error);
-+ if (!result) {
-+ g_warning ("GetSessionsForUnixUser failed: %s", error->message);
-+ g_error_free (error);
-+ return FALSE;
-+ }
-+
-+ g_variant_get (result, "(ao)", &iter);
-+ n_sessions = g_variant_iter_n_children (iter);
-+ g_variant_iter_free (iter);
-+ g_variant_unref (result);
-
-- result = g_dbus_connection_call_sync (user->bus,
-- "org.freedesktop.ConsoleKit",
-- "/org/freedesktop/ConsoleKit/Manager",
-- "org.freedesktop.ConsoleKit.Manager",
-- "GetSessionsForUnixUser",
-- g_variant_new ("(u)", um_user_get_uid (user)),
-- G_VARIANT_TYPE ("(ao)"),
-- G_DBUS_CALL_FLAGS_NONE,
-- -1,
-- NULL,
-- &error);
-- if (!result) {
-- g_warning ("GetSessionsForUnixUser failed: %s", error->message);
-- g_error_free (error);
-- return FALSE;
-+ return n_sessions > 0;
- }
--
-- g_variant_get (result, "(ao)", &iter);
-- n_sessions = g_variant_iter_n_children (iter);
-- g_variant_iter_free (iter);
-- g_variant_unref (result);
--
-- return n_sessions > 0;
- }
-
--#endif
--
- void
- um_user_set_automatic_login (UmUser *user,
- gboolean enabled)
Copied: gnome-control-center/repos/gnome-unstable-x86_64/systemd-fallback.patch (from rev 153045, gnome-control-center/trunk/systemd-fallback.patch)
===================================================================
--- gnome-unstable-x86_64/systemd-fallback.patch (rev 0)
+++ gnome-unstable-x86_64/systemd-fallback.patch 2012-03-12 00:28:07 UTC (rev 153046)
@@ -0,0 +1,81 @@
+commit 9873a7536844f5c38c2a123be58175c2774e5dcc
+Author: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+Date: Mon Mar 12 01:12:11 2012 +0100
+
+ Fallback to CK if systemd is not available
+
+ Be nice to distributions where systemd is optional. This will select
+ the code path at runtime depending on whether the system was booted
+ using systemd.
+
+diff --git a/configure.ac b/configure.ac
+index aee97ac..867f061 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
+ [with_systemd=$enableval],
+ [with_systemd=no])
+ if test "$with_systemd" = "yes" ; then
+- SYSTEMD=libsystemd-login
++ SYSTEMD="libsystemd-login libsystemd-daemon"
+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
+ else
+ SYSTEMD=
+diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
+index f027754..5ebbe29 100644
+--- a/panels/user-accounts/um-user.c
++++ b/panels/user-accounts/um-user.c
+@@ -37,6 +37,11 @@
+
+ #include <gio/gunixoutputstream.h>
+
++#ifdef HAVE_SYSTEMD
++# include <systemd/sd-login.h>
++# include <systemd/sd-daemon.h>
++#endif
++
+ #include "um-user.h"
+ #include "um-account-type.h"
+ #include "um-utils.h"
+@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user,
+ }
+ }
+
+-#ifdef HAVE_SYSTEMD
+-
+-#include <systemd/sd-login.h>
+-
+ gboolean
+ um_user_is_logged_in (UmUser *user)
+ {
+- int n_sessions;
+-
+- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
+-
+- return n_sessions > 0;
+-}
++#ifdef HAVE_SYSTEMD
++ if (sd_booted () > 0) {
++ int n_sessions;
+
+-#else
++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
+
+-gboolean
+-um_user_is_logged_in (UmUser *user)
+-{
++ return n_sessions > 0;
++ }
++#endif
+ GVariant *result;
+ GVariantIter *iter;
+ gint n_sessions;
+@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
+ return n_sessions > 0;
+ }
+
+-#endif
+-
+ void
+ um_user_set_automatic_login (UmUser *user,
+ gboolean enabled)
More information about the arch-commits
mailing list